safecheck-client 4.0.0-73 → 4.0.0-75

package/src/components/planmanage/PlanManage.vue

@@ -161,8 +161,9 @@
               class="select select_list"
               :value.sync="planCondition.f_checker"
               v-model="planCondition.f_checker"
-              @change="setProperty('checkplan','checkerid',planCondition.f_checker.id)"
+              @change="setProperty('checkplan','checkerid',planCondition.f_checker ? planCondition.f_checker.id : '')"
               :options='getConList("checker")'
+              :search="false"
               placeholder='请选择'
               close-on-select
               value-single
@@ -561,8 +562,14 @@ export default {
         this.createPlan.f_checker_id=null
         this.createPlan.f_checker=null
       }else{
-        this.createPlan.f_checker_id=this.createPlan.checker.id
-        this.createPlan.f_checker=this.createPlan.checker.name
+        if(this.createPlan.checker && this.createPlan.checker.id){
+          this.createPlan.f_checker_id=this.createPlan.checker.id
+          this.createPlan.f_checker=this.createPlan.checker.name
+        }else{
+          Vue.showMessage("请选择安检人员！")
+          this.isSend=false
+          return
+        }
       }
       console.log("this.createPlan.f_checker:"+this.createPlan.f_checker)
       this.createPlan.f_plan_type='预约计划'
@@ -620,7 +627,6 @@ export default {
     //查询安检员selectChanged
     async searchChecker(){
       console.log(this.$login.f.orgid)
-      debugger
       let res=await new HttpResetClass().load('POST', '/rs/search', {
         data:{
           source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,

package/src/filiale/jinhong/android/CurrentCreate.vue

@@ -958,7 +958,7 @@ export default {
       if (this.$refs.paged.$refs.cri.model.f_check_version)
         condition += " and ti.f_check_version <= " + this.$refs.paged.$refs.cri.model.f_check_version
       //tag
-      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检')) and ti.f_no_checkplan = '有计划安检'" + condition)
+      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检')) and f_no_checkplan = '有计划安检'" + condition)
 
     },
     getNewOrder() {
@@ -1087,8 +1087,8 @@ export default {
       } else {
         if (this.$refs.paged.$refs.cri.model.f_plan_name){
           condition += " and f_plan_name = '" + this.$refs.paged.$refs.cri.model.f_plan_name + "'"
-        }else {
-          condition = ' 1 != 1'
+        } else {
+          condition = ' 1 != 1 '
         }
       }
       let tjData = {
@@ -1097,8 +1097,11 @@ export default {
         condition: condition,
         orderitem: '1'
       }
-      let resultTj = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_OrderBy', 'criteria': tjData}})
-      if (resultTj.code==200){
+      let resultTj = HostApp._executeTask({
+        'type': 'sql',
+        'data': {'alias': 'safe_singleTable_OrderBy', 'criteria': tjData}
+      })
+      if (resultTj.code == 200) {
         const stat = resultTj.data.rows[0];
         this.planTotal = stat.total_items || 0;
         this.notVisited = stat.no_answer_count || 0;