safecheck-client 3.0.34-4 → 3.0.34-43

package/src/filiale/baiyin/pc.js

@@ -1,21 +1,21 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  // 计划安检
-  'plan-manage': (resolve) => { require(['./pc/PlanManage'], resolve) },
-  'role-selector-safe': (resolve) => { require(['./pc/RoleSelector'], resolve) },
-  'right-tree-safe': (resolve) => { require(['./pc/RightTreeSafe'], resolve) },
-  'plan-chooser': (resolve) => { require(['./pc/PlanChooser'], resolve) },
-  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
-  'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
-  'defect-main-new2': (resolve) => { require(['./pc/DefectMainNew'], resolve) },
-  'check-plan-area-list': (resolve) => { require(['./pc/CheckPlanAreaList'], resolve) },
-  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  // 计划安检
+  'plan-manage': (resolve) => { require(['./pc/PlanManage'], resolve) },
+  'role-selector-safe': (resolve) => { require(['./pc/RoleSelector'], resolve) },
+  'right-tree-safe': (resolve) => { require(['./pc/RightTreeSafe'], resolve) },
+  'plan-chooser': (resolve) => { require(['./pc/PlanChooser'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
+  'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
+  'defect-main-new2': (resolve) => { require(['./pc/DefectMainNew'], resolve) },
+  'check-plan-area-list': (resolve) => { require(['./pc/CheckPlanAreaList'], resolve) },
+  'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/bayan/android/PaperFeedback.vue

@@ -707,7 +707,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -728,6 +727,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

package/src/filiale/bayan/android/SafecheckDevices.vue

@@ -430,7 +430,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -450,6 +449,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/bayan/android/SafecheckOrderV.vue

@@ -84,6 +84,13 @@
                     close-on-select>
           </v-select>
         </div>
+        <div class="row" style="margin-top: 10px">
+          <label class="font_normal_body">选择站点</label>
+          <right-tree
+            islist
+            :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
+            @re-res="getSiteRes"></right-tree>
+        </div>
         <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给维修员'">
           <label class="font_normal_body">维&ensp;修&ensp;员</label>
           <v-select
@@ -93,13 +100,6 @@
             placeholder='请选择维修员'
             close-on-select></v-select>
         </div>
-        <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给站点'">
-          <label class="font_normal_body">站&ensp;&ensp;&ensp;&ensp;点</label>
-          <right-tree
-            islist
-            :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
-            @re-res="getSiteRes"></right-tree>
-        </div>
         <!--<div class="row" style="margin-top: 10px">
           <label class="font_normal_body">报修类型</label>
           <v-select :value.sync="selectData.f_repairtype"
@@ -362,7 +362,7 @@
         }
         console.log("准备保存！")
         this.disableTimer()
-        this.getEmp()
+        // this.getEmp()
         this.showModal2=true
       },
       cancel1(){
@@ -377,14 +377,37 @@
       getSiteRes(obj) {
         console.log('siteRes ---> ')
         console.log(obj)
-        if(obj.resids[0]){
-          this.selectData.f_meetunit = obj.res.join('.')
-          this.selectData.f_reciever = obj.resids.join('.')
-          this.selectData.f_outlets = obj.res[obj.res.length - 1]
+        if(this.selectData.dispatchType=='派发给站点'){
+          if(obj.resids[0]){
+            this.selectData.f_meetunit = obj.res.join('.')
+            this.selectData.f_reciever = obj.resids.join('.')
+            this.selectData.f_outlets = obj.res[obj.res.length - 1]
+          }else {
+            this.selectData.f_meetunit = ''
+            this.selectData.f_reciever = ''
+            this.selectData.f_outlets = ''
+          }
         }else {
-          this.selectData.f_meetunit = ''
-          this.selectData.f_reciever = ''
-          this.selectData.f_outlets = ''
+          if(obj.resids[0]){
+            this.selectData.f_meetunit = obj.res.join('.')
+          }else {
+            this.selectData.f_meetunit = ''
+            this.selectData.f_reciever = ''
+            this.selectData.f_outlets = ''
+          }
+          this.repairers = []
+          let vali = {
+            source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
+            userid: `${obj.resids[0]}`
+          }
+          let http = new HttpResetClass()
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            res.data.forEach((item) => {
+              if (item.state == '在职'){
+                this.repairers.push({label: `${item.name}`, value: item.name})
+              }
+            })
+          })
         }
       },
       rectification(){
@@ -417,7 +440,7 @@
           toRepair=null
         }else{
           console.log('派发给维修员---------'+this.selectData.f_repairman)
-          act={f_meetunit:'',f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
+          act={f_meetunit:this.selectData.f_meetunit,f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
           toRepair='一级派单'
         }
         let repData={
@@ -438,16 +461,16 @@
         this.save()
       },
       // 获取维修员
-      getEmp() {
-        this.repairers=[]
-        let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
-        let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          res.data.forEach((user)=>{
-            this.repairers.push({label:user.name, value: user.name})
-          })
-        })
-      },
+      // getEmp() {
+      //   this.repairers=[]
+      //   let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
+      //   let http = new HttpResetClass()
+      //   http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //     res.data.forEach((user)=>{
+      //       this.repairers.push({label:user.name, value: user.name})
+      //     })
+      //   })
+      // },
       closely(isdelete){
         try {
           var startOrStopAudioClipStr;
@@ -2547,9 +2570,9 @@
               delete this.config['燃气表']['items']['气量异常差值']
             }
 
-            if (this.data.f_user_type == '非民用' || this.data.f_check_type == '非民用'){
-              that.config = that.config2
-            }
+            // if (this.data.f_user_type == '非民用' || this.data.f_check_type == '非民用'){
+            //   that.config.燃气表 = that.config2.燃气表
+            // }
 
             //tag)
             if (value.data[0].f_devices) {

package/src/filiale/bayan/android/SafecheckUserInfo.vue

@@ -500,7 +500,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(type, prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -526,6 +525,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true') {
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu = '\t经度：' + obj.longitude + '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

package/src/filiale/dexin/android/SafecheckDevices.vue

@@ -430,7 +430,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -450,6 +449,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag

package/src/filiale/fugou/pc/CheckBookSearchUser.vue

@@ -170,30 +170,35 @@
 
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">街道/乡镇</label>
-              <v-select :value.sync="model.f_street_id" :value-single="true"
+              <v-select :value.sync="model.f_street_id"
+                        :multiple="true"
                         :options='$parent.$parent.streetslist' placeholder='请选择'
-                        condition="f_street_id = '{}'"
+                        condition="f_street_id in {}"
                         v-model='model.f_street_id'
                         @change="$parent.$parent.streetChange"
-                        close-on-select :search="true" >
+                       :search="true" >
               </v-select>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">片区/行政村</label>
-              <v-select :value.sync="model.f_community_id" v-model='model.f_community_id'
-                        :options='$parent.$parent.communitylist' placeholder='片区/管理站' filer-key="name"
-                        condition="f_community_id = '{}'"
+              <v-select :value.sync="model.f_community_id"
+                        :multiple="true"
+                        v-model='model.f_community_id'
+                        :options='$parent.$parent.communitylist'
+                        placeholder='片区/管理站' filer-key="name"
+                        condition="f_community_id in {}"
                         @change="$parent.$parent.communityChange"
-                        close-on-select v-ref:slice>
+                         v-ref:slice>
               </v-select>
             </div>
             <div  class="col-sm-3 form-group">
               <label class="font_normal_body">小区/自然村</label>
-              <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+              <v-select :value.sync="model.f_residential_area_id"
+                        :multiple="true"
                         :options='$parent.$parent.areaslist' placeholder='请选择'
-                        condition="f_residential_area_id = '{}'"
+                        condition="f_residential_area_id in {}"
                         v-model='model.f_residential_area_id'
-                        close-on-select>
+                       >
               </v-select>
             </div>
             <div  class="col-sm-3 form-group">
@@ -712,15 +717,30 @@ export default {
       })
       this.communitylist=redata
     },
-    async streetChange(val){
-      if(val){
-        await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
+    async streetChange(val) {
+      if (val.length > 0) {
+        // 使用数组来收集值
+        const ids = [];
+        for (let i = 0; i < val.length; i++) {
+          ids.push(val[i]);
+        }
+        // 将数组转换为逗号分隔的字符串
+        const strs = ids.join(',');
+        // 调用 initcommunity 方法时确保 SQL 语法正确
+        await this.initcommunity(`f_filialeid = '${this.f_filialeids}' and f_street_id in (${strs})`);
       }
     },
     async  communityChange(val){
       console.log(val)
-      if(val){
-        await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
+      if(val.length > 0){
+        // 使用数组来收集值
+        const ids = [];
+        for (let i = 0; i < val.length; i++) {
+          ids.push(val[i]);
+        }
+        // 将数组转换为逗号分隔的字符串
+        const strs = ids.join(',');
+        await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id in (${strs}) `)
       }
     }
   },

package/src/filiale/hanzhong/android/PaperFeedback.vue

@@ -608,7 +608,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -629,6 +628,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

package/src/filiale/hanzhong/android/SafecheckDevices.vue

@@ -435,7 +435,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -455,6 +454,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         //tag

package/src/filiale/hanzhong/android/SafecheckUserInfo.vue

@@ -422,7 +422,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -448,6 +447,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'