safecheck-client 3.0.34-gongyi → 3.0.35-gongyi-2

package/src/components/android/AreaPlan.vue

@@ -180,7 +180,7 @@
                           v-model="model.f_user_type" condition="ti.f_user_type='{}'" close-on-select clear-button></v-select>
               </div>
             </div>
-            <div class="row app-row" v-show="$parent.$parent.criteriaShow">
+            <!--<div class="row app-row" v-show="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
                 <img src="../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
                 <label  class="font text-left">挂表方式：</label>
@@ -191,7 +191,7 @@
                             :options='$parent.$parent.flow_direction' placeholder='请选择挂表方式'
                             v-model="model.f_flow_direction" condition="tm.f_flow_direction='{}'" close-on-select clear-button></v-select>
               </div>
-            </div>
+            </div>-->
             <div class="row app-row" v-show="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
                 <img src="../../assets/有无计划.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -281,7 +281,7 @@
                 </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_state }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_last_check_state }}</p>
                 </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font"><b>上传状态:</b></p>

package/src/components/android/CurrentCreate.vue

@@ -890,10 +890,12 @@
         this.tempSaveCount = 0
         this.doneCount = 0
         this.allPlanCount = 0
+        if(this.$refs.paged.$refs.cri.model.f_plan_name)
+          condition += " and f_plan_name like '%"+this.$refs.paged.$refs.cri.model.f_plan_name +"%'"
         let criteria = {
           items: 'count(id) count',
-          tablename: 't_check_plan_item',
-          condition: `f_state = '未检'`,
+          tablename: 't_check_plan_item it left join t_check_plan cp on it.f_plan_id=cp.id',
+          condition: `f_state = '未检'`+this.$refs.paged.$refs.cri.model.f_plan_name?` and f_plan_name='${this.$refs.paged.$refs.cri.model.f_plan_name}'`:'',
           groupitem: 'f_state'
         }
         let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
@@ -904,8 +906,8 @@
         }
         criteria = {
           items: 'count(id) count',
-          tablename: 't_check_plan_item',
-          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`,
+          tablename: 't_check_plan_item it left join t_check_plan cp on it.f_plan_id=cp.id',
+          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`+this.$refs.paged.$refs.cri.model.f_plan_name?` and f_plan_name='${this.$refs.paged.$refs.cri.model.f_plan_name}'`:'',
           groupitem: 'f_state'
         }
         result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
@@ -916,8 +918,8 @@
         }
         criteria = {
           items: 'count(id) count',
-          tablename: 't_check_plan_item',
-          condition: `f_complete = '已完成' AND f_state = '已检'`,
+          tablename: 't_check_plan_item it left join t_check_plan cp on it.f_plan_id=cp.id',
+          condition: `f_complete = '已完成' AND f_state = '已检'`+this.$refs.paged.$refs.cri.model.f_plan_name?` and f_plan_name='${this.$refs.paged.$refs.cri.model.f_plan_name}'`:'',
           groupitem: 'f_state'
         }
         result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})