telephone-clients 3.0.104-5 → 3.0.104-51

package/src/filiale/wenxi/android/RepairOrderV.vue

@@ -37,7 +37,7 @@
   import RepairDetails from '../../../components/workorder/RepairDetails'
   import RepairUserInfo from './RepairUserInfo'
   import Outlay from '../../../components/workorder/Outlay'
-  import FaultAll from '../../../components/workorder/FaultAll'
+  import FaultAll from './FaultAll'
   import { HttpResetClass } from 'vue-client'
   import co from 'co'
   import * as Util from "../../../components/Util";

package/src/filiale/wenxi/android/ZHihuanFirst.vue

@@ -61,6 +61,9 @@
                   <div v-show="row.f_remarks" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     备注信息: {{row.f_remarks}}
                   </div>
+                  <div v-show="row.f_single_man" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    派单人: {{row.f_single_man}}
+                  </div>
                 </div>
               </div>
               <div class="col-sm-12 col-xs-12 col-md-12">

package/src/filiale/wenxi/pc/DistributeWork.vue

@@ -25,7 +25,7 @@
       <complain-work v-show="worktype === '投诉单'" v-if="meading == '转站点'" :data='user' :cleantf="cleanstart"
                      :call-obj="callObj" :login-user="loginUser" v-on:commitsus="commit"></complain-work>
       <repairs-work v-show="worktype === '报修单'" :data='user' :cleantf="cleanstart" :type="type" :call-obj="callObj"
-                    :login-user="loginUser" :meading="'转维修员'" v-on:commitsus="commit"></repairs-work>
+                    :login-user="loginUser" :meading="'转维修员'" :telsource="meading" v-on:commitsus="commit"></repairs-work>
       <gas-work v-show="worktype === '置换通气'" :data='user' :cleantf="cleanstart" :type="type" :call-obj="callObj"
                 :login-user="loginUser" :meading="'转维修员'" v-on:saveend="saveend" v-on:saveing="savestart"
                 v-on:commitsus="commit"></gas-work>

package/src/filiale/wenxi/pc/RepairsWork.vue

@@ -1,3 +1,4 @@
+
 <template xmlns:v-validate="http://www.w3.org/1999/xhtml">
   <div class="auto select-overspread form-horizontal auto" id="pc-repair-work">
     <work-busy :is-busy="saveing" v-show="saveing"></work-busy>
@@ -5,7 +6,7 @@
       <div class="row">
         <div class="col-sm-6 form-group form-fix-width">
           <label class="font_normal_body" style="width: 30%">来电电话</label>
-          <input style="width: 60%" type="text"  v-model='model.f_phone' class="form-control"></input>
+          <input style="width: 60%" type="text" readonly v-model='model.f_phone' class="form-control"></input>
         </div>
         <div class="col-sm-6 form-group form-fix-width" >
           <label class="font_normal_body" for="f_user_name" :class="model.f_user_name ? '': 'class-error' "  style="width: 30%">客户姓名</label>
@@ -27,22 +28,22 @@
           <label for="f_address" class="font_normal_body"  style="width: 15%">详细地址</label>
           <input style="width: 80%" type="text" class="form-control" v-model="model.f_address" id="f_address" placeholder="详细地址"
                  v-el:address v-next-el="idnumber"
-           />
+          />
         </div>
         <span class="col-sm-12" style="color: red;margin-left: 100px;" v-if="serviceList" >工单编号:{{serviceList.f_service_id}}此地址下有工单未处理完成</span>
       </div>
 
-        <div class="col-sm-6 form-group form-fix-width" v-if="selectSendshow && operType != '修改工单'">
-          <label class="font_normal_body"  style="width: 30%">转接方式</label>
-          <div class="form-control">
-            <label v-for="handling1 in handling" >
-              <input style="width: 60%" type="radio"
-                     v-model="model.f_handlingtype"
-                     value="{{handling1.label}}">
-              {{handling1.label}}
-            </label>
-          </div>
+      <div class="col-sm-6 form-group form-fix-width" v-if="selectSendshow && operType != '修改工单'">
+        <label class="font_normal_body"  style="width: 30%">转接方式</label>
+        <div class="form-control">
+          <label v-for="handling1 in handling" >
+            <input style="width: 60%" type="radio"
+                   v-model="model.f_handlingtype"
+                   value="{{handling1.label}}">
+            {{handling1.label}}
+          </label>
         </div>
+      </div>
       <div class="row">
         <div class="col-sm-6 form-group form-fix-width">
           <label for="f_repair" class="font_normal_body"  style="width: 30%">报修类型</label>
