liuzhihui лет назад: 3
Родитель
Сommit
6c13f52e7f

+ 2 - 1
CallCenterWeb.UI/RMYY/config/sit.env.js

@@ -4,7 +4,8 @@ module.exports = {
4 4
   NODE_ENV: '"production"',
5 5
   ENV_CONFIG: '"sit"',
6 6
   // BASE_API: '"http://192.168.8.10:8033/"', // API地址
7
-  BASE_API: '"http://192.168.1.37:8000/"', // API地址
7
+  // BASE_API: '"http://192.168.1.37:8000/"', // API地址
8
+  BASE_API: '"http://39.164.159.192:8000/"', // API地址
8 9
   // BASE_API: '"http://117.160.241.16:8000/"', // API地址
9 10
   SOCKET_IP: '"192.168.8.7"', // WebSocket通讯ip
10 11
   SOCKET_PORT: '"8081"', // WebSocket通讯端口

+ 2 - 2
CallCenterWeb.UI/RMYY/src/components/context/commonSelect/selectDeptTree.vue

@@ -1,5 +1,5 @@
1 1
 <template>
2
-  <el-cascader ref="cascader" :span="24" v-model="deptids" :options="orderData" :props="defaultProps" style="width: 100%;" placeholder="请选择部门" filterable clearable @change="handleChange"/>
2
+  <el-cascader ref="cascader" :span="24" v-model="deptparam" :options="orderData" :props="defaultProps" style="width: 100%;" placeholder="请选择部门" filterable clearable @change="handleChange"/>
3 3
 </template>
4 4
 
5 5
 <script>
@@ -26,7 +26,7 @@ export default {
26 26
         label: 'text',
27 27
         value: 'id'
28 28
       },
29
-      deptids: this.deptparam,
29
+      // deptids: [],
30 30
       parentid: '-1',
31 31
       orderData: []
32 32
     }

+ 478 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue

