telephone-clients 3.0.103-7 → 3.0.103-71

package/src/filiale/shexian/android/Outlay.vue

@@ -5,7 +5,9 @@
 
       <div class="bq-parent" v-if="shutype == 'heng'">
         <blockquote class="blockquote">
-          <p>费用<a  @click="mute()" style="float:right"  href="javascript:void(0)" class="repair-mute-class"><img src="../../../assets/novoice.png" width="25px;" alt=""><span style="margin-left:10px;color: #304A66">关闭声音</span></a></p>
+          <p>费用<a @click="mute()" style="float:right" href="javascript:void(0)" class="repair-mute-class"><img
+            src="../../../assets/novoice.png" width="25px;" alt=""><span
+            style="margin-left:10px;color: #304A66">关闭声音</span></a></p>
         </blockquote>
       </div>
       <div class="auto repair-info-content compatible" v-if="materialsumshow">
@@ -40,22 +42,34 @@
           <!--</div>-->
           <div class="col-xs-12 col-sm-12 col-md-12 form-input-group">
             <label class="text-justify lb-left">维修内容:</label>
-            <span v-if="show" style="font-weight:bold">{{model.f_remarks}}</span>
-            <textarea class="form-control" cols="30" rows="4" style="resize: vertical;" v-model="model.f_remarks" v-if="!show" :disabled="issee"></textarea>
+            <span v-if="show" style="font-weight:bold">{{ model.f_remarks }}</span>
+            <textarea class="form-control" cols="30" rows="4" style="resize: vertical;" v-model="model.f_remarks"
+                      v-if="!show" :disabled="issee"></textarea>
+          </div>
+          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group">
+            <label class="text-justify lb-left">维修内容:</label>
+            <v-select
+              :value.sync="model.f_failure"
+              :options='failure_list'
+              placeholder='请选择'
+              close-on-select
+              :multiple="true"
+              :value-single="false"
+            ></v-select>
           </div>
         </div>
         <div class="row auto" v-if="imgtpe">
-          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group"  v-for="row in imgstype">
-            <label class="text-justify lb-left">{{row.title}}</label>
-            <img-area  :model="model.imgs"  :sutitle="getsutitle(row.title)"></img-area>
+          <div class="col-xs-12 col-sm-12 col-md-12 form-input-group" v-for="row in imgstype">
+            <label class="text-justify lb-left">{{ row.title }}</label>
+            <img-area :model="model.imgs" :sutitle="getsutitle(row.title)"></img-area>
           </div>
         </div>
-        <img-area  :model="model.imgs" :sutitle="'总体照片'" v-if="!imgtpe" ></img-area>
+        <img-area :model="model.imgs" :sutitle="'总体照片'" v-if="!imgtpe"></img-area>
         <div v-if="check" style="margin: 15px 10px; display: flex; flex-direction: column; gap: 10px">
           <div style="border-left: 5px solid #a9beeb;padding-left: 10px;">请确认并勾选以下事项然后进行签名</div>
           <div>
             <input style="margin-right: 5px" type="checkbox" v-model="isCheck" :value.sync="isCheck">
-            {{check}}
+            {{ check }}
           </div>
         </div>
         <p style="font-size: 15px;font-weight: bold" v-if="model.f_sign_imgid">客户签名:</p>
@@ -66,184 +80,187 @@
           <new-sign :value="model.f_signname" @input="getSignValue"></new-sign>
         </div>
         <div v-if="show && model.f_sign_imgid">
-          <img :src="'rs/file/getfile/' + model.f_sign_imgid" :width="150" :height="200" >
+          <img :src="'rs/file/getfile/' + model.f_sign_imgid" :width="150" :height="200">
         </div>
       </div>
       <material-sum v-if="!materialsumshow" v-on:sumchange="sumchange"
-                    v-on:back="showchenge" :material="model.material" :f_cost_material="model.f_cost_material" :show="show">
+                    v-on:back="showchenge" :material="model.material" :f_cost_material="model.f_cost_material"
+                    :show="show">
       </material-sum>
     </validator>
   </div>
 </template>
 
 <script>
