telephone-clients 3.0.103 → 3.0.104-1

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

@@ -60,7 +60,7 @@
                             :value.sync="model.f_created_date"
                             v-model="model.f_created_date"
                             :format="'yyyy-MM-dd 00:00:00'"
-                            condition="f_created_date > '{}'"
+                            condition="tswo.f_created_date > '{}'"
                 ></datepicker>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -69,7 +69,7 @@
                             :value.sync="model.f_created_enddate"
                             v-model="model.f_created_enddate"
                             :format="'yyyy-MM-dd 23:59:59'"
-                            condition="f_created_date < '{}'"
+                            condition="tswo.f_created_date < '{}'"
                 ></datepicker>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -104,7 +104,7 @@
                             :value.sync="model.f_date_start"
                             v-model="model.f_date_start"
                             :format="'yyyy-MM-dd 00:00:00'"
-                            condition="f_date > '{}'"
+                            condition="tsw.f_date > '{}'"
                 ></datepicker>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -113,7 +113,7 @@
                             :value.sync="model.f_date_end"
                             v-model="model.f_date_end"
                             :format="'yyyy-MM-dd 23:59:59'"
-                            condition="f_date < '{}'"
+                            condition="tsw.f_date < '{}'"
                 ></datepicker>
               </div>
               <div class="col-sm-3 form-group form-input-group" style="width: 20%">
@@ -152,7 +152,7 @@
                 <label class="font_normal_body" style="width: 40%" >报修类型</label>
                 <v-select :value.sync="model.f_repairtype" :value-single="true" v-model="model.f_repairtype"
                           :options='$parent.$parent.repairstypes' placeholder='报修类型'
-                          condition="f_repairtype like '%{}%'"
+                          condition="tswo.f_repairtype like '%{}%'"
                           close-on-select>
                 </v-select>
               </div>
@@ -160,7 +160,7 @@
                 <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 '%{}%'"
+                          condition="tswo.failure like '%{}%'"
                           close-on-select>
                 </v-select>
               </div>
@@ -197,7 +197,21 @@
               <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>
               <th>
                 <nobr>工单编号</nobr>
               </th>
@@ -211,9 +225,6 @@
               <th>
                 <nobr>联系电话</nobr>
               </th>
-              <th>
-                <nobr>故障明细</nobr>
-              </th>
               <th>
                 <nobr>工单来源</nobr>
               </th>
@@ -226,9 +237,6 @@
               <th>
                 <nobr>话务员</nobr>
               </th>
-              <th>
-                <nobr>接单员</nobr>
-              </th>
               <th>
                 <nobr>结单时间</nobr>
               </th>
@@ -238,24 +246,18 @@
               <th>
                 <nobr>离开时间</nobr>
               </th>
-
-              <th>
-                <nobr>逾期状态</nobr>
-              </th>
-              <th>
-                <nobr>截止时间</nobr>
-              </th>
               <th>
-                <nobr>逾期时间</nobr>
-              </th>
-
-
-              <th>
-                <nobr>工单结果</nobr>
-              </th>
-              <th>
-                <nobr>维修结果</nobr>
+                <nobr>不处理原因</nobr>
               </th>
+<!--              <th>-->
+<!--                <nobr>逾期状态</nobr>-->
+<!--              </th>-->
+<!--              <th>-->
+<!--                <nobr>截止时间</nobr>-->
+<!--              </th>-->
+<!--              <th>-->
+<!--                <nobr>逾期时间</nobr>-->
+<!--              </th>-->
 
 
             </tr>
@@ -275,7 +277,21 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_workorder_type }}</nobr>
             </td>
-
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_repairtype }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{row.f_remarks}}&nbsp;&nbsp;&nbsp;{{ $parent.$parent.$parent.trouble(row.failure) }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_order_man }} {{ row.f_repairman_phone }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_repair_remarks }}</nobr>
+            </td>
+            <td  style="text-align: center;">
+              <nobr>{{ row.f_result_status }}</nobr>
+            </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_service_id }}</nobr>
             </td>
@@ -291,9 +307,6 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_contact_phone }}</nobr>
             </td>
-            <td  style="text-align: center;">
-              <nobr>{{row.f_remarks}}&nbsp;&nbsp;&nbsp;{{ $parent.$parent.$parent.trouble(row.failure) }}</nobr>
-            </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_source }}</nobr>
             </td>