@@ -0,0 +1,478 @@
1
+<template>
2
+  <div class="order_detail">
3
+    <el-row :gutter="20">
4
+      <el-col :md="24" class="order_detail_body">
5
+        <el-card shadow="hover">
6
+          <el-col :md="21">
7
+            <h1 class="title" style="margin-right: 30%;display: inline-block;">
8
+              <svg-icon class="title_icon" icon-class="hongqi" />工单单号:001{{ orderDetailData.F_WorkOrderCode }}
9
+            </h1>
10
+            <el-button plain type="success">待结单</el-button>
11
+            <el-button plain type="danger">返修</el-button>
12
+          </el-col>
13
+          <el-col :md="24" class="order_detail_content">
14
+            <el-col :md="6" class="order_detail_item"> 业务类别:{{ orderDetailData.F_TypeName1 }} </el-col>
15
+            <el-col :md="6" class="order_detail_item"> 工单类别:{{ orderDetailData.F_TypeName2 }} </el-col>
16
+            <el-col :md="6" class="order_detail_item"> 申请部门:总部/设备科/维修部{{ orderDetailData.F_TypeName2 }} </el-col>
17
+            <el-col :md="6" class="order_detail_item"> 申请人:13241334751(张三){{ orderDetailData.F_TypeName2 }} </el-col>
18
+            <el-col :md="24" class="order_detail_item"> 工单内容:设备出现故障{{ orderDetailData.F_WorkOrderContents }} </el-col>
19
+            <el-col :md="24" class="order_detail_item"> 附件图片:
20
+              <div class="imglist">
21
+                <img src="../../../../static/img/birthday.png" />
22
+                <img src="../../../../static/img/birthday.png" />
23
+                <img src="../../../../static/img/birthday.png" />
24
+              </div>
25
+            </el-col>
26
+            <el-col :md="24" class="order_detail_item"> 返修原因:返修原因{{ orderDetailData.F_WorkOrderContents }} </el-col>
27
+          </el-col>
28
+        </el-card>
29
+      </el-col>
30
+    </el-row>
31
+    <el-row :gutter="20">
32
+      <el-col :md="24" class="order_detail_body">
33
+        <el-card shadow="hover">
34
+          <el-col :md="24">
35
+            <el-tabs v-model="activeName" @tab-click="handleClick">
36
+              <el-tab-pane label="处理结果" name="first">
37
+                <el-col :md="24" class="order_detail_content">
38
+                  <el-col :md="8" class="order_detail_item"> 处理部门:总部/设备科/维修部{{ orderDetailData.F_TypeName2 }} </el-col>
39
+                  <el-col :md="8" class="order_detail_item"> 处理人:13241334751(张三) </el-col>
40
+                  <el-col :md="8" class="order_detail_item"> 维修时间:2022-08-15 12:23:22</el-col>
41
+                  <el-col :md="24" class="order_detail_item"> 处理结果:异常结束,没有发现问题{{ orderDetailData.F_WorkOrderContents }}
42
+                  </el-col>
43
+                  <el-col :md="24" class="order_detail_item"> 附件图片:
44
+                    <div class="imglist">
45
+                      <img src="../../../../static/img/birthday.png" />
46
+                      <img src="../../../../static/img/birthday.png" />
47
+                      <img src="../../../../static/img/birthday.png" />
48
+                    </div>
49
+                  </el-col>
50
+                </el-col>
51
+              </el-tab-pane>
52
+              <el-tab-pane label="协作工单" name="second">
53
+                <el-table :data="tableData1" border style="width: 100%">
54
+                  <el-table-column prop="date" label="工单号" align="center">
55
+                  </el-table-column>
56
+                  <el-table-column prop="name" label="内容" align="center">
57
+                  </el-table-column>
58
+                  <el-table-column prop="address" label="协作方式" align="center">
59
+                  </el-table-column>
60
+                  <el-table-column prop="address" label="状态" align="center">
61
+                  </el-table-column>
62
+                  <el-table-column prop="address" label="接单部门" align="center">
63
+                  </el-table-column>
64
+                  <el-table-column prop="address" label="时间" align="center">
65
+                  </el-table-column>
66
+                </el-table>
67
+              </el-tab-pane>
68
+              <el-tab-pane label="工单流程" name="third">
69
+                <el-table :data="tableData1" border style="width: 100%">
70
+                  <el-table-column prop="date" label="操作人" align="center">
71
+                  </el-table-column>
72
+                  <el-table-column prop="name" label="内容" align="center">
73
+                  </el-table-column>
74
+                  <el-table-column prop="address" label="时间" align="center">
75
+                  </el-table-column>
76
+                </el-table>
77
+              </el-tab-pane>
78
+              <el-tab-pane label="维修记录" name="fourth">
79
+                <div v-for="(item,index) in repairList" :key="index">
80
+                  <el-col :md="24" class="order_detail_content">
81
+                    <h1 style="font-size: 20px;">{{item.time}}</h1>
82
+                    <el-col :md="8" class="order_detail_item"> 处理部门:{{ item.deptname }} </el-col>
83
+                    <el-col :md="8" class="order_detail_item"> 处理人:{{item.user}} </el-col>
84
+                    <el-col :md="8" class="order_detail_item"> 维修时间:{{item.repairtime}} </el-col>
85
+                    <el-col :md="24" class="order_detail_item"> 处理结果:{{ item.result }} </el-col>
86
+                    <el-col :md="24" class="order_detail_item"> 相关附件:
87
+                    <div class="imglist">
88
+                      <img :src="item.files" />
89
+                    </div>
90
+                    </el-col>
91
+                  </el-col>
92
+                </div>
93
+              </el-tab-pane>
94
+              <el-tab-pane label="评价" name="fifth">
95
+                <div class="evaluate">
96
+                  <span class="demonstration">服务态度:</span>
97
+                  <el-rate v-model="value1" show-text style="display: inline-block;"></el-rate>
98
+                </div>
99
+                <div class="evaluate">
100
+                  <span class="demonstration">维修质量:</span>
101
+                  <el-rate v-model="value1" show-text style="display: inline-block;"></el-rate>
102
+                </div class="evaluate">
103
+                <div>
104
+                  <el-col :md="24"> 文字评价:一月又一月晕晕晕晕晕 </el-col>
105
+                </div>
106
+              </el-tab-pane>
107
+            </el-tabs>
108
+          </el-col>
109
+        </el-card>
110
+      </el-col>
111
+    </el-row>
112
+  </div>
113
+</template>
114
+
115
+<script>
116
+  import {
117
+    mapGetters
118
+  } from 'vuex'
119
+  import {
120
+    GetOrderDetail,
121
+    GetOrderItem
122
+  } from '@/api/orderManagement/orderList'
123
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
124
+
125
+  export default {
126
+    name: 'Detail',
127
+    components: {
128
+      Pagination
129
+    },
130
+    props: {
131
+      rowid: {
132
+        type: Number,
133
+        default: 0
134
+      },
135
+      layerid: {
136
+        type: String,
137
+        default: ''
138
+      }
139
+    },
140
+    data() {
141
+      return {
142
+        activeName: 'first',
143
+        ChatList: [], // 备注详情列表
144
+        isChatList: false, // 备注列表是否展示
145
+        isFamily: false,
146
+        isSpecial: false,
147
+        isConduit: false,
148
+        orderDetailData: {
149
+          F_CallID: '',
150
+          F_WorkOrderCode: '',
151
+          F_ID: '',
152
+          F_Source: '电话', // 业务类别
153
+          F_Type1: '', // 工单类别
154
+          F_TypeName1: '', // 工单类别
155
+          F_Type2: '', // 工单子类
156
+          F_TypeName2: '', // 工单子类
157
+          F_Type3: '', // 工单三类
158
+          F_TypeName3: '', // 工单三类
159
+          F_Customer: '', // 姓名
160
+          F_Sex: '0', // 性别
161
+          F_Phon: '', // 电话
162
+          F_CusAddress: '', // 家庭住址
163
+          F_IdCard: '', // 身份证号
164
+          F_ServiceItems: '', // 服务项目
165
+          F_Address: '', // 地区
166
+          F_FirstCheckHospital: '', // 首次检查医院
167
+          F_NoduleSize: '', // 肺结节大小
168
+          F_FirstFindTime: '', // 首次发现肺结节时间
169
+          F_Urgency: '0', // 紧急程度
170
+          F_Cathetertype: '', // 置管类型
171
+          F_Catheterdept: '', // 置管科室
172
+          F_Cathetertime: '', // 置管时间
173
+          F_BedNum: '', // 床号
174
+          F_InpatientNum: '', // 住院号
175
+          opt: '', // 处理方式
176
+          cont: '',
177
+          F_WorkOrderContents: '', // 工单内容
178
+          F_DealOpinions: '' // 处理意见
179
+        },
180
+        pageParams: {
181
+          pageindex: 1, // 当前第几页
182
+          pagesize: 5, // 每页几条数据
183
+          total: 0 // 总共多少数据
184
+        },
185
+        workOrderCirculationList: [], // 工单流转
186
+        tableData1: [{
187
+          date: '2016-05-02',
188
+          name: '王小虎',
189
+          address: '上海市普陀区金沙江路 1518 弄'
190
+        }, ],
191
+        repairList: [{
192
+          time: '2022-8-15 12:15:45',
193
+          content: '工单内容维修原因',
194
+          deptname: '设备科',
195
+          user: '1342323445(张三)',
196
+          repairtime: '2022-8-25-01:11:11',
197
+          result: '处理结果',
198
+          files: '../../../../static/img/birthday.png'
199
+        }, {
200
+          time: '2022-8-24 12:15:45',
201
+          content: '维修原因',
202
+          deptname: '总院的设备科',
203
+          user: '88888888(张三)',
204
+          repairtime: '2022-8-25-01:11:11',
205
+          result: '处理结果耶耶耶耶耶耶耶耶耶',
206
+          files: '../../../../static/img/birthday.png'
207
+        }],
208
+        value1: 3
209
+      }
210
+    },
211
+    computed: {
212
+      ...mapGetters(['rolecode'])
213
+    },
214
+    created() {
215
+      if (this.rowid) {
216
+        this.getDetail(this.rowid)
217
+        this.getItem()
218
+      }
219
+    },
220
+    methods: {
221
+      handleClick(tab, event) {
222
+        // console.log(tab, event)
223
+      },
224
+      // 详情
225
+      getDetail(rid) {
226
+        GetOrderDetail(rid).then((response) => {
227
+          const res = response.model
228
+          this.orderDetailData.F_ID = res.F_ID
229
+          this.orderDetailData.F_WorkOrderCode = res.F_WorkOrderCode
230
+          this.orderDetailData.F_Source = res.F_Source // 业务类别
231
+          this.orderDetailData.F_Type1 = res.F_Type1 // 工单类别
232
+          this.orderDetailData.F_TypeName1 = res.typename1 // 工单类别
233
+          this.orderDetailData.F_Type2 = res.F_Type2 // 工单子类
234
+          if (res.F_type2 === 1003) {
235
+            this.isSpecial = true
236
+          } else if (res.F_type2 === 1004) {
237
+            this.isFamily = true
238
+          } else if (res.F_type2 === 1005) {
239
+            this.isConduit = true
240
+          }
241
+          this.orderDetailData.F_TypeName2 = res.typename2 // 工单子类
242
+          this.orderDetailData.F_Type3 = res.F_Type3 // 工单三类
243
+          this.orderDetailData.F_TypeName3 = res.typename3 // 工单三类
244
+          this.orderDetailData.F_Customer = res.F_Customer // 姓名
245
+          this.orderDetailData.F_Sex = res.F_Sex // 性别
246
+          if (res.F_Sex === 0) {
247
+            this.orderDetailData.F_Sex = '男'
248
+          } else if (res.F_Sex === 1) {
249
+            this.orderDetailData.F_Sex = '女'
250
+          }
251
+          this.orderDetailData.F_Phon = res.F_Phon // 电话
252
+          this.orderDetailData.F_CusAddress = res.F_CusAddress // 家庭住址
253
+          this.orderDetailData.F_IdCard = res.F_IdCard // 身份证号
254
+          this.orderDetailData.F_ServiceItems = res.F_ServiceItems // 服务项目
255
+          this.orderDetailData.F_Address = res.F_Address // 地区
256
+          this.orderDetailData.F_FirstCheckHospital = res.F_FirstCheckHospital // 首次检查医院
257
+          this.orderDetailData.F_NoduleSize = res.F_NoduleSize // 肺结节大小
258
+          this.orderDetailData.F_FirstFindTime = res.F_FirstFindTime // 首次发现肺结节时间
259
+          this.orderDetailData.F_Urgency = res.F_Urgency // 紧急程度
260
+          if (res.F_Urgency === 0) {
261
+            this.orderDetailData.F_Urgency = '常规'
262
+          } else if (res.F_Urgency === 1) {
263
+            this.orderDetailData.F_Urgency = '紧急'
264
+          }
265
+          this.orderDetailData.F_Cathetertype = res.F_Cathetertype // 置管类型
266
+          this.orderDetailData.F_Catheterdept = res.F_Catheterdept // 置管科室
267
+          this.orderDetailData.F_Cathetertime = res.F_Cathetertime // 置管时间
268
+          this.orderDetailData.F_BedNum = res.F_BedNum // 床号
269
+          this.orderDetailData.F_InpatientNum = res.F_InpatientNum // 住院号
270
+          this.orderDetailData.opt = res.F_DealType // 处理方式
271
+          this.orderDetailData.F_WorkOrderContents = res.F_WorkOrderContents // 工单内容
272
+          this.orderDetailData.F_DealOpinions = res.F_DealOpinions // 处理意见
273
+        })
274
+      },
275
+      getItem() {
276
+        const params = {
277
+          pageindex: this.pageParams.pageindex, // 第几页
278
+          pagesize: this.pageParams.pagesize, // 每页几条信息
279
+          id: this.rowid
280
+        }
281
+        GetOrderItem(params).then((response) => {
282
+          const res = response.rows
283
+          if (res) {
284
+            this.workOrderCirculationList = res
285
+            this.pageParams.total = response.total
286
+          }
287
+        })
288
+      }
289
+
290
+    }
291
+  }
292
+</script>
293
+
294
+<style rel="stylesheet/scss" lang="scss">
295
+  .order_detail {
296
+    .el-col {
297
+      margin-bottom: 20px;
298
+    }
299
+
300
+    .el-icon-time {
301
+      color: #d81e06;
302
+    }
303
+
304
+    .el-card__header {
305
+      padding-top: 14px;
306
+      padding-bottom: 14px;
307
+      background-color: #f5f5f6;
308
+    }
309
+
310
+    .order_file {
311
+      .el-card__body {
312
+        padding: 22px 0 0 0;
313
+        text-align: center;
314
+      }
315
+    }
316
+
317
+    .order_steps {
318
+      .el-step__icon-inner {
319
+        display: none;
320
+      }
321
+    }
322
+
323
+    .order_record {
324
+      .el-card__body {
325
+        padding: 0;
326
+      }
327
+
328
+      .el-tabs__header {
329
+        padding: 0px 20px;
330
+        background-color: #f5f5f6;
331
+
332
+        .el-tabs__item {
333
+          font-size: 16px;
334
+          height: 47px;
335
+          line-height: 47px;
336
+        }
337
+      }
338
+    }
339
+  }
340
+</style>
341
+
342
+<style rel="stylesheet/scss" lang="scss" scoped>
343
+  .order_detail {
344
+    .order_detail_body {
345
+      margin-bottom: 20px;
346
+
347
+      .round_img {
348
+        width: 90px;
349
+        height: 90px;
350
+        border-radius: 50%;
351
+        overflow: hidden;
352
+        margin: 14px;
353
+
354
+        img {
355
+          width: 100%;
356
+          height: 100%;
357
+        }
358
+      }
359
+
360
+      .title {
361
+        font-size: 20px;
362
+
363
+        .title_icon {
364
+          color: #d81e06;
365
+          font-size: 16px;
366
+          margin-right: 20px;
367
+        }
368
+      }
369
+
370
+      .title_sub {
371
+        font-size: 14px;
372
+        color: #666666;
373
+      }
374
+
375
+      .order_detail_content {
376
+        background-color: #f5f5f6;
377
+        padding-top: 20px;
378
+        color: #191919;
379
+        font-size: 15px;
380
+
381
+        .order_detail_item {
382
+          margin-bottom: 10px;
383
+
384
+          .order_content {
385
+            margin-top: 10px;
386
+          }
387
+
388
+          .order_file {
389
+            position: relative;
390
+            cursor: pointer;
391
+
392
+            .img_mask {
393
+              display: none;
394
+              position: absolute;
395
+              left: 0px;
396
+              top: 0px;
397
+              background-color: rgba(0, 0, 0, 0.3);
398
+              width: 100%;
399
+              height: 22px;
400
+              text-align: right;
401
+              z-index: 1;
402
+
403
+              i {
404
+                font-size: 20px;
405
+                line-height: 22px;
406
+                display: inline-block;
407
+                margin-right: 15px;
408
+                color: #fff;
409
+              }
410
+            }
411
+
412
+            p {
413
+              margin-top: 5px;
414
+              padding-left: 14px;
415
+              padding-right: 14px;
416
+              white-space: nowrap;
417
+              overflow: hidden;
418
+              text-overflow: ellipsis;
419
+            }
420
+
421
+            .file_icon {
422
+              height: 68px;
423
+              line-height: 68px;
424
+              font-size: 68px;
425
+              color: #409eff;
426
+            }
427
+          }
428
+
429
+          .order_file:hover .img_mask {
430
+            display: block;
431
+          }
432
+        }
433
+      }
434
+    }
435
+
436
+    .green {
437
+      color: #00c1de;
438
+    }
439
+
440
+    .done {
441
+      color: #198120;
442
+    }
443
+
444
+    .red {
445
+      color: #d81e06;
446
+    }
447
+
448
+    .yellow {
449
+      color: #e6a23c;
450
+    }
451
+
452
+    .order_steps {
453
+
454
+      // height: 240px;
455
+      .el-step__icon-inner {
456
+        display: none;
457
+      }
458
+    }
459
+
460
+    .tab_body {
461
+      padding: 0 20px 20px 20px;
462
+    }
463
+
464
+    .evaluate {
465
+      margin: 10px;
466
+    }
467
+
468
+    .imglist {
469
+      display: inline-block;
470
+      vertical-align: middle;
471
+    }
472
+
473
+    .imglist img {
474
+      width: 72px;
475
+      height: 72px;
476
+    }
477
+  }
478
+</style>

