safecheck-client 3.0.34-6 → 3.0.34-61

package/src/components/phonestate/LastKnownState.vue

@@ -1,74 +1,74 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <div novalidate class="form-inline auto" partial>
-          <button class="btn btn-default" @click="search()">刷新</button>
-          <button type="button" class="btn btn-default" @click="$parent.$parent.lastKnownPos">位置地图&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-map-marker"></span></button>
-          <div class="form-group">
-            部门:
-            <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
-          </div>
-          {{$parent.$parent.model.chosenOrg.fullname}}
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>时间</th>
-            <th>手机使用者</th>
-            <th>手机串码</th>
-            <th>经度</th>
-            <th>纬度</th>
-            <th>海拔(米)</th>
-            <th>电量%</th>
-            <th>信号强度</th>
-            <th>剩余空间M</th>
-            <th>流量Kb</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_datetime}}</td>
-          <td v-on:click.stop.prevent='$parent.$parent.$parent.footprint(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
-          <td>{{row.f_sn}}</td>
-          <td>{{row.f_longitude}}</td>
-          <td>{{row.f_latitude}}</td>
-          <td>{{row.f_altitude}}</td>
-          <td>{{row.f_battery_level}}</td>
-          <td>{{row.f_signal_strength}}</td>
-          <td>{{row.f_internal_quote}}</td>
-          <td>{{row.f_traffic/1000}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-
-export default {
-  title: '足迹及手机状态监控',
-  props: ['f'],
-  data () {
-    let model = new PagedList('rs/sql/最后在线位置及状态', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id'})
-    model.chosenOrg = {id:0}
-    return {
-      model: model
-    }
-  },
-  methods: {
-    lastKnownPos () {
-      this.$goto('post-map', {lonlats: this.model.rows}, 'self')
-    },
-    footprint (row) {
-      this.$goto('footprint-map', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name}, 'self')
-    }
-  },
-  ready () {
-    this.model.f_loggedOnUserId = this.f.id
-    this.model.chosenOrg.id = this.f.parent.id
-    this.model.search()
-  }
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <button class="btn btn-default" @click="search()">刷新</button>
+          <button type="button" class="btn btn-default" @click="$parent.$parent.lastKnownPos">位置地图&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-map-marker"></span></button>
+          <div class="form-group">
+            部门:
+            <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
+          </div>
+          {{$parent.$parent.model.chosenOrg.fullname}}
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>时间</th>
+            <th>手机使用者</th>
+            <th>手机串码</th>
+            <th>经度</th>
+            <th>纬度</th>
+            <th>海拔(米)</th>
+            <th>电量%</th>
+            <th>信号强度</th>
+            <th>剩余空间M</th>
+            <th>流量Kb</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_datetime}}</td>
+          <td v-on:click.stop.prevent='$parent.$parent.$parent.footprint(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
+          <td>{{row.f_sn}}</td>
+          <td>{{row.f_longitude}}</td>
+          <td>{{row.f_latitude}}</td>
+          <td>{{row.f_altitude}}</td>
+          <td>{{row.f_battery_level}}</td>
+          <td>{{row.f_signal_strength}}</td>
+          <td>{{row.f_internal_quote}}</td>
+          <td>{{row.f_traffic/1000}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  title: '足迹及手机状态监控',
+  props: ['f'],
+  data () {
+    let model = new PagedList('rs/sql/最后在线位置及状态', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id'})
+    model.chosenOrg = {id:0}
+    return {
+      model: model
+    }
+  },
+  methods: {
+    lastKnownPos () {
+      this.$goto('post-map', {lonlats: this.model.rows}, 'self')
+    },
+    footprint (row) {
+      this.$goto('footprint-map', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name}, 'self')
+    }
+  },
+  ready () {
+    this.model.f_loggedOnUserId = this.f.id
+    this.model.chosenOrg.id = this.f.parent.id
+    this.model.search()
+  }
+}
+</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/PhoneUpUserinfo.vue

