safecheck-client 4.0.0-71 → 4.0.0-73

package/src/components/pc/CheckBookList.vue

@@ -259,7 +259,7 @@ export default {
     },
     freshCheckBook () {
       this.checkBooks = []
-      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=9999999`, {
         data: {
           items: 'id,f_check_book_name',
           tablename: 't_check_book',

package/src/filiale/jinhong/pc/PlanManage.vue

@@ -49,6 +49,10 @@
                 <td colspan="3">安检类型 :</td>
                 <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="row.f_safecheck_type">{{row.f_safecheck_type}}</td>
               </tr>
+              <tr class="safe-bodyfont" v-if="row.f_remark">
+                <td colspan="3">计划备注 :</td>
+                <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="row.f_remark">{{row.f_remark}}</td>
+              </tr>
             </table>
           </div>
         </div>
@@ -291,6 +295,11 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-12" >
+              <label class="font_normal_body">计划备注:</label>
+              <input type="text" class="input_search" v-model="createPlan.f_remark"
+                     style="width: 60%" placeholder="请输入备注" />
+            </div>
           </div>
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -401,6 +410,11 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-12" >
+              <label class="font_normal_body">计划备注:</label>
+              <input type="text" class="input_search" v-model="upCheckPlan.f_remark"
+                     style="width: 60%" placeholder="请输入备注" />
+            </div>
           </div>
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -439,7 +453,8 @@
               f_checker:'',
               f_checkerstr:'',
               checker:{},
-              checkers:[]
+              checkers:[],
+              f_remark:''
             },
             isSend:false,
             createPlan:{
@@ -454,6 +469,7 @@
               f_checker:null,
               f_checkerstr:null,
               f_safecheck_type:'',
+              f_remark:''
             },
             planCondition:{},
             showCondtion:false,
@@ -697,6 +713,7 @@
           this.upCheckPlan.f_checker=row.f_checker?row.f_checker:null
           this.upCheckPlan.isShare=row.f_checker_id?'否':'是'
           this.upCheckPlan.f_issued=row.f_issued
+          this.upCheckPlan.f_remark=row.f_remark
           this.upCheckPlan.checker={id:row.f_checker_id,name:row.f_checker}
           this.showUpPlan=true
         },
@@ -740,7 +757,8 @@
               f_plan_year:this.upCheckPlan.f_plan_year,
               f_plan_month:this.upCheckPlan.f_plan_month,
               f_plan_id:this.upCheckPlan.id,
-              issued:'否'
+              issued:'否',
+              f_remark:this.upCheckPlan.f_remark,
             }
           }, {resolveMsg: null, rejectMsg: null})
           if(res.data.code==200){