safecheck-client 3.0.34-1 → 3.0.34-100

package/src/components/rongcheng/AspiratedUserInfo.vue

@@ -163,7 +163,7 @@
           title: '设备查看',
           safe: false
         })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
+        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
       },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())

package/src/components/rongcheng/CheckSearchUser.vue

@@ -230,6 +230,30 @@
                   v-model="$parent.$parent.check_itemValue"
                   close-on-select clear-button> </v-select>
               </div>
+              <div class="col-sm-4" style="width: 20%">
+                <label class="font_normal_body">安检员</label>
+                <v-select
+                  placeholder='安检员'
+                  :value-single="true"
+                  class="select select_list"
+                  :value.sync="model.f_checker_id"
+                  :options='$parent.$parent.checkersid'
+                  v-model="model.f_checker_id"
+                  condition="f_checker_id = '{}'"
+                  close-on-select clear-button> </v-select>
+              </div>
+<!--              <div class="col-sm-4" style="width: 20%">-->
+<!--                <label class="font_normal_body">安检状态</label>-->
+<!--                <v-select-->
+<!--                  placeholder='安检状态'-->
+<!--                  :value-single="true"-->
+<!--                  class="select select_list"-->
+<!--                  :value.sync="model.f_entry"-->
+<!--                  :options='$parent.$parent.f_entry_status'-->
+<!--                  v-model="model.f_entry"-->
+<!--                  condition="f_last_check_state= '{}'"-->
+<!--                  close-on-select clear-button> </v-select>-->
+<!--              </div>-->
               <div class="col-sm-8"></div>
               <div style="float: right;margin-right: 10px">
                 <export-excel-safe   :data="$parent.$parent.searchData"
@@ -374,19 +398,18 @@ import * as Util from './../Util'
 import Vue from 'vue'
 import {toStandardDateString} from "./../Util";
 