-import Vue from 'vue'
-import * as Util from '../../../components/Util'
-export default {
-  title: '费用',
-  props: {
-    // 本次维修, 包含照片数组  材料数组
-    model: {
-      type: Object
-    },
-    service: {
-      type: Object
-    },
-    show: {
-      type: Boolean,
-      default: false
-    },
-    f_single_man: {
-      type: Object
-    },
-    system: '',
-    shutype: 'heng',
-    issee:''
-  },
-  data () {
-    return {
-      signType:{
-        type: Boolean,
-        default: true
+  import Vue from 'vue'
+  import * as Util from '../../../components/Util'
+
+  export default {
+    title: '费用',
+    props: {
+      // 本次维修, 包含照片数组  材料数组
+      model: {
+        type: Object
+      },
+      service: {
+        type: Object
       },
-      // 拍照时的文件名
-      imgurl: 'http://192.168.2.77:8081',
-      fileName: '',
-      materialsumshow: {        //  控制明细组件和费用层的 显示     fasle 明细组建显示
+      show: {
         type: Boolean,
-        default: true
+        default: false
       },
-      imgtpe:false,
-      imgstype:[],
-      check: '',
-      isCheck: false
-    }
-  },
-  methods: {
-    getSignValue(fileName){
-      //tag
-      //tag
-      this.model.f_signname = fileName
-      this.model.f_sign_path = this.$androidUtil.getFullFileName(fileName)
-    },
-    getsutitle(val){
-      return val
-    },
-    mute () {
-      HostApp.mute()
-    },
-    // 签名回调
-    signCallback(prop, fileName) {
-      // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
-      HostApp.__this__.$set('model.f_signname', fileName)
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    },
-    // 用户签名
-    sign() {
-      this.delAudioFile('f_signname', this.model.f_signname)
-      let prop = 'f_signname'
-      let idx = 'aofeng'
-      let fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
-      HostApp.__callback__ = this.signCallback
-      HostApp.__this__ = this
-      HostApp.getSignature({
-        file: fileName,
-        requestCode: 111,
-        callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
-      })
+      f_single_man: {
+        type: Object
+      },
+      system: '',
+      shutype: 'heng',
+      issee: ''
     },
-    delAudioFile(prop, fileName) {
-      if (!fileName)
-        return
-      else {
-        HostApp.delfile(fileName)
-        this.model[prop] = null
+    data() {
+      return {
+        signType: {
+          type: Boolean,
+          default: true
+        },
+        // 拍照时的文件名
+        imgurl: 'http://192.168.2.77:8081',
+        fileName: '',
+        materialsumshow: {        //  控制明细组件和费用层的 显示     fasle 明细组建显示
+          type: Boolean,
+          default: true
+        },
+        failure_list: [{label: "请选择", value: ""}, ...this.$appdata.getParam('表具故障原因')],
+        imgtpe: false,
+        imgstype: [],
+        check: '',
+        isCheck: false
       }
     },
-    // 从图片中删除
-    remove (row) {
-      this.$androidUtil.delfile(row.android_file)
-      let pos = this.model.imgs.findIndex((value) => {
-        return value === row
-      })
-      this.model.imgs.splice(pos, 1)
-    },
-    // fileName: 回传文件名,传入的带安卓路径url
-    // prop: 传入的字段名，没做改动
-    cameraCallBack(prop, fileName) {
-      // 当前this只能通过HostApp.__tis__获取
-      let self = this.$androidUtil.getCallBack(this)
-      // 添加新图片
-      self.model.imgs.push({
-        android_file: self.fileName,
-        path: fileName
-      })
-    },
-    takePic() {
-      let prop = 'repair'
-      let idx = 'aofeng'
-      this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
-      this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName)
-    },
-    // 明细组件显示
-    sumshow(){
-      this.materialsumshow = false
-    },
-    // 当材料明细发生变化  材料费随之变化
-    sumchange(val){
-      this.model.f_cost_material = val
-    },
-    //  返回 总材料费   关闭材料费详情界面
-    showchenge(val){
-      this.materialsumshow = true
-      if(!isNaN(val)) {
+    methods: {
+      getSignValue(fileName) {
+        //tag
+        //tag
+        this.model.f_signname = fileName
+        this.model.f_sign_path = this.$androidUtil.getFullFileName(fileName)
+      },
+      getsutitle(val) {
+        return val
+      },
+      mute() {
+        HostApp.mute()
+      },
+      // 签名回调
+      signCallback(prop, fileName) {
+        // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
+        HostApp.__this__.$set('model.f_signname', fileName)
+        HostApp.__callback__ = null
+        HostApp.__this__ = null
+      },
+      // 用户签名
+      sign() {
+        this.delAudioFile('f_signname', this.model.f_signname)
+        let prop = 'f_signname'
+        let idx = 'aofeng'
+        let fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+        HostApp.__callback__ = this.signCallback
+        HostApp.__this__ = this
+        HostApp.getSignature({
+          file: fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
+        })
+      },
+      delAudioFile(prop, fileName) {
+        if (!fileName)
+          return
+        else {
+          HostApp.delfile(fileName)
+          this.model[prop] = null
+        }
+      },
+      // 从图片中删除
+      remove(row) {
+        this.$androidUtil.delfile(row.android_file)
+        let pos = this.model.imgs.findIndex((value) => {
+          return value === row
+        })
+        this.model.imgs.splice(pos, 1)
+      },
+      // fileName: 回传文件名,传入的带安卓路径url
+      // prop: 传入的字段名，没做改动
+      cameraCallBack(prop, fileName) {
+        // 当前this只能通过HostApp.__tis__获取
+        let self = this.$androidUtil.getCallBack(this)
+        // 添加新图片
+        self.model.imgs.push({
+          android_file: self.fileName,
+          path: fileName
+        })
+      },
+      takePic() {
+        let prop = 'repair'
+        let idx = 'aofeng'
+        this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+        this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName)
+      },
+      // 明细组件显示
+      sumshow() {
+        this.materialsumshow = false
+      },
+      // 当材料明细发生变化  材料费随之变化
+      sumchange(val) {
         this.model.f_cost_material = val
+      },
+      //  返回 总材料费   关闭材料费详情界面
+      showchenge(val) {
+        this.materialsumshow = true
+        if (!isNaN(val)) {
+          this.model.f_cost_material = val
+        }
       }
-    }
-  },
-  ready(){
-    if(Vue.config.telephone.Outlay.data != undefined){
-      this.check = Vue.config.telephone.Outlay.data.check
-      if (!this.check){
-        this.isCheck = true
+    },
+    ready() {
+      if (Vue.config.telephone.Outlay.data != undefined) {
+        this.check = Vue.config.telephone.Outlay.data.check
+        if (!this.check) {
+          this.isCheck = true
+        }
+        //tag
+        //tag)
+        if (this.service.f_user_type == '民用') {
+          this.imgstype = Object.assign([], JSON.parse(JSON.stringify(Vue.config.telephone.Outlay.data[this.service.f_workorder_type].civil)))
+        } else {
+          this.imgstype = Object.assign([], JSON.parse(JSON.stringify(Vue.config.telephone.Outlay.data[this.service.f_workorder_type].nocivil)))
+        }
+        if (this.imgstype.length > 0) {
+          this.imgtpe = true
+        }
       }
-      //tag
-      //tag)
-      if(this.service.f_user_type == '民用'){
-        this.imgstype = Object.assign([], JSON.parse(JSON.stringify(Vue.config.telephone.Outlay.data[this.service.f_workorder_type].civil)))
-      }else{
-        this.imgstype = Object.assign([], JSON.parse(JSON.stringify(Vue.config.telephone.Outlay.data[this.service.f_workorder_type].nocivil)))
+      if (navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')) {
+        this.signType = false
       }
-      if(this.imgstype.length>0){
-        this.imgtpe = true
+      if (this.model && this.model.f_single_man) {
+        this.model.f_single_man = this.f_single_man
       }
-    }
-    if(navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')){
-      this.signType = false
-    }
-    if(this.model && this.model.f_single_man){
-      this.model.f_single_man = this.f_single_man
-    }
-    if(!this.show&&this.model){
-      if(Vue.user == undefined)
-        return
-      this.model.f_order_man = Vue.user.name
-      this.model.f_order_man_id = Vue.user.id
-    }
-    //tag
-    //tag
-    //tag
-  },
-  computed:{
-    Detail(){
-      if (this.model.imgs && this.model.servicerepair.length > 0) {
-        let result = this.model.servicerepair.find((row) => {
-          return row.f_type === this.repairitem.header
-        })
-        return result
+      if (!this.show && this.model) {
+        if (Vue.user == undefined)
+          return
+        this.model.f_order_man = Vue.user.name
+        this.model.f_order_man_id = Vue.user.id
+      }
+      //tag
+      //tag
+      //tag
+    },
+    computed: {
+      Detail() {
+        if (this.model.imgs && this.model.servicerepair.length > 0) {
+          let result = this.model.servicerepair.find((row) => {
+            return row.f_type === this.repairitem.header
+          })
+          return result
+        }
       }
     }
   }
-}
 </script>

package/src/filiale/shexian/android/RepairFirstV.vue

@@ -1,5 +1,6 @@
 <template>
   <div style="height: auto;width: 100%" class="repair-bg">
+    <work-busy :is-busy="saveing" v-show="saveing"></work-busy>
     <div class="bq-parent">
       <blockquote style="color: #499edf;border-left-color: #499edf;font-size: 16px">
         <p>
@@ -103,7 +104,7 @@
                   <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     用户姓名: {{ row.f_user_name }}
                   </div>
-                  <div v-show="false" class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                     来电电话: {{ row.f_phone }}
                     <img src="../../../assets/telphonesend.png" style="width: 12px;"
                          @click.stop.prevent='makeAPhoneCall(row.f_phone)'>
@@ -257,6 +258,7 @@
 <script>
 import FailureShow from '../../../components/pc/FailureShow'
 import {HttpResetClass} from 'vue-client'
+import * as Util from '../../../components/Util'
 import Vue from 'vue'
 // 工作类型对应的各项设置
 const config = {
@@ -283,7 +285,8 @@ export default {
         }
         ]
       },
-
+      saveing:false,
+      sendbackmodel:{},
       // rows: Object
       rows: [{
         f_user_name: '',
@@ -349,10 +352,12 @@ export default {
   methods: {
     // 结案确认
     caseok(){
+      this.saveing = true
       let info = {
         id:this.selectone.id_back,
         f_state : '',
         f_processid: this.selectone.f_processid,
+        f_closing_time: Util.toStandardTimeString(),
         f_orderstatus:'无法处理'
       }
       // 工单结案操作
@@ -362,11 +367,15 @@ export default {
         resolveMsg: null,
         rejectMsg: null
       }).then(() => {
+        this.saveing = false
         this.$showMessage('结案成功！')
         this.endshow = false
         this.f_caseremarks = ''
         // 刷新界面
         this.getNewOrder()
+      }).catch((error)=>{
+        this.saveing=false
+        this.$showMessage('网络异常，结案失败！')
       })
     },
     // 结案返回
@@ -380,6 +389,7 @@ export default {
       this.endshow = true
     },
     WorkBack() {
+      this.saveing=true
       this.model = this.sendbackmodel
       this.model.serviceacitivity = [{
         f_site_back_date: '',
@@ -403,10 +413,14 @@ export default {
         resolveMsg: null,
         rejectMsg: null
       }).then(() => {
+        this.saveing=false
         this.$showMessage('退回成功！！！')
         this.f_site_back_reason = ''
         this.editflag = false
         this.getNewOrder()
+      }).catch((error)=>{
+        this.saveing=false
+        this.$showMessage('网络异常，退回失败！！！')
       })
     },
     WorkBackclose() {

package/src/filiale/shexian/android/RepairInfo.vue

@@ -16,6 +16,7 @@
         <!--<p>生成时间： {{service.f_created_date}}</p>-->
         <!--<p>预约时间： {{service.f_repair_date}}</p>-->
         <p>来电电话： {{service.f_phone}}<img src="../../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(service.f_phone)'></p>
+        <p>联系电话： {{service.f_contact_phone}}<img src="../../../assets/telphonesend.png" style="width: 12px;" @click.stop.prevent='makeAPhoneCall(service.f_contact_phone)'></p>
         <p>开启录音：<button type="button" class="btn btn-default" @click="openRecord()">开启</button>
         </p>
         <!--<p>用户姓名： {{service.f_user_name}}</p>-->

package/src/filiale/shexian/pc/TelByOrderManCount.vue

@@ -46,8 +46,10 @@
               <th><nobr>产品安装</nobr></th>
               <th><nobr>抢险维修</nobr></th>
               <th><nobr>换表</nobr></th>
+              <th><nobr>整改</nobr></th>
               <th><nobr>合计</nobr></th>
-
+              <th><nobr>无法处理</nobr></th>
+              <th><nobr>未完成</nobr></th>
             </tr>
           </template>
           <template partial='body'>
@@ -59,7 +61,10 @@
             <td style="text-align: center">{{row.chanpinanzhuang}}</td>
             <td style="text-align: center">{{row.qiangxianweixiu}}</td>
             <td style="text-align: center">{{row.huanbiao}}</td>
+            <td style="text-align: center">{{row.zhenggai}}</td>
             <td style="text-align: center">{{row.total}}</td>
+            <td style="text-align: center">{{row.wufachuli}}</td>
+            <td style="text-align: center">{{row.weiwancheng}}</td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -90,7 +95,10 @@
           'chanpinanzhuang': '产品安装',
           'qiangxianweixiu': '抢险维修',
           'huanbiao': '换表',
-          'total': '合计'
+          'zhenggai': '整改',
+          'total': '合计',
+          'wufachuli': '无法处理',
+          'weiwancheng': '未完成',
         },
       }
     },

package/src/filiale/shexian/pc/WorkList.vue

@@ -120,9 +120,18 @@
             <th>
               用户信息
             </th>
+            <th>
+              来电电话
+            </th>
+            <th>
+              联系电话
+            </th>
             <th>
               工单状态
             </th>
+            <th>
+              备注
+            </th>
             <th>
               操作
             </th>
@@ -146,10 +155,22 @@
             :style="{'background-color':Math.floor((new Date().getTime() - new Date(row.f_created_date).getTime())/1000/60/60)>3&&row.defname=='站点接单'?'#f1eecb':'','text-align':'center'}">
             {{ row.f_user_name }}&nbsp;&nbsp;&nbsp;{{ row.f_address }}&nbsp;&nbsp;&nbsp;{{ row.f_contact_name }}
           </td>
+          <td
+            :style="{'background-color':Math.floor((new Date().getTime() - new Date(row.f_created_date).getTime())/1000/60/60)>3&&row.defname=='站点接单'?'#f1eecb':'','text-align':'center'}">
+            {{ row.f_phone }}
+          </td>
+          <td
+            :style="{'background-color':Math.floor((new Date().getTime() - new Date(row.f_created_date).getTime())/1000/60/60)>3&&row.defname=='站点接单'?'#f1eecb':'','text-align':'center'}">
+            {{ row.f_contact_phone }}
+          </td>
           <td
             :style="{'background-color':Math.floor((new Date().getTime() - new Date(row.f_created_date).getTime())/1000/60/60)>3&&row.defname=='站点接单'?'#f1eecb':'','text-align':'center'}">
             {{ row.defname }}
           </td>
+          <td
+            :style="{'background-color':Math.floor((new Date().getTime() - new Date(row.f_created_date).getTime())/1000/60/60)>3&&row.defname=='站点接单'?'#f1eecb':'','text-align':'center'}">
+            {{ row.f_remarks }}
+          </td>
           <td
             :style="{'background-color':Math.floor((new Date().getTime() - new Date(row.f_created_date).getTime())/1000/60/60)>3&&row.defname=='站点接单'?'#f1eecb':'','text-align':'center'}"
             style="text-align: center;">
@@ -395,7 +416,10 @@ export default {
         'f_created_date': '派单时间',
         'f_user_name': '用户姓名',
         'f_address': '用户地址',
-        'f_contact_name': '联系人'
+        'f_contact_name': '联系人',
+        'f_phone': '来电电话',
+        'f_contact_phone': '联系电话',
+        'f_remarks':'备注'
       },
       //投诉单在modal框显示的信息
       showModalComplan: {