safecheck-client 3.0.32 → 3.0.33-11

package/src/filiale/wuhai/pc.js

@@ -8,6 +8,7 @@ let specialComp = {
 
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
   'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) }
 }
 exports.specialComp = specialComp
 

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

@@ -942,7 +942,7 @@
           condition += " and ti.f_last_check_state in ('入户','停用','拆除','未通气')"
         }
         if(this.$refs.paged.$refs.cri.model.f_state[0] =='未检'){
-          condition += " and (ti.f_last_check_state in ('到访不遇','拒检') or ti.f_last_check_state  is null)"
+          condition += " and  ti.f_last_check_state not in ('入户','停用','拆除','未通气')"
         }
         // if(this.$refs.paged.$refs.cri.model.f_last_state[0])
         //   condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_state[0]+"'"
@@ -974,7 +974,11 @@
         if(this.$refs.paged.$refs.cri.model.userinfo){
           condition += ` and (f_userinfo_code like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_name like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_meter_no like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_address like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_zuhu_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_rent_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_phone2 like '%${this.$refs.paged.$refs.cri.model.userinfo}%')`
         }
-        this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成' or f_complete = '已完成') or (f_state = '未检' or f_state = '已检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检' )) and ti.f_no_checkplan = '有计划安检'" + condition)
+        if(this.$refs.paged.$refs.cri.model.f_state[0] ==''){
+          this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成' or f_complete = '已完成') or (f_state = '未检' or f_state = '已检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检' )) and ti.f_no_checkplan = '有计划安检'" + condition)
+        }else{
+          this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成' or f_complete = '已完成') or (f_state = '未检' or f_state = '已检')) and ti.f_no_checkplan = '有计划安检'" + condition)
+        }
       },
       getNewOrder(){
         HostApp.__this__ = this

package/src/filiale/yangchunboneng/android/SafecheckOrderV.vue

@@ -684,9 +684,9 @@ export default {
       hasError = this.verifyDevices()
       if (hasError)
         return hasError
-      hasError = this.verifyFeedback()
-      if (hasError)
-        return hasError
+      // hasError = this.verifyFeedback()
+      // if (hasError)
+      //   return hasError
     },
     verifyState() {
       if (Vue.android && this.data.f_entry_status == '未使用天然气' && this.data.f_nongasuser_path == Vue.nopic)

package/src/filiale/yangchunboneng/android/SafecheckUserInfo.vue

@@ -357,7 +357,7 @@ export default {
   methods: {
     safeState(){
       let state = this.userinfo.f_last_check_state
-      debugger
+
       if(state=='' ||state=='到访不遇' ||state=='拒检' ||state==null){
         return  '未检'
       }else{

package/src/filiale/yangchunboneng/pc/CheckBookUser.vue

@@ -96,7 +96,7 @@ export default {
         this.bookList=[]
       }
       //如果是全选，则查询这个安检册下的用户
-      debugger
+
       if(val){
      //遍历this.model.rows
         this.model.rows.forEach(res=>{
@@ -139,7 +139,7 @@ export default {
       }
     },
     removes(){
-      debugger
+
       if(this.bookList.length===0){
         this.$showMessage('请选择用户')
         return
@@ -166,7 +166,7 @@ export default {
       })
     },
     remove(row){
-      debugger
+
       this.$showMessage("确认移出此安检册?",['confirm']).then(res=>{
         if(res==='confirm'){
           let data = {

package/src/filiale/yongzhou/pc/safeStatistics.vue

@@ -80,6 +80,7 @@
               {{{ model.data.substring(26,model.data.length-8) }}}
             </th>
           </tr>
+          <tr style="height: 100px"></tr>
         </table>
       </div>
     </criteria-paged>

package/src/filiale/yongzhou/pc/safeStatisticsYear.vue

@@ -72,6 +72,7 @@
               {{{ model.data.substring(26,model.data.length-8) }}}
             </th>
           </tr>
+          <tr style="height: 100px"></tr>
         </table>
       </div>
     </criteria-paged>

package/src/filiale/yunchengminsheng/android/SafecheckDevices.vue

@@ -568,6 +568,9 @@ export default {
                 let multiple = this.config[this.device.device].items[item].multiple?this.config[this.device.device].items[item].multiple:false
                 let options = this.config[this.device.device].items[item].options
                 if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && item == this.f_items[n].f_item_name) {
+                  if (val.length > 1 && val.indexOf('正常') != -1){
+                    this.f_items[n].f_item_value.splice(val.indexOf('正常'),1)
+                  }
                   for (let i in options) {
                     if(typeof options[i]=='function'){
                       continue

package/src/filiale/yunchengminsheng/pc/checkUserList.vue

@@ -81,6 +81,21 @@
                     >
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">表具状态:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_table_state"
+                      v-model="model.f_table_state"
+                      :options='$parent.$parent.tableStates'
+                      placeholder='请选择'
+                      condition="uf.f_table_state='{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">用气性质:</label>
                     <v-select
@@ -402,6 +417,7 @@
         showCondtion:false,
         userTypes:[],//用户类型
         userStates:[],//用户状态
+        tableStates:[],//表具状态
         gasproperties:[],//用气性质
         meter_classifys:[],//气表类型
         hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
@@ -520,7 +536,8 @@
           value: ''
         }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
 
-        this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
+        this.userStates=this.$appdata.getParam('安检用户状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('安检用户状态')] : [{label: '全部', value: ''}]
+        this.tableStates=this.$appdata.getParam('安检表具状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('安检表具状态')] : [{label: '全部', value: ''}]
         this.gasproperties=this.$appdata.getParam('用气性质') ? [{
           label: '全部',
           value: ''

package/src/filiale/zhongyi/pc/DefectListNew.vue

@@ -201,7 +201,7 @@ const upSolveDefect = function * (self) {
       if (res.data.code === 200) {
         self.$showMessage('隐患已处理。')
         self.showSolveModal = false
-        self.model.search('f_repaire_type != \'无隐患\'', {})
+        self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
       }
     })
 }
@@ -303,7 +303,7 @@ const sendRepair = function* (self) {
     let updateRes = yield self.$resetpost('/rs/logic/updateDefectStateNew', data)
     if (updateRes.data.code == 200) {
       self.$showMessage('隐患已转维修。')
-      self.model.search(`f_repaire_type != '无隐患'`, {})
+      self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     }
   }
 }
@@ -400,7 +400,7 @@ export default {
     this.model.f_item_value = `(SELECT stuff(( SELECT ',' + f_item_value FROM t_devices_items_lists WHERE ( f_is_defect = 'true' OR di.f_is_defect = 'true') AND f_item_id = di.id FOR xml path ( '' ) ),1,1,'' ) )`
     if (this.check) {
       this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
+      this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     }
     this.getEmp()
   },
@@ -415,7 +415,7 @@ export default {
       let http = new HttpResetClass()
       http.load('POST', 'rs/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
         if(res.data.code == 200){
-          this.model.search(`f_repaire_type != '无隐患'`, {})
+          this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
           this.showSolveModal = false
           this.showToRepairModal = false
           this.$showMessage('提交成功')
@@ -487,14 +487,14 @@ export default {
   watch: {
     'check'() {
       this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
+      this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     },
     'model.rows'() {
       //
       if (this.model.rows.length > 0) {
         let tempRow = this.model.rows
         for (let i = 0; i < tempRow.length; i++) {
-          if (tempRow[i].f_repaire_type == '未处理') {
+          if (tempRow[i].f_repaire_type == '未处理' ||  !tempRow[i].f_repaire_type ) {
             this.needRepair = true
             return
           }