scholar-wei преди 3 години
родител
ревизия
5ee28d4f54

+ 18 - 0
CallCenterWeb.UI/RMYY/src/api/orderManagement/vehicle.js

1
+import request from '@/utils/request'
2
+// 工单类型--车辆调度
3
+// 撤回
4
+export function getCarWithdrawWorkOrder(params) {
5
+  return request({
6
+    url: 'T_Car_WorkOrder/Withdraw',
7
+    method: 'get',
8
+    params
9
+  })
10
+}
11
+// 评价
12
+export function getCarEvaluateWorkorder(params) {
13
+  return request({
14
+    url: 'T_Car_WorkOrder/EvaluateWorkorder',
15
+    method: 'get',
16
+    params
17
+  })
18
+}

+ 41 - 3
CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

171
         <el-button type="primary" @click="submitForm('dealWorkForm')">确 定</el-button>
171
         <el-button type="primary" @click="submitForm('dealWorkForm')">确 定</el-button>
172
       </div>
172
       </div>
173
     </el-dialog>
173
     </el-dialog>
174
+    <!-- 车辆调度-评价 -->
175
+    <el-dialog :visible.sync="dialogStatus.dialog_cldu_pingjia" title="评价">
176
+      <el-form ref="carEvaluteForm" :model="carEvaluteForm" :rules="rules" label-width="100px">
177
+        <el-form-item label="评价内容">
178
+          <el-input
179
+            :autosize="{ minRows: 4, maxRows: 8}"
180
+            v-model="carEvaluteForm.Evaluation"
181
+            show-word-limit
182
+            maxlength="100"
183
+            type="textarea" />
184
+        </el-form-item>
185
+        <el-form-item label="分值">
186
+          <el-input-number v-model="carEvaluteForm.score" :min="0"/>
187
+        </el-form-item>
188
+      </el-form>
189
+      <div slot="footer" class="dialog-footer">
190
+        <el-button @click="dialogStatus.dialog_cldu_pingjia = false">取 消</el-button>
191
+        <el-button type="primary" @click="submitForm('carEvaluteForm')">确 定</el-button>
192
+      </div>
193
+    </el-dialog>
174
   </div>
194
   </div>
175
 </template>
195
 </template>
176
 
196
 
189
 
209
 
190
 import {
210
 import {
191
   schedulRetractOrder,
211
   schedulRetractOrder,
192
-  	deleteSchedulingOrder
212
+  deleteSchedulingOrder
193
 } from '@/api/orderManagement/orderList'
213
 } from '@/api/orderManagement/orderList'
194
 import {
214
 import {
195
   getSureWorkOrder,
215
   getSureWorkOrder,
205
   postDelDispatchWorkOrder,
225
   postDelDispatchWorkOrder,
206
   postwithdrawDispatchWorkOrder
226
   postwithdrawDispatchWorkOrder
207
 } from '@/api/comDispatch/addOrEditDispatch'
227
 } from '@/api/comDispatch/addOrEditDispatch'
228
+import { getCarWithdrawWorkOrder, getCarEvaluateWorkorder } from '@/api/orderManagement/vehicle'
208
 import {
229
 import {
209
   GetPerson
230
   GetPerson
210
 } from '@/api/commonAPI'
231
 } from '@/api/commonAPI'
