telephone-clients 3.0.97 → 3.0.98-10

package/package.json

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

package/src/components/android/AddMyTask.vue

@@ -103,13 +103,13 @@
               </div>
               <div class="col-xs-8" >
                 <v-select
-                  :value.sync="model.f_repairtype"
-                  v-model="model.f_repairtype"
-                  :options='$parent.$parent.repairTypeOptions'
-                  placeholder='请选择'
-                  close-on-select
-                  :value-single="true"
-                  condition="f_repairtype like '%{}%'"
+                    :value.sync="model.f_repairtype"
+                    v-model="model.f_repairtype"
+                    :options='$parent.$parent.repairTypeOptions'
+                    placeholder='请选择'
+                    close-on-select
+                    :value-single="true"
+                    condition="f_repairtype like '%{}%'"
                 ></v-select>
               </div>
             </div>
@@ -162,6 +162,13 @@
                   <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{ row.f_address }} &nbsp;&nbsp; {{row.f_contact_name}} </p>
                 </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>联系电话:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_contact_phone || '无' }}
+                    <img src="../../assets/telphonesend.png" style="width: 12px;"
+                         @click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_contact_phone)'>
+                  </p>
+                </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font" style="float: left"><b>派单员:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{row.f_attendant}} </p>
@@ -170,6 +177,10 @@
                   <p class="panel-title col-xs-5 text-left font" style="float: left"><b>故障明细:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{$parent.$parent.$parent.getfailure(row.failure)}} </p>
                 </div>
+                <div class="col-xs-12" v-show="row.f_remarks">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>工单备注:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_remarks }}</p>
+                </div>
                 <div class="col-xs-12">
                   <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="$parent.$parent.$parent.inspect(row)">接单</button>
                 </div>
@@ -200,11 +211,16 @@ export default {
         // userid: Vue.user.ename
       },
       repairTypeOptions: [{label: '全部', value: ''}],