@@ -309,9 +322,6 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_attendant }}</nobr>
             </td>
-            <td  style="text-align: center;">
-              <nobr>{{ row.f_order_man }} {{ row.f_repairman_phone }}</nobr>
-            </td>
             <td  style="text-align: center;">
               <nobr>{{ row.f_date }}</nobr>
             </td>
@@ -321,27 +331,19 @@
             <td  style="text-align: center;">
               <nobr>{{ row.f_date_leave }}</nobr>
             </td>
-
-            <td  style="text-align: center;">
-              <nobr>{{ $parent.$parent.$parent.d1(row)}}</nobr>
-            </td>
             <td  style="text-align: center;">
-              <nobr>{{ row.f_finish_date == '1900-01-01 00:00:00' ? '' : row.f_finish_date}}</nobr>
+              <nobr>{{ row.f_case_remarks }}</nobr>
             </td>
-            <td  style="text-align: center;">
-              <nobr>{{ $parent.$parent.$parent.d2(row) }}</nobr>
-            </td>
-
-
-            <td  style="text-align: center;">
-              <nobr>{{ row.f_result_status }}</nobr>
-            </td>
-
-            <td  style="text-align: center;">
-              <nobr>{{ row.f_repair_remarks }}</nobr>
-            </td>
-
 
+<!--            <td  style="text-align: center;">-->
+<!--              <nobr>{{ $parent.$parent.$parent.d1(row)}}</nobr>-->
+<!--            </td>-->
+<!--            <td  style="text-align: center;">-->
+<!--              <nobr>{{ row.f_finish_date == '1900-01-01 00:00:00' ? '' : row.f_finish_date}}</nobr>-->
+<!--            </td>-->
+<!--            <td  style="text-align: center;">-->
+<!--              <nobr>{{ $parent.$parent.$parent.d2(row) }}</nobr>-->
+<!--            </td>-->
           </template>
         </data-grid>
       </criteria-paged>
@@ -379,7 +381,7 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <visit-info v-if="showVisit" :row="visitrow" :phone="wavflie"
-                  @show-obj="watchShow"></visit-info>
+                   @visitback="visitshow"></visit-info>
     </article>
     <footer slot="modal-footer" class="modal-footer">
     </footer>
@@ -440,20 +442,22 @@ export default {
       },
       excelHeaders: {
         'f_workorder_type': '工单类型',
+        'f_repairtype': '报修类型',
         'f_service_id': '工单编号',
         'f_created_date': '派单时间',
         'f_user_name': '用户姓名',
         'f_address': '用户地址',
         'f_contact_phone': '联系电话',
         'f_source': '工单来源',
+        'f_remarks': '备注',
         'f_json': '故障明细',
+        'f_repair_remarks': '维修结果',
         'f_single_man': '派单人',
         'f_attendant': '受理人',
         'f_order_man': '接单人',
         'defname': '工单状态',
-        'f_date_leave': '完成时间',
-        'f_repair_remarks': '维修结果',
-        'f_remarks': '备注'
+        'f_case_remarks':'无法处理原因',
+        'f_date_leave': '完成时间'
       },
       criteriaShow: false
     }