+ 84 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/evaluate.vue

@@ -0,0 +1,84 @@
1
+<template>
2
+  <div>
3
+    <el-form ref="ruleForm" :model="ruleForm" label-width="80px">
4
+      <el-form-item label="服务态度">
5
+        <el-rate v-model="ruleForm.value" show-text>
6
+        </el-rate>
7
+      </el-form-item>
8
+      <el-form-item label="维修质量">
9
+       <el-rate v-model="ruleForm.value1" show-text>
10
+       </el-rate>
11
+      </el-form-item>
12
+      <el-form-item label="文字评价">
13
+        <el-input type="textarea" maxlength="100" show-word-limit placeholder="请输入文字评价" v-model="ruleForm.remark"></el-input>
14
+      </el-form-item>
15
+      <el-form-item>
16
+        <el-button type="primary" @click="submitForm()">提交</el-button>
17
+      </el-form-item>
18
+    </el-form>
19
+  </div>
20
+</template>
21
+<script>
22
+  import {
23
+    AuditOrder
24
+  } from '@/api/orderManagement/orderList'
25
+  export default {
26
+    props: {
27
+      rowid: {
28
+        type: Number,
29
+        default: 0
30
+      },
31
+      layerid: {
32
+        type: String,
33
+        default: ''
34
+      }
35
+    },
36
+    data() {
37
+      return {
38
+        ruleForm: {
39
+          orderid: '', // id
40
+          value: 3,
41
+          value1: 4,
42
+          remark: ''
43
+        }
44
+      }
45
+    },
46
+    created() {
47
+      console.log(this.rowid)
48
+      if (this.rowid) {
49
+        this.ruleForm.orderid = this.rowid
50
+      }
51
+    },
52
+    methods: {
53
+      submitForm() {
54
+        this.$refs.ruleForm.validate(valid => {
55
+          if (valid) {
56
+            // 添加
57
+            if (!this.ruleForm.F_ID) {
58
+              AuditOrder(this.ruleForm)
59
+                .then((response) => {
60
+                  if (response.state.toLowerCase() === 'success') {
61
+                    this.$parent.$layer.close(this.layerid)
62
+                    this.$parent.getList() // 重新加载父级数据
63
+                    this.$message.success('添加成功!')
64
+                  }
65
+                })
66
+                .catch(() => {
67
+                  this.loading = false
68
+                })
69
+              return
70
+            }
71
+          } else {
72
+            this.$message.error('请输入有效的必填项信息!')
73
+            return false
74
+          }
75
+        })
76
+      }
77
+    }
78
+  }
79
+</script>
80
+<style lang="scss" scoped>
81
+  .form_select {
82
+    width: 100%;
83
+  }
84
+</style>

