telephone-clients 3.0.103 → 3.0.104-11

package/src/components/weinan/SiteSendWeixiu.vue

@@ -33,10 +33,11 @@
             @click="$emit('cancel')">取消
     </button>
 
-    <button style="float: right; margin-top: 25vh " type="button" name="button" class="button_search button_spacing" @click="worksend()">
+    <button v-if="rowlist.length===0" style="float: right; margin-top: 25vh " type="button" name="button" class="button_search button_spacing" @click="worksend()">
       下发
     </button>
-    <!--<button type="button" name="button" class="btn btn-success" @click="worksendall()" :disabled='btnshow' v-if="!source == 'mobile'">批量下发</button>-->
+    <button v-if="!(rowlist.length===0) && !(source == 'mobile')" style="float: right; margin-top: 25vh" type="button" name="button" class="button_search button_spacing" @click="worksendall()">批量下发</button>
+<!--    <button type="button" name="button" class="btn btn-success" @click="worksendall()" :disabled='btnshow' v-if="!source == 'mobile'">批量下发</button>-->
   </div>
 </template>
 <script>
@@ -182,43 +183,33 @@ export default {
       if (!this.row.serviceacitivity[0].f_reciever) {
         return this.$showAlert('请选择维修人员', 'warning', 2000)
       }
-      if (this.rowlist.length > 0 && this.rowlist.length < 16) {
+      if (this.rowlist.length > 0) {
         this.bartext = '正在批量下发' + this.rowlist.length + '个单子'
         this.btnshow = true
         this.$showAlert('正在批量下发，请稍等！！！！！', 'warning', 2000)
         for (var index in this.rowlist) {
           this.barperc = ((parseInt(index) + 1) * 100) / (parseInt(this.rowlist.length))
-          //this.barperc=parseInt((parseInt(index)+1)/this.rowlist.length)*100)
-          //tag
-          //tag
-          // let result = ''
-          // if(this.rowlist[index].f_repairtype == '置换通气'){
-          //   result = this.getUserfile(this.rowlist[index])
-          //   //tag)
-          // }
           this.rowlist[index].serviceacitivity = this.row.serviceacitivity
           let userdata = Object.assign({}, userdata, this.rowlist[index])
           userdata.f_advice = this.f_advice
           let data = {
             model: userdata,
             loginUser: {name: this.$login.f.name, ename: this.$login.f.ename}
-            // adduser:{userinfo: result, devices: []}
           }
           let gen = await this.sendmsg(data)
-          //tag
         }
         this.saveing = false
         this.btnshow = false
         this.barperc = 0
         this.$showMessage('批量派发' + this.rowlist.length + '个单子成功', ['confirm']).then((res) => {
           if (res === 'confirm') {
+            this.rowlist = []
             this.$emit('success')
-            // this.cleardate()
           }
         })
         //tag
       } else {
-        this.$showMessage('批量派发单子个数小于等于15个', ['confirm']).then((res) => {
+        this.$showMessage('请先选择工单，再进行批量下发', ['confirm']).then((res) => {
           if (res === 'confirm') {
             //tag
           }
@@ -262,7 +253,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
 
           result.forEach((item) => {
             this.repairers.push({label: item.name, value: item.name})

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

@@ -30,6 +30,9 @@
               <button class="button_search button_spacing" @click="search(),$dispatch('search')"
                       style="margin-right: 9px">查询
               </button>
+              <button class="button_search button_spacing" @click="$parent.$parent.repairSendAll()"
+                      style="margin-right: 9px">批量下发
+              </button>
 
               <export-excel-tel
                 :data="$parent.$parent.searchData"
@@ -105,6 +108,7 @@
       <data-grid partial='list' v-ref:grid :model="model" class="list_area table_sy" :classname="'table tablenew table-bordered table-striped table-hover'">
         <template partial='head'>
           <tr>
+            <th><nobr><input type="checkbox" v-model="$parent.$parent.$parent.checkAll"/> 全选</nobr></th>
             <!--<th></th>-->
             <!--<th>-->
             <!--预约时间-->
@@ -140,6 +144,7 @@
           <!--:checked="$parent.$parent.$parent.isInList(row)"-->
           <!--@click=$parent.$parent.$parent.addInList(row)></td>-->
           <!--<td>{{row.f_repair_date}}</td>-->
+          <td style="text-align: center;white-space:nowrap;"><input type="checkbox" v-if="row.processins.activities[0].defname=='站点接单'" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.id)"  @change="$parent.$parent.$parent.setCheckes(row)" /></td>
           <td
             :style="Math.floor((new Date().getTime() - new Date(row.f_created_date).getTime())/1000/60/60)>3&&row.processins.activities[0].defname=='站点接单'?'background-color: #f1eecb':''">
             {{ row.f_workorder_type }}<span style="color: red" v-if="row.f_remindersign==='true'">(催单)</span></td>
@@ -384,6 +389,9 @@ export default {
   title: '工单列表',
   data () {
     return {
+      rowlist:[],
+      checkes:[],
+      checkAll:false,
       criteriaShow: false,
       f_complaint_results: '',
       serlist: [],
@@ -475,6 +483,68 @@ export default {
     }
   },
   methods: {
+    isChecked(v) {
+      // 如果全选，不在的按选中算，否则，在的按选中算
+      if (this.checkAll) {
+        return this.checkes.indexOf(v) == -1
+      } else {
+        return this.checkes.indexOf(v) != -1
+      }
+    },
+    setCheckes(row) {
+      if (!this.checkAll){
+        let index=this.checkes.indexOf(row.id)
+        if(index<0){
+          this.checkes.push(row.id)
+          this.rowlist.push(row)
+        }else{
+          this.checkes.splice(index,1)
+          this.rowlist.splice(this.rowlist.findIndex(res => {
+            return res.id === row.id
+          }) , 1)
+        }
+      }
+    },
+   async repairSendAll () {
+      //tag
+      if (!this.$refs.paged.$refs.criteria.model.f_workorder_type){
+        this.$showMessage('必须选择工单类型后查询')
+        return
+      }
+      this.selectone={
+        f_workorder_type:this.$refs.paged.$refs.criteria.model.f_workorder_type
+      }
+
+      if (this.checkAll){
+        //如果全选，根据条件去查询数据
+        let data={
+          condition:this.model.params.condition,
+          userid:this.$login.f.name
+        }
+      await  new HttpResetClass().load('post','rs/sql/operatorService',{data:data},{resolveMsg:null,rejectMsg:null}).then(res=>{
+          const results=res.data
+          this.rowlist=results.filter(result=>{
+            //tag)
+            console.log("999",result,JSON.stringify(result).indexOf('站点接单')!=-1)
+            return JSON.stringify(result).indexOf('站点接单')!=-1
+          })
+          console.log(this.rowlist)
+          //tag
+          this.serlist=JSON.parse(JSON.stringify(this.rowlist))
+          this.editflag ='工单下发'
+        })
+
+      }else{
+        if (this.rowlist.length===0){
+          this.$showMessage('请选择工单')
+          return
+        }
+        //不全选，去取数据
+        this.serlist=JSON.parse(JSON.stringify(this.rowlist))
+        console.log("752752",this.rowlist)
+        this.editflag ='工单下发'
+      }
+    },
     hidden () {
       this.criteriaShow = !this.criteriaShow
     },
@@ -552,6 +622,7 @@ export default {
       return checkstr
     },
     proc (selectone, type) {
+      this.serlist = []
       this.editflag = type
       this.selectone = selectone
     },
@@ -578,6 +649,7 @@ export default {
       this.imgfilename = 'rs/image/file/' + val.f_single_path
     },
     search (args) {
+      this.rowlist = []
       this.serlist = []
       //tag
       let data = {}
@@ -589,6 +661,7 @@ export default {
     },
     selfSearch () {
       // 取消编辑状态
+      this.rowlist = []
       this.serlist = []
       this.editflag = null
 

package/src/components/weinan/WorkListAll.vue

@@ -136,6 +136,30 @@
                           condition="{}"
                           close-on-select></v-select>
               </div>
+              <div class="col-sm-6 form-group form-input-group" style="width: 40%">
+              <role-selector-safe-dep
+                role-name="维修员"
+                role-lable="接&nbsp;单&nbsp;员&nbsp;"
+                style="width: 60%"
+                @re-res="$parent.$parent.getRes"
+                @alluser="$parent.$parent.getchecker"
+                :value.sync="model.f_order_man"
+                v-model="model.f_order_man"
+                condition="f_order_man = '{}'">
+              </role-selector-safe-dep>
+              </div>
+<!--              <div class="col-sm-3 form-group form-input-group" style="width: 20%">-->
+<!--                <label class="font_normal_body">所属部门</label>-->
+<!--                <right-tree width="80%" :source="$parent.$parent.source" @re-res="$parent.$parent.getRes"></right-tree>-->
+<!--              </div>-->
+<!--              <div class="col-sm-3 form-group form-input-group" style="width: 20%">-->
+<!--                <label class="font_normal_body" style="width: 40%">接&ensp;单&ensp;员</label>-->
+<!--                <v-select :value.sync="model.f_order_man" v-model='model.f_order_man'-->
+<!--                          :value-single="true"-->
+<!--                          :options='$parent.$parent.repairerss' placeholder='接单员'-->
+<!--                          close-on-select-->
+<!--                          condition="f_order_man = '{}'"></v-select>-->
+<!--              </div>-->
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
                 <label class="font_normal_body" style="width: 40%" title="接单站点">接单站点</label>
                 <v-select :value="model.f_outlets" v-model='model.f_outlets'
@@ -147,20 +171,21 @@
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
                 <label class="font_normal_body" style="width: 40%">接单班组</label>
-                <v-select :value.sync="model.f_single_man" v-model='model.f_single_man'
+                <v-select :value="model.f_single_man" v-model='model.f_single_man'
                           :value-single="true"
                           :options='$parent.$parent.single_mans' placeholder='接单班组'
+                          @change="$parent.$parent.getrepair"
                           condition="(f_single_man = '{}' or f_order_man = '{}')"
                           close-on-select></v-select>
               </div>
-              <div class="col-sm-3 form-group form-input-group" style="width: 20%">
-                <label class="font_normal_body" style="width: 40%">接&ensp;单&ensp;员</label>
-                <v-select :value.sync="model.f_order_man" v-model='model.f_order_man'
-                          :value-single="true"
-                          :options='$parent.$parent.repairers' placeholder='接单员'
-                          close-on-select
-                          condition="f_order_man = '{}'"></v-select>
-              </div>
+<!--              <div class="col-sm-3 form-group form-input-group" style="width: 20%">-->
+<!--                <label class="font_normal_body" style="width: 40%">接&ensp;单&ensp;员</label>-->
+<!--                <v-select :value.sync="model.f_order_man" v-model='model.f_order_man'-->
+<!--                          :value-single="true"-->
+<!--                          :options='$parent.$parent.repairerss' placeholder='接单员'-->
+<!--                          close-on-select-->
+<!--                          condition="f_order_man = '{}'"></v-select>-->
+<!--              </div>-->
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
                 <label class="font_normal_body" style="width: 40%">报修类型</label>
                 <v-select :value.sync="model.f_repairtype" v-model='model.f_repairtype'
@@ -363,9 +388,16 @@
     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},
         single_mans:[{label: '全部', value: ''}],
         f_accept_man:"",
         repairmans:[],
+        curorgid: [this.$login.f.orgid],
+        f_orgid:'',
+        f_filialeids:'',
         gongdan:{
           zixundan:0,
           tousudan:0,
@@ -395,13 +427,14 @@
         wavflie : '',
         selectone: '',
         repairers:[{label: '全部', value: ''}],
+        repairerss:[{label: '全部', value: ''}],
         model: new PagedList('rs/sql/worklistallnew', 20,{}),
         row: null,
         orderMan: '',
         msgs: [],
         service: Object,
         pendingCount: 0,
-        defnames: [{label: '全部', value: ''},{label: '未完成', value: "state = '未完成'"},{label: '已完成', value: "state = '已完成'"}],
+        defnames: [{label: '全部', value: ''},{label: '未完成', value: "state = '未完成'"},{label: '已完成', value: "state = '已完成'"},{label: '撤销', value: "state = '撤销'"}],
         // 打印
         all: false,
         modelval: [],
@@ -485,8 +518,34 @@
         this.selfSearch()
         //this.model.search()
       }
+
     },
     methods: {
+      getchecker(val){
+        this.$refs.paged.$refs.criteria.model.f_order_man = ''
+        if(val && val.length > 0){
+          this.order_man = ''
+          val.forEach(user => {
+            this.order_man += `'${user.name}',`
+          })
+          this.order_man = this.order_man.slice(0,this.order_man.length-1)
+        }else{
+          this.order_man = ''
+        }
+      },
+      //通过参数取
+      getrepair(val){
+        this.$refs.paged.$refs.criteria.model.f_single_man = val
+        // if(val){
+        //   this.repairerss = this.$appdata.getParam(val) ? [{
+        //     label: '全部',
+        //     value: ''
+        //   }, ...this.$appdata.getParam(val)] : [{label: '全部', value: ''}]
+        // }else{
+        //   this.repairerss = this.repairers
+        // }
+
+      },
       // 如果接单站点改变，则重组班组下拉值,维修员下拉值改变
       getsingleman(val){
         if(val) {
@@ -683,6 +742,9 @@
           condition1:this.$refs.paged.$refs.criteria.condition,
           condition2: '1 = 1'
         }
+        if(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}'`
           condition.condition1 += 'and tt.actcount > 0'
@@ -726,6 +788,9 @@
           condition1: '1 = 1',
           condition2: '1 = 1'
         }
+        if(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}'`
           condition.condition1 += 'and tt.actcount > 0'
@@ -831,10 +896,21 @@
         this.criteriaShow = !this.criteriaShow
       },
       getRes(obj){
-        //tag
-        ////tag)
-        this.f_filialeids = this.$login.convertToIn(obj.resids);
-        //tag
+        this.depname = obj.res[0]
+        // if(obj){
+        //   this.$refs.paged.$refs.criteria.model.f_order_man = ''
+        //   this.repairerss = [{label: '全部', value: ''}]
+        //   let val = {source: 'this.getChildUser().where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)', userid: `${obj.resids[0]}`}
+        //   let http = new HttpResetClass()
+        //   http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        //     this.order_man = ''
+        //     res.data.forEach((item) => {
+        //       this.repairerss.push({label: item.name, value: item.name})
+        //       this.order_man += `'${item.name}',`
+        //     })
+        //     this.order_man = this.order_man.slice(0,this.order_man.length-1)
+        //   })
+        // }
       }
     },
     computed: {

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'
         }