Browse Source

fix: merge

lufeng 2 years ago
parent
commit
8579c497bb

+ 4 - 7
src/main/resources/static/app/intelligent/aeration/views/aerationJob-edit.html

@@ -359,13 +359,10 @@
359 359
 													<select ng-model="aerationJob.fwszfs" required name="fwszfs"
360 360
 													class="form-control" ng-disabled="isNotEdit">
361 361
 														<option value="">--请选择--</option>
362
-														<option value="1">地槽</option>
363
-														<option value="2">地上笼</option>
364
-														<option value="3">移动式</option>
365
-														<option value="4">箱式</option>
366
-														<option value="5">径向</option>
367
-														<option value="6">维持通风</option>
368
-														<option value="9">其他</option>
362
+														<option value="1">地上槽</option>
363
+														<option value="2">地下槽</option>
364
+														<option value="3">横向</option>
365
+														<option value="4">径向</option>
369 366
 													</select>
370 367
 												</label>
371 368
 											</th>

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

@@ -378,7 +378,7 @@
378 378
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内宽</td>
379 379
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.width}}</td>
380 380
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">建卡日期</td>
381
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate}}</td>
381
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate | date:'yyyy-MM-dd'}}</td>
382 382
                                                 
383 383
                                                 <!--小麦及混合小麦3164,玉米3165,大豆2777,稻谷3166-->
384 384
 
@@ -423,9 +423,9 @@
423 423
                                             </tr>
424 424
                                             <tr>
425 425
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">状态</td>
426
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封</td>
426
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封</td>
427 427
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">存储类型</td>
428
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.storeType == 1 ? "直储" : "代储"}}</td>
428
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
429 429
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">收储地点</td>
430 430
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">库内</td>
431 431
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">计价数量</td>
@@ -435,11 +435,11 @@
435 435
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
436 436
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.slice(0, 4)}}</td>
437 437
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积</td>
438
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.looseGrainVolume}}</td>
438
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
439 439
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">包存粮包数</td>
440
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainPacks}}</td>
440
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainPacks}}</td>
441 441
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
442
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainRights == 1 ? "市粮食局" : orgInfo.orgName}}</td>
442
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights == 1 ? "市粮食局" : orgInfo.orgName}}</td>
443 443
                                             </tr>
444 444
                                             <!-- <tr>
445 445
                                                 
@@ -461,7 +461,7 @@
461 461
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计仓容</td>
462 462
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.designCapacity}}</td>
463 463
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">备注</td>
464
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="3">{{grainCardView.remark}}</td>
464
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="3">{{GrainCardByIdObj.remark}}</td>
465 465
                                             </tr>
466 466
                                            
467 467
                                             <table class="table table-striped table-bordered table-hover"

+ 77 - 9
src/main/resources/static/app/storage/grainCard/views/grainCarAdd.html

@@ -27,7 +27,7 @@
27 27
                                     <table class="table table-striped table-bordered table-hover" width="100%">
28 28
                                         <tr>
29 29
                                             <th width='10%'>
30
-                                                <label class="label" style="margin-top: 9px;text-align: center;">仓房名称<span style="color: red;">*</span></label>
30
+                                                <label class="label" style="margin-top: 9px;text-align: center;">仓房名称:<span style="color: red;">*</span></label>
31 31
                                             </th>
32 32
                                             <th width='20%'>
33 33
                                                 <section>
@@ -43,7 +43,7 @@
43 43
                                                 </section>
44 44
                                             </th>
45 45
                                             <th width='10%'>
46
-                                                <label class="label" style="margin-top: 9px;text-align: center;">货位名称<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
46
+                                                <label class="label" style="margin-top: 9px;text-align: center;">货位名称:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
47 47
                                             </th>
48 48
                                             <th width='20%'>
49 49
                                                 <section>
@@ -59,7 +59,7 @@
59 59
                                                 </section>
60 60
                                             </th>
61 61
                                             <th width='10%'>
62
-                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种<span style="color: red;">*</span></label>
62
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种:<span style="color: red;">*</span></label>
63 63
                                             </th>
64 64
                                             <th width='20%'>
65 65
                                                 <section>
@@ -72,7 +72,7 @@
72 72
                                         </tr>
73 73
                                         <tr>
74 74
                                             <th>
75
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期<span style="color: red;">*</span></label>
75
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡日期:<span style="color: red;">*</span></label>
76 76
                                             </th>
77 77
                                             <th>
78 78
                                                 <section>
