Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -65,23 +65,23 @@
                                                border="1">
                                             <tbody>
                                             <tr>
-                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="8">油罐设计说明</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;"  colspan="8">油罐设计说明</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐名称</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐名称</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</td>
-                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">使用单位</td>
+                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" >使用单位</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{orgName}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计单位</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >设计单位</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px" colspan="2">保管员</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;"  colspan="2">保管员</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐类型</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[tankObj[GrainCardByIdObj.storehouseId].tankType]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].builddate.toString().substring(0,4)}}</td>
-                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐容量</td>
+                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" >油罐容量</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].tankCapacity}}</td>
                                                 <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
                                                     <div style="width:313px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
@@ -115,14 +115,14 @@
                                             </tr>
 
                                             <tr>
-                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="6">储油基本信息</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;"  colspan="6">储油基本信息</td>
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮油品种</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.subType]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">库存数量(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >库存数量(吨)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
                                             </tr>
                                             <tr>
@@ -143,22 +143,21 @@
                                                 <td colspan="2" rowspan="2" style="vertical-align: middle;text-align: center;" class="text-center">{{tankObj[GrainCardByIdObj.storehouseId].keeperNames}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">业务类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >业务类型</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">
-                                                	<div ng-switch="{{GrainCardByIdObj.checkTypeNum}}">
-					                                    <div ng-switch-when="0">入库</div>
-					                                    <div ng-switch-when="1">倒仓</div>
-					                                    <div ng-switch-when="2">移库</div>
-					                                    <div ng-switch-default>{{GrainCardByIdObj.checkTypeNum}}</div>
-				                                    </div>
+				                                    <div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==2">移库</div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==0">入库</div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==1">倒仓</div>
+										            </div>
                                                 </td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">管理方式</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >储粮方式</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">散装储粮</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">国别</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >国别</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">中国</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">实际储油高度(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.csscldg}}</td>
@@ -171,7 +170,7 @@
                                         </table>
                                         <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;border-collapse:collapse;border:none; font-size: 13px;" border="1">
                                             <tr>
-                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="6">质检信息</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;"  colspan="6">质检信息</td>
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">不溶性杂质含量%</td>
@@ -192,9 +191,9 @@
                                         </table>
                                         <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
                                             <tr>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">建卡人：{{GrainCardByIdObj.jkr}}</td>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">备注：{{GrainCardByIdObj.remark}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡人：{{GrainCardByIdObj.jkr}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >备注：{{GrainCardByIdObj.remark}}</td>
                                             </tr>
                                         </table>
                                     </div>
@@ -254,7 +253,7 @@
                                             </tr>
 
                                             <tr>
-                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="6">储粮基本信息</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" height="45px" colspan="6">储粮基本信息</td>
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">货位名称</td>
@@ -274,14 +273,13 @@
                                                 <td colspan="2" style="vertical-align: middle;text-align: center;" class="text-center">{{storehouseObj[GrainCardByIdObj.storehouseId].dutystoreman}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">业务类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >业务类型</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">
-                                                	<div ng-switch="{{GrainCardByIdObj.checkTypeNum}}">
-					                                    <div ng-switch-when="0">入库</div>
-					                                    <div ng-switch-when="1">倒仓</div>
-					                                    <div ng-switch-when="2">移库</div>
-					                                    <div ng-switch-default>{{GrainCardByIdObj.checkTypeNum}}</div>
-				                                    </div>
+                                                	<div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==2">移库</div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==0">入库</div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==1">倒仓</div>
+										            </div>
                                                 </td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">管理方式</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
@@ -291,7 +289,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">国别</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >国别</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">中国</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.toString().substring(0,4)}}</td>
@@ -301,7 +299,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.zhycsj}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >储粮方式</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">散装储粮</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">初始散存粮体积长/宽/高(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.csscldc+'/'+GrainCardByIdObj.csscldk+'/'+GrainCardByIdObj.csscldg}}</td>
@@ -350,7 +348,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">色泽、气味</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">{{grainCardView.huskedRation}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >{{grainCardView.huskedRation}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.fullGoodRation}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.water}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.impurityTotal}}</td>
@@ -362,9 +360,9 @@
                                         </table>
                                         <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
                                             <tr>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">建卡人：{{GrainCardByIdObj.jkr}}</td>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">备注：{{GrainCardByIdObj.remark}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡人：{{GrainCardByIdObj.jkr}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >备注：{{GrainCardByIdObj.remark}}</td>
                                             </tr>
                                         </table>
                                     </div>

src/main/resources/static/app/storage/grainCard/views/productGrain-check-G.html

@@ -2,23 +2,23 @@
 
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="8">粮仓设计说明</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">粮仓设计说明</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">仓房名称</td>
+        <td style="vertical-align: middle;text-align: center;" >仓房名称</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.storehouseName}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">使用单位</td>
+        <td style="vertical-align: middle;text-align: center;" >使用单位</td>
         <td style="vertical-align: middle;text-align: center;">{{orgInfo.orgName}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">设计单位</td>
+        <td style="vertical-align: middle;text-align: center;" >设计单位</td>
         <td style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].sjdw}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px" colspan="2">保管员</td>
