safecheck-client 4.0.0-65 → 4.0.0-66

package/src/components/planmanage/PlanManage.vue

@@ -320,7 +320,7 @@
                 :search="false"
                 :value="upCheckPlan.f_plan_year"
                 :options='yearList'
-
+                :disabled="true"
                 close-on-select
                 value-single>
 
@@ -342,7 +342,7 @@
                 class="select select_list"
                 :value.sync="upCheckPlan.f_plan_month"
                 v-model="upCheckPlan.f_plan_month"
-
+                :disabled="true"
                 :options='monthList'
                 close-on-select
                 value-single>
@@ -357,6 +357,7 @@
                 v-model="upCheckPlan.isShare"
                 :options='isAndNot'
                 placeholder='请选择'
+                :disabled="true"
                 close-on-select
                 value-single
               >
@@ -395,6 +396,7 @@
                 v-model="upCheckPlan.f_safecheck_type"
                 :options='ntoway'
                 close-on-select
+                :disabled="true"
                 value-single
               >
               </v-select>
@@ -480,6 +482,7 @@
           }
         },
       async ready(){
+        document.addEventListener('keydown', this.handleEnter, true);
         await this.loadpage()
         if (!this.userlogin.orgid){
           if (this.$login.f.f_orgids){
@@ -496,6 +499,13 @@
         }
         },
       methods:{
+        handleEnter(e) {
+          if (e.key === 'Enter') {
+            this.loadCheckPlan();
+            this.$refs.item.model.search()
+            this.$refs.user.model.search()
+          }
+        },
       /*  ntoway() {
           /!* return AppData.getParam('安检类型')*!/
           return Vue.$appdata.getParam('安检类型')
@@ -693,10 +703,6 @@
           this.showUpPlan=true
         },
         async upPlan(){
-          if(this.upCheckPlan.f_issued=='已下发'){
-            this.$showMessage("该计划已下发，无法进行修改！")
-            return
-          }
           if(!this.upCheckPlan.f_plan_name){
             Vue.showMessage("请输入安检计划名称！")
             return false
@@ -735,7 +741,8 @@
               f_plan_name:this.upCheckPlan.f_plan_name,
               f_plan_year:this.upCheckPlan.f_plan_year,
               f_plan_month:this.upCheckPlan.f_plan_month,
-              f_plan_id:this.upCheckPlan.id
+              f_plan_id:this.upCheckPlan.id,
+              issued:'否'
             }
           }, {resolveMsg: null, rejectMsg: null})
           if(res.data.code==200){

package/src/components/planmanage/checkUserList.vue

@@ -196,20 +196,20 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_meter_book_num"
-                      v-model="model.f_meter_book_num"
-                      :options='$parent.$parent.cbc'
-                      placeholder='请选择'
-                      condition="uf.f_meter_book_num='{}'"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
+<!--                  <div class="form-group col-sm-4" >-->
+<!--                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>-->
+<!--                    <v-select-->
+<!--                      class="select select_list"-->
+<!--                      :value.sync="model.f_meter_book_num"-->
+<!--                      v-model="model.f_meter_book_num"-->
+<!--                      :options='$parent.$parent.cbc'-->
+<!--                      placeholder='请选择'-->
+<!--                      condition="uf.f_meter_book_num='{}'"-->
+<!--                      close-on-select-->
+<!--                      value-single-->
+<!--                    >-->
+<!--                    </v-select>-->
+<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
                     <v-select
@@ -265,7 +265,7 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" v-if="$parent.$parent.hasCheckBooks == '是'">
+                  <div class="form-group col-sm-4">
                     <label class="font_normal_body">安检册:</label>
                     <v-select
                       class="select select_list"
@@ -445,9 +445,14 @@
       this.getCheckBook()
       this.setConList()
       this.loadpage()
-
+      document.addEventListener('keydown', this.handleEnter, true);
     },
     methods: {
+      handleEnter(e) {
+        if (e.key === 'Enter') {
+          this.$refs.paged.$refs.criteria.search()
+        }
+      },
       getCheckBook(){
         this.checkBooks=[]
         new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -149,10 +149,10 @@
               <v-select class="select_list select"
                         placeholder='抄表册' style="width: 60%"
                         :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
-                        :options='$parent.$parent.cbc'
+                        :options='$parent.$parent.checkBooks'
                         filer-key="name"
                         close-on-select clear-button
-                        condition="f_meter_book_num={}"
+                        condition="f_check_book_name like '%{}%'"
                         :value-single="true">
               </v-select>
             </div>
@@ -529,7 +529,8 @@ export default {
       sliceArea: [],
       cbcs:[],
       cbc:[],
-      pcds:[]
+      pcds:[],
+      checkBooks:[]
     }
   },
   props: {
@@ -560,8 +561,33 @@ export default {
     this.model.f_OrgStr = this.$login.f.orgpathstr
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
+    document.addEventListener('keydown', this.handleEnter, true);
   },
   methods: {
+    handleEnter(e) {
+      if (e.key === 'Enter') {
+        this.$refs.paged.$refs.criteria.search()
+      }
+    },
+    getCheckBook(){
+      this.checkBooks=[]
+      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: 'id,f_check_book_name,f_check_book_type',
+          tablename: 't_check_book',
+          condition: `f_orgid = '${this.$login.f.orgid}'`,
+          orderitem: 'id desc'
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then(res => {
+        this.checkBooks.push({label: '全部', value: ''})
+        res.data.forEach(ress => {
+          this.checkBooks.push({
+            label: ress.f_check_book_name,
+            value: ress.f_check_book_name
+          })
+        })
+      })
+    },
 
   dateDiff(date1Str) {
   // 确保传入的date1Str是有效的字符串格式
@@ -836,7 +862,7 @@ export default {
     changeStates() {
       if (this.checkedAll) {//实现反选/
         this.checkrows = [];
-        for (let i = 0; i < this.$refs.paged.model.rows.length; i++) {
+        for (let i = 0; i < c.rows.length; i++) {
           this.$set('$refs.paged.model.rows[' + i + '].checked', false)
         }
       } else {//实现全选

package/src/components/report/CheckPlanAreaList.vue

@@ -107,7 +107,9 @@
               <input type="checkbox" id="f_checker_name" value="f_checker_name" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">安检员</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
-              <label for="f_checker_name">档案数量</label>
+              <label for="f_user_number">档案数量</label>
+              <input type="checkbox" id="f_issue_time" value="f_issue_time" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_issue_time">下发时间</label>
             </div>
           </div>
         </div>
@@ -125,6 +127,7 @@
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')"><nobr>计划名称</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')"><nobr>安检员</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"><nobr>档案数量</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_issue_time')"><nobr>下发时间</nobr></th>
             <th>
               <nobr>计划总数</nobr>
             </th>
@@ -165,6 +168,7 @@
             <td style="text-align:center" :class="{'td-0':row.f_plan_name==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')">{{row.f_plan_name.indexOf('*&')!=-1?'':row.f_plan_name}}</td>
             <td style="text-align:center" :class="{'td-0':row && !row.f_checker_name,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_checker_name && row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name && row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_issue_time')">{{row.f_issue_time}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
             <td style="text-align:center"><nobr>{{row.f_yijian}}</nobr></td>
@@ -235,7 +239,7 @@
       }
     },
     ready () {
-      this.nameForSql = ['f_plan_month', 'f_plan_name','f_checker_name']
+      this.nameForSql = ['f_plan_month', 'f_plan_name','f_checker_name', 'f_issue_time']
       this.groupNameForSql = 'f_plan_month', 'f_plan_name','f_checker_name'
       this.pl()
       // this.search()
@@ -283,6 +287,8 @@
             this.exportExcelField.f_residential_area='小区名称'
           }if (ff==='f_user_number') {
             this.exportExcelField.f_user_number='档案数量'
+          }if (ff==='f_issue_time') {
+            this.exportExcelField.f_issue_time='下发时间'
           }
         }
       },
@@ -359,7 +365,7 @@
 
       // 拼接groupName1
       getGroupName1 () {
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_issue_time']
         var newtemp=[]
 
         for (var i=0;i<temp.length;i++){
@@ -396,7 +402,7 @@
         }
         this.listflag=true
         //tag
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_issue_time']
         var newtemp=[]
         for (var i=0;i<temp.length;i++){
           for (var j=0;j<this.nameForSql.length;j++){