safecheck-client 4.0.1-6 → 4.0.1-61

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

@@ -147,24 +147,24 @@
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div partial>
           <form>
-            <div class="row app-row">
-              <!--小区名称-->
-              <v-select :value.sync="model.f_residential_area" class="input-font clear-select-with"
-                        :options='$parent.$parent.residentialAreaOptions' placeholder='小区名称' :width="'32.5%'"
-                        v-model="model.f_residential_area" condition="ti.f_residential_area = '{}'"
-                        @change="$parent.$parent.getbuilds" close-on-select clear-button>
-              </v-select>
-              <!--楼栋-->
-              <v-select :value.sync="model.f_building" class="input-font" :options='$parent.$parent.buildOptions'
-                        placeholder='楼栋' :width="'32.5%'" v-model="model.f_building" condition="ti.f_building = '{}'"
-                        @change="$parent.$parent.getUnits" close-on-select clear-button>
-              </v-select>
-              <!--单元-->
-              <v-select :value.sync="model.f_unit" class="input-font" :options='$parent.$parent.unitOptions'
-                        placeholder='单元' :width="'32.5%'" v-model="model.f_unit" condition="ti.f_unit = '{}'" close-on-select
-                        clear-button>
-              </v-select>
-            </div>
+            <!--            <div class="row app-row">-->
+            <!--              &lt;!&ndash;小区名称&ndash;&gt;-->
+            <!--              <v-select :value.sync="model.f_residential_area" class="input-font clear-select-with"-->
+            <!--                        :options='$parent.$parent.residentialAreaOptions' placeholder='小区名称' :width="'32.5%'"-->
+            <!--                        v-model="model.f_residential_area" condition="ti.f_residential_area = '{}'"-->
+            <!--                        @change="$parent.$parent.getbuilds" close-on-select clear-button>-->
+            <!--              </v-select>-->
+            <!--              &lt;!&ndash;楼栋&ndash;&gt;-->
+            <!--              <v-select :value.sync="model.f_building" class="input-font" :options='$parent.$parent.buildOptions'-->
+            <!--                        placeholder='楼栋' :width="'32.5%'" v-model="model.f_building" condition="ti.f_building = '{}'"-->
+            <!--                        @change="$parent.$parent.getUnits" close-on-select clear-button>-->
+            <!--              </v-select>-->
+            <!--              &lt;!&ndash;单元&ndash;&gt;-->
+            <!--              <v-select :value.sync="model.f_unit" class="input-font" :options='$parent.$parent.unitOptions'-->
+            <!--                        placeholder='单元' :width="'32.5%'" v-model="model.f_unit" condition="ti.f_unit = '{}'" close-on-select-->
+            <!--                        clear-button>-->
+            <!--              </v-select>-->
+            <!--            </div>-->
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -207,6 +207,18 @@
               </v-select>
             </div>
 