+        <td style="vertical-align: middle;text-align: center;"  colspan="2">保管员</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房类型</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >仓房类型</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[cerealsCard.spareOne].storehouseType]}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房结构</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >仓房结构</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[cerealsCard.spareOne].wall]}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].usedate}}</td>
         <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
             <div style="width:313px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
@@ -51,10 +51,10 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].actualCapacity}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="6">储粮基本信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" colspan="6">储粮基本信息</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">货位名称</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >货位名称</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.warehouseName}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lqss}}</td>
@@ -62,7 +62,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">库存数量(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >库存数量(吨)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">包数</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.js}}</td>
@@ -70,7 +70,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">入仓年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >入仓年度</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj.toString().substring(0,4)}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">品牌</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.pinp}}</td>
@@ -79,37 +79,36 @@
         <td style="vertical-align: middle;text-align: center;" colspan="2">{{storehouseObj[cerealsCard.spareOne].dutystoreman}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">入库时间(最后一车)</td>
+        <td style="vertical-align: middle;text-align: center;" >入库时间(最后一车)</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
         <td style="vertical-align: middle;text-align: center;">等级/类别</td>
         <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.lydjCode]}}</td>
         <td style="vertical-align: middle;text-align: center;">业务类型</td>
         <td style="vertical-align: middle;text-align: center;">
-            <div ng-switch="{{cerealsCard.ywlx}}">
-                <div ng-switch-when="0">入库</div>
-                <div ng-switch-when="1">倒仓</div>
-                <div ng-switch-when="2">移库</div>
-                <div ng-switch-default>{{cerealsCard.ywlx}}</div>
+            <div>
+                <div ng-if="cerealsCard.ywlx==2">移库</div>
+                <div ng-if="cerealsCard.ywlx==0">入库</div>
+                <div ng-if="cerealsCard.ywlx==1">倒仓</div>
             </div>
         </td>
         <td style="vertical-align: middle;text-align: center;">产地</td>
         <td style="vertical-align: middle;text-align: center;">{{dicData[cd]}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">国别</td>
+        <td style="vertical-align: middle;text-align: center;" >国别</td>
         <td style="vertical-align: middle;text-align: center;">中国</td>
         <td style="vertical-align: middle;text-align: center;">粮油性质</td>
         <td style="vertical-align: middle;text-align: center;">{{dicData[lyxz]}}</td>
         <td style="vertical-align: middle;text-align: center;">包装规格(kg/件)</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzgg}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">保质期</td>
+        <td style="vertical-align: middle;text-align: center;" >保质期</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzq}}</td>
     </tr>
     
     <tr>
         <td style="vertical-align: middle;text-align: center;">储存方式</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">管理方式</td>
+        <td style="vertical-align: middle;text-align: center;" >管理方式</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.orgId == 76 ? "直储" : "代储"}}</td>
         <td style="vertical-align: middle;text-align: center;">厂家</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.cj}}</td>
@@ -122,7 +121,7 @@
 <table ng-show="cerealsCard.lypzCode=='7107' && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;">加工精度</td>
@@ -150,10 +149,10 @@
     </tr>
 </table>
 <!-- 小麦粉 -->
-<table ng-show="cerealsCard.lypzCode==7138 && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+<table ng-show="cerealsCard.lypzCode==7038 && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;">水分%</td>
@@ -184,7 +183,7 @@
 <table ng-show="(cerealsCard.lypzCode==7050 || cerealsCard.lypzCode==7052) && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;">气味、滋味</td>

src/main/resources/static/app/storage/grainCard/views/productGrain-check-T.html

@@ -2,7 +2,7 @@
 
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="8">油罐设计说明</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">油罐设计说明</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;" height="56px">油罐名称</td>
@@ -14,11 +14,11 @@
         <td style="vertical-align: middle;text-align: center;" height="56px" colspan="2">保管员</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐类型</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐类型</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[tankObj[cerealsCard.spareOne].tankType]}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].builddate.toString().substring(0,4)}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐容量</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐容量</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].tankCapacity}}</td>
         <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
             <div style="width:313px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
@@ -51,14 +51,14 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].insportHeight}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="6">储油基本信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" colspan="6">储油基本信息</td>
     </tr>
     <tr>
         <td class="text-center" style="vertical-align: middle;text-align: center;">粮油品种</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lqss}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">库存数量(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >库存数量(吨)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
     </tr>
     <tr>
@@ -66,7 +66,7 @@
         <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.lydjCode]}}</td>
         <td style="vertical-align: middle;text-align: center;">粮油性质</td>
         <td style="vertical-align: middle;text-align: center;">{{dicData[lyxz]}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">入罐年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >入罐年度</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj.toString().substring(0,4)}}</td>
     </tr>
     <tr>
@@ -79,21 +79,20 @@
         <td style="vertical-align: middle;text-align: center;" colspan="2">{{tankObj[cerealsCard.spareOne].keeperNames}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">入库时间(最后一车)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
-        <td style="vertical-align: middle;text-align: center;">保质期</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzq}}</td>
-        <td style="vertical-align: middle;text-align: center;">产地</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[cd]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间(最后一车)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">保质期</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.bzq}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[cd]}}</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;">业务类型</td>
         <td style="vertical-align: middle;text-align: center;">
