telephone-clients 3.0.80 → 3.0.82

package/package.json

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

package/src/components/android/AddMyTask.vue

@@ -125,11 +125,7 @@
                   <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" style="width: 79%">{{ row.f_created_date }}</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>
-                </div>
-                <div class="col-xs-6">
+                <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_user_name }}
                   </p>
@@ -138,9 +134,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-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>
+                </div>
                 <div class="col-xs-12">
-                  <failure-show :value='row.failure'>
-                  </failure-show>
+                  <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">
                   <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="$parent.$parent.$parent.inspect(row)">接单</button>
@@ -184,13 +184,30 @@ export default {
 
   },
   methods: {
+    getfailure(val){
+      if (val) {
+        var result = ''
+        // 把字符串转换成故障列表对象
+        var array = JSON.parse(val)
+        if(Array.isArray(array)) {
+          array.forEach((value) => {
+            result += value.f_failure_type + ':'
+            value.failurecase.forEach((failure) => {
+              result +=  failure + ' '
+            })
+            result += ';'
+          })
+        }
+        return result
+      }
+    },
     search (args) {
       //tag
       //tag
       let data = {}
       data.condition = this.$refs.paged.$refs.cri.condition?this.$refs.paged.$refs.cri.condition:'1=1'
       data.condition += " "+"and f_workorder_type like '%报修单%'";
-      data.condition += " "+`and f_orgid = '${Vue.user.orgid}'`;
+      data.condition += " "+`and f_filiale_id = '${Vue.user.orgid}'`;
       data.sign = this.$refs.paged.$refs.cri.select ? `defname = '${this.$refs.paged.$refs.cri.select.defname[0]}'`:'1=1'
       this.searchData.condition = data
       this.searchData = Object.assign(this.searchData,args.model)

package/src/filiale/qianneng/android/PhoneStandWork.vue

@@ -101,6 +101,7 @@
               </div>
               <div class="col-sm-12 col-xs-12 col-md-12">
                 <button type="button" name="button" class="btn btn-primary btn-sm" style="float: right" @click="selected(row)">下派</button>
+                <button type="button" name="button" class="btn btn-primary btn-sm" style="float: right" @click="showback(row)">退回</button>
               </div>
             </div>
           </div>
@@ -137,6 +138,25 @@
           <button type="button" class="btn btn-default" @click="undo()">取消</button>
         </div>
       </modal>
+      <modal :show.sync="backshow" v-ref:backshow :backdrop="false">
+        <div slot="modal-header" class="modal-header">
+          <h4 class="modal-title">
+            工单退回
+          </h4>
+        </div>
+        <div slot="modal-body" class="modal-body">
+          <div class="row" style="margin-top: 6px">
+            <label class="control-label font text-left col-md-4 col-xs-4">退回原因:</label>
+            <div class="col-xs-8 col-md-8">
+              <input type="text" v-model="f_site_back_reason"/>
+            </div>
+          </div>
+        </div>
+        <div slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-default" @click="sendbackdo()">确定</button>
+          <button type="button" class="btn btn-default" @click="sendbackundo()">取消</button>
+        </div>
+      </modal>
     </div>
   </div>
 </template>
@@ -150,6 +170,17 @@
     title: '移动端站点派发',
     data () {
       return {
+        backshow:false,
+        sendBackData:{
+          f_processid:'',
+          id:'',
+          serviceacitivity:[
+            {
+              f_site_back_reason:''
+            }
+          ]
+        },
+        f_site_back_reason:'',
         // rows: Object
         rows: [],
         username:'',
@@ -176,6 +207,33 @@
     props: {
     },
     methods: {
+      sendbackdo(){
+        this.sendBackData.serviceacitivity[0].f_site_back_reason = this.f_site_back_reason
+        var data = {model: this.sendBackData, loginUser: {name: Vue.user.name, ename: Vue.user.ename, id: Vue.user.id}}
+        return this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/siteBack`, data).then(() => {
+          this.ifsearch()
+          this.sendBackData = {
+            f_processid:'',
+            id:'',
+            serviceacitivity:[{f_site_back_reason:''}]
+          }
+          this.backshow =false
+          this.$showMessage(`退回成功!`, ['confirm'])
+        })
+      },
+      sendbackundo(){
+        this.f_site_back_reason = ''
+        this.backshow =false
+      },
+      // 工单退回
+      showback(val){
+        this.sendBackData = {
+          f_processid:val.f_processid,
+          id:val.id_back,
+          serviceacitivity:[{f_site_back_reason:''}]
+        }
+        this.backshow = true
+      },
       worksend () {
         if (!this.sendselected.serviceacitivity[0].f_reciever) {
           this.$showMessage(`请选择接单人员!`, ['confirm'])

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

@@ -827,6 +827,7 @@
         } else {
           this.repairers = []
           this.meading = '转运营系统'
+          this.model.serviceacitivity[0].f_reciever = '运营系统'
         }
       },
       // 是否清空

package//345/221/274/345/217/253/345/267/245/345/215/225/351/205/215/347/275/256/350/257/264/346/230/216.md

@@ -0,0 +1,6 @@
+# 配置说明
+所有关于呼叫工单模块功能得配置
+
+## 3.0.80 - 2023-07-20 @ 文明
+- 咨询单、投诉单，派发方式选择框，由单值 咨询投诉处理方式 ： 是
+