telephone-clients 3.0.103-65 → 3.0.103-67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.103-65",
+  "version": "3.0.103-67",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/weinan/SiteSend.vue

@@ -199,7 +199,7 @@ export default {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {
-          let result = res.data.filter(res=>res.depids==Vue.user.depids)
+          let result = res.data.filter(res=>res.depids==Vue.user.depids && res.state == '在职')
           result.forEach((item) => {
             this.repairers.push({label: `${item.name} ${item.f_user_telephone}`, value: item.name})
 
@@ -213,7 +213,7 @@ export default {
         }
         http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
 
-          let result = res.data.filter(res=>res.depids==this.$login.f.depids)
+          let result = res.data.filter(res=>res.depids==this.$login.f.depids && res.state == '在职')
 
           result.forEach((item) => {
             this.repairers.push({label: `${item.name} ${item.f_user_telephone}`, value: item.name})

package/src/components/weinan/SiteSendWeixiu.vue

@@ -203,8 +203,8 @@ export default {
         this.barperc = 0
         this.$showMessage('批量派发' + this.rowlist.length + '个单子成功', ['confirm']).then((res) => {
           if (res === 'confirm') {
+            this.rowlist = []
             this.$emit('success')
-            // this.cleardate()
           }
         })
         //tag

package/src/components/weinan/StandWorkWeixiu.vue

@@ -16,7 +16,7 @@
 import * as Util from '../Util'
 
 export default {
-  title: '站点工单',
+  title: '维修班工单',
   data () {
     return {
       user: this.$login.f,

package/src/components/weinan/WorkList.vue

@@ -649,6 +649,7 @@ export default {
       this.imgfilename = 'rs/image/file/' + val.f_single_path
     },
     search (args) {
+      this.rowlist = []
       this.serlist = []
       //tag
       let data = {}
@@ -660,6 +661,7 @@ export default {
     },
     selfSearch () {
       // 取消编辑状态
+      this.rowlist = []
       this.serlist = []
       this.editflag = null
 

package/src/components/weinan/WorkListAll.vue

@@ -388,6 +388,7 @@
     title: '工单列表',
     data () {
       return {
+        depname:this.$login.f.deps,
         order_man:'',
         source:'tool.getFullTree(this.getRights().where(row.getType() == $department$))',
         resobjprop: {res: this.$login.f.orgs, resids: this.$login.f.orgid},
@@ -742,7 +743,7 @@
           condition2: '1 = 1'
         }
         if(this.order_man){
-          condition.condition1 += ` and f_order_man in (${this.order_man}) `
+          condition.condition1 += ` and (f_order_man in (${this.order_man}) or f_outlets = '${this.depname}') `
         }
         if(this.f_accept_man){
           condition.condition2 = ` sender = '${this.f_accept_man}'`
@@ -788,7 +789,7 @@
           condition2: '1 = 1'
         }
         if(this.order_man){
-          condition.condition1 += ` and f_order_man in (${this.order_man}) `
+          condition.condition1 += ` and (f_order_man in (${this.order_man}) or f_outlets = '${this.depname}') `
         }
         if(this.f_accept_man){
           condition.condition2 = ` sender = '${this.f_accept_man}'`
@@ -895,6 +896,7 @@
         this.criteriaShow = !this.criteriaShow
       },
       getRes(obj){
+        this.depname = obj.res[0]
         // if(obj){
         //   this.$refs.paged.$refs.criteria.model.f_order_man = ''
         //   this.repairerss = [{label: '全部', value: ''}]

package/src/components/weinan/WorkListWeixiu.vue

@@ -420,7 +420,7 @@ export default {
       this.serlist = []
       if (this.picked) {
         if (this.picked === 'wait') {
-          this.model.url = 'rs/path/operatorService'
+          this.model.url = 'rs/path/pcService'
         } else if (this.picked === 'done') {
           this.model.url = 'rs/path/doneService'
         }