@@ -63,6 +64,7 @@
           <input style="width: 60%" type="text" v-show="false" v-model="serviceacitivity.f_reciever"
                  v-validate:f_reciever='{ required: true }'>
           <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择站点管理员" :selectData="" v-ref:f_reciever>
+
           </right-tree>
         </div>
         <div class="col-sm-6 form-group form-fix-width" :class="[$v.f_reciever.required ? 'select-error' : '']" v-if="meading == '转维修员' && operType != '修改工单'">
@@ -72,22 +74,33 @@
                     close-on-select v-on:change="repiarmancg" style="width: 60%"></v-select>
         </div>
         <div class="col-sm-6 form-group form-fix-width">
-                <label class=" font_normal_body"  style="width: 30%">工单来源</label>
-                <v-select :value="model.f_source" :value-single="true"
-                          :options='sources' placeholder='请选择工单来源'
-                          close-on-select
-                          v-on:change="sourcechange" style="width: 60%"></v-select>
+          <label class=" font_normal_body"  style="width: 30%">工单来源</label>
+          <v-select :value="model.f_source" :value-single="true"
+                    :options='sources' placeholder='请选择工单来源'
+                    close-on-select
+                    v-on:change="sourcechange" style="width: 60%"></v-select>
+        </div>
+        <div class="col-sm-6 form-group form-fix-width">
+          <label class=" font_normal_body" style="width: 30%">截止天数</label>
+          <v-select :value="model.day" :value-single="true"
+                    :options='days' placeholder='请选择截止天数'
+                    close-on-select
+                    v-on:change="daychange" style="width: 60%"></v-select>
         </div>
+
         <div class="col-sm-6 form-group form-fix-width">
-                  <label class=" font_normal_body" style="width: 30%">截止时间</label>
-                  <datepicker placeholder="请选择截至时间"
-                              :value.sync="model.f_finish_date"
-                              v-model="model.f_finish_date"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              style="width: 60%"></datepicker>
+          <label class=" font_normal_body" style="width: 30%">截止时间</label>
+          <datepicker placeholder="请选择截至时间"
+                      :value.sync="model.f_finish_date"
+                      v-model="model.f_finish_date"
+                      :format="'yyyy-MM-dd HH:mm:ss'"
+                      style="width: 60%"
+                      :disabled="flag" ></datepicker>
         </div>
+
       </div>
-      <failure-edit v-ref:failureedit :value="model.failure"  @input="procFailure"></failure-edit>
+      <failure-edit :value="model.failure" @input="procFailure"></failure-edit>
+
       <div class="row">
         <div class="col-sm-12 form-input-group form-fix-width">
           <label class="font_normal_body"  style="width: 15%">备&emsp;&emsp;注</label>
@@ -111,11 +124,11 @@
 </template>
 
 <script>
-import FailureEdit from '../pc/FailureEdit'
-import { HttpResetClass } from 'vue-client'
-import * as Util from '../../../components/Util'
+  import FailureEdit from '../../../components/pc/FailureEdit'
+  import { HttpResetClass } from 'vue-client'
+  import * as Util from '../../../components/Util'
 
