safecheck-client 3.0.34-44 → 3.0.34-47

package/src/components/android/PlumberAnnualDetail.vue

@@ -1,65 +1,65 @@
-<template>
-  <div>
-    <label>{{f_repairman}}{{f_plan_year}}任务月完成情况</label>
-    <button type="button" class="btn btn-default" @click="this.$goto('plumber-annual', {}, 'master-router')">&lt;&lt;</button>
-    <data-grid :model="model" partial='list' v-ref:grid>
-      <template partial='head'>
-        <tr>
-          <th>年</th>
-          <th>月</th>
-          <th>已检</th>
-          <th>在检</th>
-          <th>未检</th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <td>{{row.f_plan_year}}</td>
-        <td>{{row.f_plan_month}}</td>
-        <td>{{row.checked}}</td>
-        <td>{{row.checking}}</td>
-        <td>{{row.unchecked}}</td>
-      </template>
-    </data-grid>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-
-let aggCheckerTaskDetail = function * (self) {
-    let result = yield self.$post(Vue.url + 'sql/统计维修员年任务明细?pageNo=1&pageSize=9999', {
-        data: {
-            f_repairman: self.f_repairman,
-            f_plan_year: self.f_plan_year,
-            f_subcompany: Vue.user.f_subcompany
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '维修员年任务明细',
-  props: ['f_repairman', 'f_plan_year'],
-  data() {
-    return {
-      model: {
-        rows: []
-      }
-    }
-  },
-  ready () {
-    this.getPlan()
-  },
-  methods: {
-    getPlan () {
-      let fp = aggCheckerTaskDetail(this)
-      co(fp)
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <label>{{f_repairman}}{{f_plan_year}}任务月完成情况</label>
+    <button type="button" class="btn btn-default" @click="this.$goto('plumber-annual', {}, 'master-router')">&lt;&lt;</button>
+    <data-grid :model="model" partial='list' v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>年</th>
+          <th>月</th>
+          <th>已检</th>
+          <th>在检</th>
+          <th>未检</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td>{{row.f_plan_year}}</td>
+        <td>{{row.f_plan_month}}</td>
+        <td>{{row.checked}}</td>
+        <td>{{row.checking}}</td>
+        <td>{{row.unchecked}}</td>
+      </template>
+    </data-grid>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+
+let aggCheckerTaskDetail = function * (self) {
+    let result = yield self.$post(Vue.url + 'sql/统计维修员年任务明细?pageNo=1&pageSize=9999', {
+        data: {
+            f_repairman: self.f_repairman,
+            f_plan_year: self.f_plan_year,
+            f_subcompany: Vue.user.f_subcompany
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '维修员年任务明细',
+  props: ['f_repairman', 'f_plan_year'],
+  data() {
+    return {
+      model: {
+        rows: []
+      }
+    }
+  },
+  ready () {
+    this.getPlan()
+  },
+  methods: {
+    getPlan () {
+      let fp = aggCheckerTaskDetail(this)
+      co(fp)
+    }
+  }
+}
+</script>

package/src/components/android/PlumberMonthly.vue

@@ -1,84 +1,84 @@
-<template>
-  <div>
-    <form>
-      <div class="form-group">
-        <label for="c_plan_year">年份：</label>
-        <v-select id="c_plan_year" :value.sync="c_plan_year"
-        :options='c_year_list' close-on-select clear-button></v-select>
-        <label for="c_plan_month">月份：</label>
-        <v-select id="c_plan_month" :value.sync="c_plan_month"
-        :options='c_month_list' close-on-select clear-button></v-select>
-        <button type="button" class="btn btn-default" @click="search">刷新</button>
-      </div>
-    </form>
-    <data-grid :model="model" partial='list' v-ref:grid>
-      <template partial='head'>
-        <tr>
-          <th>维修员</th>
-          <th>已维修</th>
-          <th>在维修</th>
-          <th>未维修</th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <td>{{row.f_repairman}}</td>
-        <td>{{row.checked}}</td>
-        <td>{{row.checking}}</td>
-        <td>{{row.unchecked}}</td>
-      </template>
-    </data-grid>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-
-let aggCheckerTask = function * (self) {
-    let result = yield self.$resetpost(Vue.url + 'sql/统计维修员月任务?pageNo=1&pageSize=9999', {
-        data: {
-            id: Vue.user.id,
-            org_id: Vue.user.parentid,
-            f_subcompany: Vue.user.f_subcompany,
-            f_ym: self.c_plan_year[0] + '-' + (self.c_plan_month[0].length > 1 ? self.c_plan_month[0] : '0' + self.c_plan_month[0])
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '维修员月任务',
-  data() {
-    let options = []
-    let year = (new Date()).getFullYear()
-    options.push({label: year+'', value: year+''})
-    year++
-    options.push({label: year+'', value: year+''})
-    let moptions = []
-    for(let i=1; i<=12; i++)
-      moptions.push({label: i + '', value: i + ''})
-    return {
-      c_plan_year: options[0].value,
-      c_year_list: options,
-      c_month_list: moptions,
-      c_plan_month: moptions[new Date().getMonth()].value,
-      model: {
-        rows: [],
-      }
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    search () {
-      let fp = aggCheckerTask(this)
-      co(fp)
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <form>
+      <div class="form-group">
+        <label for="c_plan_year">年份：</label>
+        <v-select id="c_plan_year" :value.sync="c_plan_year"
+        :options='c_year_list' close-on-select clear-button></v-select>
+        <label for="c_plan_month">月份：</label>
+        <v-select id="c_plan_month" :value.sync="c_plan_month"
+        :options='c_month_list' close-on-select clear-button></v-select>
+        <button type="button" class="btn btn-default" @click="search">刷新</button>
+      </div>
+    </form>
+    <data-grid :model="model" partial='list' v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>维修员</th>
+          <th>已维修</th>
+          <th>在维修</th>
+          <th>未维修</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td>{{row.f_repairman}}</td>
+        <td>{{row.checked}}</td>
+        <td>{{row.checking}}</td>
+        <td>{{row.unchecked}}</td>
+      </template>
+    </data-grid>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+
+let aggCheckerTask = function * (self) {
+    let result = yield self.$resetpost(Vue.url + 'sql/统计维修员月任务?pageNo=1&pageSize=9999', {
+        data: {
+            id: Vue.user.id,
+            org_id: Vue.user.parentid,
+            f_subcompany: Vue.user.f_subcompany,
+            f_ym: self.c_plan_year[0] + '-' + (self.c_plan_month[0].length > 1 ? self.c_plan_month[0] : '0' + self.c_plan_month[0])
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '维修员月任务',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    options.push({label: year+'', value: year+''})
+    year++
+    options.push({label: year+'', value: year+''})
+    let moptions = []
+    for(let i=1; i<=12; i++)
+      moptions.push({label: i + '', value: i + ''})
+    return {
+      c_plan_year: options[0].value,
+      c_year_list: options,
+      c_month_list: moptions,
+      c_plan_month: moptions[new Date().getMonth()].value,
+      model: {
+        rows: [],
+      }
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    search () {
+      let fp = aggCheckerTask(this)
+      co(fp)
+    }
+  }
+}
+</script>

package/src/components/android/PostMap.vue

@@ -1,83 +1,83 @@
-<template>
-  <div class="auto">
-    <button type="button" class="btn btn-default" @click="this.$goto('track-state', {}, 'master-router')">&lt;&lt;</button>
-    <div id="allmap" :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.$root.$el.clientWidth + 'px',
-        height: (this.$root.$el.clientHeight - 119) + '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_username + '[' + item.f_datetime + ']'
-      })
-    })
-    if(Vue.mapLoaded) {
-      window.map = new BMap.Map("allmap")
-      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 () {
-      window.map = new BMap.Map("allmap")
-      Vue.mapLoaded = true
-      this.render()
-    },
-    patch () {
-      let a = document.getElementById('allmap').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
-      if(a.length != 0) {
-        a[0].style.height = 'auto'
-      } else {
-        window.setTimeout(this.patch, 500)
-      }
-    },
-    render () {
-      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.$goto('track-state', {}, 'master-router')">&lt;&lt;</button>
+    <div id="allmap" :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.$root.$el.clientWidth + 'px',
+        height: (this.$root.$el.clientHeight - 119) + '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_username + '[' + item.f_datetime + ']'
+      })
+    })
+    if(Vue.mapLoaded) {
+      window.map = new BMap.Map("allmap")
+      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 () {
+      window.map = new BMap.Map("allmap")
+      Vue.mapLoaded = true
+      this.render()
+    },
+    patch () {
+      let a = document.getElementById('allmap').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
+      if(a.length != 0) {
+        a[0].style.height = 'auto'
+      } else {
+        window.setTimeout(this.patch, 500)
+      }
+    },
+    render () {
+      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/android/QRCode/QRCodeBinding.vue

@@ -40,27 +40,19 @@
       <div  class="panel-body ">
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt" style="width: 30%;">小区名称:</label>
-          <v-select v-model="bindingData.f_user_name" :options='residentialAreas' :value.sync="bindingData.f_user_name" :width="'60%'"
+          <v-select v-model="bindingData.f_userinfo" :options='residentialAreas' :value.sync="bindingData.f_userinfo" :width="'60%'"
                     class="input-font" clear-button close-on-select placeholder='小区名称'
                     style="margin-left: 5%;" value-single></v-select>
         </div>
       </div>
     </div>
-    <div v-if="bindingData.f_type === '用户'" class="panel auto">
-      <div  class="panel-body ">
-        <div class="row auto" style="margin: 5px 0">
-          <label class="righttxt" style="width: 30%;">用户编号:</label>
-          <input v-model="bindingData.f_userinfo_code" class="form-control rightipt" type="text"/>
-        </div>
-      </div>
-    </div>
     <div v-if="bindingData.f_type == '用户'" class="panel auto">
       <div  class="panel-body ">
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt" style="width: 30%;">用户名称:</label>
           <v-select v-model="bindingData.f_userinfo" :options='userNames' :value.sync="bindingData.f_userinfo" :width="'60%'"
                     class="input-font" clear-button close-on-select placeholder='用户名称' @select-search="refreshUser"
-                    style="margin-left: 5%;" menu-mode="align-button" @click="initUser"
+                    style="margin-left: 5%;" menu-mode="align-button"
                     value-single></v-select>
         </div>
       </div>
@@ -132,30 +124,15 @@ export default {
         return [];
       }
     },
-    async initUser() {
-      if (!this.bindingData.f_userinfo_code) return;
-      const baseCondition = `1=1 and f_user_name is not null and uf.f_user_type = '非民用' and uf.f_table_state in ('正常','停用')`;
-      const condition = `${baseCondition} and ui.f_userinfo_code like '${this.bindingData.f_userinfo_code}%'`;
-      const users = await this.fetchUsers(condition);
-      users.forEach(item => {
-        if (!this.userNames.some(user => user.value.f_userinfo_id === item.f_userinfo_id)) {
-          this.userNames.push({ label: `${item.f_user_name}:${item.f_userinfo_code}`, value: item })
-        }
-      })
-    },
     async refreshUser(val) {
-      let condition = `1=1 and f_user_name is not null and uf.f_user_type = '非民用' and uf.f_table_state in ('正常','停用') and ui.f_user_name like '${val}%'`;
-      if (this.bindingData.f_userinfo_code) {
-        condition += ` and ui.f_userinfo_code like '${this.bindingData.f_userinfo_code}%'`;
-      }
+      let condition = `1=1 and f_user_name is not null and uf.f_user_type = '非民用' and uf.f_table_state in ('正常','停用') and (ui.f_user_name like '${val}%' or ui.f_userinfo_code like '${this.bindingData.f_userinfo_code}%')`;
       const users = await this.fetchUsers(condition);
       users.forEach(item => {
-        if (!this.userNames.some(user => user.value.f_userinfo_id === item.f_userinfo_id)) {
+        if (!this.userNames.some(user => user.value.f_userinfo_id == item.f_userinfo_id)) {
           this.userNames.push({ label: `${item.f_user_name}:${item.f_userinfo_code}`, value: item })
         }
       })
     },
-
     cameraCallBack(prop,fileName) {
       this.$set('bindingData.f_head_pic',fileName)
     },
@@ -193,6 +170,13 @@ export default {
     },
     async commitCallBack(jo) {
       if (jo.state == 'ok') {
+        if (this.bindingData.f_userinfo && this.bindingData.f_type == '用户'){
+          this.bindingData.f_user_name = this.bindingData.f_userinfo.split(':')[0].trim()
+          this.bindingData.f_userinfo_id = this.bindingData.f_userinfo.split(':')[1].trim()
+        }else if (this.bindingData.f_userinfo && this.bindingData.f_type == '小区') {
+          this.bindingData.f_user_name = this.bindingData.f_userinfo.split(':')[0].trim()
+          this.bindingData.f_userinfo_id = this.bindingData.f_userinfo.split(':')[1].trim()
+        }
         const res = JSON.parse(jo.result)
         let sql = ''
         if (res.images && res.images.length > 0){
@@ -200,10 +184,10 @@ export default {
         }else {
           sql = `update t_qr_code set f_head_name = '${this.bindingData.f_head_name}',f_head_post = '${this.bindingData.f_head_post}',f_head_phone = '${this.bindingData.f_head_phone}',f_type = '${this.bindingData.f_type}',f_user_name = '${this.bindingData.f_user_name}',f_userinfo_id = '${this.bindingData.f_userinfo_id}',f_comments = '${this.bindingData.f_comments}' where id = '${this.bindingData.id}'`
         }
-        new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/runSQL`, {data: {sql: sql}}).then(res=>{
+        new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/runSQL`, {data: {sql: sql}}).then(()=>{
           this.$showMessage('绑定成功')
           this.$dispatch('confirm')
-        }).catch(e=>{
+        }).catch(()=>{
           this.$showMessage('绑定失败')
         })
       }else {
@@ -225,11 +209,17 @@ export default {
       }
     })
     residentialArea.data.forEach(item => {
+      if (item.f_residential_area.trim() == this.bindingData.f_user_name.trim() && item.id == this.bindingData.f_userinfo_id){
+        this.bindingData.f_userinfo = `${item.f_residential_area}:${item.id}`
+      }
       this.residentialAreas.push({label: item.f_residential_area, value: `${item.f_residential_area}:${item.id}`});
     })
     const users = await this.fetchUsers(`1=1 and f_user_name is not null and uf.f_user_type = '非民用' and uf.f_table_state in ('正常','停用')`)
     users.forEach(item => {
-      this.userNames.push({ label: `${item.f_user_name}:${item.f_userinfo_code}`, value: item })
+      if (this.bindingData.f_userinfo_id.trim() == item.f_userinfo_code.trim() && item.f_user_name.trim() == this.bindingData.f_user_name.trim()){
+        this.bindingData.f_userinfo = `${item.f_user_name}:${item.f_userinfo_code}`
+      }
+      this.userNames.push({ label: `${item.f_user_name}:${item.f_userinfo_code}`, value: `${item.f_user_name}:${item.f_userinfo_code}` })
     })
   }
 }

package/src/components/android/QRCode/QRCodePage.vue

@@ -154,10 +154,10 @@ export default {
         condition += ` and (f_head_code = '${this.$refs.paged.$refs.cri.model.id}' or f_safecheck_code= '${this.$refs.paged.$refs.cri.model.id}')`
       }
       if (this.$refs.paged.$refs.cri.model.f_head_name) {
-        condition += ` and f_head_name = '${this.$refs.paged.$refs.cri.model.f_head_name}'`
+        condition += ` and f_head_name like '%${this.$refs.paged.$refs.cri.model.f_head_name}%'`
       }
       if (this.$refs.paged.$refs.cri.model.f_user_name) {
-        condition += ` and f_user_name = '${this.$refs.paged.$refs.cri.model.f_user_name}'`
+        condition += ` and f_user_name like '%${this.$refs.paged.$refs.cri.model.f_user_name}%'`
       }
       this.model.search(condition)
     }