+ 72 - 20
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

@@ -14,6 +14,11 @@
14 14
       </el-cascader>
15 15
       <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="btn_search">搜索</el-button>
16 16
     </div>
17
+    <el-tabs v-model="activeName" @tab-click="handleClick">
18
+      <el-tab-pane label="全部" name="0" />
19
+      <el-tab-pane label="待处理" name="1" />
20
+      <el-tab-pane label="已处理" name="2" />
21
+    </el-tabs>
17 22
     <el-table v-loading="loading" ref="multipleTable" :data="dataLists" border stripe row-key="F_Id">
18 23
       <el-table-column type="index" label="编号" align="center" fixed width="60" />
19 24
       <el-table-column prop="F_WorkOrderCode" label="工单编号" align="center" min-width="110">
@@ -28,27 +33,27 @@
28 33
       <el-table-column prop="F_WorkOrderContents" label="工单内容" align="center" />
29 34
       <el-table-column prop="Wostate" label="工单状态" align="center" />
30 35
       <el-table-column prop="F_CreateTime" label="创建时间" align="center" />
31
-      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
36
+      <el-table-column label="操作" align="center" class-name="oparate_btn" fixed="right">
32 37
         <template slot-scope="scope">
33
-          <el-button v-permission="'edit_orderList'" :disabled="isDisable" type="text"
34
-            @click="btn_edit(scope.row.F_ID)">编辑</el-button>
35
-          <el-button v-permission="'deal_orderList'" v-if="scope.row.Wostate==='已指派待处理'" :disabled="isDisable"
36
-            type="text" @click="btn_Deal(scope.row.F_ID)">处理</el-button>
37
-          <el-button v-permission="'complete_orderList'" v-if="scope.row.Wostate==='处理中'" :disabled="isDisable"
38
-            type="text" @click="btn_Complete(scope.row.F_ID)">完结</el-button>
39
-          <el-button v-permission="'audit_orderList'" v-if="scope.row.Wostate==='待审核'" :disabled="isDisable" type="text"
40
-            @click="btn_Audit(scope.row.F_ID)">审核</el-button>
41
-          <el-button v-permission="'delete_orderList'" type="text" @click="btn_delete(scope.row.F_ID)">删除</el-button>
38
+          <el-button type="text" @click="btn_selfsolve(scope.row.F_ID)">自行解决</el-button>
39
+          <el-button type="text" @click="btn_rework(scope.row.F_ID)">返工</el-button>
40
+          <el-button type="text" @click="btn_evaluate(scope.row.F_ID)">评价</el-button>
42 41
         </template>
43 42
       </el-table-column>
44 43
     </el-table>
45 44
     <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
46 45
       :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
46
+    <el-dialog top="15%" :title="title" :visible.sync="dialogSelf" width="40%" :show-close="false">
47
+      <el-input type="textarea" maxlength="1000" autosize show-word-limit placeholder="请输入原因" v-model="selfReason"></el-input>
48
+      <span slot="footer" class="dialog-footer">
49
+        <el-button @click="oncancel">取 消</el-button>
50
+        <el-button type="primary" @click="onsure">确 定</el-button>
51
+      </span>
52
+    </el-dialog>
47 53
   </div>
48 54
 </template>
49 55
 
50 56
 <script>
51
-  // import { getDictionaryValueList } from '@/api/commonAPI'
52 57
   import {
53 58
     getOrderTypeDrop
54 59
   } from '@/api/systemSetup/roleSetting/menuSetup'
@@ -64,16 +69,15 @@
64 69
     getOrderTypeList
65 70
   } from '@/api/commonAPI'
66 71
 
67
-  // import { pickerOptions } from '@/utils'
68 72
   import AddOrEditInfOrder from '@/views/orderManage/components/addOrEditInfOrder'
69
-
70
-  // import detail from './detail'
73
+  import detail from '../components/orderDetail.vue'
74
+  import evaluate from './evaluate.vue'
71 75
   // import addAudit from './addAudit'
72 76
   // import orderDeal from './orderDeal'
73 77
   import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
74 78
 
75 79
   export default {
76
-    name: 'OrderList',
80
+    name: 'MySubmit',
77 81
     components: {
78 82
       Pagination
79 83
     },
@@ -99,7 +103,9 @@
99 103
           pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
100 104
           total: 0 // 总共多少数据
101 105
         },
102
-        dataLists: [], // 列表数据数据
106
+        dataLists: [{
107
+          'F_WorkOrderCode': '001'
108
+        }], // 列表数据数据
103 109
         orderstate: [], // 工单状态数据
104 110
         defaultProps: {
105 111
           checkStrictly: true,
@@ -107,8 +113,12 @@
107 113
           label: 'text',
108 114
           value: 'id'
109 115
         },
116
+        activeName: '0',
110 117
         orderData: [],
111
-        subclassData: []
118
+        subclassData: [],
119
+        selfReason:'',
120
+        title:'',
121
+        dialogSelf:false
112 122
       }
113 123
     },
114 124
     created() {
@@ -123,7 +133,10 @@
123 133
       }
124 134
     },