-            <div ng-switch="{{cerealsCard.ywlx}}">
-                <div ng-switch-when="0">入库</div>
-                <div ng-switch-when="1">倒仓</div>
-                <div ng-switch-when="2">移库</div>
-                <div ng-switch-default>{{cerealsCard.ywlx}}</div>
+            <div>
+                <div ng-if="cerealsCard.ywlx==2">移库</div>
+                <div ng-if="cerealsCard.ywlx==0">入库</div>
+                <div ng-if="cerealsCard.ywlx==1">倒仓</div>
             </div>
         </td>
         <td style="vertical-align: middle;text-align: center;">管理方式</td>
@@ -120,7 +119,7 @@
 <table ng-show="cerealsCard.lypzCode=='7107' && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;">加工精度</td>
@@ -148,10 +147,10 @@
     </tr>
 </table>
 <!-- 小麦粉 -->
-<table ng-show="cerealsCard.lypzCode==7138 && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+<table ng-show="cerealsCard.lypzCode==7038 && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;">水分%</td>
@@ -182,7 +181,7 @@
 <table ng-show="(cerealsCard.lypzCode==7050 || cerealsCard.lypzCode==7052) && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;">气味、滋味</td>

src/main/resources/static/app/storage/grainCard/views/productGrain-check.html

@@ -40,9 +40,9 @@
                                     <div ng-include="'app/storage/grainCard/views/productGrain-check-T.html'" ng-hide="!grainOrOil"></div>
                                     <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
                                         <tr>
-                                            <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">建卡人：{{cerealsCard.jkr}}</td>
-                                            <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">建卡时间：{{cerealsCard.jkrq}}</td>
-                                            <td class="text-left" style="vertical-align: middle;text-align: left;" height="45px">备注：{{cerealsCard.remark}}</td>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;">建卡人：{{cerealsCard.jkr}}</td>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;">建卡时间：{{cerealsCard.jkrq}}</td>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;">备注：{{cerealsCard.remark}}</td>
                                         </tr>
                                     </table>
                                 </div>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-edit.html

@@ -1572,10 +1572,10 @@
 														</td>
 													</tr>
 													<tr>
-														<td class="text-center" colspan="2">粗细度%</td>
+														<td class="text-center" colspan="2">外观形态</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.coarseness" name="coarseness" ng-readonly="isNotEdit" validNumber=true>
+																<input type="text" ng-model="qualitycheckInspection.wgxt" name="wgxt" ng-readonly="isNotEdit" />
 															</label>
 														</td>
 														<td class="text-center" colspan="2">气味、口味</td>
@@ -1586,7 +1586,7 @@
 														</td>
 													</tr>
 													<tr>
-														<td class="text-center" colspan="2">面筋质%（以湿重计）</td>
+														<td class="text-center" colspan="2">湿面筋含量/%</td>
 														<td colspan="2">
 															<label class="input">
 																<input type="text" ng-model="qualitycheckInspection.gluten" name="gluten" ng-readonly="isNotEdit" validNumber=true>
@@ -2801,9 +2801,9 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">粗细度%</td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">外观形态</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.coarseness}}
+							{{qualitycheckInspection.wgxt}}
 						</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;">气味、口味</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
@@ -2811,7 +2811,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">面筋质%（以湿重计）</td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">湿面筋含量/%</td>
 						<td colspan="6" style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.gluten}}>
 						</td>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-outcheck-edit.html

@@ -1600,10 +1600,10 @@
 														</td>
 													</tr>
 													<tr>
-														<td class="text-center" colspan="2">粗细度%</td>
+														<td class="text-center" colspan="2">外观形态</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.coarseness" name="coarseness" ng-readonly="isNotEdit" validNumber=true>
+																<input type="text" ng-model="qualitycheckInspection.wgxt" name="wgxt" ng-readonly="isNotEdit" />
 															</label>
 														</td>
 														<td class="text-center" colspan="2">气味、口味</td>
@@ -1614,7 +1614,7 @@
 														</td>
 													</tr>
 													<tr>
-														<td class="text-center" colspan="2">面筋质%（以湿重计）</td>
+														<td class="text-center" colspan="2">湿面筋含量/%</td>
 														<td colspan="2">
 															<label class="input">
 																<input type="text" ng-model="qualitycheckInspection.gluten" name="gluten" ng-readonly="isNotEdit" validNumber=true>
@@ -2826,9 +2826,9 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">粗细度%</td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">外观形态</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.coarseness}}
+							{{qualitycheckInspection.wgxt}}
 						</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;">气味、口味</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
@@ -2836,7 +2836,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">面筋质%（以湿重计）</td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">湿面筋含量/%</td>
 						<td colspan="6" style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.gluten}}>
 						</td>