ソースを参照

Merge branch 'debelop' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_UI into debelop

miaofuhao 2 年 前
コミット
1bdd9619d5

+ 8 - 0
CallCenterWeb.UI/RMYY/src/api/faultRepairManagement/faultRepair.js

@@ -25,6 +25,14 @@ export function getMaintenancerList(params) {
25 25
     params
26 26
   })
27 27
 }
28
+export function getListExpt(params) {
29
+  return request({
30
+    url: 'FaultRepair/MaintenancerList',
31
+    method: 'get',
32
+    responseType: 'blob',
33
+    params
34
+  })
35
+}
28 36
 // 查收工单
29 37
 export function postTaskOrders(params) {
30 38
   return request({

+ 8 - 0
CallCenterWeb.UI/RMYY/src/api/vehicleDispatch/vehicleScheduling.js

@@ -113,3 +113,11 @@ export function getListExptIsdc(params) {
113 113
     params
114 114
   })
115 115
 }
116
+// 催单
117
+export function getReminderWorkOrder(params) {
118
+  return request({
119
+    url: 'T_Car_WorkOrder/Reminder',
120
+    method: 'post',
121
+    params
122
+  })
123
+}

+ 5 - 1
CallCenterWeb.UI/RMYY/src/utils/fieldsData.js

@@ -401,7 +401,7 @@ export default {
401 401
   },
402 402
   {
403 403
     key: 'GapTime',
404
-    value: '超时时限'
404
+    value: '工单时效'
405 405
   },
406 406
   {
407 407
     key: 'F_CreateTime',
@@ -443,6 +443,10 @@ export default {
443 443
   {
444 444
     key: 'F_AssignTime',
445 445
     value: '申请时间'
446
+  },
447
+  {
448
+    key: 'GapTime',
449
+    value: '工单时效'
446 450
   }
447 451
   ],
448 452
   _reportForm_deptTransfer: [{

+ 17 - 6
CallCenterWeb.UI/RMYY/src/views/comDispatch/scheduleList/index.vue

@@ -124,18 +124,29 @@
124 124
         align="center"
125 125
       />
126 126
       <el-table-column
127
+        v-if="fieldListFlag.F_AssignTime"
128
+        prop="F_AssignTime"
129
+        label="申请时间"
130
+        align="center"
131
+      />
132
+      <el-table-column
127 133
         v-if="fieldListFlag.F_ToPlace"
128 134
         prop="F_ToPlace"
129 135
         label="送达地点"
130 136
         align="center"
131
-      />
137
+      />    
132 138
       <el-table-column
133
-        v-if="fieldListFlag.F_AssignTime"
134
-        prop="F_AssignTime"
135
-        label="申请时间"
139
+        v-if="fieldListFlag.GapTime"
140
+        prop="GapTime"
141
+        label="工单时效"
136 142
         align="center"
137
-      />
138
-      <!-- <el-table-column v-if="fieldListFlag.StateName" prop="StateName" label="工单状态" align="center" min-width /> -->
143
+        min-width>
144
+        <template slot-scope="scope">
145
+          <span v-if="scope.row.GapTime.indexOf('超时')>=0" style="color:red">{{ scope.row.GapTime }}</span>
146
+          <span v-if="scope.row.GapTime.indexOf('剩余')>=0" style="color:green">{{ scope.row.GapTime }}</span>
147
+          <span v-if="scope.row.GapTime=='-'">{{ "-" }}</span>
148
+        </template>
149
+      </el-table-column>
139 150
       <el-table-column
140 151
         v-if="fieldListFlag.StateName"
141 152
         prop="StateName"

+ 32 - 6
CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -32,10 +32,13 @@
32 32
         start-placeholder="开始日期"
33 33
         end-placeholder="结束日期"
34 34
       />
35
-      <el-button type="primary" class="filter-btn" @click="getListTask">
36
-        查询
35
+      <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="getListTask">
36
+        搜索
37 37
       </el-button>
38
-      <el-button type="primary" class="filter-btn" @click="btn_add_list">
38
+      <el-button type="primary" class="filter-btn" @click="btn_import">
39
+        导出
40
+      </el-button>
41
+      <el-button type="primary" class="filter-btn" icon="el-icon-s-tools" @click="btn_add_list">
39 42
         设置列
40 43
       </el-button>
41 44
     </div>
@@ -159,10 +162,15 @@
159 162
       <el-table-column
160 163
         v-if="fieldListFlag.GapTime"
161 164
         prop="GapTime"
162
-        label="超时时限"
165
+        label="工单时效"
163 166
         align="center"
164
-        min-width
165
-      />
167
+        min-width>
168
+        <template slot-scope="scope">
169
+          <span v-if="scope.row.GapTime.indexOf('超时')>=0" style="color:red">{{ scope.row.GapTime }}</span>
170
+          <span v-if="scope.row.GapTime.indexOf('剩余')>=0" style="color:green">{{ scope.row.GapTime }}</span>
171
+          <span v-if="scope.row.GapTime=='-'">{{ "-" }}</span>
172
+        </template>
173
+      </el-table-column>
166 174
       <el-table-column
167 175
         v-if="fieldListFlag.F_CreateTime"
168 176
         prop="F_CreateTime"
@@ -975,10 +983,14 @@ import {
975 983
   getDicValueList,
976 984
   getsbeilist,
977 985
   getDicReason,
986
+  getListExpt,
978 987
 } from "@/api/faultRepairManagement/faultRepair";
979 988
 import { GetEquipmentAlllist, GetDelEquips } from "@/api/equipment/equip";
980 989
 import detail from "../../orderManage/components/orderDetail.vue";
981 990
 import Finish from "./finish";
991
+import {
992
+    exportExcel
993
+  } from "@/utils";
982 994
 export default {
983 995
   name: "RepairList",
984 996
   components: {
@@ -1179,6 +1191,20 @@ export default {
1179 1191
   },
1180 1192
   mounted() {},
1181 1193
   methods: {
1194
+    btn_import() {
1195
+      const exportparams = {
1196
+        page: this.pageParams.pageindex, // 第几页
1197
+        pagesize: this.pageParams.pagesize, // 每页几条信息
1198
+        name: this.repairman,
1199
+        state: this.state,
1200
+        tel: this.rpairmanphone,
1201
+        starttime: this.searchTime && this.searchTime[0],
1202
+        endtime: this.searchTime && this.searchTime[1],
1203
+        workordercode: this.workOrderId,
1204
+        isdc: 1,
1205
+      };
1206
+      exportExcel(exportparams, getListExpt);
1207
+    },
1182 1208
     getDeptid(data) {
1183 1209
       console.log(data);
1184 1210
       this.deptidArr = data;

+ 3 - 4
CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -28,6 +28,7 @@
28 28
       </el-button>
29 29
     </div>
30 30
     <el-tabs v-model="activeName" @tab-click="handleClick">
31
+      <el-tab-pane label="未接单" name="3" />
31 32
       <el-tab-pane label="待完成" name="0" />
32 33
       <el-tab-pane label="已完成" name="1" />
33 34
       <el-tab-pane label="全部" name="2" />
@@ -167,7 +168,7 @@
167 168
     },
168 169
     data() {
169 170
       return {
170
-        activeName: "0",
171
+        activeName: "3",
171 172
         isDisable: false, // 防止多次点击
172 173
         loading: false,
173 174
         isedit: "1",
@@ -175,7 +176,7 @@
175 176
         fieldListFlag: {},
176 177
         buttonName: "",
177 178
         searchData: {
178
-          tab: "0",
179
+          tab: "3",
179 180
           keyword: "", // 关键字
180 181
           searchTime: "", // 时间
181 182
           starttime: "", // 开始时间
@@ -265,7 +266,6 @@
265 266
         }
266 267
       },
267 268
       getList() {
268
-        this.loading = true;
269 269
         return new Promise((resolve) => {
270 270
           const params = {
271 271
             usercode: this.searchData.usercode,
@@ -281,7 +281,6 @@
281 281
             pagesize: this.pageParams.pagesize, // int 每页几条信息
282 282
           };
283 283
           comOrderList(params).then((response) => {
284
-            this.loading = false;
285 284
             if (response.state.toLowerCase() === "success") {
286 285
               this.pageParams.total = response.total;
287 286
               this.dataLists = response.rows;

+ 10 - 4
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/driverOrder/index.vue

@@ -8,6 +8,12 @@
8 8
         size="medium"
9 9
         class="filter-item"
10 10
       />
11
+      <el-select v-model="state" size="medium" clearable placeholder="请选择工单状态">
12
+        <el-option value="0" label="待接单"></el-option>
13
+        <el-option value="2" label="已接单"></el-option>
14
+        <el-option value="4" label="处理中"></el-option>
15
+        <el-option value="10" label="已完成"></el-option>
16
+      </el-select>
11 17
       <el-input
12 18
         v-model="carname"
13 19
         clearable
@@ -32,15 +38,14 @@
32 38
         start-placeholder="开始日期"
33 39
         end-placeholder="结束日期"
34 40
       />
35
-      <el-button type="primary" class="filter-item" @click="btn_search"
41
+      <el-button type="primary" class="filter-item" size="medium" icon="el-icon-search" @click="btn_search"
36 42
         >搜索</el-button
37 43
       >
38
-      <el-button type="primary" class="filter-btn" @click="btn_export">
44
+      <el-button type="primary" class="filter-btn" size="medium" @click="btn_export">
39 45
         导出
40 46
       </el-button>
41 47
     </div>
42 48
     <el-table v-loading="loading" :data="dataLists" border stripe>
43
-      <!-- <el-table-column :show-overflow-tooltip="true" prop="F_WorkOrderCode" label="工单编号" align="center" /> -->
44 49
       <el-table-column
45 50
         prop="F_WorkOrderCode"
46 51
         label="调度编号"
@@ -131,6 +136,7 @@ export default {
131 136
   data() {
132 137
     return {
133 138
       loading: false,
139
+      state:"",
134 140
       keyword: "",
135 141
       ordercode: "",
136 142
       carname: "",
@@ -165,7 +171,7 @@ export default {
165 171
           WorkOrderCode: this.ordercode,
166 172
           carname: this.carname,
167 173
           driverName: this.drivername,
168
-          state: "",
174
+          state: this.state,
169 175
         };
170 176
         this.searchData = params;
171 177
         getDriverList(params).then((response) => {

+ 41 - 8
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/index.vue

@@ -35,10 +35,11 @@
35 35
         type="primary"
36 36
         class="filter-item"
37 37
         size="medium"
38
+        icon="el-icon-search"
38 39
         @click="btn_search"
39 40
         >搜索</el-button
40 41
       >
41
-      <el-button type="primary" class="filter-btn" @click="btn_export"
42
+      <el-button type="primary" size="medium" class="filter-btn" @click="btn_export"
42 43
         >导出</el-button
43 44
       >
44 45
       <el-button
@@ -50,6 +51,7 @@
50 51
       >
51 52
     </div>
52 53
     <el-tabs v-model="activeName" @tab-click="handleClick">
54
+      <el-tab-pane label="未接单" name="2" />
53 55
       <el-tab-pane label="待分配" name="0" />
54 56
       <el-tab-pane label="已分配" name="1" />
55 57
       <el-tab-pane label="已完成" name="10" />
@@ -82,7 +84,8 @@
82 84
       <el-table-column prop="F_Type" label="类别" align="center">
83 85
         <template slot-scope="scope">
84 86
           <div>
85
-            {{ $store.getters.workTypeMap[parseInt(scope.row.F_Type)].text }}
87
+            {{scope.row.F_TypeName}}
88
+            <!-- {{ $store.getters.workTypeMap[parseInt(scope.row.F_Type)].text }} -->
86 89
           </div>
87 90
         </template>
88 91
       </el-table-column>
@@ -170,6 +173,13 @@
170 173
             @click="btn_overorder(scope.row.F_WorkOrderCode)"
171 174
             >完结</el-button
172 175
           >
176
+          <el-button
177
+            v-if="scope.row.F_State == 1"
178
+            size="mini"
179
+            type="text"
180
+            @click="btn_reminderorder(scope.row.F_WorkOrderCode)"
181
+            >催单</el-button
182
+          >
173 183
         </template>
174 184
       </el-table-column>
175 185
     </el-table>
@@ -203,7 +213,8 @@ import {
203 213
   getModelDetail,
204 214
   getAssignWorkOrder,
205 215
   getSureWorkOrder,
206
-  getOver
216
+  getOver,
217
+  getReminderWorkOrder
207 218
 } from "@/api/vehicleDispatch/vehicleScheduling.js";
208 219
 import { getGetAllCar } from "@/api/Escortservice/Escortservice.js";
209 220
 import { getOrderTypeList } from "@/api/commonAPI.js";
@@ -222,10 +233,10 @@ export default {
222 233
   data() {
223 234
     return {
224 235
       dialogFormVisible:false,
225
-      activeName: "0",
236
+      activeName: "2",
226 237
       loading: false,
227 238
       ordercode: "",
228
-      state: "0",
239
+      state: "2",
229 240
       typeList: [],
230 241
       type: "",
231 242
       startTime: "",
@@ -412,6 +423,28 @@ export default {
412 423
         }
413 424
       });
414 425
     },
426
+    //催单
427
+    btn_reminderorder(code){
428
+      const params ={
429
+        WorkOrderCode:code
430
+      }
431
+      this.$confirm("您确定要催单吗?", "提示", {
432
+        confirmButtonText: "确定",
433
+        cancelButtonText: "取消",
434
+        type: "warning",
435
+      })
436
+        .then(() => {
437
+          getReminderWorkOrder(params).then((response) => {
438
+            if (response.state.toLowerCase() === "success") {
439
+              this.getList();
440
+              this.$message.success("催单成功!");
441
+            }
442
+          });
443
+        })
444
+        .catch(() => {
445
+          this.$message("已取消");
446
+        });
447
+    },
415 448
     // 确定工单
416 449
     btn_sure(rowid) {
417 450
       const params = {
@@ -463,7 +496,7 @@ export default {
463 496
   font-size: 16px !important;
464 497
   font-weight: 600;
465 498
 }
466
-/deep/.el-tabs__header{
467
-  float: right;
468
-}
499
+// /deep/.el-tabs__header{
500
+//   float: right;
501
+// }
469 502
 </style>