+            <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_plan_name" class="font text-left">安检册：</label>
+              </div>
+              <v-select id="f_plan_name" :value.sync="model.f_check_book" class="input-font"
+                        :options='$parent.$parent.checkBooks' placeholder='安检册' :width="'60%'" v-model="model.f_check_book"
+                        @select-search="$parent.$parent.getCheckBook"
+                        condition="f_check_book_id like '%{}%'" align="right" close-on-select clear-button>
+              </v-select>
+            </div>
+
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
                 <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -645,6 +657,7 @@ export default {
       buildOptions: [],
       unitOptions: [],
       planNameOptions: [],
+      checkBooks: [],
       upcomingCount: 0,
       doneCount: 0,
       tempSaveCount: 0,
@@ -657,6 +670,7 @@ export default {
     }
   },
   ready() {
+    this.getCheckBook()
     this.getAllArea()
     this.getAllPlanName()
     this.selfSearch()
@@ -675,6 +689,29 @@ export default {
     window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
   },
   methods: {
+    getCheckBook(val){
+      this.checkBooks=[]
+      let condition = '1=1'
+      if (val){
+        condition = `f_check_book_name like '%${val}%' `
+      }
+      new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: 'id,f_check_book_name,f_check_book_type',
+          tablename: 't_check_book',
+          condition: ` ${condition}`,
+          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.id
+          })
+        })
+      })
+    },
     scan() {
       HostApp.__this__ = this,
         HostApp.scanCode({ callback: "javascript:HostApp.__this__.getCode();" })
@@ -972,7 +1009,7 @@ export default {
       if (this.planName) {
         condition += " and f_plan_name like '%" + this.planName + "%'"
       } else {
-        if (this.$refs.paged.$refs.cri.model.f_plan_name)
+        if (this.$refs.paged.$refs.cri.model.f_plan_name.length > 0)
           condition += " and f_plan_name like '%" + this.$refs.paged.$refs.cri.model.f_plan_name + "%'"
       }
       // if(this.$refs.paged.$refs.cri.model.f_plan_year)
@@ -1000,10 +1037,17 @@ export default {
       }
       if (this.$refs.paged.$refs.cri.model.f_enter_number)
         condition += " and ti.f_enter_number like '%" + this.$refs.paged.$refs.cri.model.f_enter_number + "%'"
+      if (this.$refs.paged.$refs.cri.model.f_check_book.length > 0){
+        if (this.$refs.paged.$refs.cri.model.f_plan_name.length > 0 || this.planName){
+          condition += " and ti.f_check_book_id like '%" + this.$refs.paged.$refs.cri.model.f_check_book + "%'"
+        }else {
+          this.$showMessage("使用安检册筛选项必须选择计划名称")
+          return
+        }
+      }
       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)
+        condition += " and ti.f_check_version = " + this.$refs.paged.$refs.cri.model.f_check_version
+      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' )) and ti.f_no_checkplan = '有计划安检'" + condition)
 
     },
     getNewOrder() {

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

@@ -20,11 +20,10 @@
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">安检册名称</label>
               <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
-                        :value-single="true" style="width: 60%"
+                        :multiple="true" style="width: 60%"
                         class="select_list select"
                         :options='$parent.$parent.checkBooks' placeholder='安检册名称'
-                        close-on-select
-                        condition="tcb.id ='{}'"></v-select>
+                        condition="tcb.id in {}"></v-select>
             </div>
             <!--            <div :class="$parent.$parent.style">-->
             <!--              <label class="font_normal_body">表册类型</label>-->
@@ -46,6 +45,7 @@
             <!--            </div>-->
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <button type="button" class="button_search button_spacing" @click="$parent.$parent.clean()">重置</button>
               <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增安检册</button>
               <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">安检册用户管理</button>
               <div style="float: right" class="button_spacing"
@@ -73,13 +73,12 @@
             </div>
 
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">安检册名</label>
+              <label class="font_normal_body">安检册名称</label>
               <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
-                        :value-single="true" style="width: 60%"
+                        :multiple="true" style="width: 60%"
                         class="select_list select"
                         :options='$parent.$parent.checkBooks' placeholder='安检册名称'
-                        close-on-select
-                        condition="tcb.id ='{}'"></v-select>
+                        condition="tcb.id in {}"></v-select>
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
@@ -257,6 +256,10 @@ export default {
     bus.$off('fresh-main')
   },
   methods: {
+    clean(){
+      this.$refs.paged.$refs.criteria.model.f_checker_id = ''
+      this.$refs.paged.$refs.criteria.model.f_check_book_id = []
+    },
     getchecker(val){
       this.$refs.paged.$refs.criteria.model.f_checker_id = ''
       if(val && val.length > 0){

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

@@ -331,10 +331,10 @@
             <th><nobr>计划名</nobr></th>
             <th><nobr>是否有隐患</nobr></th>
             <th><nobr>隐患数</nobr></th>
-            <th><nobr>处理数</nobr></th>
-            <th><nobr>完成数</nobr></th>
-            <th><nobr>处理情况</nobr></th>
-            <th><nobr>完成情况</nobr></th>
+<!--            <th><nobr>处理数</nobr></th>-->
+<!--            <th><nobr>完成数</nobr></th>-->
+<!--            <th><nobr>处理情况</nobr></th>-->
+<!--            <th><nobr>完成情况</nobr></th>-->
 <!--            <th><nobr>维修情况</nobr></th>-->
             <th><nobr>维修员</nobr></th>
             <th><nobr>隐患明细</nobr></th>
@@ -353,10 +353,10 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_plan_name}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_has_defect}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_defect_count}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_deal_count}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_is_deal}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_is_repair}}</td>
+<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_deal_count}}</td>-->
+<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>-->
+<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_is_deal}}</td>-->
+<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_is_repair}}</td>-->
 <!--          <td style="text-align: center;white-space:nowrap;">{{row.f_repaired}}</td>-->
           <td style="text-align: center;white-space:nowrap;">{{row.f_repairman}}</td>
           <td style="text-align: center;white-space:nowrap;"><span :title="$parent.$parent.$parent.trouble(row.f_defect_content)" style="display: block;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ $parent.$parent.$parent.trouble(row.f_defect_content)}}</span></td>
@@ -526,8 +526,8 @@ export default {
       repairers:[],
       cbcs:[],
       thead: '',
-      headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','处理数','完成数','处理情况','完成情况','维修员'],
-      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','defecttext','f_deal_count','f_repair_count','f_is_deal','f_is_repair','f_repairman'],
+      headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','维修员'],
+      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','defecttext','f_repairman'],
     }
   },
   props:{