safecheck-client 3.0.35-4 → 3.0.35-40

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/planmanage/PlanManage.vue

@@ -251,6 +251,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="createPlan.isShare=='是' && ismulchecker">
+              <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="createPlan.checkers"
+                v-model="createPlan.checkers"
+                :options='checker'
+                placeholder='请选择'
+                :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -350,6 +362,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='是' && ismulchecker">
+              <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="upCheckPlan.checkers"
+                v-model="upCheckPlan.checkers"
+                :options='checker'
+                placeholder='请选择'
+                :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -396,6 +420,7 @@
         title: '计划管理',
         data() {
           return {
+            ismulchecker:this.$appdata.getSingleValue('计划安检员多选')?true:false,
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
@@ -410,7 +435,9 @@
               f_checker_id:'',
               isShare:'',
               f_checker:'',
-              checker:{}
+              f_checkerstr:'',
+              checker:{},
+              checkers:[]
             },
             isSend:false,
             createPlan:{
@@ -421,7 +448,9 @@
               f_issued:'否',
               f_checker_id:null,
               checker:{},
+              checkers:[],
               f_checker:null,
+              f_checkerstr:null,
               f_safecheck_type:'',
             },
             planCondition:{},
@@ -523,6 +552,12 @@
             return
           }
           if(this.createPlan.isShare=="是"){
+              if(this.ismulchecker && this.createPlan.checkers.length > 0){
+                this.createPlan.checkers.forEach((value) => {
+                  this.createPlan.f_checkerstr += `${value.name},`
+                })
+                this.createPlan.f_checkerstr = this.createPlan.f_checkerstr.slice(0, -1)
+              }
             this.createPlan.f_checker_id=null
             this.createPlan.f_checker=null
           }else{
@@ -545,7 +580,9 @@
               f_issued:'否',
               f_checker_id:null,
               checker:{},
+              checkers:[],
               f_checker:null,
+              f_checkerstr:null,
               f_safecheck_type:'',
               f_create_operator:''
           }
@@ -608,7 +645,7 @@
         //按条件查询所有安检计划
         async loadCheckPlan() {
           this.isSend=true
-          this.checkplan.check.checkes=[]
+          this.checkplan.check.checkescheckes=[]
           let fieldValue=''
           switch(this.currentorder){
             case "按时间降序":
@@ -677,6 +714,12 @@
           console.log(this.upCheckPlan)
 
           if(this.upCheckPlan.isShare=="是"){
+            if(this.ismulchecker && this.upCheckPlan.checkers.length > 0){
+              this.upCheckPlan.checkers.forEach((value) => {
+                this.upCheckPlan.f_checkerstr += `${value.name},`
+              })
+              this.upCheckPlan.f_checkerstr = this.upCheckPlan.f_checkerstr.slice(0, -1)
+            }
             this.upCheckPlan.f_checker_id=null
             this.upCheckPlan.f_checker=null
           }else{
@@ -686,6 +729,8 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
             data:{
+              checkers:this.createPlan.checkers,
+              f_checkerstr:this.createPlan.f_checkerstr,
               f_checker:this.upCheckPlan.f_checker,
               f_safecheck_type:this.upCheckPlan.f_safecheck_type,
               f_checker_id:this.upCheckPlan.f_checker_id,

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/report/CheckPlanAreaList.vue

@@ -172,12 +172,21 @@
             <td style="text-align:center">{{row.f_buyu}}</td>
             <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
-            <!--<td style="text-align: center;">-->
-            <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
-            <!--</td>-->
           </tr>
         </template>
-        <template partial='foot'></template>
+        <template partial="foot">
+          <tr>
+            <td  style="text-align:center"><strong>合计：</strong></td>
+            <td  style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_weijian}}</strong></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_yijian}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_jujian}}</strong></nobr></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_yijian/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
+          </tr >
+        </template>
       </data-grid>
     </criteria-paged>
   </div>
@@ -194,7 +203,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
+        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -437,7 +446,18 @@
         }
         //tag
         this.model.rows=JSON.parse(JSON.stringify(temp))