-      typeData: []
+      typeData: [],
+      showMessage: true
     }
   },
   ready(){
     this.$refs.paged.$refs.cri.search()
+    if (this.$appdata.getSingleValue('取消在线接单二次确定') === '是') {
+      this.showMessage = false
+    }
+    console.log(this.showMessage)
   },
   mounted(){
 
@@ -216,7 +232,7 @@ export default {
     //  获取现有的报修类型对应的数量
     async initRepairTypeNum() {
       this.typeData = []
-      this.repairTypeOptions = []
+      this.repairTypeOptions = [{label: '全部', value: ''}]
       const http = new HttpResetClass()
       const res = await http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/getOperatorServiceTypeNum`,{data: {condition: `tswo.f_filiale_id = '${Vue.user.orgid}'`}},{resolveMsg: null, rejectMsg: null})
       const plainArray = res.data.map(item => Object.assign({}, item))
@@ -261,32 +277,58 @@ export default {
       return this.model.search(data, args.model)
     },
     inspect(row){
-      this.$showMessage(`确定要接编号为${row.f_service_id}的单子吗？`, ['confirm', 'cancel']).then((isconfirm)=>{
-        //tag)
-        if (isconfirm === 'confirm') {
-          let userdata = Object.assign({}, userdata, row)
-          userdata.f_advice = '自我接单'
-          userdata.serviceacitivity = [] //Vue.user.name
-          userdata.serviceacitivity.push({f_reciever: Vue.user.name})
-          let data = ''
-          data = {
-            model: userdata,
-            // loginUser: {name: '何文强', ename: 'hwq'}
-            loginUser: {name: Vue.user.name, ename: Vue.user.ename}
-          }
-          let HttpReset = new HttpResetClass()
-          HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
-            if (res.data.code==300){
-              this.$refs.paged.$refs.cri.search()
-              return this.$showMessage('没有抢到该单哦！')
-            }else {
-              this.$refs.paged.$refs.cri.search()
-              return this.$showMessage('接单成功！请及时处理。')
+      if (this.showMessage) {
+        this.$showMessage(`确定要接编号为${row.f_service_id}的单子吗？`, ['confirm', 'cancel']).then((isconfirm)=>{
+          //tag)
+          if (isconfirm === 'confirm') {
+            let userdata = Object.assign({}, userdata, row)
+            userdata.f_advice = '自我接单'
+            userdata.serviceacitivity = [] //Vue.user.name
+            userdata.serviceacitivity.push({f_reciever: Vue.user.name})
+            let data = ''
+            data = {
+              model: userdata,
+              // loginUser: {name: '何文强', ename: 'hwq'}
+              loginUser: {name: Vue.user.name, ename: Vue.user.ename}
             }
-          })
+            let HttpReset = new HttpResetClass()
+            HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
+              if (res.data.code==300){
+                this.$refs.paged.$refs.cri.search()
+                return this.$showMessage('没有抢到该单哦！')
+              }else {
+                this.$refs.paged.$refs.cri.search()
+                return this.$showMessage('接单成功！请及时处理。')
+              }
+            })
+          }
+        })
+      } else {
+        let userdata = Object.assign({}, userdata, row)
+        userdata.f_advice = '自我接单'
+        userdata.serviceacitivity = [] //Vue.user.name
+        userdata.serviceacitivity.push({f_reciever: Vue.user.name})
+        let data = ''
+        data = {
+          model: userdata,
+          // loginUser: {name: '何文强', ename: 'hwq'}
+          loginUser: {name: Vue.user.name, ename: Vue.user.ename}
         }
-      })
-    }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/siteSend`,data).then((res)=>{
+          if (res.data.code==300){
+            this.$refs.paged.$refs.cri.search()
+            return this.$showMessage('没有抢到该单哦！')
+          }else {
+            this.$refs.paged.$refs.cri.search()
+            return this.$showMessage('接单成功！请及时处理。')
+          }
+        })
+      }
+    },
+    makeAPhoneCall(phoneNumber) {
+      this.$androidUtil.makeAPhoneCall(phoneNumber)
+    },
   },
   computed:{
 

package/src/components/guoxin/Console.vue

@@ -81,6 +81,8 @@
     data() {
       return {
         flgwaihu:false,
+        url7397:this.$appdata.getSingleValue('语音系统网关'),
+        url12121:this.$appdata.getSingleValue("呼叫系统网关"),
         flagip: true,
         showclick: false,
         shownotclick: true,
@@ -111,8 +113,16 @@
         this.initPhone = ''
         this.zhixian()
       })
+      if(!this.url7397 || !this.url12121){
+        var message = ''
+        message += this.url12121?"":"所属分公司 语音系统网关 未配置;"
+        message += this.url7397?"":"所属分公司 呼叫系统网关 未配置;"
+        message += "请配置后重新登录"
+        this.$showMessage(message)
+        return
+      }
       if(!this.$webSocket){
-        this.$webSocket = new StateContainer("ws://192.168.50.77:7397/websocket");
+        this.$webSocket = new StateContainer(`ws://${this.url7397}:7397/websocket`);
         this.$webSocket.oncnnsucc =  (event) => {
           //tag
           this.zhixian()

package/src/components/workorder/FaultAll.vue

@@ -508,6 +508,16 @@ export default {
             error.ifmust = true
             return error
           }
+          if(this.msg.f_source == '安检' && this.msg.serviceacitivity[0].servicerepair[i].details[j].f_defect_id && this.msg.serviceacitivity[0].servicerepair[i].details[j].f_content == '已处理'&& !this.msg.serviceacitivity[0].servicerepair[i].details[j].f_first_repairimg){
+            error.msg = `${this.msg.serviceacitivity[0].servicerepair[i].f_type}中${this.msg.serviceacitivity[0].servicerepair[i].details[j].f_project}的维修照片`
+            error.ifmust = true
+            return error
+          }
+          if(this.msg.f_source == '安检' && this.msg.serviceacitivity[0].servicerepair[i].details[j].f_defect_id && !this.msg.serviceacitivity[0].servicerepair[i].details[j].f_content){
+            error.msg = `${this.msg.serviceacitivity[0].servicerepair[i].f_type}中${this.msg.serviceacitivity[0].servicerepair[i].details[j].f_project}`
+            error.ifmust = true
+            return error
+          }
         }
       }
       return error

package/src/filiale/hanzhong/pc/message/AllUserNew.vue

@@ -264,7 +264,7 @@
                 <th><nobr>模板id</nobr></th>
 <!--                <th><nobr>自动短信</nobr></th>-->
                 <th><nobr><b>创建人</b></nobr></th>
-<!--                <th><nobr>操作</nobr></th>-->
+                <th><nobr>操作</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -278,9 +278,9 @@
                 <button v-show="row.f_auto_send != 1" type="button" class="btn btn-success width-30" @click='$parent.$parent.$parent.$parent.autoSend(row,1)'>启动</button>
               </td>-->
               <td style="text-align: center;"><b>{{row.f_operator}}</b></td>
-<!--              <td style="text-align: center;"><nobr>
+              <td style="text-align: center;"><nobr>
                 <a @click='$parent.$parent.$parent.$parent.edit(row)'>编辑</a>&nbsp;&nbsp;&nbsp;&nbsp;<a @click='$parent.$parent.$parent.$parent.senddelete(row)'>删除</a>
-              </nobr></td>-->
+              </nobr></td>
             </template>
           </data-grid>
         </criteria-paged>

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

@@ -575,7 +575,7 @@ export default {
           let repairitem = []
           for (var i = 0;i< this.repairdetails[j].details.length;i++) {
             if(this.row.f_source == '安检'){
-              repairitem.push({f_project:this.repairdetails[j].details[i].f_project,type:this.repairdetails[j].details[i].type,f_defect_id:this.repairdetails[j].details[i].f_defect_id,f_status:''})
+              repairitem.push({f_project:this.repairdetails[j].details[i].f_project,f_defect_remark:this.repairdetails[j].details[i].f_defect_remark,type:this.repairdetails[j].details[i].type,f_defect_id:this.repairdetails[j].details[i].f_defect_id,f_status:'',f_content:''})
             }else{
               repairitem.push({f_project:this.repairdetails[j].details[i].f_project,type:this.repairdetails[j].details[i].type,f_status:'',f_content:'',f_is_must:this.repairdetails[j].details[i].f_is_must ? 'true':'false'})
             }