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

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

@@ -30,36 +30,36 @@
                                     <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
                                         <tbody>
                                         <tr>
-                                            <td class="text-center" rowspan="2" colspan="2" style="vertical-align: middle;">检查日期</td>
-                                            <td class="text-center" colspan="3" style="vertical-align: middle;">虫害检查</td>
-                                            <td class="text-center"  rowspan="2" style="vertical-align: middle;">雨后检查</td>
-                                            <td class="text-center" rowspan="2" style="vertical-align: middle;">鼠雀检查</td>
-                                            <td class="text-center" rowspan="2" style="vertical-align: middle;">其他检查</td>
-                                            <td class="text-center"  colspan="2"  rowspan="2" style="vertical-align: middle;">发现问题及处理情况</td>
-                                            <td class="text-center"  colspan="2"  rowspan="2" style="vertical-align: middle;">操作</td>
+                                            <td class="text-center" rowspan="1" colspan="2" style="vertical-align: middle;">检查日期</td>
+                                            <!--<td class="text-center" colspan="3" style="vertical-align: middle;">虫害检查</td>-->
+                                            <td class="text-center"  rowspan="1" style="vertical-align: middle;">雨后检查</td>
+                                            <td class="text-center" rowspan="1" style="vertical-align: middle;">鼠雀检查</td>
+                                            <td class="text-center" rowspan="1" colspan="2" style="vertical-align: middle;">其他检查</td>
+                                            <td class="text-center"  colspan="4"  rowspan="1" style="vertical-align: middle;">发现问题及处理情况</td>
+                                            <td class="text-center"  colspan="2"  rowspan="1" style="vertical-align: middle;">操作</td>
                                         </tr>
-                                        <tr>
+                                        <!--<tr>
                                             <td class="text-center" >部位</td>
                                             <td class="text-center">密度(头/公斤)</td>
                                             <td class="text-center">春虫虫种</td>
-                                        </tr>
+                                        </tr>-->
                                         <tr  ng-repeat="dailyCard in dailyCardList">
                                             <td class="text-center" colspan="2" style="vertical-align: middle;">
                                                 {{dailyCard.checkTime | date:'yyyy-MM-dd' }}
                                             </td>
-                                            <td class="text-center" style="vertical-align: middle;">{{dailyCard.pestsPosition}}</td>
+                                            <!--<td class="text-center" style="vertical-align: middle;">{{dailyCard.pestsPosition}}</td>
                                             <td class="text-center" style="vertical-align: middle;">{{dailyCard.pestsDensity}}</td>
                                             <td class="text-center" style="vertical-align: middle;">
                                                 <span ng-if="dailyCard.pestsSpecies == null ">无</span>
                                                 <span ng-if="dailyCard.pestsSpecies != null ">{{dicData[dailyCard.pestsSpecies]}}</span>
-                                            </td>
+                                            </td>-->
                                             <td class="text-center" style="vertical-align: middle;">{{dailyCard.rainCheck}}</td>
                                             <td class="text-center" style="vertical-align: middle;">
                                                 <span ng-if="dailyCard.ratfinchCheck == '0' ">无</span>
                                                 <span ng-if="dailyCard.ratfinchCheck == '1' ">有</span>
                                             </td>
-                                            <td class="text-center" style="vertical-align: middle;">{{dailyCard.otherCheck}}</td>
-                                            <td class="text-center" colspan="2" style="vertical-align: middle;">
+                                            <td class="text-center" colspan="2" style="vertical-align: middle;">{{dailyCard.otherCheck}}</td>
+                                            <td class="text-center" colspan="4" style="vertical-align: middle;">
                                                 <div ng-if="dailyCard.flagType == 1">
                                                     <textarea ng-model="dailyCard.findQuestion" style="width:100%;">{{dailyCard.findQuestion}}</textarea>
                                                 </div>

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

@@ -1280,52 +1280,52 @@
                                     style="table-layout: fixed;border-collapse:collapse;border:none;" border="1">
                                     <tbody>
                                     <tr>
-                                        <td class="text-center" rowspan="2" colspan="2" width="150px" style="vertical-align: middle;text-align: center;">
+                                        <td class="text-center" rowspan="1" colspan="2" width="150px" style="vertical-align: middle;text-align: center;">
                                             检查日期
                                         </td>
-                                        <td class="text-center" colspan="3" style="vertical-align: middle;text-align: center;">
+                                        <!--<td class="text-center" colspan="3" style="vertical-align: middle;text-align: center;">
                                             虫害检查
-                                        </td>
-                                        <td class="text-center" rowspan="2" style="vertical-align: middle;text-align: center;">
+                                        </td>-->
+                                        <td class="text-center" rowspan="1" style="vertical-align: middle;text-align: center;">
                                             雨后检查
                                         </td>
-                                        <td class="text-center" rowspan="2" style="vertical-align: middle;text-align: center;">
+                                        <td class="text-center" rowspan="1" style="vertical-align: middle;text-align: center;">
                                             鼠雀检查
                                         </td>
-                                        <td class="text-center" rowspan="2" style="vertical-align: middle;text-align: center;">
+                                        <td class="text-center" rowspan="1" colspan="2" style="vertical-align: middle;text-align: center;">
                                             其他检查
                                         </td>
-                                        <td class="text-center" width="260px" colspan="2" rowspan="2"
+                                        <td class="text-center" width="520px" colspan="4" rowspan="1"
                                             style="vertical-align: middle;text-align: center;">发现问题及处理情况
                                         </td>
                                     </tr>
-                                    <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;">密度(头/公斤)</td>
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">春虫虫种</td>
-                                    </tr>
+                                    </tr>-->
 
                                     <tr ng-repeat="dailyCard in dailyCardList">
                                         <td class="text-center" colspan="2" height="45px" style="vertical-align: middle;text-align: center;">
                                             {{dailyCard.checkTime  | date :'yyyy-MM-dd'}}
                                         </td>
-                                        <td class="text-center" style="vertical-align: middle;text-align: center;">
+                                        <!--<td class="text-center" style="vertical-align: middle;text-align: center;">
                                             {{dailyCard.pestsPosition}}</td>
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">
                                             {{dailyCard.pestsDensity}}</td>
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">
                                             <span ng-if="dailyCard.pestsSpecies == null ">无</span>
                                             <span ng-if="dailyCard.pestsSpecies != null ">{{dicData[dailyCard.pestsSpecies]}}</span>
-                                        </td>
+                                        </td>-->
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">
                                             {{dailyCard.rainCheck}}</td>
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">
                                             <span ng-if="dailyCard.ratfinchCheck == 0 ">无</span>
                                             <span ng-if="dailyCard.ratfinchCheck == 1 ">有</span>
                                         </td>
-                                        <td class="text-center" style="vertical-align: middle;text-align: center;">
-                                            {{dailyCard.otherCheck}}</td>
                                         <td class="text-center" colspan="2" style="vertical-align: middle;text-align: center;">
+                                            {{dailyCard.otherCheck}}</td>
+                                        <td class="text-center" colspan="4" style="vertical-align: middle;text-align: center;">
                                             {{dailyCard.findQuestion}}
                                         </td>
                                     </tr>