safecheck-client 3.0.33-38 → 3.0.33-40

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

@@ -59,6 +59,18 @@
                   :title="row.f_create_time">{{ row.f_create_time }}
               </td>
             </tr>
+            <tr class="safe-bodyfont" v-if="row.f_end_time">
+              <td colspan="3">结束时间 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_end_time">{{ row.f_end_time }}
+              </td>
+            </tr>
+            <tr class="safe-bodyfont" >
+              <td colspan="3">计划状态:</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  >{{ checkState(row.f_end_time,row.unchecked)}}
+              </td>
+            </tr>
             <tr class="safe-bodyfont" v-if="row.f_safecheck_type">
               <td colspan="3">安检类型 :</td>
               <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
@@ -619,6 +631,29 @@ export default {
 
   },
   methods: {
+    //判断计划状态
+    checkState(time,unchecked) {
+      //判断当前时间与time的大小，time格式为 yyyy-MM-dd HH:mm:ss
+      let now = new Date()
+      let last = new Date(time)
+      if(time==undefined || time==''){
+        return  '无'
+      }else{
+        if(last.getTime() >now.getTime() ){
+          return  '安检中'
+        }else if(last.getTime() <now.getTime()){
+          //结束时间小于当前时间，
+          //判断未检数，未检大于0，则逾期
+          if(unchecked>0){
+            return '逾期'
+          }
+          if(unchecked<=0){
+            return '已完成'
+          }
+        }
+      }
+
+    },
     showPlanHistory(row){
       this.showPlanHistoryButton = true
       this.planHistory = JSON.parse(row.f_update_check_plan)

package/src/filiale/hanzhong/pc/CheckUserList.vue

@@ -221,7 +221,7 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_start_time"
                       v-model="model.f_start_time"
-                      condition="ui.f_last_check_date >='{} 00:00:00'">
+
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -234,7 +234,7 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_end_time"
                       v-model="model.f_end_time"
-                      condition="ui.f_last_check_date  <='{} 23:59:59'">
+
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4">
@@ -246,7 +246,6 @@
                       v-model="model.f_last_check_state"
                       :options='$parent.$parent.entry_status'
                       placeholder='请选择'
-                      condition="ui.f_last_check_state  = '{}'"
                       :search="false"
                       close-on-select
                       value-single
@@ -494,12 +493,34 @@
             args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
           }
         }
-        if (args.model.f_last_check_state == '未检'){
-          args.condition = args.condition.replace("ui.f_last_check_state  = '未检'"," (ui.f_last_check_state is null or ui.f_last_check_date is null) ")
-        }
-        if (!this.isTimeSelected){
-          args.model.f_last_check_state = ''
-          args.condition = args.condition.replace("(ui.f_last_check_state is null or ui.f_last_check_date is null)"," 1=1 ")
+        // if (args.model.f_last_check_state == '未检'){
+        //   args.condition += ` and ui.f_last_check_date <='${args.model.f_start_time}' or ui.f_last_check_date  >='${args.model.f_start_time}' and ( ui.f_last_check_date is null or ui.f_last_check_state is null or ui.f_last_check_date ='' ) `
+        // }else if(args.model.f_last_check_state == '') {
+        //   args.model.f_start_time ==''?
+        //   args.condition +=`  and ui.f_last_check_date >='${args.model.f_start_time}' and ui.f_last_check_date  <='${args.model.f_start_time}' `
+        // }else {
+        //   args.condition +=` and ui.f_last_check_state = ${args.model.f_last_check_state?args.model.f_last_check_state:''} and ui.f_last_check_date >='${args.model.f_start_time}' and ui.f_last_check_date  <='${args.model.f_start_time}' `
+        // }
+        if (!Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_start_time) || !Util.isEmpty(args.model.f_end_time) )){
+          if (args.model.f_last_check_state == '未检'){
+            var lscon = args.model.f_start_time ? ` or ui.f_last_check_date <= '${args.model.f_start_time} 00:00:00'` :''
+            lscon += lscon ? (args.model.f_end_time ? ` or ui.f_last_check_date >= '${args.model.f_end_time} 23:59:59'` :''): (args.model.f_end_time ? `ui.f_last_check_date >= '${args.model.f_end_time} 23:59:59'` :'')
+            args.condition +=`and (ui.f_last_check_state is null or ui.f_last_check_state =''  ${lscon} ) `
+          }else  {
+            var lscon = args.model.f_start_time ? ` and ui.f_last_check_date >= '${args.model.f_start_time} 00:00:00'` :''
+            lscon += lscon ? (args.model.f_end_time ? ` and ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'') : (args.model.f_end_time ? ` ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'')
+            args.condition += `and ui.f_last_check_state = '${args.model.f_last_check_state}' ${lscon}`
+          }
+
+        }else if (Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_start_time) || !Util.isEmpty(args.model.f_end_time) )) {
+          var lscon = args.model.f_start_time ? ` and ui.f_last_check_date >= '${args.model.f_start_time} 00:00:00'` :''
+          lscon += lscon ? (args.model.f_end_time ? ` and ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'') : (args.model.f_end_time ? ` ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'')
+          args.condition += lscon
+        }else if (!Util.isEmpty(args.model.f_last_check_state) && Util.isEmpty(args.model.f_start_time) && Util.isEmpty(args.model.f_end_time)){
+          this.$showMessage("选择安检状态时，需要选择安检时间区间！")
+          return
+        }else{
+          console.log('这块无条件')
         }
         if(this.uploadCodeCondition){
           args.condition +=` and ${this.uploadCodeCondition}`