125 135
     methods: {
126
-
136
+      handleClick(res) {
137
+        this.searchData.state = Number(res.name)
138
+        this.getList()
139
+      },
127 140
       getList() {
128 141
         this.loading = true
129 142
         return new Promise((resolve) => {
@@ -141,7 +154,7 @@
141 154
             this.loading = false
142 155
             if (response.state.toLowerCase() === 'success') {
143 156
               this.pageParams.total = response.total
144
-              this.dataLists = response.rows
157
+              // this.dataLists = response.rows
145 158
             }
146 159
           })
147 160
           resolve()
@@ -151,6 +164,37 @@
151 164
         this.pageParams.pageindex = 1
152 165
         this.getList()
153 166
       },
167
+      //自行解决
168
+      btn_selfsolve(id){
169
+        this.title = '异常原因'
170
+        this.dialogSelf = true
171
+      },
172
+      //返工
173
+      btn_rework(id){
174
+        this.title = '返工'
175
+        this.dialogSelf = true
176
+      },
177
+      //评价
178
+      btn_evaluate(id){
179
+        this.$layer.iframe({
180
+          content: {
181
+            content: evaluate, // 传递的组件对象
182
+            parent: this, // 当前的vue对象
183
+            data: {
184
+              rowid: id
185
+            } // props
186
+          },
187
+          area: ['50%', '50%'],
188
+          title: '评价'
189
+        })
190
+      },
191
+      oncancel(){
192
+        this.dialogSelf = false
193
+        this.selfReason = ''
194
+      },
195
+      onsure(){
196
+        this.dialogSelf = false
197
+      },
154 198
       // 编辑
155 199
       btn_edit(operateId) {
156 200
         this.$layer.iframe({
@@ -284,6 +328,9 @@
284 328
       },
285 329
       changeOrder(data) {
286 330
         console.log(data)
331
+        if(!data){
332
+          return;
333
+        }
287 334
         this.searchData.menutypeid = data
288 335
         const params = {
289 336
           pid: data,
@@ -303,5 +350,10 @@
303 350
 </script>
304 351
 
305 352
 <style rel="stylesheet/scss" lang="scss" scoped>
306
-
353
+  /deep/.el-tabs__item {
354
+    width: 185px !important;
355
+    text-align: center;
356
+    font-size: 16px !important;
357
+    font-weight: 600;
358
+  }
307 359
 </style>

+ 360 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/detail - 副本.vue

@@ -0,0 +1,360 @@
1
+<template>
2
+  <div class="order_detail">
3
+    <el-row :gutter="20">
4
+      <el-col :md="24" class="order_detail_body">
5
+        <el-card shadow="hover">
6
+          <el-col :md="21">
7
+            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />工单单号:{{ orderDetailData.F_WorkOrderCode }}</h1>
8
+          </el-col>
9
+          <el-col :md="24" class="order_detail_content">
10
+            <el-col :md="6" class="order_detail_item"> 业务类别:{{ orderDetailData.F_TypeName1 }} </el-col>
11
+            <el-col :md="6" class="order_detail_item"> 工单类别:{{ orderDetailData.F_TypeName2 }} </el-col>
12
+            <el-col :md="6" class="order_detail_item"> 工单子类:{{ orderDetailData.F_TypeName3 }} </el-col>
13
+            <el-col :md="6" class="order_detail_item"> 姓名:{{ orderDetailData.F_Customer }} </el-col>
14
+            <el-col :md="6" class="order_detail_item"> 性别:{{ orderDetailData.F_Sex }} </el-col>
15
+            <el-col :md="6" class="order_detail_item"> 电话:{{ orderDetailData.F_Phon }} </el-col>
16
+            <el-col :md="6" class="order_detail_item"> 身份证号:{{ orderDetailData.F_IdCard }} </el-col>
17
+            <el-col :md="6" class="order_detail_item"> 家庭住址:{{ orderDetailData.F_CusAddress }} </el-col>
18
+            <!-- 家庭预约上门字段 -->
19
+            <el-col v-show="isFamily" :md="6" class="order_detail_item"> 服务项目:{{ orderDetailData.F_ServiceItems }} </el-col>
20
+            <!-- 外聘专家咨询字段 -->
21
+            <el-col v-show="isSpecial" :md="6" class="order_detail_item"> 首次检查医院:{{ orderDetailData.F_FirstCheckHospital }} </el-col>
22
+            <el-col v-show="isSpecial" :md="6" class="order_detail_item"> 肺结节大小:{{ orderDetailData.F_NoduleSize }} </el-col>
23
+            <el-col v-show="isSpecial" :md="6" class="order_detail_item"> 发现时间:{{ orderDetailData.F_FirstFindTime }} </el-col>
24
+            <el-col v-show="isSpecial" :md="6" class="order_detail_item"> 紧急程度:{{ orderDetailData.F_Urgency }} </el-col>
25
+            <el-col v-show="isSpecial" :md="6" class="order_detail_item"> 地区:{{ orderDetailData.F_Address }} </el-col>
26
+            <!-- PICC、中长导管置管 -->
27
+            <el-col v-show="isConduit" :md="6" class="order_detail_item"> 置管类型:{{ orderDetailData.F_Cathetertype }} </el-col>
28
+            <el-col v-show="isConduit" :md="6" class="order_detail_item"> 置管科室:{{ orderDetailData.F_Catheterdept }} </el-col>
29
+            <el-col v-show="isConduit" :md="6" class="order_detail_item"> 置管时间:{{ orderDetailData.F_Cathetertime }} </el-col>
30
+            <el-col v-show="isConduit" :md="6" class="order_detail_item"> 床号:{{ orderDetailData.F_BedNum }} </el-col>
31
+            <el-col v-show="isConduit" :md="6" class="order_detail_item"> 住院号:{{ orderDetailData.F_InpatientNum }} </el-col>
32
+            <!-- 处理内容 -->
33
+            <el-col :md="6" class="order_detail_item"> 工单内容:{{ orderDetailData.F_WorkOrderContents }} </el-col>
34
+            <el-col :md="6" class="order_detail_item"> 处理意见:{{ orderDetailData.F_DealOpinions }} </el-col>
35
+            <el-col :md="6" class="order_detail_item"> 处理方式:{{ orderDetailData.opt }} </el-col>
36
+
37
+        </el-col></el-card>
38
+      </el-col>
39
+    </el-row>
40
+    <el-row :gutter="20">
41
+      <el-col :md="24" class="order_detail_body">
42
+        <el-card shadow="hover">
43
+          <el-col :md="21">
44
+            <h1 class="title">工单流转</h1>
45
+          </el-col>
46
+
47
+          <el-table :data="workOrderCirculationList" border stripe row-key="F_Id">
48
+            <el-table-column prop="F_CreateUser" label="创建人" align="center" min-width />
49
+            <el-table-column prop="F_CreateTime" label="创建时间" align="center" min-width />
50
+            <el-table-column prop="F_OptContent" label="内容" align="center" min-width />
51
+          </el-table>
52
+          <Pagination
53
+            v-show="pageParams.total > 0"
54
+            :total="pageParams.total"
55
+            :page-sizes="[5, 10, 15, 20]"
56
+            :pageindex.sync="pageParams.pageindex"
57
+            :pagesize.sync="pageParams.pagesize"
58
+            class="pagination"
59
+            @pagination="getItem" />
60
+        </el-card>
61
+      </el-col>
62
+    </el-row>
63
+  </div>
64
+</template>
65
+
66
+<script>
67
+import { mapGetters } from 'vuex'
68
+import { GetOrderDetail, GetOrderItem } from '@/api/orderManagement/orderList'
69
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
70
+
71
+export default {
72
+  name: 'Detail',
73
+  components: {
74
+    Pagination
75
+  },
76
+  props: {
77
+    rowid: {
78
+      type: Number,
79
+      default: 0
80
+    },
81
+    layerid: {
82
+      type: String,
83
+      default: ''
84
+    }
85
+  },
86
+  data() {
87
+    return {
88
+      activeName: 'first',
89
+      ChatList: [], // 备注详情列表
90
+      isChatList: false, // 备注列表是否展示
91
+      isFamily: false,
92
+      isSpecial: false,
93
+      isConduit: false,
94
+      orderDetailData: {
95
+        F_CallID: '',
96
+        F_WorkOrderCode: '',
97
+        F_ID: '',
98
+        F_Source: '电话', // 业务类别
99
+        F_Type1: '', // 工单类别
100
+        F_TypeName1: '', // 工单类别
101
+        F_Type2: '', // 工单子类
102
+        F_TypeName2: '', // 工单子类
103
+        F_Type3: '', // 工单三类
104
+        F_TypeName3: '', // 工单三类
105
+        F_Customer: '', // 姓名
106
+        F_Sex: '0', // 性别
107
+        F_Phon: '', // 电话
108
+        F_CusAddress: '', // 家庭住址
109
+        F_IdCard: '', // 身份证号
110
+        F_ServiceItems: '', // 服务项目
111
+        F_Address: '', // 地区
112
+        F_FirstCheckHospital: '', // 首次检查医院
113
+        F_NoduleSize: '', // 肺结节大小
114
+        F_FirstFindTime: '', // 首次发现肺结节时间
115
+        F_Urgency: '0', // 紧急程度
116
+        F_Cathetertype: '', // 置管类型
117
+        F_Catheterdept: '', // 置管科室
118
+        F_Cathetertime: '', // 置管时间
119
+        F_BedNum: '', // 床号
120
+        F_InpatientNum: '', // 住院号
121
+        opt: '', // 处理方式
122
+        cont: '',
123
+        F_WorkOrderContents: '', // 工单内容
124
+        F_DealOpinions: '' // 处理意见
125
+      },
126
+      pageParams: {
127
+        pageindex: 1, // 当前第几页
128
+        pagesize: 5, // 每页几条数据
129
+        total: 0 // 总共多少数据
130
+      },
131
+      workOrderCirculationList: [] // 工单流转
132
+    }
133
+  },
134
+  computed: {
135
+    ...mapGetters(['rolecode'])
136
+  },
137
+  created() {
138
+    if (this.rowid) {
139
+      this.getDetail(this.rowid)
140
+      this.getItem()
141
+    }
142
+  },
143
+  methods: {
144
+    handleClick(tab, event) {
145
+      console.log(tab, event)
146
+    },
147
+    // 详情
148
+    getDetail(rid) {
149
+      GetOrderDetail(rid).then((response) => {
150
+        const res = response.model
151
+        this.orderDetailData.F_ID = res.F_ID
152
+        this.orderDetailData.F_WorkOrderCode = res.F_WorkOrderCode
153
+        this.orderDetailData.F_Source = res.F_Source // 业务类别
154
+        this.orderDetailData.F_Type1 = res.F_Type1 // 工单类别
155
+        this.orderDetailData.F_TypeName1 = res.typename1 // 工单类别
156
+        this.orderDetailData.F_Type2 = res.F_Type2 // 工单子类
157
+        if (res.F_type2 === 1003) {
158
+          this.isSpecial = true
159
+        } else if (res.F_type2 === 1004) {
160
+          this.isFamily = true
161
+        } else if (res.F_type2 === 1005) {
162
+          this.isConduit = true
163
+        }
164
+        this.orderDetailData.F_TypeName2 = res.typename2 // 工单子类
165
+        this.orderDetailData.F_Type3 = res.F_Type3 // 工单三类
166
+        this.orderDetailData.F_TypeName3 = res.typename3 // 工单三类
167
+        this.orderDetailData.F_Customer = res.F_Customer // 姓名
168
+        this.orderDetailData.F_Sex = res.F_Sex // 性别
169
+        if (res.F_Sex === 0) {
170
+          this.orderDetailData.F_Sex = '男'
171
+        } else if (res.F_Sex === 1) {
172
+          this.orderDetailData.F_Sex = '女'
173
+        }
174
+        this.orderDetailData.F_Phon = res.F_Phon // 电话
175
+        this.orderDetailData.F_CusAddress = res.F_CusAddress // 家庭住址
176
+        this.orderDetailData.F_IdCard = res.F_IdCard // 身份证号
177
+        this.orderDetailData.F_ServiceItems = res.F_ServiceItems // 服务项目
178
+        this.orderDetailData.F_Address = res.F_Address // 地区
179
+        this.orderDetailData.F_FirstCheckHospital = res.F_FirstCheckHospital // 首次检查医院
180
+        this.orderDetailData.F_NoduleSize = res.F_NoduleSize // 肺结节大小
181
+        this.orderDetailData.F_FirstFindTime = res.F_FirstFindTime // 首次发现肺结节时间
182
+        this.orderDetailData.F_Urgency = res.F_Urgency // 紧急程度
183
+        if (res.F_Urgency === 0) {
184
+          this.orderDetailData.F_Urgency = '常规'
185
+        } else if (res.F_Urgency === 1) {
186
+          this.orderDetailData.F_Urgency = '紧急'
187
+        }
188
+        this.orderDetailData.F_Cathetertype = res.F_Cathetertype // 置管类型
189
+        this.orderDetailData.F_Catheterdept = res.F_Catheterdept // 置管科室
190
+        this.orderDetailData.F_Cathetertime = res.F_Cathetertime // 置管时间
191
+        this.orderDetailData.F_BedNum = res.F_BedNum // 床号
192
+        this.orderDetailData.F_InpatientNum = res.F_InpatientNum // 住院号
193
+        this.orderDetailData.opt = res.F_DealType // 处理方式
194
+        this.orderDetailData.F_WorkOrderContents = res.F_WorkOrderContents // 工单内容
195
+        this.orderDetailData.F_DealOpinions = res.F_DealOpinions// 处理意见
196
+      })
197
+    },
198
+    getItem() {
199
+      const params = {
200
+        pageindex: this.pageParams.pageindex, // 第几页
201
+        pagesize: this.pageParams.pagesize, // 每页几条信息
202
+        id: this.rowid
203
+      }
204
+      GetOrderItem(params).then((response) => {
205
+        const res = response.rows
206
+        if (res) {
207
+          this.workOrderCirculationList = res
208
+          this.pageParams.total = response.total
209
+        }
210
+      })
211
+    }
212
+
213
+  }
214
+}
215
+</script>
216
+
217
+<style rel="stylesheet/scss" lang="scss">
218
+.order_detail {
219
+  .el-col {
220
+    margin-bottom: 20px;
221
+  }
222
+  .el-icon-time {
223
+    color: #d81e06;
224
+  }
225
+  .el-card__header {
226
+    padding-top: 14px;
227
+    padding-bottom: 14px;
228
+    background-color: #f5f5f6;
229
+  }
230
+  .order_file {
231
+    .el-card__body {
232
+      padding: 22px 0 0 0;
233
+      text-align: center;
234
+    }
235
+  }
236
+  .order_steps {
237
+    .el-step__icon-inner {
238
+      display: none;
239
+    }
240
+  }
241
+  .order_record {
242
+    .el-card__body {
243
+      padding: 0;
244
+    }
245
+    .el-tabs__header {
246
+      padding: 0px 20px;
247
+      background-color: #f5f5f6;
248
+      .el-tabs__item {
249
+        font-size: 16px;
250
+        height: 47px;
251
+        line-height: 47px;
252
+      }
253
+    }
254
+  }
255
+}
256
+</style>
257
+
258
+<style rel="stylesheet/scss" lang="scss" scoped>
259
+.order_detail {
260
+  .order_detail_body {
261
+    margin-bottom: 20px;
262
+    .round_img {
263
+      width: 90px;
264
+      height: 90px;
265
+      border-radius: 50%;
266
+      overflow: hidden;
267
+      margin: 14px;
268
+      img {
269
+        width: 100%;
270
+        height: 100%;
271
+      }
272
+    }
273
+    .title {
274
+      font-size: 20px;
275
+      .title_icon {
276
+        color: #d81e06;
277
+        font-size: 16px;
278
+        margin-right: 20px;
279
+      }
280
+    }
281
+    .title_sub {
282
+      font-size: 14px;
283
+      color: #666666;
284
+    }
285
+    .order_detail_content {
286
+      background-color: #f5f5f6;
287
+      padding-top: 20px;
288
+      color: #4c4c4c;
289
+      font-size: 14px;
290
+      .order_detail_item {
291
+        margin-bottom: 10px;
292
+        .order_content {
293
+          margin-top: 10px;
294
+        }
295
+        .order_file {
296
+          position: relative;
297
+          cursor: pointer;
298
+          .img_mask {
299
+            display: none;
300
+            position: absolute;
301
+            left: 0px;
302
+            top: 0px;
303
+            background-color: rgba(0, 0, 0, 0.3);
304
+            width: 100%;
305
+            height: 22px;
306
+            text-align: right;
307
+            z-index: 1;
308
+            i {
309
+              font-size: 20px;
310
+              line-height: 22px;
311
+              display: inline-block;
312
+              margin-right: 15px;
313
+              color: #fff;
314
+            }
315
+          }
316
+          p {
317
+            margin-top: 5px;
318
+            padding-left: 14px;
319
+            padding-right: 14px;
320
+            white-space: nowrap;
321
+            overflow: hidden;
322
+            text-overflow: ellipsis;
323
+          }
324
+          .file_icon {
325
+            height: 68px;
326
+            line-height: 68px;
327
+            font-size: 68px;
328
+            color: #409eff;
329
+          }
330
+        }
331
+        .order_file:hover .img_mask {
332
+          display: block;
333
+        }
334
+      }
335
+    }
336
+  }
337
+  .green {
338
+    color: #00c1de;
339
+  }
340
+  .done {
341
+    color: #198120;
342
+  }
343
+  .red {
344
+    color: #d81e06;
345
+  }
346
+  .yellow {
347
+    color: #e6a23c;
348
+  }
349
+  .order_steps {
350
+    // height: 240px;
351
+    .el-step__icon-inner {
352
+      display: none;
353
+    }
354
+  }
355
+
356
+  .tab_body {
357
+    padding: 0 20px 20px 20px;
358
+  }
359
+}
360
+</style>

+ 20 - 15
CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -4,23 +4,14 @@
4 4
       <el-date-picker v-model="searchData.searchTime" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd"
5 5
         align="left" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="medium"/>
6 6
       <el-input v-model="searchData.keywords" placeholder="请输入关键字" class="filter-item" size="medium"/>
7
-    <!--  <el-select v-model="searchData.type" clearable placeholder="请选择工单类别" size="medium">
8
-        <el-option v-for="item in secondOrderData" :key="item.fid" :label="item.fname" :value="item.fid"
9
-          class="filter-item" />
10
-      </el-select> -->
11 7
       <el-select v-model="searchData.type" clearable placeholder="请选择业务类别" size="medium" @change="changeOrder">
12 8
         <el-option v-for="item in orderData" :key="item.id" :label="item.text" :value="item.id" />
13 9
       </el-select>
14
-      <!-- <el-select v-model="searchData.state" class="form_select" filterable clearable placeholder="请选择工单状态" size="medium">
15
-        <el-option v-for="item in orderstate" :key="item.StateId" :label="item.StateRemark" :value="item.StateId"
16
-          class="filter-item" />
17
-      </el-select> -->
18 10
       <el-cascader v-model="searchData.orderids" size="medium" placeholder="请选择工单类别" :options="subclassData"
19 11
         :props="defaultProps" ref="cascader" filterable clearable @change="handleChange">
20 12
       </el-cascader>
21 13
       <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="btn_search">搜索</el-button>
22 14
     </div>
23
-
24 15
     <el-table v-loading="loading" ref="multipleTable" :data="dataLists" border stripe row-key="F_Id">
25 16
       <el-table-column type="index" label="编号" align="center" fixed width="60" />
26 17
       <el-table-column prop="F_WorkOrderCode" label="工单编号" align="center" min-width="110">
@@ -35,7 +26,7 @@
35 26
       <el-table-column prop="F_WorkOrderContents" label="工单内容" align="center" />
36 27
       <el-table-column prop="Wostate" label="工单状态" align="center" />
37 28
       <el-table-column prop="F_CreateTime" label="创建时间" align="center" />
38
-      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
29
+      <el-table-column label="操作" align="center" class-name="oparate_btn" fixed="right">
39 30
         <template slot-scope="scope">
40 31
           <el-button v-permission="'edit_orderList'" :disabled="isDisable" type="text"
41 32
             @click="btn_edit(scope.row.F_ID)">编辑</el-button>
@@ -67,11 +58,12 @@
67 58
   import {
68 59
     getOrderTypeList
69 60
   } from '@/api/commonAPI'
70
-
61
+  import {
62
+    getOrderTypeDrop
63
+  } from '@/api/systemSetup/roleSetting/menuSetup'
71 64
   // import { pickerOptions } from '@/utils'
72 65
   import AddOrEditInfOrder from '@/views/orderManage/components/addOrEditInfOrder'
73
-
74
-  import detail from './detail'
66
+  import detail from '../components/orderDetail.vue'
75 67
   import addAudit from './addAudit'
76 68
   import orderDeal from './orderDeal'
77 69
   import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
@@ -103,7 +95,17 @@
103 95
           pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
104 96
           total: 0 // 总共多少数据
105 97
         },
106
-        dataLists: [], // 列表数据数据
98
+        dataLists: [{
99
+          'F_WorkOrderCode':'001'
100
+        }], // 列表数据数据
101
+        defaultProps: {
102
+          checkStrictly: true,
103
+          children: 'children',
104
+          label: 'text',
105
+          value: 'id'
106
+        },
107
+        orderData:[],
108
+        subclassData:[],
107 109
         orderstate: [] // 工单状态数据
108 110
       }
109 111
     },
@@ -137,7 +139,7 @@
137 139
             this.loading = false
138 140
             if (response.state.toLowerCase() === 'success') {
139 141
               this.pageParams.total = response.total
140
-              this.dataLists = response.rows
142
+              // this.dataLists = response.rows
141 143
             }
142 144
           })
