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

src/main/resources/static/app/business/facility/views/add-facility.html

@@ -52,7 +52,7 @@
 											<label class="label">竣工年份：<span style="color: red;">*</span></label>
 											<label class="input">
                                                 <input type="text" name="jgnf" id="facility_jgnf" ng-disabled="isNotEdit" ng-model="facilityInfo.jgnf"
-							                		class="form-control" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy'})" ng-readonly="true" required>
+                                                placeholder="竣工年份" class="form-control" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy'})" required>
 											</label>
 										</section>
 										<section class="col col-3">

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

@@ -129,19 +129,33 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.checkTime}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">溶剂残留量(mg/kg)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.residualSolvent}}</td>
-                                                <td class="text-center" rowspan="3" colspan="2"
+                                                <td class="text-center" colspan="2"
                                                     style="vertical-align: middle;border:1px solid #ccc;vertical-align: middle;text-align: center;">{{grainCardView.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;">{{grainCardView.oilHeight}}</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;"></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.storeType == 1 ? "直储" : "代储"}}</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.number ? grainCardView.number/1000 : 0 | number : 3}}</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;">{{grainCardView.inputTime.slice(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;">{{GrainCardByIdObj.looseGrainVolume}}</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.grainPacks}}</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 == 1 ? "市粮食局" : orgInfo.orgName}}</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;">{{grainCardView.oilHeight}}</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;">{{grainCardView.insportHeight}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;"></td>
@@ -166,7 +180,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[oneCard.tankType]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{oneCard.number ? oneCard.number/1000 : 0 | number : 3}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{oneCard.keeperNames}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="2"></td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="3">{{GrainCardByIdObj.remark}}</td>
                                             </tr>
                                             <table class="table table-striped table-bordered table-hover"
                                                    width="100%" style="table-layout: fixed;"

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

@@ -107,6 +107,44 @@
                                         </tr>
                                         <tr>
                                             <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="oilCard.looseGrainVolume"
+                                                               name="looseGrainVolume" class="form-control">
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="select">
+                                                        <select ng-model="oilCard.storeType" name="storeType">
+                                                            <option value="">--请选择--</option>
+                                                            <option value="1">直储</option>
+                                                            <option value="2">代储</option>
+                                                        </select><i></i>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th style="border-bottom-width:1px">
+                                                <label class="label" style="margin-top: 9px;text-align: center;">包存粮包数:</label>
+                                            </th>
+                                            <th style="border-bottom-width:1px">
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="oilCard.grainPacks"
+                                                               name="grainPacks" class="form-control">
+                                                    </label>
+                                                </section>
+                                            </th>
+                                        </tr>
+                                        <tr>
+                                            <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">轮换协议编号</label>
                                             </th>
                                             <th style="border-bottom-width:1px">
@@ -117,7 +155,34 @@
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th colspan="4"></th>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:</label>
+                                            </th>
+                                            <th style="border-bottom-width:1px">
+                                                <section>
+                                                    <label class="select">
+                                                        <select ng-model="oilCard.grainRights" name="grainRights" required>
+                                                            <option value="">--请选择--</option>
+                                                            <option value="1">市粮食局</option>
+                                                            <option value="2">{{orgInfo.orgName}}</option>
+                                                        </select><i></i>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <!-- <th colspan="4"></th> -->
+                                        </tr>
+                                        <tr>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
+                                            </th>
+                                            <th style="border-bottom-width:1px" colspan="5">
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="oilCard.remark"
+                                                               name="remark" class="form-control">
+                                                    </label>
+                                                </section>
+                                            </th>
                                         </tr>
                                     </table>
                                     <div>