@@ -476,8 +480,6 @@ export default {
     }
   },
   ready () {
-
-    this.selfSearch()
   },
   watch: {
     'all' (val) {
@@ -549,10 +551,16 @@ export default {
         + seperator2 + second
       return currentdate
     },
-    watchShow (val) {
+    visitshow(val){
+      if(val == 'commit'){
+        this.model.rows.forEach((value, index)=>{
+          if(value.id == this.visitrow.id){
+            this.model.rows[index].f_again_revisit = '否'
+          }
+        })
+      }
       this.visitrow = {}
-      this.showVisit = val
-      this.selfSearch()
+      this.showVisit = false
     },
     playWav (val, val2) {
       //tag
@@ -579,9 +587,9 @@ export default {
     search (args) {
 
       if (this.f_filialeids) {
-        args.condition += ` and f_filiale_id in ${this.f_filialeids}`
+        args.condition += ` and tswo.f_filiale_id in ${this.f_filialeids}`
       } else {
-        args.condition += ` and f_filiale_id = '${this.$login.f.orgid}'`
+        args.condition += ` and tswo.f_filiale_id = '${this.$login.f.orgid}'`
       }
 
       this.searchData.condition = args.condition
@@ -592,10 +600,10 @@ export default {
       let condition = '1=1'
 
       if (this.f_filialeids) {
-        condition += ` and f_filiale_id in ${this.f_filialeids}`
+        condition += ` and tswo.f_filiale_id in ${this.f_filialeids}`
         //tag
       } else {
-        condition += ` and f_filiale_id = '${this.$login.f.orgid}'`
+        condition += ` and tswo.f_filiale_id = '${this.$login.f.orgid}'`
       }
       return this.model.search(condition)
     },

package/src/filiale/shexian/telephone.js

@@ -1,18 +1,21 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//pc和手机分别注册到两个文件中
-let specialComp = {
-  // 工单详情子组件
-  'tel-orderman-count': (resolve) => { require(['./pc/TelByOrderManCount'], resolve) },
-  'tel-repairtype-count': (resolve) => { require(['./pc/TelByRepairType'], resolve) },
-  'new-repair-paper': (resolve) => { require(['./pc/NewRepairPaper'], resolve) },
-  'tel-orderman': (resolve) => { require(['./pc/TelByOrderMan'], resolve) },
-  'work-listall-new': (resolve) => { require(['./pc/WorkListAllNew'], resolve) },
-  'work-list': (resolve) => { require(['./pc/WorkList'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//pc和手机分别注册到两个文件中
+let specialComp = {
+  // 工单详情子组件
+  'tel-orderman-count': (resolve) => { require(['./pc/TelByOrderManCount'], resolve) },
+  'tel-repairtype-count': (resolve) => { require(['./pc/TelByRepairType'], resolve) },
+  'new-repair-paper': (resolve) => { require(['./pc/NewRepairPaper'], resolve) },
+  'tel-orderman': (resolve) => { require(['./pc/TelByOrderMan'], resolve) },
+  'work-listall-new': (resolve) => { require(['./pc/WorkListAllNew'], resolve) },
+  'work-list': (resolve) => { require(['./pc/WorkList'], resolve) },
+  'query-visit-history': (resolve) => {require(['./pc/QueryVisitHistory'], resolve)},
+  'tel-agentvoice-report': (resolve) => {require(['./pc/TelAgentVoiceReport'], resolve)}
+
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/shexian/telephoneAndroid.js

@@ -1,26 +1,32 @@
-// 分公司特殊组件页面注册
-
-//pc和手机端重写组件较多的话 建议将cp和android分到两个文件中  蓉城较少，所以我就合并到一起
-let specialComp = {
-  // 竖屏待办工单新
-  'repair-first': (resolve) => {
-    require(['./android/RepairFirstV'], resolve)
-  },
-  'repair-orderV': (resolve) => {
-    require(['./android/RepairOrderV'], resolve)
-  },
-  'repair-info': (resolve) => {
-    require(['./android/RepairInfo'], resolve)
-  },
-  'outlay': (resolve) => {
-    require(['./android/Outlay'], resolve)
-  },
-  'add-my-task': (resolve) => {
-    require(['./android/AddMyTask'], resolve)
-  }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+
+//pc和手机端重写组件较多的话 建议将cp和android分到两个文件中  蓉城较少，所以我就合并到一起
+let specialComp = {
+  // 竖屏待办工单新
+  'repair-first': (resolve) => {
+    require(['./android/RepairFirstV'], resolve)
+  },
+  'repair-orderV': (resolve) => {
+    require(['./android/RepairOrderV'], resolve)
+  },
+  'repair-info': (resolve) => {
+    require(['./android/RepairInfo'], resolve)
+  },
+  'outlay': (resolve) => {
+    require(['./android/Outlay'], resolve)
+  },
+  'add-my-task': (resolve) => {
+    require(['./android/AddMyTask'], resolve)
+  },
+  'fault-all': (resolve) => {
+    require(['./android/FaultAll'], resolve)
+  },
+  'completed-repairV': (resolve) => {
+    require(['./android/CompletedRepair'], resolve)
+  }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/tongchuan/android/TicketDetails.vue

@@ -179,6 +179,9 @@
                 <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
                   故障明细: {{ trouble(row.failure) }}
                 </div>
+                <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu" v-if="['维修员接单', '维修完成'].indexOf(row.defname) >= 0">
+                  维修人员: {{ row.f_order_man }}
+                </div>
               </div>
             </div>
           </div>