Selaa lähdekoodia

系统中所有的实际仓容改成核定仓容

fanxw 2 vuotta sitten
vanhempi
commit
99fcfba442

+ 1 - 1
src/main/resources/static/app/basic/storehouse/views/Storehouse-edit.html

@@ -412,7 +412,7 @@
412 412
 												</label>
413 413
 											</th>
414 414
 											<th>
415
-												<label class="label" style="margin-top: 9px;text-align: center;">实际仓容(吨)</label>
415
+												<label class="label" style="margin-top: 9px;text-align: center;">核定仓容(吨)</label>
416 416
 											</th>
417 417
 											<th>
418 418
 												<label class="input">

+ 1 - 1
src/main/resources/static/app/basic/storehouse/views/Storehouse-list.html

@@ -63,7 +63,7 @@
63 63
 											<th data-hide="expand">仓房类型</th>
64 64
 											<th data-hide="expand">代储甲方名称</th>
65 65
 											<th data-hide="expand">设计仓容(吨)</th>
66
-											<th data-hide="expand">实际仓容(吨)</th>
66
+											<th data-hide="expand">核定仓容(吨)</th>
67 67
 											<!--<th data-hide="expand">通风方式</th>-->
68 68
 											<!--<th data-hide="expand">保管方式</th>-->
69 69
 											<!--<th data-hide="expand">装粮线高度(m)</th>-->

+ 1 - 1
src/main/resources/static/app/business/agent/basic/views/agentStorehouse-list.html

@@ -58,7 +58,7 @@
58 58
 											<th data-class="expand">仓房名称</th>
59 59
 											<th data-hide="expand">仓房类型</th>
60 60
 											<th data-hide="expand">设计仓容(吨)</th>
61
-											<th data-hide="expand">实际仓容(吨)</th>
61
+											<th data-hide="expand">核定仓容(吨)</th>
62 62
 											<th data-hide="expand">保管员</th>
63 63
 											<th data-hide="expand">仓房状态</th>
64 64
 											<th data-hide="expand">使用情况</th>

+ 1 - 1
src/main/resources/static/app/intelligent/basicData/views/basicWareHouseSet-edit.html

@@ -115,7 +115,7 @@
115 115
                                             </label>
116 116
                                             </section>
117 117
                                             <section class="col col-3">
118
-                                                <label class="label">实际仓容:</label> <label class="input">
118
+                                                <label class="label">核定仓容:</label> <label class="input">
119 119
                                                 <input type="text" ng-model="basicStorehouse.actualCapacity"
120 120
                                                        ng-disabled="isNotEdit"
121 121
                                                        name="actualCapacity" maxlength="10" ng-keyup="clearNoNum(basicStorehouse,'actualCapacity')">

+ 1 - 1
src/main/resources/static/app/intelligent/basicData/views/basicWareHouseSet-list.html

@@ -42,7 +42,7 @@
42 42
                                         <th data-class="expand" style="text-align:center;">仓房名称</th>
43 43
                                         <th data-class="expand" style="text-align:center;">仓房类型</th>
44 44
                                         <th data-class="expand" style="text-align:center;">设计仓容</th>
45
-                                        <th data-class="expand" style="text-align:center;">实际仓容</th>
45
+                                        <th data-class="expand" style="text-align:center;">核定仓容</th>
46 46
                                         <th data-class="expand" style="text-align:center;">建造年代</th>
47 47
                                         <th data-class="expand" style="text-align:center;">保管员</th>
48 48
                                         <th data-class="expand" style="text-align:center;">操作</th>

+ 1 - 1
src/main/resources/static/app/storage/views/storehouse/storehouse-housebaseinfo-view.html

@@ -48,7 +48,7 @@
48 48
 										<th data-hide="expand">库点名称</th>
49 49
 										<th data-class="expand">仓房名称</th>
50 50
 										<th data-class="expand">仓房类型</th>
51
-										<th data-hide="expand">实际仓容</th>
51
+										<th data-hide="expand">核定仓容</th>
52 52
 										<th data-hide="expand">仓房使用状态</th>
53 53
 										<th data-hide="expand">启用日期</th>
54 54
 										<th data-hide="expand">保管员</th>

+ 1 - 1
src/main/resources/static/app/supervise/controller/ptCtrl.js

@@ -143,7 +143,7 @@ angular.module('app.supervise')
143 143
                             pop += "<div id='popContainer'><div class='popover-con'>"+
144 144
                                 "<h3>&nbsp;"+data[i].barnname+"</h3><div class='popover-main'>"+
145 145
                                 "<table><tr><td style='width:143px;'>入仓时间:"+(crkObj.rq?crkObj.rq:"空")+"</td></tr><tr>"+
146
-                                "</tr><tr><td colspan='2'>实际仓容:"+(data[i].capacity?data[i].capacity:"0")+"吨</td></tr><tr>"+
146
+                                "</tr><tr><td colspan='2'>核定仓容:"+(data[i].capacity?data[i].capacity:"0")+"吨</td></tr><tr>"+
147 147
                                 "<td colspan='2'>状&#12288;&#12288;态:"+($scope.dicData[data[i].housestate]?$scope.dicData[data[i].housestate]:"空")+"</td></tr></table><div class='tit1'>"+
148 148
                                 "<span>储粮信息</span></div><table><tr><td colspan='2'>品&#12288;&#12288;种:"+($rootScope.dicData[crkObj.pz]?$rootScope.dicData[crkObj.pz]:"空")+"</td>"+
149 149
                                 "</tr><tr><td colspan='2'>数&#12288;&#12288;量:"+(crkObj.kcsl!=undefined?(crkObj.kcsl/1000).toFixed(2):'0')+"吨</td>"+

+ 1 - 1
src/main/resources/static/app/supervise/views/storageState/storageState-list.html

@@ -49,7 +49,7 @@
49 49
 											<th data-class="expand">仓房名称</th>
50 50
 											<th data-hide="expand">仓房类型</th>
51 51
 											<th data-hide="expand">设计仓容(吨)</th>
52
-											<th data-hide="expand">实际仓容(吨)</th>
52
+											<th data-hide="expand">核定仓容(吨)</th>
53 53
 											<th data-hide="expand">保管员</th>
54 54
 											<th data-hide="expand">仓房状态</th>
55 55
 											<th data-hide="expand">交付使用日期</th>