217
     return {
238
     return {
218
       optionName: '',
239
       optionName: '',
219
       wocode: '',
240
       wocode: '',
241
+      fid: '',
220
       dialogStatus: {
242
       dialogStatus: {
221
         dialog_zixingjiejue: false,
243
         dialog_zixingjiejue: false,
222
         dialog_zhdd_chehui: false,
244
         dialog_zhdd_chehui: false,
237
         dialog_haocai: false,
259
         dialog_haocai: false,
238
         dialog_dispatch_tuihui: false,
260
         dialog_dispatch_tuihui: false,
239
         dialog_schbianji: false,
261
         dialog_schbianji: false,
262
+        dialog_dispatch_daoda: false,
240
         dialog_schshanchu: false,
263
         dialog_schshanchu: false,
241
         dialog_schchehui: false,
264
         dialog_schchehui: false,
265
+        dialog_cldu_chehui: false,
266
+        dialog_cldu_bianji: false,
267
+        dialog_cldu_pingjia: false,
268
+        dialog_cldu_chehui: {
269
+          text: '确定要撤回吗?',
270
+          action: getCarWithdrawWorkOrder,
271
+          type: 'confirm'
272
+        },
242
         dialog_yw_shanchu: {
273
         dialog_yw_shanchu: {
243
           text: '确定要删除吗?',
274
           text: '确定要删除吗?',
244
           action: getDelWorkOrder,
275
           action: getDelWorkOrder,
259
           action: deleteSchedulingOrder,
290
           action: deleteSchedulingOrder,
260
           type: 'confirm'
291
           type: 'confirm'
261
         },
292
         },
262
-        dialog_dispatch_daoda: false,
263
         dialog_ywzx_jiedan: {
293
         dialog_ywzx_jiedan: {
264
           text: '确定要接单吗?',
294
           text: '确定要接单吗?',
265
           action: getSureWorkOrder,
295
           action: getSureWorkOrder,
319
       evaluateText: [
349
       evaluateText: [
320
         '极差', '失望', '一般', '满意', '惊喜'
350
         '极差', '失望', '一般', '满意', '惊喜'
321
       ],
351
       ],
352
+      carEvaluteForm: {
353
+        Evaluation: '',
354
+        score: 0
355
+      },
322
       evaluateForm: {
356
       evaluateForm: {
323
         Attitude: 0,
357
         Attitude: 0,
324
         Quality: 0,
358
         Quality: 0,
427
     butOptionMethod(name, code, row) {
461
     butOptionMethod(name, code, row) {
428
       this.optionName = name
462
       this.optionName = name
429
       this.wocode = code
463
       this.wocode = code
464
+      this.fid = row.F_ID
430
       if (this.dialogStatus[`dialog_${name}`] === false) {
465
       if (this.dialogStatus[`dialog_${name}`] === false) {
431
         this.dialogStatus[`dialog_${name}`] = true
466
         this.dialogStatus[`dialog_${name}`] = true
432
       } else {
467
       } else {
444
         type: 'warning'
479
         type: 'warning'
445
       }).then(() => {
480
       }).then(() => {
446
         new Promise((resolve) => {
481
         new Promise((resolve) => {
447
-          if (this.optionName == 'ywzx_jiedan' || this.optionName == 'ywzx_tuihui' || this.optionName == 'dispatch_jiedan' || this.optionName == 'schshanchu' || this.optionName == 'yw_shanchu') {
482
+          if (this.optionName == 'ywzx_jiedan' || this.optionName == 'ywzx_tuihui' || this.optionName == 'dispatch_jiedan' || this.optionName == 'schshanchu' || this.optionName == 'yw_shanchu' || this.optionName == 'cldu_chehui') {
448
             var params = {
483
             var params = {
449
               WorkOrderCode: this.wocode
484
               WorkOrderCode: this.wocode
450
             }
485
             }
556
             case 'dealWorkForm':
591
             case 'dealWorkForm':
557
               this.postEvent = postDispatchDealWorkOrder
592
               this.postEvent = postDispatchDealWorkOrder
558
               break
593
               break
594
+            case 'carEvaluteForm':
595
+              this.postEvent = getCarEvaluateWorkorder
596
+              break
559
             default:
597
             default:
560
               break
598
               break
561
           }
599
           }

+ 1 - 1
CallCenterWeb.UI/RMYY/src/components/context/commonSelect/selectOrderType.vue

35
       inserted(el, binging) {
35
       inserted(el, binging) {
36
         // console.log(el.id)
36
         // console.log(el.id)
37
         if ((el.id.split(',')[0] == 'nav2' && el.id.split(',')[1] == '3000') || (el.id.split(',')[0] == 'nav0' && el
37
         if ((el.id.split(',')[0] == 'nav2' && el.id.split(',')[1] == '3000') || (el.id.split(',')[0] == 'nav0' && el
38
-          .id.split(',')[1] == '1000') || (el.id.split(',')[0] == 'nav1' && el.id.split(',')[1] == '2000')) {
38
+          .id.split(',')[1] == '1000') || (el.id.split(',')[0] == 'nav1' && el.id.split(',')[1] == '2000') || (el.id.split(',')[0] == 'nav3' && el.id.split(',')[1] == '4000')) {
39
           el.click()
39
           el.click()
40
         } else {
40
         } else {
41
           el.id.split(',')[0] == 'nav0' ? el.click() : null
41
           el.id.split(',')[0] == 'nav0' ? el.click() : null

+ 8 - 0
CallCenterWeb.UI/RMYY/src/utils/global.js

47
     value: '10'
47
     value: '10'
48
   }],
48
   }],
49
   stateOptions_4000: [{
49
   stateOptions_4000: [{
50
+    label: '待提交',
51
+    value: '-1'
52
+  },
53
+  {
50
     label: '待分配',
54
     label: '待分配',
51
     value: '0'
55
     value: '0'
52
   },
56
   },
63
     value: '4'
67
     value: '4'
64
   },
68
   },
65
   {
69
   {
70
+    label: '待评价',
71
+    value: '7'
72
+  },
73
+  {
66
     label: '已完成',
74
     label: '已完成',
67
     value: '10'
75
     value: '10'
68
   }],
76
   }],

+ 3 - 0
CallCenterWeb.UI/RMYY/src/views/callScreen/components/AddOrEditOrder.vue

75
       <!-- 车辆调度 -->
75
       <!-- 车辆调度 -->
76
       <el-col v-if="orderTypeData.F_Type1 === 4000" :span="22">
76
       <el-col v-if="orderTypeData.F_Type1 === 4000" :span="22">
77
         <add-or-edit
77
         <add-or-edit
78
+          :wid="wid"
79
+          :iswomanage="iswomanage"
80
+          :rtype="rtype"
78
           :r2type="r2type"
81
           :r2type="r2type"
79
           :callid="callid"
82
           :callid="callid"
80
           :order-type-data="orderTypeData"
83
           :order-type-data="orderTypeData"

+ 3 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

277
       if (this.buttonName === 'ywzx_bianji') {
277
       if (this.buttonName === 'ywzx_bianji') {
278
         this.btn_ywzxedit(wocode, row.F_Type, row.F_SonType)
278
         this.btn_ywzxedit(wocode, row.F_Type, row.F_SonType)
279
       }
279
       }
280
+      if (this.buttonName === 'cldu_bianji') {
281
+        this.btn_ywzxedit(wocode, row.F_Type, row.F_SonType)
282
+      }
280
     },
283
     },
281
     // 编辑
284
     // 编辑
282
     btn_edit(rid) {
285
     btn_edit(rid) {

+ 17 - 11
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/addOrEdit.vue

98
 
98
 
99
 <script>
99
 <script>
100
 import {
100
 import {
101
-  getList,
101
+  // getList,
102
   getModelDetail,
102
   getModelDetail,
103
   getAddWorkOrder,
103
   getAddWorkOrder,
104
   getUpdateWorkOrder
104
   getUpdateWorkOrder
106
 import {
106
 import {
107
   getOrderTypeList
107
   getOrderTypeList
108
 } from '@/api/commonAPI.js'
108
 } from '@/api/commonAPI.js'
109
-import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
109
+  // import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
110
 import {
110
 import {
111
   getCartype
111
   getCartype
112
 } from '@/api/vehicleDispatch/vehicleManagement'
112
 } from '@/api/vehicleDispatch/vehicleManagement'
130
       type: String,
130
       type: String,
131
       default: ''
131
       default: ''
132
     },
132
     },
133
+    wid: {
134
+      type: String,
135
+      default: ''
136
+    },
133
     wocode: {
137
     wocode: {
134
       type: String,
138
       type: String,
135
       default: ''
139
       default: ''
241
   created() {
245
   created() {
242
     this.getTypeOrder()
246
     this.getTypeOrder()
243
     this.getCarlist()
247
     this.getCarlist()
244
-    if (this.rowid) {
245
-      this.ruleForm.F_ID = this.rowid
248
+    if (this.wid) {
249
+      this.wocode = this.wid
246
       this.getDetail('0')
250
       this.getDetail('0')
247
-      console.log(this.rowid)
248
     }
251
     }
249
   },
252
   },
250
   methods: {
253
   methods: {
311
               .then((response) => {
314
               .then((response) => {
312
                 this.loading = false
315
                 this.loading = false
313
                 if (response.state.toLowerCase() === 'success') {
316
                 if (response.state.toLowerCase() === 'success') {
314
-                  this.$parent.$layer.close(this.layerid)
315
-                  this.$parent.getList() // 重新加载父级数据
317
+                  this.$parent.$layer.closeAll()
318
+                  // this.$parent.$layer.close(this.layerid)
319
+                  this.$parent.$parent.getList() // 重新加载父级数据
316
                   this.$message({
320
                   this.$message({
317
                     message: '恭喜你,添加工单成功!',
321
                     message: '恭喜你,添加工单成功!',
318
                     type: 'success',
322
                     type: 'success',
327
             // 编辑
331
             // 编辑
328
             const datas = {
332
             const datas = {
329
               WorkOrderCode: this.wocode,
333
               WorkOrderCode: this.wocode,
330
-              type: this.ruleForm.type,
334
+              type: this.type,
331
               hosid: this.ruleForm.hosid, //	院区id
335
               hosid: this.ruleForm.hosid, //	院区id
332
               detpid: this.ruleForm.deptid, //	申请科室id
336
               detpid: this.ruleForm.deptid, //	申请科室id
333
               startplace: this.ruleForm.startplace,
337
               startplace: this.ruleForm.startplace,
342
             getUpdateWorkOrder(datas)
346
             getUpdateWorkOrder(datas)
343
               .then((response) => {
347
               .then((response) => {
344
                 if (response.state.toLowerCase() === 'success') {
348
                 if (response.state.toLowerCase() === 'success') {
345
-                  this.$parent.$layer.close(this.layerid)
346
-                  this.$parent.getList() // 重新加载父级数据
349
+                  this.$parent.$layer.closeAll()
350
+                  // this.$parent.$layer.close(this.layerid)
351
+                  this.$parent.$parent.getList() // 重新加载父级数据
347
                   this.$message({
352
                   this.$message({
348
                     message: '恭喜你,编辑工单成功!',
353
                     message: '恭喜你,编辑工单成功!',
349
                     type: 'success',
354
                     type: 'success',
366
     // 获取详情
371
     // 获取详情
367
     getDetail(num) {
372
     getDetail(num) {
368
       const params = {
373
       const params = {
369
-        orderid: this.rowid,
374
+        // orderid: this.rowid,
370
         WorkOrderCode: this.wocode,
375
         WorkOrderCode: this.wocode,
371
         type: num
376
         type: num
372
       }
377
       }
376
           this.getRepairman(res.F_ProposerDeptId)
381
           this.getRepairman(res.F_ProposerDeptId)
377
           this.ruleForm.F_ID = res.F_ID
382
           this.ruleForm.F_ID = res.F_ID
378
           this.ruleForm.type = res.F_Type
383
           this.ruleForm.type = res.F_Type
384
+          this.type = res.F_Type
379
           this.hospitalsParam.id = res.F_HosId
385
           this.hospitalsParam.id = res.F_HosId
380
           this.hospitalsParam.name = res.HosName
386
           this.hospitalsParam.name = res.HosName
381
           this.departmentsParam.id = res.F_ProposerDeptId
387
           this.departmentsParam.id = res.F_ProposerDeptId