-// 获取派单类型， 类型 ： 转站点，转维修员，自选模式
+  // 获取派单类型， 类型 ： 转站点，转维修员，自选模式
   let getSendType = async function (self) {
     try {
       // 如果初始化为派维修员，则不获取配置文件
@@ -203,7 +216,6 @@ import * as Util from '../../../components/Util'
     },
     data() {
       return {
-        abc: '',
         saveing:false,
         selectSendshow:false,
         // 选择小区树参数
@@ -214,12 +226,13 @@ import * as Util from '../../../components/Util'
         addressshow: false,
         addressselect: false,
         phoneValid:false,
+        flag:true,
         residential: [],
         row: {
           f_residential_area: ''
         },
         residentialquery: '',
-        servicesource:'用户来电',  // 工单来源
+        servicesource:'话务来电',  // 工单来源
         areacondition: '',
         testdata: {f_equipment: ''},
         residentialTemplate: 'f_villagename',
@@ -229,25 +242,26 @@ import * as Util from '../../../components/Util'
           serviceacitivity: [{
             f_service_acitivity_type: '派单'
           }],
-          failure_str:'',
           f_finish_date:'',
-          f_source:'用户来电',
+          f_source:'话务来电',
           f_service_id: '',
           f_contact_phone: '',
           f_meetunit: '',
           f_phone: '',
           f_user_name: '',
+          failure:'',
           f_address: '',
+          f_json: '',
           f_repair_date: Util.getNowDate(),
           f_card_id: '',
           // f_department: '', 站点选择
           f_reciever:'',
           f_remarks: '',
           f_user_type: '',
+          failure_str:'',
           f_area: '',
           f_unit_name:'',
           f_street: '',
-          failure:'',
           f_residential_area: '',
           f_building: '',
           f_unit: '',
@@ -274,18 +288,23 @@ import * as Util from '../../../components/Util'
         usertypes : this.$appdata.getParam('用户类型'),
         // stands : this.$appdata.getParam('站点管理员'),
         sources: this.$appdata.getParam('工单来源'),
-        handling:[{label:'转维修员',value:'转维修员'}],
+        days:this.$appdata.getParam('截止天数'),
+        handling:[{label:'转站点',value:'转站点'},{label:'转维修员',value:'转维修员'}],
         source:
-        'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
-        'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
+          'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+          'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
         userid: this.$login.f.id,
+        is_to_other :false,
         repairers: []   // 维修员
       }
     },
     ready() {
       // 获取sendType.json配置信息   获取派单类型  转站点，转维修员，自选模式
-        getSendType(this)
-
+      getSendType(this)
+      if (this.$appdata.getSingleValue('转班组长') && this.$appdata.getSingleValue('转班组长') == 'true'){
+        this.is_to_other = true
+        this.source = 'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($班组长$)))'
+      }
     },
     methods: {
       // 当维修员发生改变，获取维修员手机号
@@ -314,6 +333,25 @@ import * as Util from '../../../components/Util'
         this.model.f_source = val
         this.servicesource = val
       },
+      daychange(val){
+        if (val=='其他'){
+          this.flag = false
+        }else {
+          this.flag = true
+          var t = new Date();//你已知的时间
+          var t1= t.getTime()
+          val = val*1000
+          t.setTime(t1 + val * 60 * 60 * 24);
+          var Y = t.getFullYear() + '-'
+          var M = (t.getMonth()+1 < 10 ? '0'+(t.getMonth()+1):t.getMonth()+1) + '-'
+          var D = (t.getDate()< 10 ? '0'+t.getDate():t.getDate())+ ' '
+          var h = (t.getHours() < 10 ? '0'+t.getHours():t.getHours())+ ':'
+          var m = (t.getMinutes() < 10 ? '0'+t.getMinutes():t.getMinutes())+ ':'
+          var s = t.getSeconds() < 10 ? '0'+t.getSeconds():t.getSeconds()
+          this.model.f_finish_date = Y+M+D+h+m+s
+          console.log("当前时间:"+Y+M+D+h+m+s)
+        }
+      },
       // 获取维修员
       getEmp (role) {
         // let val = {source: 'tool.getChildrenOfResName($维修员$)', userid: `${this.$login.f.id}`}
@@ -323,8 +361,9 @@ import * as Util from '../../../components/Util'
         http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           // let result = res.data.filter(res=>res.orgid==this.$login.f.orgid)
           res.data.forEach((item) => {
-            this.repairers.push({label: `${item.name}`, value: item.name})
-
+            if (item.state == '在职'){
+              this.repairers.push({label: `${item.name}`, value: item.name})
+            }
           })
         })
       },
@@ -438,7 +477,11 @@ import * as Util from '../../../components/Util'
           }, {resolveMsg: null, rejectMsg: null}
         )
       },
-      setModifyOrder() {
+      async setModifyOrder() {
+        this.meading = this.modifyOrder.f_handlingtype
+        if(this.meading === '转维修员' ){
+          await this.getEmp('维修员')
+        }
         this.model = Object.assign({}, this.model, this.modifyOrder)
       },
       assignObj() {
@@ -490,12 +533,13 @@ import * as Util from '../../../components/Util'
           f_user_name: '',
           failure: '',
           f_userinfo_id: '',
+          failure_str:'',
           f_address: '',
+          f_json: '',
           f_repair_date: Util.getNowDate(),
           f_card_id: '',
           f_remarks: '',
           f_user_type: '',
-          failure_str:'',
           f_area: '',
           f_street: '',
           f_residential_area: '',
@@ -518,16 +562,15 @@ import * as Util from '../../../components/Util'
 
         }),
           this.modifyOrder = {}
