telephone-clients 3.0.93 → 3.0.94

package/package.json

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

package/src/components/pc/RepairsWork.vue

@@ -249,6 +249,7 @@
           f_phone: '',
           f_user_name: '',
           f_address: '',
+          f_json: '',
           f_repair_date: Util.getNowDate(),
           f_card_id: '',
           // f_department: '', 站点选择
@@ -524,6 +525,7 @@
           failure: '',
           f_userinfo_id: '',
           f_address: '',
+          f_json: '',
           f_repair_date: Util.getNowDate(),
           f_card_id: '',
           f_remarks: '',
@@ -590,6 +592,9 @@
         if(this.operType == '报修'){
           data.model.f_attendant = this.loginUser.name
         }
+        if(data.model.failure){
+          data.model.f_json =  this.trouble(data.model.failure)
+        }
         // 获得数据发送地址
         let url = ''
         if(this.meading === '转站点'){
@@ -649,6 +654,29 @@
           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: {
       // 转接类型

package/src/components/pc/WorkListAllNew.vue

@@ -25,6 +25,12 @@
                        condition="tswo.f_user_name like '%{}%'"
                        :size="model.f_user_name ? model.f_user_name.length : 6">
               </div>
+              <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+                <label class="font_normal_body" style="width: 40%">客户编号</label>
+                <input type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
+                       condition="tswo.f_userinfo_code like '%{}%'"
+                       :size="model.f_userinfo_code ? model.f_userinfo_code.length : 6">
+              </div>
               <div class="form-group col-sm-6 button-range" style="margin-right: 10px">
                 <button class="button_search button_spacing" style="margin-right: 9px"
                         @click="search(),$dispatch('search')">查询
@@ -47,12 +53,6 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
-              <div class="col-sm-3 form-group form-input-group" style="width: 20%">
-                <label class="font_normal_body" style="width: 40%">客户编号</label>
-                <input type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                       condition="tswo.f_userinfo_code like '%{}%'"
-                       :size="model.f_userinfo_code ? model.f_userinfo_code.length : 6">
-              </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
                 <label class="font_normal_body" style="width: 40%">派单时间</label>
                 <datepicker placeholder="起始派单时间"
@@ -83,6 +83,14 @@
                        condition="tswo.f_contact_phone like '%{}%'"
                        :size="model.f_contact_phone ? model.f_contact_phone.length : 6">
               </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_source" v-model='model.f_source'
+                          :value-single="true"
+                          :options='$parent.$parent.sources' placeholder='工单来源'
+                          close-on-select
+                          condition="tswo.f_source = '{}'"></v-select>
+              </div>
             </div>
 
 
@@ -141,14 +149,6 @@
               <!--                       condition="tswo.f_order_man like '%{}%'"-->
               <!--                       :size="model.f_order_man ? model.f_order_man.length : 6">-->
               <!--              </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_source" v-model='model.f_source'
-                          :value-single="true"
-                          :options='$parent.$parent.sources' placeholder='工单来源'
-                          close-on-select
-                          condition="tswo.f_source = '{}'"></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.defname" v-model='model.defname'
@@ -165,6 +165,14 @@
                           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%" >故障类型</label>
+                <v-select :value.sync="model.failure" :value-single="true" v-model="model.failure"
+                          :options='$parent.$parent.failures' placeholder='故障类型'
+                          condition="failure like '%{}%'"
+                          close-on-select>
+                </v-select>
+              </div>
 
             </div>
 
@@ -412,7 +420,7 @@ export default {
       thead: '',
       tfoot: '',
       zhihuans: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '异常', value: '异常'}],
-      headData: ['工单类型', '报修类型', '工单编号', '用户姓名', '用户地址', '用户电话', '报修电话', '报修时间', '报修原因', '维修人'],
+      headData: ['工单类型', '报修类型', '工单编号', '用户姓名', '用户地址', '用户电话', '报修电话', '报修时间', '报修原因', '维修人','故障类型'],
       bodyData: ['f_workorder_type', 'f_repairtype', 'f_service_id', 'f_user_name', 'f_address', 'f_phone', 'f_contact_phone', 'f_created_date', 'f_remarks', 'f_order_man'],
       searchData: {
         condition: '1=1'
@@ -425,6 +433,7 @@ export default {
         'f_address': '用户地址',
         'f_contact_phone': '联系电话',
         'f_source': '工单来源',
+        'f_json': '故障明细',
         'f_single_man': '派单人',
         'f_attendant': '受理人',
         'f_order_man': '接单人',
@@ -658,6 +667,9 @@ export default {
 
   },
   computed: {
+    failures(){
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('呼叫故障类型')]
+    },
     defnames () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('呼叫工单状态')]
     },

package/src/filiale/furuike/pc/WorkListAllNew.vue

@@ -717,7 +717,7 @@
       },
       selfSearch() {
         // 取消编辑状态
-        let condition = this.searchData.condition
+        let condition = '1=1'
 
         if (this.f_filialeids) {
           condition += ` and f_filiale_id in ${this.f_filialeids}`