safecheck-client 3.0.34-7 → 3.0.34-71

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) {