@@ -300,98 +300,6 @@
         </div>
       </div>
     </div>
-    <div class="panel auto">
-      <div class="panel-heading" @click="selectVal('设备信息')" style="background-color: #ffffff">
-        <span class="spanboder"><img src="../../assets/list.png" style="width: 22px;margin-right: 8px;">设备信息<img
-          class="butt3" :src="imgback('设备信息')"></span>
-      </div>
-      <div class="panel-body" v-show="headername == '设备信息'">
-        <div class="row" v-for="(idx, row) in devicemodel"
-             style="border:2px solid #A2C2EB; border-top:10px solid #A2C2EB; box-shadow: #00b3ee;margin-bottom: 10px">
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">设备类型:</label>
-            <v-select class="rightipt" :value.sync="row.f_devices_type" v-model="row.f_devices_type" placeholder='请选择'
-                      :width='wid' readonly :options="device_type"
-                      close-on-select value-single></v-select>
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">厂家:</label>
-            <input type="text" class="form-control rightipt" v-model="row.f_manufactor" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">设备编号:</label><input type="text" class="form-control rightipt"
-                                                            v-model="row.f_devices_model" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">设备型号:</label><input type="text" class="form-control rightipt"
-                                                            v-model="row.f_devices_model" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">安&ensp;装&ensp;人:</label><input type="text" class="form-control rightipt"
-                                                                      v-model="row.f_instaler_person" />
-          </div>
-          <div class="row auto" style="margin: 5px 0">
-            <label class="righttxt">安装日期:</label>
-            <datepicker class="rightipt" :value.sync="row.f_input_date"
-                        v-model="row.f_input_date" :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset"
-                        readonly="readonly">
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin: 5px 0" >
-            <label class="righttxt">生产日期:</label>
-            <datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin:  5px 0">
-            <label class="righttxt">设备数量:</label>
-            <input type="number" class="form-control rightipt" v-model="row.f_devices_num" />
-          </div>
-          <div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '报警器'">
-            <label class="righttxt">首校日期:</label>
-            <datepicker class="rightipt" :value.sync="row.f_firstcheck_date" v-model="row.f_firstcheck_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '报警器'">
-            <label class="righttxt">报废日期:</label>
-            <datepicker class="rightipt" :value.sync="row.f_expire_date" v-model="row.f_expire_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '报警器'">
-            <label class="righttxt">下次校验:</label>
-            <datepicker class="rightipt" :value.sync="row.f_nextcheck_date" v-model="row.f_nextcheck_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '切断阀'">
-            <label class="righttxt">报废日期:</label>
-            <datepicker class="rightipt" :value.sync="row.f_expire_date" v-model="row.f_expire_date"
-                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
-            </datepicker>
-          </div>
-          <div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '调压器'">
-            <label class="righttxt">流量:</label>
-            <input type="number" class="form-control rightipt" v-model="row.f_rate_flow"  />
-          </div>
-          <div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '调压器'">
-            <label class="righttxt">出口压力:</label>
-            <input type="text" class="form-control rightipt" v-model="row.f_pressure_range" />
-          </div>
-          <div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '调压器'">
-            <label class="righttxt">进口压力:</label>
-            <input type="text" class="form-control rightipt" v-model="row.f_import_pressure" />
-          </div>
-          <div style="display: flex;justify-content: center;margin-bottom: 3px">
-            <button class="btn btn-warning" @click="deleteDevice($index)">删除设备</button>
-          </div>
-        </div>
-        <div style="display: flex;justify-content: space-around;">
-          <button class="col-sm-3 btn btn-primary" @click="pushDevices($index)">新增设备</button>
-        </div>
-      </div>
-    </div>
     <div class="panel auto">
       <div class="panel-body">
         <div style="display: flex;justify-content: center;">

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()
               //获取微信推送内容