-// let select = function * (self,userid) {
-//   let http = new HttpResetClass()
-//   let getGasman = yield http.load('POST','/rs/search', {
-//     source: 'this.getChildByName($安检员$).getUsers()',
-//     userid: userid
-//   }, {resolveMsg: null, rejectMsg: null})
-//   console.log('获取安检员', getGasman)
-//   getGasman.data.forEach((checker)=>{
-//     self.checkersid.push({label:checker.name,value:checker.id})
-//   })
-//   self.checkersid.push({label:'全部',value:''})
-// }
-
+let select = function* (self) {
+  let http = new HttpResetClass()
+  let getGasman = yield http.load('POST','/rs/search', {
+    source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+    userid: self.$login.f.id
+  }, {resolveMsg: null, rejectMsg: null})
+  //tag
+  self.checkersid.push({label: '全部', value: ''})
+  getGasman.data.forEach((checker) => {
+    self.checkersid.push({label: checker.name, value: checker.id})
+  })
+}
 
 export default {
   title: '民用用户安检情况',
@@ -435,7 +458,7 @@ export default {
       SafeCheckXZs: [{label: '全部', value: ''},{label: '已入户', value: '已入户'}, {label: '未入户', value: '未入户'}], // 安检筛选选项
       safe_rhs: [{label: '全部', value: ''},{label: '今年已入户', value: '今年已入户'}, {label: '今年未入户', value: '今年未入户'}], // 安检筛选选项
       SafeCheckSXs: [{label: '是', value: '是'}, {label: '否', value: '否'}, {label: '全部', value: ''},],
-      checkstatus:[{label: '全部', value: ''},{label: '到访不遇', value: '到访不遇'}, {label: '拒检', value: '拒检'}],
+      checkstatus:[{label: '全部', value: ''},{label: '到访不遇', value: '到访不遇'}, {label: '拒检', value: '拒检'},{label: '激光检漏', value: '激光检漏'},{label: '立杠保压', value: '立杠保压'},{label: '室外关阀', value: '室外关阀'}],
       IsShares: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       IsShare:'否',
       checker: {},
@@ -471,7 +494,8 @@ export default {
       hasHousehold:'',
       check_items:[{label: '全部', value: ''}, ...this.$appdata.getParam('安检项名')],
       check_item:'',
-      check_itemValue:''
+      check_itemValue:'',
+      // f_entry_status: this.$appdata.getParam('安检状态'),
     }
   },
   props: {
@@ -496,6 +520,8 @@ export default {
     this.initVillage()
     this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStandardDateString()
     this.$refs.paged.$refs.criteria.model.f_check_end = Util.toStandardDateString()
+    let gen = select(this)
+    co(gen)
     // this.$refs.paged.$refs.criteria.search();
   },
   methods: {
@@ -612,12 +638,13 @@ export default {
       let con1='1=1 '
       let con2='1=1 '
       if(this.SafeCheckXZ == '已入户'){
-        args.condition += " and r > 0"
+        args.condition += " and r > 0 and f_last_check_state = '入户'"
         con1 += ` and  f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         con2 += ` and  f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         //args.condition += " and ( f_last_check_date > '"+ args.model.f_check_end + " 23:59:00' or  f_last_check_date < '"+ args.model.f_check_start + " 00:00:00' or f_last_check_date is null)"
       } else if(this.SafeCheckXZ == '未入户') {
         args.condition += " and r < 1"
+        args.condition += " and f_last_check_state != '入户'"
         con1 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         con2 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         if(args.model.f_check_state=='到访不遇'){
@@ -626,6 +653,9 @@ export default {
           args.condition += " and j > 0"
         }
       }
+      if (args.model.f_check_state){
+        args.condition += ` and f_last_check_state = '${args.model.f_check_state}'`
+      }
       this.model.check_item=this.check_item
       this.model.check_itemValue=this.check_itemValue
       /*if(this.hasHousehold=='今年已入户'){

package/src/components/rongcheng/PaperStatem.vue

@@ -54,7 +54,12 @@
           <label class="text-left font">到访不遇照片：</label>
           <img-self :src="item.f_noanswer_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
           <img-self :src="item.f_noanswertwo_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
-
+          <img-self :src="item.f_noanswer3_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer4_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer5_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer6_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer7_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+          <img-self :src="item.f_noanswer8_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
         </div>
         <div class="col-sm-4 col-xs-4">
           <div class="auto">

package/src/components/rongcheng/PhoneDevicesInfo.vue

@@ -77,7 +77,8 @@
         row: Object,
         userinfo:Object,
         wid:"60%",
-        devices_types:[{label:'热水器',value:'热水器'},{label:'壁挂炉',value:'壁挂炉'},{label:'灶具',value:'灶具'}],
+        devices_types:Vue.$appdata.getParam('设备类型')?Vue.$appdata.getParam('设备类型'):[{label:'热水器',value:'热水器'},{label:'壁挂炉',value:'壁挂炉'},{label:'灶具',value:'灶具'}],
+        // devices_types:[{label:'热水器',value:'热水器'},{label:'壁挂炉',value:'壁挂炉'},{label:'灶具',value:'灶具'}],
         pipe_types:[{label:'橡胶管',value:'橡胶管'},{label:'波纹管',value:'波纹管'},{label:'钢管',value:'钢管'}],
         update:false
       }
@@ -86,6 +87,7 @@
       user: {
         type: Object
       },
+      f_user_type:'',
       f_userinfo_id:''
     },
     methods: {
@@ -148,6 +150,19 @@
 
       },
       save(){
+        if (this.f_user_type == "非民用") {
+          let hasAlarmOrValve = false;
+          for (let i = 0; i < this.model.length; i++) {
+            if (this.model[i].f_devices_type === '报警器' || this.model[i].f_devices_type === '切断阀') {
+              hasAlarmOrValve = true;
+              break;
+            }
+          }
+          if (!hasAlarmOrValve) {
+            this.$showMessage("请添加报警器或切断阀！  ")
+            return;
+          }
+        }
         if(this.model.length==0){
           this.$showMessage("请添加设备信息后再点击保存！")
           return