+      },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1){
+        this.model.sums.f_plan_total = 0
+        this.model.sums.f_weijian = 0
+        this.model.sums.f_yijian = 0
+        this.model.sums.f_ruhu = 0
+        this.model.sums.f_buyu = 0
+        this.model.sums.f_jujian = 0
       }
+    }
     },
     computed:{
       exportParameter(){

package/src/components/rongcheng/AddPlanItem.vue

@@ -168,7 +168,7 @@
                 </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_last_check_result }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_defect_text }}</p>
                 </div>
               </div>
             </div>

package/src/components/rongcheng/AspiratedAreaPlan.vue

@@ -334,6 +334,7 @@
       </div>
       <div slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-default" @click="uploadPic">上传</button>
+        <button type="button" class="btn btn-default" @click="imgUpModalShow = false">取消</button>
       </div>
     </modal>
     <!--<back-page :need-back='true'  @flag="$back()"></back-page>-->

package/src/components/rongcheng/AspiratedPaperFeedbackm.vue

@@ -456,6 +456,10 @@
             let temp = getFile.data[i].f_downloadpath
             if (temp) {
               let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+              if (temp.startsWith('E:')){
+                URL = `rs/image/file/${getFile.data[i].f_filename}`
+              }
+              console.log(URL)
               getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
             }
           }

package/src/components/rongcheng/AspiratedUserInfo.vue

@@ -32,7 +32,7 @@
           <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_address }}</p>
         </div>
         <div class="col-xs-12" style="margin-left: 20px">
-          <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a></p>
+          <p class="panel-title col-xs-7 text-left input-font"><a @click="upuserinfo(userinfo.f_userinfoid)">设备信息维护</a></p>
         </div>
         <!--<div class="col-xs-12">
           <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
@@ -157,13 +157,21 @@
         })
         this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
       },
-      searchDevices(f_userinfo_id) {
+      // searchDevices(f_userinfo_id) {
+      //   this.$dispatch('gotoson', {
+      //     _this: this.$parent.$parent,
+      //     title: '设备查看',
+      //     safe: false
+      //   })
+      //   this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
+      // },
+      upuserinfo (f_userinfo_id) {
         this.$dispatch('gotoson', {
           _this: this.$parent.$parent,
-          title: '设备查看',
+          title: '档案信息变更',
           safe: false
         })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
+        this.$parent.$parent.$goto('PhoneUpUserinfo', {f_userinfo_id: f_userinfo_id, f_source: '安检'})
       },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())

package/src/components/rongcheng/CheckSearchUser.vue

@@ -644,7 +644,7 @@ export default {
         //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 != '入户'"
+        // 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=='到访不遇'){

package/src/components/rongcheng/SafecheckOrderV.vue

@@ -1786,7 +1786,7 @@ 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_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_rent_phone',this.item.f_rent_phone)
       this.$set('data.f_remark', '')
       this.$set('data.f_user_phone2',this.item.f_plan_meters[0].f_user_phone2)
       this.$set('data.f_userinfoid', this.item.f_userinfoid)

package/src/components/rongcheng/SafecheckUserInfo.vue

@@ -55,10 +55,10 @@
                      :options="f_usetypes"
                      clear-button></v-select>
         </div>
-        <div class="col-xs-12" style="margin-left: 20px">
-          <!-- <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>-->
-          <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>
-        </div>
+<!--        <div class="col-xs-12" style="margin-left: 20px">-->
+<!--          &lt;!&ndash; <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>&ndash;&gt;-->
+<!--          <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>-->
+<!--        </div>-->
       </div>
       <div class="panel-body">
         <div v-show="false" class="row repair-info-content auto">
@@ -753,14 +753,14 @@
         })
         this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
       },
-      searchDevices(f_userinfo_id) {
-        this.$dispatch('gotoson', {
-          _this: this.$parent.$parent,
-          title: '设备查看',
-          safe: false
-        })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
-      },
+      // searchDevices(f_userinfo_id) {
+      //   this.$dispatch('gotoson', {
+      //     _this: this.$parent.$parent,
+      //     title: '设备查看',
+      //     safe: false
+      //   })
+      //   this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
+      // },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())
         //tag