@@ -84,7 +84,7 @@
84 84
                                                 </section>
85 85
                                             </th>
86 86
                                             <th>
87
-                                                <label class="label" style="margin-top: 9px;text-align: center;">类型<span style="color: red;">*</span></label>
87
+                                                <label class="label" style="margin-top: 9px;text-align: center;">类型:<span style="color: red;">*</span></label>
88 88
                                             </th>
89 89
                                             <th width='20%'>
90 90
                                                 <section>
@@ -99,7 +99,7 @@
99 99
                                                 </section>
100 100
                                             </th>
101 101
                                             <th style="border-bottom-width:1px">
102
-                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨)</label>
102
+                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨):</label>
103 103
                                             </th>
104 104
                                             <th style="border-bottom-width:1px">
105 105
                                                 <section>
@@ -110,9 +110,51 @@
110 110
                                                 </section>
111 111
                                             </th>
112 112
                                         </tr>
113
+
114
+
115
+                                        <tr>
116
+                                            <th>
117
+                                                <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
118
+                                            </th>
119
+                                            <th>
120
+                                                <section>
121
+                                                    <label class="input">
122
+                                                        <input type="text" ng-model="grainCard.looseGrainVolume"
123
+                                                               name="looseGrainVolume" class="form-control">
124
+                                                    </label>
125
+                                                </section>
126
+                                            </th>
127
+                                            <th>
128
+                                                <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
129
+                                            </th>
130
+                                            <th>
131
+                                                <section>
132
+                                                    <label class="select">
133
+                                                        <select ng-model="grainCard.storeType" name="storeType">
134
+                                                            <option value="">--请选择--</option>
135
+                                                            <option value="1">直储</option>
136
+                                                            <option value="2">代储</option>
137
+                                                        </select><i></i>
138
+                                                    </label>
139
+                                                </section>
140
+                                            </th>
141
+                                            <th style="border-bottom-width:1px">
142
+                                                <label class="label" style="margin-top: 9px;text-align: center;">包存粮包数:</label>
143
+                                            </th>
144
+                                            <th style="border-bottom-width:1px">
145
+                                                <section>
146
+                                                    <label class="input">
147
+                                                        <input type="text" ng-model="grainCard.grainPacks"
148
+                                                               name="grainPacks" class="form-control">
149
+                                                    </label>
150
+                                                </section>
151
+                                            </th>
152
+                                        </tr>
153
+
154
+                                        
113 155
                                         <tr>
114 156
                                             <th>
115
-                                                <label class="label" style="margin-top: 9px;text-align: center;">生产年度</label>
157
+                                                <label class="label" style="margin-top: 9px;text-align: center;">生产年度:</label>
116 158
                                             </th>
117 159
                                             <th style="border-bottom-width:1px">
118 160
                                                 <section>
@@ -123,7 +165,7 @@
123 165
                                                 </section>
124 166
                                             </th>
125 167
                                             <th>
126
-                                                <label class="label" style="margin-top: 9px;text-align: center;">轮换协议编号</label>
168
+                                                <label class="label" style="margin-top: 9px;text-align: center;white-space: nowrap;">轮换协议编号:</label>
127 169
                                             </th>
128 170
                                             <th style="border-bottom-width:1px">
129 171
                                                 <section>
@@ -133,7 +175,33 @@
133 175
                                                     </label>
134 176
                                                 </section>
135 177
                                             </th>
136
-                                            <th colspan="2"></th>
178
+                                            <th>
179
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:</label>
180
+                                            </th>
181
+                                            <th style="border-bottom-width:1px">
182
+                                                <section>
183
+                                                    <label class="select">
184
+                                                        <select ng-model="grainCard.grainRights" name="grainRights" required>
185
+                                                            <option value="">--请选择--</option>
186
+                                                            <option value="1">市粮食局</option>
187
+                                                            <option value="2">{{orgInfo.orgName}}</option>
188
+                                                        </select><i></i>
189
+                                                    </label>
190
+                                                </section>
191
+                                            </th>
192
+                                        </tr>
193
+                                        <tr>
194
+                                            <th>
195
+                                                <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
196
+                                            </th>
197
+                                            <th style="border-bottom-width:1px" colspan="5">
198
+                                                <section>
199
+                                                    <label class="input">
200
+                                                        <input type="text" ng-model="grainCard.remark"
201
+                                                               name="remark" class="form-control">
202
+                                                    </label>
203
+                                                </section>
204
+                                            </th>
137 205
                                         </tr>
138 206
                                     </table>
139 207
                                     <div>