-          this.types = []
-          this.data = {}
-
-
+        this.types = []
+        this.data = {}
       },
       save() {
+        //tag
         // 判断是否输入地址
-          if(this.model.f_address == '' || this.model.f_address == undefined) {
-            return this.$showAlert('请输入地址！', 'warning', 2000)
-          }
+        if(this.model.f_address == '' || this.model.f_address == undefined) {
+          return this.$showAlert('请输入地址！', 'warning', 2000)
+        }
         if(!this.model.f_repairtype) {
           return this.$showAlert('请输入报修类型！', 'warning', 2000)
         }
@@ -565,15 +608,15 @@ import * as Util from '../../../components/Util'
             name: this.loginUser.name,
             ename: this.loginUser.ename
           },
-           user: this.data, callObj: this.callObj
+          user: this.data, callObj: this.callObj
         }
         // 如果是修改工单，受理人还是原始的 派单人  不做修改
         if(this.operType == '报修'){
           data.model.f_attendant = this.loginUser.name
         }
-        //tag)
-        // // 获得数据发送地址
-        // let url = config[this.operType].url
+        if(data.model.failure){
+          data.model.f_json =  this.trouble(data.model.failure)
+        }
         // 获得数据发送地址
         let url = ''
         if(this.meading === '转站点'){
@@ -582,14 +625,20 @@ import * as Util from '../../../components/Util'
           url = config[this.operType].url
           data.toRepair = '一级派单'
         }
+        data.model.f_state = null
         this.saveing = true
+
+        if (this.is_to_other){
+          data.is_to_other = 'true'
+        }
+
         return this.$resetpost(url, data).then((data) => {
-           if(data.data && data.data.id){
-                this.id = JSON.parse(data.data.id).id
+          if(data.data && data.data.id){
+            this.id = JSON.parse(data.data.id).id
 
-           }
+          }
           // 清空数据
-          this.$emit('commitsus',this.model.f_phone)
+          this.$emit('commitsus',this.model.f_phone,this.model)
           this.cleardata()
           if (this.callObj && this.callObj.callNum) {
             this.callObj.callNum = null
@@ -599,6 +648,8 @@ import * as Util from '../../../components/Util'
             Util.afterCallBz(this.$login.f.id, this.$login.f.name)
           }
           this.saveing = false
+        }).catch(error=>{
+          this.saveing = false
         })
       },
       address() {
@@ -633,10 +684,36 @@ import * as Util from '../../../components/Util'
           this.model.failure = value
         }
       },
+      trouble(val) {
+        let failureall = ''
+        // val=[{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""},{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""},{"f_failure_type":"抽油烟机","failurecase":[],"f_equipment":""}]
+
+        let failure = JSON.parse(val)
+        for (let i = 0; i < failure.length; i++) {
+          if (failure[i].failurecase.length > 0) {
+            failureall += failure[i].f_failure_type + ":"
+            for (let j = 0; j < failure[i].failurecase.length; j++) {
+              failureall += failure[i].failurecase[j]
+              if (j + 1 != failure[i].failurecase.length) {
+                failureall += ","
+              }
+            }
+          } else {
+            failureall += failure[i].f_failure_type
+          }
+          if (i + 1 != failure.length) {
+            failureall += ';'
+          }
+        }
+        return failureall
+      },
     },
     watch: {
       // 转接类型
       'model.f_handlingtype'(){
+        if(this.operType === '修改工单'){
+          return
+        }
         // 清楚上次记录
         this.model.serviceacitivity[0].f_reciever = ''
         this.model.serviceacitivity[0].f_meetunit =''
@@ -664,12 +741,13 @@ import * as Util from '../../../components/Util'
         this.phoneValid = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/.test(this.model.f_contact_phone)
       },
       // 话务对象发生变化将来电电话赋值给f_phone
-      // 'callObj.callNum' () {
-      //   this.cleardata()
-      //   this.model.f_phone = this.callObj.callNum
-      //   // this.model.f_contact_phone = this.callObj.callNum
-      //   this.model.f_repair_date = Util.getNowDate()
-      // },
+      'callObj.callNum' () {
+        this.cleardata()
+        this.model.f_phone = this.callObj.callNum
+        this.model.f_records_id = this.callObj.RecordsID
+        // this.model.f_contact_phone = this.callObj.callNum
+        this.model.f_repair_date = Util.getNowDate()
+      },
       'types.length' () {
         var ev = new Event("resize", {"bubbles": true, "cancelable": false});
         window.dispatchEvent(ev);
@@ -761,7 +839,8 @@ import * as Util from '../../../components/Util'
       }
     },
     components: {
-      FailureEdit
+      FailureEdit,
+      'failure-edit': FailureEdit
     }
   }