143 145
           resolve()
@@ -280,6 +282,9 @@
280 282
       },
281 283
       changeOrder(data) {
282 284
         console.log(data)
285
+        if(!data){
286
+          return;
287
+        }
283 288
         this.searchData.menutypeid = data
284 289
         const params = {
285 290
           pid: data,

+ 15 - 6
CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/department/component/addOrEdit.vue

@@ -44,10 +44,10 @@ export default {
44 44
       type: String,
45 45
       default: ''
46 46
     },
47
-    deptid:{
48
-      type: String,
49
-      default: ''
50
-    },
47
+    // deptid:{
48
+    //   type: String,
49
+    //   default: ''
50
+    // },
51 51
     layerid: {
52 52
       type: String,
53 53
       default: ''
@@ -66,6 +66,8 @@ export default {
66 66
       loading: false,
67 67
       deptid:[],
68 68
       ruleForm: {
69
+        id:this.rowid,
70
+        DeptId:'',
69 71
         hosid:'',
70 72
         pid:'',
71 73
         name: '' ,// 分类名称 name
@@ -94,7 +96,7 @@ export default {
94 96
   },
95 97
   created() {
96 98
     this.getDeptment() // 部门
97
-    if(this.deptid){
99
+    if(this.rowid){
98 100
       this.getTypeDetails()
99 101
     }
100 102
     // if (this.rowid) {
@@ -107,16 +109,21 @@ export default {
107 109
   methods: {
108 110
     // 获取菜单详情
109 111
     getTypeDetails() {
110
-      getTypeDetail(this.deptid).then((response) => {
112
+      getTypeDetail(this.rowid).then((response) => {
111 113
         if (response.state.toLowerCase() === 'success') {
112 114
           const res = response.data
115
+          this.ruleForm.id = res.F_DeptId
113 116
           this.ruleForm.pid = res.F_ParentId // 父节点id
114 117
           this.ruleForm.name = res.F_DeptName // 分类名称
115 118
           this.ruleForm.sort = res.F_Sort // 排序
116 119
           this.ruleForm.code = res.F_DeptCode//编码
117 120
           this.ruleForm.officeTelephone = res.F_OfficeTelephone//电话
118 121
           this.ruleForm.location = res.F_Location//位置
122
+          this.ruleForm.DeptId = res.F_DeptId.toString() // 所属部门Number(res.F_DeptId)
119 123
           const levelid = response.data.F_ParentId
124
+          this.deptid = this.$store.getters.deptmap[parseInt(res.F_DeptId)].ids
125
+          console.log(this.deptid)
126
+          this.ruleForm.hosid = this.deptid[0]
120 127
         }
121 128
       })
122 129
     },
@@ -174,6 +181,8 @@ export default {
174 181
                 this.$parent.$layer.close(this.layerid)
175 182
                 this.$parent.getDepList(this.listPid) // 重新加载父级数据this.listPid
176 183
                 this.$message.success('恭喜你,编辑成功!')
184
+                this.$parent.getTreeList()
185
+                // this.$parent.handleNodeClick(this.ruleForm.id)
177 186
               }
178 187
             })
179 188
             .catch(() => {

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/department/index.vue

@@ -196,7 +196,7 @@
196 196
             content: addOrEditDepartment, // 传递的组件对象
197 197
             parent: this, // 当前的vue对象
198 198
             data: {
199
-              deptid:this.selectdeptid
199
+              rowid:this.selectdeptid.toString()
200 200
             } // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
201 201
           },
202 202
           area: ['50%', '55%'],

+ 5 - 3
CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/addOrEdit.vue

@@ -220,7 +220,7 @@ export default {
220 220
       seatFlag: false, // 话务标识
221 221
       checkPass: '', // 确认密码
222 222
       seatOptions: [],
223
-      deptid: ['1', '2002'],
223
+      deptid: [],
224 224
       ruleForm: {
225 225
         // Usercode: '',
226 226
         Username: '',
@@ -358,14 +358,15 @@ export default {
358 358
           this.ruleForm.Phon = res.F_Telephone // 电话
359 359
           this.ruleForm.companyphone = res.F_WorkPhone// 公司电话
360 360
           this.ruleForm.job = res.F_Job// 职务
361
-          // this.ruleForm.DeptId = res.F_DeptId//部门id
362
-          this.ruleForm.DeptId = res.F_DeptName// 部门name
361
+          // this.ruleForm.DeptId = res.F_DeptName// 部门name
363 362
           this.ruleForm.address = res.F_HomeAddress
364 363
           this.ruleForm.sex = res.F_Sex && res.F_Sex + '' //
365 364
           this.ruleForm.Remark = res.F_Remark
366 365
           this.ruleForm.IsSeat = res.F_SeatFlag.toString()
367 366
           this.ruleForm.SeatGroup = res.F_SeatGroup // 坐席组id
368 367
           this.seatFlag = res.F_SeatFlag
368
+          console.log(this.$store.getters.deptmap[parseInt(res.F_DeptId)].ids,'8888888')
369
+          this.deptid = this.$store.getters.deptmap[parseInt(res.F_DeptId)].ids
369 370
         }
370 371
       })
371 372
     },
@@ -412,6 +413,7 @@ export default {
412 413
     },
413 414
     getDeptid(data) {
414 415
       console.log(data, '999999')
416
+      this.ruleForm.DeptId = data[data.length-1]
415 417
     }
416 418
   }
417 419
 }

+ 7 - 7
CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/btnOperation/index.vue

@@ -97,13 +97,13 @@
97 97
           this.ids.push(this.selectArr[i].F_Id)
98 98
         }
99 99
       },
100
-      formtDept(row, column) {
101
-        const deptid = row[column.property].trim()
102
-        if (deptid) {
103
-          return this.$store.getters.deptmap[parseInt(deptid)].text
104
-        }
105
-        return ''
106
-      },
100
+      // formtDept(row, column) {
101
+      //   const deptid = row[column.property].trim()
102
+      //   if (deptid) {
103
+      //     return this.$store.getters.deptmap[parseInt(deptid)].text
104
+      //   }
105
+      //   return ''
106
+      // },
107 107
       btn_search_task() {
108 108
         if (this.searchData.menutype == 0) {
109 109
           this.$message.warning('请选择工单类别')