safecheck-client 3.0.34-5 → 3.0.34-50

package/src/components/phonestate/PostMap.vue

@@ -1,82 +1,82 @@
-<template>
-  <div class="auto">
-    <button type="button" class="btn btn-default" @click="this.$back('ass')">&lt;&lt;</button>
-    <div id="allmap2" :style="mapStyle"></div>
-  </div>
-</template>
-
-<script>
-// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
-
-import Vue from 'vue'
-
-export default {
-  title: '岗位图',
-  props: ['lonlats'],
-  data () {
-    return {
-      mapStyle: {
-        width: (this.$parent.$el.clientWidth -30) + 'px',
-        height: (this.$parent.$el.clientHeight - 80) + 'px'
-      },
-      markers : []
-    }
-  },
-  ready () {
-    this.lonlats.filter((item) => {
-      return item.f_longitude != 0 && item.f_latitude != 0
-    }).forEach((item) => {
-      this.markers.push({
-        longitude: item.f_longitude,
-        latitude: item.f_latitude,
-        hint: item.f_user_name + '[' + item.f_datetime + ']'
-      })
-    })
-    if(Vue.mapLoaded) {
-      this.render()
-    } else {
-      window.__mapCallback__ = this.mapCallback
-      let element = document.createElement('script')
-      element.setAttribute("type","text/javascript")
-      element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
-      document.body.appendChild(element)
-    }
-  },
-  methods: {
-    mapCallback () {
-      Vue.mapLoaded = true
-      this.render()
-    },
-    patch () {
-      let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
-      if(a.length != 0) {
-        a[0].style.height = 'auto'
-      } else {
-        window.setTimeout(this.patch, 500)
-      }
-    },
-    render () {
-      window.map = new BMap.Map("allmap2")
-      window.map.clearOverlays();
-      if(this.markers.length == 0)
-        window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
-      else
-        window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
-      window.map.addControl(new BMap.NavigationControl())
-      this.markers.forEach(function(pos) {
-        var point = new BMap.Point(pos.longitude,pos.latitude)
-      	var marker = new BMap.Marker(point)  // 创建标注
-        var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
-        marker.setLabel(label)
-        label.setStyle({ border : '0px', padding: '0px'})
-      	window.map.addOverlay(marker)              // 将标注添加到地图中
-      // 	var infoWindow = new BMap.InfoWindow(pos.hint)  // 创建信息窗口对象
-      // 	marker.addEventListener("click", function(){
-      // 		window.map.openInfoWindow(infoWindow,point) //开启信息窗口
-      // 	})
-      })
-      this.patch()
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto">
+    <button type="button" class="btn btn-default" @click="this.$back('ass')">&lt;&lt;</button>
+    <div id="allmap2" :style="mapStyle"></div>
+  </div>
+</template>
+
+<script>
+// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
+
+import Vue from 'vue'
+
+export default {
+  title: '岗位图',
+  props: ['lonlats'],
+  data () {
+    return {
+      mapStyle: {
+        width: (this.$parent.$el.clientWidth -30) + 'px',
+        height: (this.$parent.$el.clientHeight - 80) + 'px'
+      },
+      markers : []
+    }
+  },
+  ready () {
+    this.lonlats.filter((item) => {
+      return item.f_longitude != 0 && item.f_latitude != 0
+    }).forEach((item) => {
+      this.markers.push({
+        longitude: item.f_longitude,
+        latitude: item.f_latitude,
+        hint: item.f_user_name + '[' + item.f_datetime + ']'
+      })
+    })
+    if(Vue.mapLoaded) {
+      this.render()
+    } else {
+      window.__mapCallback__ = this.mapCallback
+      let element = document.createElement('script')
+      element.setAttribute("type","text/javascript")
+      element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
+      document.body.appendChild(element)
+    }
+  },
+  methods: {
+    mapCallback () {
+      Vue.mapLoaded = true
+      this.render()
+    },
+    patch () {
+      let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
+      if(a.length != 0) {
+        a[0].style.height = 'auto'
+      } else {
+        window.setTimeout(this.patch, 500)
+      }
+    },
+    render () {
+      window.map = new BMap.Map("allmap2")
+      window.map.clearOverlays();
+      if(this.markers.length == 0)
+        window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
+      else
+        window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
+      window.map.addControl(new BMap.NavigationControl())
+      this.markers.forEach(function(pos) {
+        var point = new BMap.Point(pos.longitude,pos.latitude)
+      	var marker = new BMap.Marker(point)  // 创建标注
+        var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
+        marker.setLabel(label)
+        label.setStyle({ border : '0px', padding: '0px'})
+      	window.map.addOverlay(marker)              // 将标注添加到地图中
+      // 	var infoWindow = new BMap.InfoWindow(pos.hint)  // 创建信息窗口对象
+      // 	marker.addEventListener("click", function(){
+      // 		window.map.openInfoWindow(infoWindow,point) //开启信息窗口
+      // 	})
+      })
+      this.patch()
+    }
+  }
+}
+</script>

package/src/components/querycheckpaper/PaperItem.vue

@@ -1,59 +1,59 @@
-<template>
-  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
-    <div class="auto">
-      <partial-view v-ref:pv>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户姓名:</label>
-          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户地址:</label>
-          <span class = "col-sm-8">{{rowdata.f_address}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">安检人:</label>
-          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
-          <label class = "col-sm-3 control-label">安检状态:</label>
-          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">入户时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">离开时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">用户评价:</label>
-          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
-        </div>
-      </partial-view>
-    </div>
-    <check-paper-items :row="rowdata"></check-paper-items>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import co from 'co'
-
-  export default {
-    title: '安检项信息',
-    name: 'CheckPaperItem',
-    props: ['row'],
-    data () {
-      return {
-        rowdata: this.row
-      }
-    },
-    ready () {
-      this.rowdata = this.row
-    },
-    watch: {
-      'row' (val) {
-        this.rowdata = val
-      }
-    }
-  }
-</script>
+<template>
+  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
+    <div class="auto">
+      <partial-view v-ref:pv>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户姓名:</label>
+          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户地址:</label>
+          <span class = "col-sm-8">{{rowdata.f_address}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">安检人:</label>
+          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
+          <label class = "col-sm-3 control-label">安检状态:</label>
+          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">入户时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">离开时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户评价:</label>
+          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
+        </div>
+      </partial-view>
+    </div>
+    <check-paper-items :row="rowdata"></check-paper-items>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import co from 'co'
+
+  export default {
+    title: '安检项信息',
+    name: 'CheckPaperItem',
+    props: ['row'],
+    data () {
+      return {
+        rowdata: this.row
+      }
+    },
+    ready () {
+      this.rowdata = this.row
+    },
+    watch: {
+      'row' (val) {
+        this.rowdata = val
+      }
+    }
+  }
+</script>

package/src/components/rongcheng/AddPlanItem.vue

@@ -162,6 +162,10 @@
                   <p class="panel-title col-xs-4 text-left font">最后安检状态</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_last_check_state }}</p>
                 </div>
+                <div class="col-xs-12">
+                  <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_rectificationed ? row.f_rectificationed : '未处理' }}</p>
+                </div>
               </div>
             </div>
 

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: '民用用户安检情况',
@@ -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: {

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

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -272,6 +272,7 @@ export default {
           header: '拍照签名',complete:'paper-feedback', class: 'outlay-class', props: null
         }
       ],
+      changeinfo:'',
       faultshow:{
         number : 8
       }     // 控制 故障汇总 在 菜单里显示与否,
@@ -1063,6 +1064,7 @@ export default {
           //   }
           // })
           codata.f_devices = this.f_devices
+          this.changeinfo=codata
           let param = {
             f_check_item_id: this.data.f_check_item_id,
             f_checker_id: this.data.f_checker_id,
@@ -1118,6 +1120,7 @@ export default {
           //   }
           // })
           codata.f_devices = this.f_devices
+          this.changeinfo=codata
           let param = {
             f_check_item_id: this.data.f_check_item_id,
             f_checker_id: this.data.f_checker_id,
@@ -1276,6 +1279,11 @@ export default {
         'backresult':backresult
       })
     },
+    changeinfos(){
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/changeuserinfo`, {data:this.changeinfo
+      }).then(res4 =>{
+      })
+    },
     saveCallBack(jo){
       //tag)
       this.isdisable = false
@@ -1284,6 +1292,7 @@ export default {
         //tag)
         if(res.code == 200){
           //tag
+          this.changeinfos()
           if(!this.onlySave){
             let codata = this.getAllDefect()
             //获取微信推送内容
@@ -1776,10 +1785,10 @@ export default {
       // 用户信息
       this.$set('data.f_user_name', this.item.f_user_name)
       this.$set('data.f_user_phone', this.item.f_user_phone)
-      this.$set('data.f_used_name', this.item.f_used_name)
-      this.$set('data.f_rent_phone', this.item.f_rent_phone)
+      this.$set('data.f_used_name', this.item.f_plan_meters[0].f_used_name)
+      this.$set('data.f_rent_phone',this.item.f_plan_meters[0].f_rent_phone)
       this.$set('data.f_remark', '')
-      this.$set('data.f_user_phone2', this.item.f_user_phone2)
+      this.$set('data.f_user_phone2',this.item.f_plan_meters[0].f_user_phone2)
       this.$set('data.f_userinfoid', this.item.f_userinfoid)
       this.$set('data.f_address', this.item.f_address)
       this.$set('data.f_small_area', this.item.f_small_area)

package/src/components/rongcheng/SafecheckOrderVCli.vue

@@ -291,6 +291,7 @@
             header: '拍照签名',complete:'paper-feedback', class: 'outlay-class', props: null
           }
         ],
+        changeinfo:'',
         faultshow:{
           number : 8
         }     // 控制 故障汇总 在 菜单里显示与否,
@@ -1076,6 +1077,7 @@
             //   }
             // })
             codata.f_devices = this.f_devices
+            this.changeinfo=codata
             let param = {
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
@@ -1131,6 +1133,7 @@
             //   }
             // })
             codata.f_devices = this.f_devices
+            this.changeinfo=codata
             let param = {
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
@@ -1289,6 +1292,11 @@
           'backresult':backresult
         })
       },
+      changeinfos(){
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/changeuserinfo`, {data:this.changeinfo
+        }).then(res4 =>{
+        })
+      },
       saveCallBack(jo){
         //tag)
         this.isdisable = false
@@ -1297,6 +1305,7 @@
           //tag)
           if(res.code == 200){
             //tag
+            this.changeinfos()
             if(!this.onlySave){
               let codata = this.getAllDefect()
               //获取微信推送内容