Selaa lähdekoodia

1测试问题

liuzhihui 3 vuotta sitten
vanhempi
commit
8ef6ab8b05
19 muutettua tiedostoa jossa 878 lisäystä ja 809 poistoa
  1. 8 0
      CallCenterWeb.UI/RMYY/src/api/vehicleDispatch/vehicleScheduling.js
  2. 2 2
      CallCenterWeb.UI/RMYY/src/components/button/orderList.vue
  3. 1 2
      CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue
  4. 383 423
      CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue
  5. 22 0
      CallCenterWeb.UI/RMYY/src/utils/fieldsData.js
  6. 0 1
      CallCenterWeb.UI/RMYY/src/views/callScreen/components/drugList.vue
  7. 1 1
      CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue
  8. 1 1
      CallCenterWeb.UI/RMYY/src/views/customerManagement/customerList/components/addOrEdit.vue
  9. 3 3
      CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue
  10. 315 303
      CallCenterWeb.UI/RMYY/src/views/orderManage/components/askdetail.vue
  11. 29 10
      CallCenterWeb.UI/RMYY/src/views/reportForm/dayWeekForm/index.vue
  12. 54 6
      CallCenterWeb.UI/RMYY/src/views/reportForm/deptTransfer/index.vue
  13. 0 30
      CallCenterWeb.UI/RMYY/src/views/reportForm/handymanForm/index.vue
  14. 2 1
      CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/roleSetup/index.vue
  15. 2 0
      CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/index.vue
  16. 5 3
      CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/dataDictionary/index.vue
  17. 4 3
      CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/addOrEdit.vue
  18. 1 1
      CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/index.vue
  19. 45 19
      CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingReport/index.vue

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

@@ -7,6 +7,14 @@ export function getCarList(params) {
7 7
     params
8 8
   })
9 9
 }
10
+// 获取车辆类型
11
+export function getCarType(params) {
12
+  return request({
13
+    url: 'Dictionary/GetDicValueList',
14
+    method: 'get',
15
+    params
16
+  })
17
+}
10 18
 // 获取司机
11 19
 export function getCarUserList(params) {
12 20
   return request({

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

@@ -795,8 +795,8 @@ export default {
795 795
       },
796 796
       appointmentForm: {
797 797
         isover: 1,
798
-        isvisit: '',
799
-        communicate: '',
798
+        isvisit: '0',
799
+        communicate: '0',
800 800
         cont: ''
801 801
       },
802 802
       consumablesForm: {

+ 1 - 2
CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -584,11 +584,9 @@ export default {
584 584
     this.getbeds()
585 585
     this.getbiaoben()
586 586
     this.getdrugs()
587
-    // console.log(this.iswomanage)
588 587
     if (this.wid) {
589 588
       this.butIsDisabled = true
590 589
       this.getDetail()
591
-      // console.log(this.iswomanage)
592 590
       if (this.iswomanage === '2') {
593 591
         this.butIsDisabledMyList = true
594 592
       }
@@ -882,6 +880,7 @@ export default {
882 880
                   this.$parent.$layer.closeAll()
883 881
                   // this.$parent.$layer.close(this.layerid)
884 882
                   // this.$parent.getList() // 重新加载父级数据
883
+                  this.$refs.ruleForm.resetFields()
885 884
                   this.$message.success('恭喜你,添加成功!')
886 885
                   this.usercodeSearch = ''
887 886
                 }

+ 383 - 423
CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -1,11 +1,6 @@
1 1
 <template>
2 2
   <div v-loading="loading">
3
-    <el-form
4
-      ref="ruleForm"
5
-      :model="ruleForm"
6
-      :rules="rules"
7
-      label-width="150px"
8
-    >
3
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px">
9 4
       <el-col :span="24">
10 5
         <!-- <el-row v-if="wocode!=''">
11 6
           <el-col :span="24">
@@ -31,18 +26,9 @@
31 26
           </el-col>
32 27
           <el-col :span="12">
33 28
             <el-form-item label="申请人" prop="needman">
34
-              <el-select
35
-                v-model="ruleForm.needman"
36
-                placeholder="请选择申请人"
37
-                style="width: 100%"
38
-                @change="changeRepairman"
39
-              >
40
-                <el-option
41
-                  v-for="item in repairman"
42
-                  :key="item.usercode"
43
-                  :label="item.username"
44
-                  :value="item.usercode"
45
-                />
29
+              <el-select v-model="ruleForm.needman" placeholder="请选择申请人" style="width: 100%" @change="changeRepairman">
30
+                <el-option v-for="item in repairman" :key="item.usercode" :label="item.username"
31
+                  :value="item.usercode" />
46 32
               </el-select>
47 33
             </el-form-item>
48 34
           </el-col>
@@ -56,12 +42,8 @@
56 42
           <el-col :span="12">
57 43
             <el-form-item label="车辆要求" prop="cartype">
58 44
               <el-select v-model="ruleForm.cartype" style="width: 100%">
59
-                <el-option
60
-                  v-for="(item, index) in carArr"
61
-                  :key="index"
62
-                  :label="item.F_Name"
63
-                  :value="item.F_DictionaryValueId"
64
-                />
45
+                <el-option v-for="(item, index) in carArr" :key="index" :label="item.F_Name"
46
+                  :value="item.F_DictionaryValueId" />
65 47
               </el-select>
66 48
             </el-form-item>
67 49
           </el-col>
@@ -69,36 +51,24 @@
69 51
         <el-row>
70 52
           <el-col :span="12">
71 53
             <el-form-item label="出发地点" prop="startplace">
72
-              <el-input
73
-                v-model="ruleForm.startplace"
74
-                placeholder="请输入出发地点"
75
-              />
54
+              <el-input v-model="ruleForm.startplace" placeholder="请输入出发地点" />
76 55
             </el-form-item>
77 56
           </el-col>
78 57
           <el-col :span="12">
79 58
             <el-form-item label="目的地" prop="endplace">
80
-              <el-input
81
-                v-model="ruleForm.endplace"
82
-                placeholder="请输入目的地"
83
-              />
59
+              <el-input v-model="ruleForm.endplace" placeholder="请输入目的地" />
84 60
             </el-form-item>
85 61
           </el-col>
86 62
         </el-row>
87 63
         <el-row>
88 64
           <el-col :span="24">
89 65
             <el-form-item label="发车时间" prop="usertime">
90
-              <el-date-picker
91
-                v-model="ruleForm.usertime"
92
-                style="width: 100%"
93
-                value-format="yyyy-MM-dd HH:mm:ss"
94
-                format="yyyy-MM-dd HH:mm:ss"
95
-                type="datetime"
96
-                placeholder="选择发车时间"
97
-              />
66
+              <el-date-picker v-model="ruleForm.usertime" style="width: 100%" value-format="yyyy-MM-dd HH:mm:ss"
67
+                format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择发车时间" />
98 68
             </el-form-item>
99 69
           </el-col>
100 70
         </el-row>
101
-        <el-row v-if="ruleForm.type2Arr[0] == 9017">
71
+        <el-row v-if=" worktypeInfo === 'cldd_xsezy'">
102 72
           <el-col :span="24">
103 73
             <el-form-item label="是否出生" prop="birth">
104 74
               <el-radio v-model="ruleForm.birth" :label="0">否</el-radio>
@@ -109,11 +79,7 @@
109 79
         <el-row>
110 80
           <el-col :span="24">
111 81
             <el-form-item label="工单内容" prop="content">
112
-              <el-input
113
-                v-model="ruleForm.content"
114
-                type="textarea"
115
-                placeholder="请输入工单内容"
116
-              />
82
+              <el-input v-model="ruleForm.content" type="textarea" placeholder="请输入工单内容" />
117 83
             </el-form-item>
118 84
           </el-col>
119 85
         </el-row>
@@ -137,423 +103,417 @@
137 103
 </template>
138 104
 
139 105
 <script>
140
-import {
141
-  // getList,
142
-  getModelDetail,
143
-  getAddWorkOrder,
144
-  getUpdateWorkOrder
145
-} from '@/api/vehicleDispatch/vehicleScheduling.js'
146
-import { getOrderTypeList } from '@/api/commonAPI.js'
147
-// import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
148
-import { getUserMsg } from '@/api/orderManagement/orderList'
149
-import { getCartype } from '@/api/vehicleDispatch/vehicleManagement'
150
-import { GetPerson } from '@/api/commonAPI'
151
-export default {
152
-  name: 'AddOrEdit',
153
-  props: {
154
-    orderTypeData: {
155
-      type: Object,
156
-      default() {
157
-        return {}
158
-      }
159
-    },
160
-    callid: {
161
-      type: String,
162
-      default: ''
163
-    },
164
-    rowid: {
165
-      type: String,
166
-      default: ''
167
-    },
168
-    wid: {
169
-      type: String,
170
-      default: ''
171
-    },
172
-    fid: {
173
-      type: String,
174
-      default: ''
175
-    },
176
-    wocode: {
177
-      type: String,
178
-      default: ''
179
-    },
180
-    layerid: {
181
-      type: String,
182
-      default: ''
183
-    },
184
-    iswomanage: {
185
-      type: String,
186
-      default: ''
187
-    }
188
-  },
189
-  data() {
190
-    return {
191
-      cid: '',
192
-      typeList: [],
193
-      carArr: [],
194
-      repairman: [], // 申请人数据
195
-      sourceList: [
196
-        {
197
-          value: '电话',
198
-          label: '电话'
199
-        },
200
-        {
201
-          value: '电脑',
202
-          label: '电脑'
203
-        },
204
-        {
205
-          value: '微信',
206
-          label: '微信'
106
+  import {
107
+    // getList,
108
+    getModelDetail,
109
+    getAddWorkOrder,
110
+    getUpdateWorkOrder
111
+  } from '@/api/vehicleDispatch/vehicleScheduling.js'
112
+  import {
113
+    getOrderTypeList
114
+  } from '@/api/commonAPI.js'
115
+  // import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
116
+  import {
117
+    getUserMsg
118
+  } from '@/api/orderManagement/orderList'
119
+  import {
120
+    getCartype
121
+  } from '@/api/vehicleDispatch/vehicleManagement'
122
+  import {
123
+    GetPerson
124
+  } from '@/api/commonAPI'
125
+  export default {
126
+    name: 'AddOrEdit',
127
+    props: {
128
+      orderTypeData: {
129
+        type: Object,
130
+        default () {
131
+          return {}
207 132
         }
208
-      ],
209
-      hospitalsParam: {
210
-        id: 0,
211
-        name: ''
212 133
       },
213
-      departmentsParam: {
214
-        id: 0,
215
-        name: ''
134
+      callid: {
135
+        type: String,
136
+        default: ''
137
+      },
138
+      rowid: {
139
+        type: String,
140
+        default: ''
141
+      },
142
+      wid: {
143
+        type: String,
144
+        default: ''
216 145
       },
217
-      repairmanParam: {
218
-        id: 0,
219
-        name: ''
146
+      fid: {
147
+        type: String,
148
+        default: ''
220 149
       },
221
-      rules: {
222
-        type: [
150
+      wocode: {
151
+        type: String,
152
+        default: ''
153
+      },
154
+      layerid: {
155
+        type: String,
156
+        default: ''
157
+      },
158
+      iswomanage: {
159
+        type: String,
160
+        default: ''
161
+      }
162
+    },
163
+    data() {
164
+      return {
165
+        worktypeInfo: '',
166
+        cid: '',
167
+        typeList: [],
168
+        carArr: [],
169
+        repairman: [], // 申请人数据
170
+        sourceList: [{
171
+            value: '电话',
172
+            label: '电话'
173
+          },
223 174
           {
224
-            required: true,
225
-            message: '请选择',
226
-            trigger: 'change'
175
+            value: '电脑',
176
+            label: '电脑'
177
+          },
178
+          {
179
+            value: '微信',
180
+            label: '微信'
227 181
           }
228 182
         ],
229
-        deptid: [
230
-          {
183
+        hospitalsParam: {
184
+          id: 0,
185
+          name: ''
186
+        },
187
+        departmentsParam: {
188
+          id: 0,
189
+          name: ''
190
+        },
191
+        repairmanParam: {
192
+          id: 0,
193
+          name: ''
194
+        },
195
+        rules: {
196
+          type: [{
231 197
             required: true,
232 198
             message: '请选择',
233 199
             trigger: 'change'
234
-          }
235
-        ],
236
-        needman: [
237
-          {
200
+          }],
201
+          deptid: [{
238 202
             required: true,
239 203
             message: '请选择',
240 204
             trigger: 'change'
241
-          }
242
-        ],
243
-        cartype: [
244
-          {
205
+          }],
206
+          needman: [{
245 207
             required: true,
246 208
             message: '请选择',
247 209
             trigger: 'change'
248
-          }
249
-        ],
250
-        // usertime: [{
251
-        //   type: 'string',
252
-        //   required: true,
253
-        //   message: '请选择',
254
-        //   trigger: 'change'
255
-        // }],
256
-        phon: [
257
-          {
210
+          }],
211
+          cartype: [{
258 212
             required: true,
259
-            message: '请输入联系电话',
260
-            trigger: 'blur'
261
-          },
262
-          {
263
-            pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
264
-            message: '请输入正确的电话号码或者固话号码',
265
-            trigger: 'blur'
266
-          }
267
-        ],
268
-        startplace: [
269
-          {
213
+            message: '请选择',
214
+            trigger: 'change'
215
+          }],
216
+          // usertime: [{
217
+          //   type: 'string',
218
+          //   required: true,
219
+          //   message: '请选择',
220
+          //   trigger: 'change'
221
+          // }],
222
+          phon: [{
223
+              required: true,
224
+              message: '请输入联系电话',
225
+              trigger: 'blur'
226
+            },
227
+            {
228
+              pattern: /^((0\d{2,3}-\d{5,8})|(1[345789]\d{9}))$/,
229
+              message: '请输入正确的电话号码或者固话号码',
230
+              trigger: 'blur'
231
+            }
232
+          ],
233
+          startplace: [{
270 234
             required: true,
271 235
             message: '请输入',
272 236
             trigger: 'blur'
273
-          }
274
-        ],
275
-        endplace: [
276
-          {
237
+          }],
238
+          endplace: [{
277 239
             required: true,
278 240
             message: '请输入',
279 241
             trigger: 'blur'
280
-          }
281
-        ],
282
-        content: [
283
-          {
242
+          }],
243
+          content: [{
284 244
             required: true,
285 245
             message: '请输入',
286 246
             trigger: 'blur'
287
-          }
288
-        ]
289
-      },
290
-      ruleForm: {
291
-        F_ID: '',
292
-        startplace: '',
293
-        endplace: '',
294
-        source: '',
295
-        hosid: '', // 院区id
296
-        hosname: '', // 院区id
297
-        deptid: '', // 申请科室id
298
-        deptname: '', // 申请科室名称
299
-        usercode: '', // 申请人编码
300
-        username: '', //	申请人
301
-        needman: '',
302
-        birth: '',
303
-        phon: '',
304
-        type: '',
305
-        cartype: '',
306
-        F_CarMessage: '',
307
-        remark: '',
308
-        content: '',
309
-        EmergencyTypes: '一般',
310
-        type2Arr: []
311
-      },
312
-      deptid: [],
313
-      usercodeSearch: '',
314
-      loading: false
315
-    }
316
-  },
317
-  watch: {
318
-    'orderTypeData.F_Type2': function() {
319
-      console.log(this.orderTypeData.type2Arr)
320
-      this.ruleForm.type2Arr = this.orderTypeData.type2Arr
321
-      // this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
322
-      // this.ruleForm.identification = this.orderTypeData.identification
323
-    }
324
-  },
325
-  created() {
326
-    this.cid = this.callid
327
-    if (!this.cid) {
328
-      this.cid = window.localStorage.getItem('callidSave')
329
-    }
330
-    this.getTypeOrder()
331
-    this.getCarlist()
332
-    if (this.wocode) {
333
-      this.wocode = this.wocode
334
-      this.getDetail('0')
335
-    }
336
-    if (this.wid) {
337
-      this.wocode = this.wid
338
-      this.getDetail('0')
339
-    }
340
-    if (this.iswomanage === '1') {
341
-      const dept = this.$store.getters.teamId
342
-      this.deptid = this.$store.getters.deptmap[parseInt(dept)].ids
343
-      this.ruleForm.hosid = this.$store.getters.deptmap[parseInt(dept)].ids[0]
344
-      this.ruleForm.deptid = dept
345
-      this.getRepairman(dept)
346
-      this.ruleForm.needman = this.$store.getters.usercode
347
-      this.ruleForm.phon = this.$store.getters.mobile
348
-    }
349
-  },
350
-  methods: {
351
-    getUserData() {
352
-      const params = {
353
-        usercode: this.usercodeSearch
247
+          }]
248
+        },
249
+        ruleForm: {
250
+          F_ID: '',
251
+          startplace: '',
252
+          endplace: '',
253
+          source: '',
254
+          hosid: '', // 院区id
255
+          hosname: '', // 院区id
256
+          deptid: '', // 申请科室id
257
+          deptname: '', // 申请科室名称
258
+          usercode: '', // 申请人编码
259
+          username: '', //	申请人
260
+          needman: '',
261
+          birth: '',
262
+          phon: '',
263
+          type: '',
264
+          cartype: '',
265
+          F_CarMessage: '',
266
+          remark: '',
267
+          content: '',
268
+          EmergencyTypes: '一般',
269
+          type2Arr: []
270
+        },
271
+        deptid: [],
272
+        usercodeSearch: '',
273
+        loading: false
354 274
       }
355
-      getUserMsg(params).then(res => {
356
-        const data = res.data
357
-        this.ruleForm.deptid = data.F_DeptId
358
-        this.deptid = this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids
359
-        this.ruleForm.hosid = this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids[0]
360
-        this.getRepairman(data.F_DeptId)
361
-        this.ruleForm.needman = data.F_UserCode
362
-        this.ruleForm.phon = data.F_Telephone
363
-      })
364
-    },
365
-    // 获取申请人数据
366
-    getRepairman(id) {
367
-      return new Promise((resolve) => {
368
-        const params = {
369
-          deptid: id // 字典管理的工单标识
370
-        }
371
-        GetPerson(params).then((res) => {
372
-          this.repairman = res.rows
373
-        })
374
-        resolve()
375
-      })
376 275
     },
377
-    // 申请人
378
-    changeRepairman(data) {
379
-      this.ruleForm.needman = data
380
-      const user = this.repairman.find((o) => {
381
-        return o.usercode === data.toString()
382
-      })
383
-      if (user) {
384
-        this.ruleForm.phon = user.usertelphone
276
+    watch: {
277
+      'orderTypeData.F_Type2': function() {
278
+        console.log(this.orderTypeData.type2Arr)
279
+        this.ruleForm.type2Arr = this.orderTypeData.type2Arr
280
+        this.worktypeInfo = this.$store.getters.workTypeMap[parseInt(this.orderTypeData.type2Arr[0])].tag
281
+        // this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
282
+        // this.ruleForm.identification = this.orderTypeData.identification
385 283
       }
386 284
     },
387
-    getCarlist() {
388
-      const params = {
389
-        Flag: 'CLLX',
390
-        Name: ''
285
+    created() {
286
+      this.cid = this.callid
287
+      if (!this.cid) {
288
+        this.cid = window.localStorage.getItem('callidSave')
391 289
       }
392
-      getCartype(params).then((res) => {
393
-        this.carArr = res.rows
394
-      })
395
-    },
396
-    getTypeOrder() {
397
-      const params = {
398
-        pid: 2,
399
-        typeid: 4000
290
+      this.getTypeOrder()
291
+      this.getCarlist()
292
+      if (this.wocode) {
293
+        this.wocode = this.wocode
294
+        this.getDetail('0')
295
+      }
296
+      if (this.wid) {
297
+        this.wocode = this.wid
298
+        this.getDetail('0')
299
+      }
300
+      if (this.iswomanage === '1') {
301
+        const dept = this.$store.getters.teamId
302
+        this.deptid = this.$store.getters.deptmap[parseInt(dept)].ids
303
+        this.ruleForm.hosid = this.$store.getters.deptmap[parseInt(dept)].ids[0]
304
+        this.ruleForm.deptid = dept
305
+        this.getRepairman(dept)
306
+        this.ruleForm.needman = this.$store.getters.usercode
307
+        this.ruleForm.phon = this.$store.getters.mobile
400 308
       }
401
-      getOrderTypeList(params.pid, params.typeid).then((res) => {
402
-        this.typeList = res.rows
403
-      })
404
-    },
405
-    getDeptid(data) {
406
-      this.ruleForm.hosid = data[0]
407
-      this.ruleForm.deptid = data[data.length - 1]
408
-      this.deptid = data
409
-      this.getRepairman(data[data.length - 1])
410 309
     },
411
-    submitForm() {
412
-      this.$refs.ruleForm.validate((valid) => {
413
-        if (valid) {
414
-          // 添加
415
-          if (!this.wid) {
416
-            const datas = {
417
-              callid: this.cid,
418
-              LeaveRecordId: this.fid,
419
-              type: this.orderTypeData.type2Arr[
420
-                this.orderTypeData.type2Arr.length - 1
421
-              ],
422
-              hosid: this.ruleForm.hosid, //	院区id
423
-              detpid: this.ruleForm.deptid, //	申请科室id
424
-              startplace: this.ruleForm.startplace,
425
-              endplace: this.ruleForm.endplace,
426
-              needman: this.ruleForm.needman, //	申请人
427
-              phon: this.ruleForm.phon,
428
-              cartype: this.ruleForm.cartype,
429
-              usertime: this.ruleForm.usertime,
430
-              birth: this.ruleForm.birth,
431
-              EmergencyTypes: this.ruleForm.EmergencyTypes,
432
-              content: this.ruleForm.content //	备注
310
+    methods: {
311
+      getUserData() {
312
+        const params = {
313
+          usercode: this.usercodeSearch
314
+        }
315
+        getUserMsg(params).then(res => {
316
+          const data = res.data
317
+          this.ruleForm.deptid = data.F_DeptId
318
+          this.deptid = this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids
319
+          this.ruleForm.hosid = this.$store.getters.deptmap[parseInt(data.F_DeptId)].ids[0]
320
+          this.getRepairman(data.F_DeptId)
321
+          this.ruleForm.needman = data.F_UserCode
322
+          this.ruleForm.phon = data.F_Telephone
323
+        })
324
+      },
325
+      // 获取申请人数据
326
+      getRepairman(id) {
327
+        return new Promise((resolve) => {
328
+          const params = {
329
+            deptid: id // 字典管理的工单标识
330
+          }
331
+          GetPerson(params).then((res) => {
332
+            this.repairman = res.rows
333
+          })
334
+          resolve()
335
+        })
336
+      },
337
+      // 申请人
338
+      changeRepairman(data) {
339
+        this.ruleForm.needman = data
340
+        const user = this.repairman.find((o) => {
341
+          return o.usercode === data.toString()
342
+        })
343
+        if (user) {
344
+          this.ruleForm.phon = user.usertelphone
345
+        }
346
+      },
347
+      getCarlist() {
348
+        const params = {
349
+          Flag: 'CLLX',
350
+          Name: ''
351
+        }
352
+        getCartype(params).then((res) => {
353
+          this.carArr = res.rows
354
+        })
355
+      },
356
+      getTypeOrder() {
357
+        const params = {
358
+          pid: 2,
359
+          typeid: 4000
360
+        }
361
+        getOrderTypeList(params.pid, params.typeid).then((res) => {
362
+          this.typeList = res.rows
363
+        })
364
+      },
365
+      getDeptid(data) {
366
+        this.ruleForm.hosid = data[0]
367
+        this.ruleForm.deptid = data[data.length - 1]
368
+        this.deptid = data
369
+        this.getRepairman(data[data.length - 1])
370
+      },
371
+      submitForm() {
372
+        this.$refs.ruleForm.validate((valid) => {
373
+          if (valid) {
374
+            // 添加
375
+            if (!this.wid) {
376
+              const datas = {
377
+                callid: this.cid,
378
+                LeaveRecordId: this.fid,
379
+                type: this.orderTypeData.type2Arr[
380
+                  this.orderTypeData.type2Arr.length - 1
381
+                ],
382
+                hosid: this.ruleForm.hosid, //	院区id
383
+                detpid: this.ruleForm.deptid, //	申请科室id
384
+                startplace: this.ruleForm.startplace,
385
+                endplace: this.ruleForm.endplace,
386
+                needman: this.ruleForm.needman, //	申请人
387
+                phon: this.ruleForm.phon,
388
+                cartype: this.ruleForm.cartype,
389
+                usertime: this.ruleForm.usertime,
390
+                birth: this.ruleForm.birth,
391
+                EmergencyTypes: this.ruleForm.EmergencyTypes,
392
+                content: this.ruleForm.content //	备注
393
+              }
394
+              getAddWorkOrder(datas)
395
+                .then((response) => {
396
+                  this.loading = false
397
+                  if (response.state.toLowerCase() === 'success') {
398
+                    this.$parent.$layer.closeAll()
399
+                    // this.$parent.$layer.close(this.layerid)
400
+                    // this.$parent.$parent.getList() // 重新加载父级数据
401
+                    this.$message({
402
+                      message: '恭喜你,添加工单成功!',
403
+                      type: 'success',
404
+                      duration: 1000
405
+                    })
406
+                    this.$refs.ruleForm.resetFields()
407
+                    this.usercodeSearch = ''
408
+                    this.deptid = []
409
+                  }
410
+                })
411
+                .catch(() => {
412
+                  this.loading = false
413
+                })
414
+            } else {
415
+              // 编辑
416
+              const datas = {
417
+                WorkOrderCode: this.wocode,
418
+                type: this.type,
419
+                hosid: this.ruleForm.hosid, //	院区id
420
+                detpid: this.ruleForm.deptid, //	申请科室id
421
+                startplace: this.ruleForm.startplace,
422
+                endplace: this.ruleForm.endplace,
423
+                needman: this.ruleForm.needman, //	申请人
424
+                phon: this.ruleForm.phon,
425
+                cartype: this.ruleForm.cartype,
426
+                usertime: this.ruleForm.usertime,
427
+                birth: this.ruleForm.birth,
428
+                EmergencyTypes: this.ruleForm.EmergencyTypes,
429
+                content: this.ruleForm.content //	备注
430
+              }
431
+              getUpdateWorkOrder(datas)
432
+                .then((response) => {
433
+                  if (response.state.toLowerCase() === 'success') {
434
+                    // this.$parent.$layer.closeAll()
435
+                    // this.$parent.$layer.close(this.layerid)
436
+                    // this.$parent.$parent.getList() // 重新加载父级数据
437
+                    this.$emit('closeLayer')
438
+                    this.usercodeSearch = ''
439
+                    this.$message({
440
+                      message: '恭喜你,编辑工单成功!',
441
+                      type: 'success',
442
+                      duration: 1000
443
+                    })
444
+                  }
445
+                })
446
+                .catch(() => {})
433 447
             }
434
-            getAddWorkOrder(datas)
435
-              .then((response) => {
436
-                this.loading = false
437
-                if (response.state.toLowerCase() === 'success') {
438
-                  this.$parent.$layer.closeAll()
439
-                  // this.$parent.$layer.close(this.layerid)
440
-                  // this.$parent.$parent.getList() // 重新加载父级数据
441
-                  this.$message({
442
-                    message: '恭喜你,添加工单成功!',
443
-                    type: 'success',
444
-                    duration: 1000
445
-                  })
446
-                  this.$refs.ruleForm.resetFields()
447
-                  this.usercodeSearch = ''
448
-                  this.deptid = []
449
-                }
450
-              })
451
-              .catch(() => {
452
-                this.loading = false
453
-              })
454 448
           } else {
455
-            // 编辑
456
-            const datas = {
457
-              WorkOrderCode: this.wocode,
458
-              type: this.type,
459
-              hosid: this.ruleForm.hosid, //	院区id
460
-              detpid: this.ruleForm.deptid, //	申请科室id
461
-              startplace: this.ruleForm.startplace,
462
-              endplace: this.ruleForm.endplace,
463
-              needman: this.ruleForm.needman, //	申请人
464
-              phon: this.ruleForm.phon,
465
-              cartype: this.ruleForm.cartype,
466
-              usertime: this.ruleForm.usertime,
467
-              birth: this.ruleForm.birth,
468
-              EmergencyTypes: this.ruleForm.EmergencyTypes,
469
-              content: this.ruleForm.content //	备注
470
-            }
471
-            getUpdateWorkOrder(datas)
472
-              .then((response) => {
473
-                if (response.state.toLowerCase() === 'success') {
474
-                  // this.$parent.$layer.closeAll()
475
-                  // this.$parent.$layer.close(this.layerid)
476
-                  // this.$parent.$parent.getList() // 重新加载父级数据
477
-                  this.$emit('closeLayer')
478
-                  this.usercodeSearch = ''
479
-                  this.$message({
480
-                    message: '恭喜你,编辑工单成功!',
481
-                    type: 'success',
482
-                    duration: 1000
483
-                  })
484
-                }
485
-              })
486
-              .catch(() => {})
449
+            this.$message.error('请输入有效的必填项信息!')
450
+            return false
487 451
           }
488
-        } else {
489
-          this.$message.error('请输入有效的必填项信息!')
490
-          return false
491
-        }
492
-      })
493
-    },
494
-    resetForm() {
495
-      this.$refs.ruleForm.resetFields()
496
-    },
452
+        })
453
+      },
454
+      resetForm() {
455
+        this.$refs.ruleForm.resetFields()
456
+      },
497 457
 
498
-    // 获取详情
499
-    getDetail(num) {
500
-      const params = {
501
-        // orderid: this.rowid,
502
-        WorkOrderCode: this.wocode,
503
-        type: num
504
-      }
505
-      getModelDetail(params).then((response) => {
506
-        if (response.state.toLowerCase() === 'success') {
507
-          const res = response.model
508
-          this.getRepairman(res.F_ProposerDeptId)
509
-          this.ruleForm.F_ID = res.F_ID
510
-          this.ruleForm.type = res.F_Type
511
-          this.type = res.F_Type
512
-          this.hospitalsParam.id = res.F_HosId
513
-          this.hospitalsParam.name = res.HosName
514
-          this.departmentsParam.id = res.F_ProposerDeptId
515
-          this.departmentsParam.name = res.F_ProposerDeptName
516
-          this.repairmanParam.id = res.F_ProposerCode
517
-          this.repairmanParam.name = res.F_ProposerName
518
-          this.ruleForm.username = res.F_ProposerName
519
-          this.ruleForm.hosid = res.F_HosId
520
-          this.ruleForm.hosname = res.HosName
521
-          this.ruleForm.deptid = res.F_ProposerDeptId
522
-          this.ruleForm.deptname = res.F_ProposerDeptName
523
-          this.ruleForm.usercode = res.F_ProposerCode
524
-          this.ruleForm.username = res.F_ProposerName
525
-          this.ruleForm.phon = res.F_Phon
526
-          this.ruleForm.cartype = res.F_CarType
527
-          this.ruleForm.startplace = res.F_DepartPlace
528
-          this.ruleForm.endplace = res.F_Destination
529
-          this.ruleForm.F_CarMessage = res.F_CarMessage
530
-          this.ruleForm.remark = res.F_Remark
531
-          this.ruleForm.usertime = res.F_UseTime
532
-          this.ruleForm.birth = res.F_Birth
533
-          this.ruleForm.content = res.F_Content
534
-          this.deptid =
535
-            this.$store.getters.deptmap[parseInt(res.F_ProposerDeptId)].ids
536
-          this.ruleForm.needman = res.F_ProposerCode
458
+      // 获取详情
459
+      getDetail(num) {
460
+        const params = {
461
+          // orderid: this.rowid,
462
+          WorkOrderCode: this.wocode,
463
+          type: num
537 464
         }
538
-      })
465
+        getModelDetail(params).then((response) => {
466
+          if (response.state.toLowerCase() === 'success') {
467
+            const res = response.model
468
+            this.getRepairman(res.F_ProposerDeptId)
469
+            this.ruleForm.F_ID = res.F_ID
470
+            this.ruleForm.type = res.F_Type
471
+            this.type = res.F_Type
472
+            this.hospitalsParam.id = res.F_HosId
473
+            this.hospitalsParam.name = res.HosName
474
+            this.departmentsParam.id = res.F_ProposerDeptId
475
+            this.departmentsParam.name = res.F_ProposerDeptName
476
+            this.repairmanParam.id = res.F_ProposerCode
477
+            this.repairmanParam.name = res.F_ProposerName
478
+            this.ruleForm.username = res.F_ProposerName
479
+            this.ruleForm.hosid = res.F_HosId
480
+            this.ruleForm.hosname = res.HosName
481
+            this.ruleForm.deptid = res.F_ProposerDeptId
482
+            this.ruleForm.deptname = res.F_ProposerDeptName
483
+            this.ruleForm.usercode = res.F_ProposerCode
484
+            this.ruleForm.username = res.F_ProposerName
485
+            this.ruleForm.phon = res.F_Phon
486
+            this.ruleForm.cartype = res.F_CarType
487
+            this.ruleForm.startplace = res.F_DepartPlace
488
+            this.ruleForm.endplace = res.F_Destination
489
+            this.ruleForm.F_CarMessage = res.F_CarMessage
490
+            this.ruleForm.remark = res.F_Remark
491
+            this.ruleForm.usertime = res.F_UseTime
492
+            this.ruleForm.birth = res.F_Birth
493
+            this.ruleForm.content = res.F_Content
494
+            this.deptid =
495
+              this.$store.getters.deptmap[parseInt(res.F_ProposerDeptId)].ids
496
+            this.ruleForm.needman = res.F_ProposerCode
497
+          }
498
+        })
499
+      }
500
+      // 科室下拉改变事件
501
+      // getDepartments(data) {
502
+      //   this.ruleForm.deptid = data.value
503
+      //   this.ruleForm.deptname = data.name
504
+      // },
505
+      // 院区下拉改变事件
506
+      // getHospitals(data) {
507
+      //   this.ruleForm.hosid = data.value
508
+      //   this.ruleForm.hosname = data.name
509
+      // },
510
+      // 申请人下拉改变事件
511
+      // getRepairman(data) {
512
+      //   this.ruleForm.usercode = data.value
513
+      //   this.ruleForm.username = data.name
514
+      // },
539 515
     }
540
-    // 科室下拉改变事件
541
-    // getDepartments(data) {
542
-    //   this.ruleForm.deptid = data.value
543
-    //   this.ruleForm.deptname = data.name
544
-    // },
545
-    // 院区下拉改变事件
546
-    // getHospitals(data) {
547
-    //   this.ruleForm.hosid = data.value
548
-    //   this.ruleForm.hosname = data.name
549
-    // },
550
-    // 申请人下拉改变事件
551
-    // getRepairman(data) {
552
-    //   this.ruleForm.usercode = data.value
553
-    //   this.ruleForm.username = data.name
554
-    // },
555 516
   }
556
-}
557 517
 </script>
558 518
 
559 519
 <style rel="stylesheet/scss" lang="scss" scoped>

+ 22 - 0
CallCenterWeb.UI/RMYY/src/utils/fieldsData.js

@@ -191,6 +191,28 @@ export default {
191 191
       value: '申请时间'
192 192
     }
193 193
   ],
194
+  _reportForm_deptTransfer: [
195
+    {
196
+      key: 'F_transfertodept',
197
+      value: '科室'
198
+    },
199
+    {
200
+      key: 'transfercount',
201
+      value: '转接电话量'
202
+    },
203
+    {
204
+      key: 'jietongliang',
205
+      value: '接通量'
206
+    },
207
+    {
208
+      key: 'weijietongliang',
209
+      value: '未接通量'
210
+    },
211
+    {
212
+      key: 'jietonglv',
213
+      value: '接通率'
214
+    }
215
+  ],
194 216
   _reportForm_handymanForm: [
195 217
     {
196 218
       key: 'dealusername',

+ 0 - 1
CallCenterWeb.UI/RMYY/src/views/callScreen/components/drugList.vue

@@ -29,7 +29,6 @@ import {
29 29
 } from '@/api/callScreen/callScreen'
30 30
 import drugDetail from './drugdetail.vue'
31 31
 import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
32
-import hischange from './hischange'
33 32
 export default {
34 33
   name: 'DrugList',
35 34
   components: {

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -58,7 +58,7 @@
58 58
                 <th>工单内容:</th>
59 59
                 <td colspan="5">{{ orderDetailData.F_Content }}</td>
60 60
               </tr>
61
-              <tr v-if="orderDetailData.FileUrl">
61
+              <tr v-if="orderDetailData.FileUrl||orderDetailData.DealFileUrl">
62 62
                 <th>附件:</th>
63 63
                 <td colspan="5" style="text-align: left;padding: 5px 10px;">
64 64
                   <div class="imglist">

+ 1 - 1
CallCenterWeb.UI/RMYY/src/views/customerManagement/customerList/components/addOrEdit.vue

@@ -114,7 +114,7 @@ export default {
114 114
       const data = {
115 115
         id: this.rowid
116 116
       }
117
-      console.log(data, 'data')
117
+      // console.log(data, 'data')
118 118
       this.getDetail(data)
119 119
     }
120 120
   },

+ 3 - 3
CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

@@ -227,7 +227,7 @@ export default {
227 227
         series: [
228 228
           {
229 229
             type: 'pie',
230
-            center: ['50%', '50%'],
230
+            center: ['60%', '50%'],
231 231
             radius: ['40%', '60%'],
232 232
             label: {
233 233
               show: false,
@@ -270,7 +270,7 @@ export default {
270 270
         series: [
271 271
           {
272 272
             type: 'pie',
273
-            center: ['50%', '50%'],
273
+            center: ['60%', '50%'],
274 274
             radius: ['40%', '60%'],
275 275
             label: {
276 276
               show: false,
@@ -322,7 +322,7 @@ export default {
322 322
         series: [
323 323
           {
324 324
             type: 'pie',
325
-            center: ['50%', '50%'],
325
+            center: ['60%', '50%'],
326 326
             radius: ['40%', '60%'],
327 327
             label: {
328 328
               show: false,

+ 315 - 303
CallCenterWeb.UI/RMYY/src/views/orderManage/components/askdetail.vue

@@ -123,11 +123,11 @@
123 123
                   </tr>
124 124
                   <tr>
125 125
                     <th>是否回访:</th>
126
-                    <td>{{ orderDetailData.F_IsVisit==0?'否':'是' }}</td>
126
+                    <td>{{ orderDetailData.F_IsVisit }}</td>
127 127
                   </tr>
128 128
                   <tr>
129 129
                     <th>沟通情况:</th>
130
-                    <td>{{ orderDetailData.F_IsReturnBak==0?'沟通':orderDetailData.F_IsReturnBak==1?'已沟通未预约':'已沟通已预约' }}</td>
130
+                    <td>{{ orderDetailData.F_IsReturnBak }}</td>
131 131
                   </tr>
132 132
                   <tr>
133 133
                     <th>处理结果:</th>
@@ -137,26 +137,10 @@
137 137
               </el-col>
138 138
             </el-tab-pane>
139 139
             <el-tab-pane label="工单流程" name="2">
140
-              <el-table
141
-                :data="workOrderCirculationList"
142
-                border
143
-                style="width: 100%"
144
-              >
145
-                <el-table-column
146
-                  prop="F_CreateUser"
147
-                  label="操作人"
148
-                  align="center"
149
-                />
150
-                <el-table-column
151
-                  prop="F_OptContent"
152
-                  label="内容"
153
-                  align="center"
154
-                />
155
-                <el-table-column
156
-                  prop="F_CreateTime"
157
-                  label="时间"
158
-                  align="center"
159
-                />
140
+              <el-table :data="workOrderCirculationList" border style="width: 100%">
141
+                <el-table-column prop="F_CreateUser" label="操作人" align="center" />
142
+                <el-table-column prop="F_OptContent" label="内容" align="center" />
143
+                <el-table-column prop="F_CreateTime" label="时间" align="center" />
160 144
               </el-table>
161 145
             </el-tab-pane>
162 146
           </el-tabs>
@@ -167,343 +151,371 @@
167 151
 </template>
168 152
 
169 153
 <script>
170
-import { mapGetters } from 'vuex'
171
-import { GetOrderDetail, GetOrderItem } from '@/api/orderManagement/orderList'
172
-import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
173
-
174
-export default {
175
-  name: 'AskDetail',
176
-  components: {
177
-    Pagination
178
-  },
179
-  props: {
180
-    rowid: {
181
-      type: String,
182
-      default: '0'
154
+  import {
155
+    mapGetters
156
+  } from 'vuex'
157
+  import {
158
+    GetOrderDetail,
159
+    GetOrderItem
160
+  } from '@/api/orderManagement/orderList'
161
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
162
+
163
+  export default {
164
+    name: 'AskDetail',
165
+    components: {
166
+      Pagination
183 167
     },
184
-    layerid: {
185
-      type: String,
186
-      default: ''
187
-    }
188
-  },
189
-  data() {
190
-    return {
191
-      activeName: '1',
192
-      ChatList: [], // 备注详情列表
193
-      isChatList: false, // 备注列表是否展示
194
-      // isFamily: false,
195
-      isSpecial: false,
196
-      showAppointmentTime: false,
197
-      // isConduit: false,
198
-      orderDetailData: {
199
-        F_CallID: '',
200
-        F_WorkOrderCode: '',
201
-        F_ID: '',
202
-        F_Source: '电话', // 业务类别
203
-        F_Type1: '', // 工单类别
204
-        F_TypeName1: '', // 工单类别
205
-        F_Type2: '', // 工单子类
206
-        F_TypeName2: '', // 工单子类
207
-        F_Type3: '', // 工单三类
208
-        F_TypeName3: '', // 工单三类
209
-        F_Customer: '', // 姓名
210
-        F_Sex: '0', // 性别
211
-        F_Phon: '', // 电话
212
-        F_CusAddress: '', // 家庭住址
213
-        F_IdCard: '', // 身份证号
214
-        F_ServiceItems: '', // 服务项目
215
-        F_Address: '', // 地区
216
-        F_FirstCheckHospital: '', // 首次检查医院
217
-        F_NoduleSize: '', // 肺结节大小
218
-        F_FirstFindTime: '', // 首次发现肺结节时间
219
-        F_Urgency: '0', // 紧急程度
220
-        F_Cathetertype: '', // 置管类型
221
-        F_Catheterdept: '', // 置管科室
222
-        F_Cathetertime: '', // 置管时间
223
-        F_BedNum: '', // 床号
224
-        F_InpatientNum: '', // 住院号
225
-        opt: '', // 处理方式
226
-        cont: '',
227
-        F_WorkOrderContents: '', // 工单内容
228
-        F_DealOpinions: '' // 处理意见
229
-      },
230
-      pageParams: {
231
-        pageindex: 1, // 当前第几页
232
-        pagesize: 5, // 每页几条数据
233
-        total: 0 // 总共多少数据
168
+    props: {
169
+      rowid: {
170
+        type: String,
171
+        default: '0'
234 172
       },
235
-      workOrderCirculationList: [] // 工单流转
236
-    }
237
-  },
238
-  computed: {
239
-    ...mapGetters(['rolecode'])
240
-  },
241
-  created() {
242
-    this.getDetail('0')
243
-    this.getDetail('1')
244
-  },
245
-  methods: {
246
-    handleClick(tab, event) {
247
-      console.log(tab, event)
173
+      layerid: {
174
+        type: String,
175
+        default: ''
176
+      }
248 177
     },
249
-    // 详情
250
-    getDetail(num) {
251
-      const params = {
252
-        WorkOrderCode: this.rowid,
253
-        type: num
178
+    data() {
179
+      return {
180
+        activeName: '1',
181
+        ChatList: [], // 备注详情列表
182
+        isChatList: false, // 备注列表是否展示
183
+        // isFamily: false,
184
+        isSpecial: false,
185
+        showAppointmentTime: false,
186
+        // isConduit: false,
187
+        orderDetailData: {
188
+          F_CallID: '',
189
+          F_WorkOrderCode: '',
190
+          F_ID: '',
191
+          F_Source: '电话', // 业务类别
192
+          F_Type1: '', // 工单类别
193
+          F_TypeName1: '', // 工单类别
194
+          F_Type2: '', // 工单子类
195
+          F_TypeName2: '', // 工单子类
196
+          F_Type3: '', // 工单三类
197
+          F_TypeName3: '', // 工单三类
198
+          F_Customer: '', // 姓名
199
+          F_Sex: '0', // 性别
200
+          F_Phon: '', // 电话
201
+          F_CusAddress: '', // 家庭住址
202
+          F_IdCard: '', // 身份证号
203
+          F_ServiceItems: '', // 服务项目
204
+          F_Address: '', // 地区
205
+          F_FirstCheckHospital: '', // 首次检查医院
206
+          F_NoduleSize: '', // 肺结节大小
207
+          F_FirstFindTime: '', // 首次发现肺结节时间
208
+          F_Urgency: '0', // 紧急程度
209
+          F_Cathetertype: '', // 置管类型
210
+          F_Catheterdept: '', // 置管科室
211
+          F_Cathetertime: '', // 置管时间
212
+          F_BedNum: '', // 床号
213
+          F_InpatientNum: '', // 住院号
214
+          opt: '', // 处理方式
215
+          cont: '',
216
+          F_IsVisit: '0',
217
+          F_IsReturnBak: '0',
218
+          F_WorkOrderContents: '', // 工单内容
219
+          F_DealOpinions: '' // 处理意见
220
+        },
221
+        pageParams: {
222
+          pageindex: 1, // 当前第几页
223
+          pagesize: 5, // 每页几条数据
224
+          total: 0 // 总共多少数据
225
+        },
226
+        workOrderCirculationList: [] // 工单流转
254 227
       }
255
-      GetOrderDetail(params).then((response) => {
256
-        if (num === '1') {
257
-          this.workOrderCirculationList = response.data
258
-        } else {
259
-          const res = response.data[0]
260
-          this.orderDetailData = res
261
-          const thisTypeInfo =
262
-            this.$store.getters.workTypeMap[parseInt(res.F_type2)]
263
-          if (thisTypeInfo.tag === 'ywzx_zjyy') {
264
-            this.isSpecial = true
265
-          }
228
+    },
229
+    computed: {
230
+      ...mapGetters(['rolecode'])
231
+    },
232
+    created() {
233
+      this.getDetail('0')
234
+      this.getDetail('1')
235
+    },
236
+    methods: {
237
+      handleClick(tab, event) {
238
+        console.log(tab, event)
239
+      },
240
+      // 详情
241
+      getDetail(num) {
242
+        const params = {
243
+          WorkOrderCode: this.rowid,
244
+          type: num
245
+        }
246
+        GetOrderDetail(params).then((response) => {
247
+          if (num === '1') {
248
+            this.workOrderCirculationList = response.data
249
+          } else {
250
+            const res = response.data[0]
251
+            this.orderDetailData = res
252
+            const thisTypeInfo =
253
+              this.$store.getters.workTypeMap[parseInt(res.F_type2)]
254
+            if (thisTypeInfo.tag === 'ywzx_zjyy') {
255
+              this.isSpecial = true
256
+            }
266 257
 
267
-          // 家庭预约类服务内容一致,所以需要判断一下二级类别是否是家庭预约 ywzx_jtyy
268
-          const twoTypeInfo =
269
-            this.$store.getters.workTypeMap[parseInt(thisTypeInfo.ids[1])]
270
-          if (twoTypeInfo && twoTypeInfo.tag === 'ywzx_jtyy') {
271
-            this.showAppointmentTime = true
272
-          }
258
+            // 家庭预约类服务内容一致,所以需要判断一下二级类别是否是家庭预约 ywzx_jtyy
259
+            const twoTypeInfo =
260
+              this.$store.getters.workTypeMap[parseInt(thisTypeInfo.ids[1])]
261
+            if (twoTypeInfo && twoTypeInfo.tag === 'ywzx_jtyy') {
262
+              this.showAppointmentTime = true
263
+            }
273 264
 
274
-          this.orderDetailData.F_TypeName2 =
275
-            this.$store.getters.workTypeMap[parseInt(res.F_type2)].text // 工单子类
276
-          this.orderDetailData.F_Sex = res.F_Sex // 性别
277
-          if (res.F_Sex === 0) {
278
-            this.orderDetailData.F_Sex = '男'
279
-          } else if (res.F_Sex === 1) {
280
-            this.orderDetailData.F_Sex = '女'
281
-          }
282
-          this.orderDetailData.F_Urgency = res.F_Urgency // 紧急程度
283
-          if (res.F_Urgency === 0) {
284
-            this.orderDetailData.F_Urgency = '常规'
285
-          } else if (res.F_Urgency === 1) {
286
-            this.orderDetailData.F_Urgency = '紧急'
265
+            this.orderDetailData.F_TypeName2 =
266
+              this.$store.getters.workTypeMap[parseInt(res.F_type2)].text // 工单子类
267
+            this.orderDetailData.F_Sex = res.F_Sex // 性别
268
+            if (res.F_Sex === 0) {
269
+              this.orderDetailData.F_Sex = '男'
270
+            } else if (res.F_Sex === 1) {
271
+              this.orderDetailData.F_Sex = '女'
272
+            }
273
+            this.orderDetailData.F_Urgency = res.F_Urgency // 紧急程度
274
+            if (res.F_Urgency === 0) {
275
+              this.orderDetailData.F_Urgency = '常规'
276
+            } else if (res.F_Urgency === 1) {
277
+              this.orderDetailData.F_Urgency = '紧急'
278
+            }
279
+            this.orderDetailData.F_IsVisit = res.F_IsVisit
280
+            if (res.F_IsVisit === 0) {
281
+              this.orderDetailData.F_IsVisit = '否'
282
+            } else if (res.F_IsVisit === 1) {
283
+              this.orderDetailData.F_IsVisit = '是'
284
+            } else {
285
+              this.orderDetailData.F_IsVisit = '-'
286
+            }
287
+            this.orderDetailData.F_IsReturnBak = res.F_IsReturnBak
288
+            if (res.F_IsReturnBak == '-1') {
289
+              this.orderDetailData.F_IsReturnBak = '-'
290
+            } else if (res.F_IsReturnBak === 0) {
291
+              this.orderDetailData.F_IsReturnBak = '沟通'
292
+            } else if (res.F_IsReturnBak === 1) {
293
+              this.orderDetailData.F_IsReturnBak = '已沟通未预约'
294
+            } else if (res.F_IsReturnBak === 2) {
295
+              this.orderDetailData.F_IsReturnBak = '已沟通已预约'
296
+            } else {
297
+              this.orderDetailData.F_IsReturnBak = '-'
298
+            }
287 299
           }
300
+        })
301
+      },
302
+      getItem() {
303
+        const params = {
304
+          pageindex: this.pageParams.pageindex, // 第几页
305
+          pagesize: this.pageParams.pagesize, // 每页几条信息
306
+          id: this.rowid
288 307
         }
289
-      })
290
-    },
291
-    getItem() {
292
-      const params = {
293
-        pageindex: this.pageParams.pageindex, // 第几页
294
-        pagesize: this.pageParams.pagesize, // 每页几条信息
295
-        id: this.rowid
308
+        GetOrderItem(params).then((response) => {
309
+          const res = response.rows
310
+          if (res) {
311
+            this.workOrderCirculationList = res
312
+            this.pageParams.total = response.total
313
+          }
314
+        })
296 315
       }
297
-      GetOrderItem(params).then((response) => {
298
-        const res = response.rows
299
-        if (res) {
300
-          this.workOrderCirculationList = res
301
-          this.pageParams.total = response.total
302
-        }
303
-      })
304 316
     }
305 317
   }
306
-}
307 318
 </script>
308 319
 
309 320
 <style rel="stylesheet/scss" lang="scss">
310
-.order_detail {
311
-  .tabdept {
312
-    width: 100%;
313
-    margin: 10px 0;
314
-    border: 1px solid #ccc;
315
-  }
316
-
317
-  .tabdept th {
318
-    width: 150px;
319
-    padding: 10px 0;
320
-    font-size: 14px;
321
-    text-align: center;
322
-    background-color: #ececec;
323
-    border: 1px solid #ccc;
324
-  }
321
+  .order_detail {
322
+    .tabdept {
323
+      width: 100%;
324
+      margin: 10px 0;
325
+      border: 1px solid #ccc;
326
+    }
325 327
 
326
-  .tabdept td {
327
-    font-size: 14px;
328
-    text-align: center;
329
-    background-color: #fafafa;
330
-    border: 1px solid #ccc;
331
-  }
328
+    .tabdept th {
329
+      width: 150px;
330
+      padding: 10px 0;
331
+      font-size: 14px;
332
+      text-align: center;
333
+      background-color: #ececec;
334
+      border: 1px solid #ccc;
335
+    }
332 336
 
333
-  .wostate {
334
-    color: #67aa60;
335
-    display: inline-block;
336
-    border: 1px solid #c1c1c1;
337
-    border-radius: 5px;
338
-    padding: 5px 10px 3px 10px;
339
-    font-size: 17px !important;
340
-  }
337
+    .tabdept td {
338
+      font-size: 14px;
339
+      text-align: center;
340
+      background-color: #fafafa;
341
+      border: 1px solid #ccc;
342
+    }
341 343
 
342
-  .el-col {
343
-    // margin-bottom: 20px;
344
-  }
344
+    .wostate {
345
+      color: #67aa60;
346
+      display: inline-block;
347
+      border: 1px solid #c1c1c1;
348
+      border-radius: 5px;
349
+      padding: 5px 10px 3px 10px;
350
+      font-size: 17px !important;
351
+    }
345 352
 
346
-  .el-icon-time {
347
-    color: #d81e06;
348
-  }
353
+    .el-col {
354
+      // margin-bottom: 20px;
355
+    }
349 356
 
350
-  .el-card__header {
351
-    padding-top: 14px;
352
-    padding-bottom: 14px;
353
-    background-color: #f5f5f6;
354
-  }
357
+    .el-icon-time {
358
+      color: #d81e06;
359
+    }
355 360
 
356
-  .order_file {
357
-    .el-card__body {
358
-      padding: 22px 0 0 0;
359
-      text-align: center;
361
+    .el-card__header {
362
+      padding-top: 14px;
363
+      padding-bottom: 14px;
364
+      background-color: #f5f5f6;
360 365
     }
361
-  }
362 366
 
363
-  .order_steps {
364
-    .el-step__icon-inner {
365
-      display: none;
367
+    .order_file {
368
+      .el-card__body {
369
+        padding: 22px 0 0 0;
370
+        text-align: center;
371
+      }
366 372
     }
367
-  }
368 373
 
369
-  .order_record {
370
-    .el-card__body {
371
-      padding: 0;
374
+    .order_steps {
375
+      .el-step__icon-inner {
376
+        display: none;
377
+      }
372 378
     }
373 379
 
374
-    .el-tabs__header {
375
-      padding: 0px 20px;
376
-      background-color: #f5f5f6;
380
+    .order_record {
381
+      .el-card__body {
382
+        padding: 0;
383
+      }
377 384
 
378
-      .el-tabs__item {
379
-        font-size: 16px;
380
-        height: 47px;
381
-        line-height: 47px;
385
+      .el-tabs__header {
386
+        padding: 0px 20px;
387
+        background-color: #f5f5f6;
388
+
389
+        .el-tabs__item {
390
+          font-size: 16px;
391
+          height: 47px;
392
+          line-height: 47px;
393
+        }
382 394
       }
383 395
     }
384 396
   }
385
-}
386 397
 </style>
387 398
 
388 399
 <style rel="stylesheet/scss" lang="scss" scoped>
389
-.order_detail {
390
-  .order_detail_body {
391
-    margin-bottom: 20px;
392
-
393
-    .round_img {
394
-      width: 90px;
395
-      height: 90px;
396
-      border-radius: 50%;
397
-      overflow: hidden;
398
-      margin: 14px;
399
-
400
-      img {
401
-        width: 100%;
402
-        height: 100%;
400
+  .order_detail {
401
+    .order_detail_body {
402
+      margin-bottom: 20px;
403
+
404
+      .round_img {
405
+        width: 90px;
406
+        height: 90px;
407
+        border-radius: 50%;
408
+        overflow: hidden;
409
+        margin: 14px;
410
+
411
+        img {
412
+          width: 100%;
413
+          height: 100%;
414
+        }
403 415
       }
404
-    }
405 416
 
406
-    .title {
407
-      font-size: 20px;
417
+      .title {
418
+        font-size: 20px;
408 419
 
409
-      .title_icon {
410
-        color: #d81e06;
411
-        font-size: 16px;
412
-        margin-right: 20px;
420
+        .title_icon {
421
+          color: #d81e06;
422
+          font-size: 16px;
423
+          margin-right: 20px;
424
+        }
413 425
       }
414
-    }
415 426
 
416
-    .title_sub {
417
-      font-size: 14px;
418
-      color: #666666;
419
-    }
427
+      .title_sub {
428
+        font-size: 14px;
429
+        color: #666666;
430
+      }
420 431
 
421
-    .order_detail_content {
422
-      background-color: #f5f5f6;
423
-      padding-top: 20px;
424
-      color: #4c4c4c;
425
-      font-size: 14px;
432
+      .order_detail_content {
433
+        background-color: #f5f5f6;
434
+        padding-top: 20px;
435
+        color: #4c4c4c;
436
+        font-size: 14px;
426 437
 
427
-      .order_detail_item {
428
-        margin-bottom: 10px;
438
+        .order_detail_item {
439
+          margin-bottom: 10px;
429 440
 
430
-        .order_content {
431
-          margin-top: 10px;
432
-        }
441
+          .order_content {
442
+            margin-top: 10px;
443
+          }
433 444
 
434
-        .order_file {
435
-          position: relative;
436
-          cursor: pointer;
437
-
438
-          .img_mask {
439
-            display: none;
440
-            position: absolute;
441
-            left: 0px;
442
-            top: 0px;
443
-            background-color: rgba(0, 0, 0, 0.3);
444
-            width: 100%;
445
-            height: 22px;
446
-            text-align: right;
447
-            z-index: 1;
448
-
449
-            i {
450
-              font-size: 20px;
451
-              line-height: 22px;
452
-              display: inline-block;
453
-              margin-right: 15px;
454
-              color: #fff;
445
+          .order_file {
446
+            position: relative;
447
+            cursor: pointer;
448
+
449
+            .img_mask {
450
+              display: none;
451
+              position: absolute;
452
+              left: 0px;
453
+              top: 0px;
454
+              background-color: rgba(0, 0, 0, 0.3);
455
+              width: 100%;
456
+              height: 22px;
457
+              text-align: right;
458
+              z-index: 1;
459
+
460
+              i {
461
+                font-size: 20px;
462
+                line-height: 22px;
463
+                display: inline-block;
464
+                margin-right: 15px;
465
+                color: #fff;
466
+              }
455 467
             }
456
-          }
457 468
 
458
-          p {
459
-            margin-top: 5px;
460
-            padding-left: 14px;
461
-            padding-right: 14px;
462
-            white-space: nowrap;
463
-            overflow: hidden;
464
-            text-overflow: ellipsis;
465
-          }
469
+            p {
470
+              margin-top: 5px;
471
+              padding-left: 14px;
472
+              padding-right: 14px;
473
+              white-space: nowrap;
474
+              overflow: hidden;
475
+              text-overflow: ellipsis;
476
+            }
466 477
 
467
-          .file_icon {
468
-            height: 68px;
469
-            line-height: 68px;
470
-            font-size: 68px;
471
-            color: #409eff;
478
+            .file_icon {
479
+              height: 68px;
480
+              line-height: 68px;
481
+              font-size: 68px;
482
+              color: #409eff;
483
+            }
472 484
           }
473
-        }
474 485
 
475
-        .order_file:hover .img_mask {
476
-          display: block;
486
+          .order_file:hover .img_mask {
487
+            display: block;
488
+          }
477 489
         }
478 490
       }
479 491
     }
480
-  }
481 492
 
482
-  .green {
483
-    color: #00c1de;
484
-  }
493
+    .green {
494
+      color: #00c1de;
495
+    }
485 496
 
486
-  .done {
487
-    color: #198120;
488
-  }
497
+    .done {
498
+      color: #198120;
499
+    }
489 500
 
490
-  .red {
491
-    color: #d81e06;
492
-  }
501
+    .red {
502
+      color: #d81e06;
503
+    }
493 504
 
494
-  .yellow {
495
-    color: #e6a23c;
496
-  }
505
+    .yellow {
506
+      color: #e6a23c;
507
+    }
508
+
509
+    .order_steps {
497 510
 
498
-  .order_steps {
499
-    // height: 240px;
500
-    .el-step__icon-inner {
501
-      display: none;
511
+      // height: 240px;
512
+      .el-step__icon-inner {
513
+        display: none;
514
+      }
502 515
     }
503
-  }
504 516
 
505
-  .tab_body {
506
-    padding: 0 20px 20px 20px;
517
+    .tab_body {
518
+      padding: 0 20px 20px 20px;
519
+    }
507 520
   }
508
-}
509 521
 </style>

+ 29 - 10
CallCenterWeb.UI/RMYY/src/views/reportForm/dayWeekForm/index.vue

@@ -26,9 +26,9 @@
26 26
     </el-form>
27 27
     <table class="tabdept" cellspacing="0" cellpadding="0">
28 28
       <tr>
29
-        <th colspan="6" style="background-color:#3691db">业务咨询({{ totaldata[0].zscount }}次)</th>
29
+        <th colspan="6" style="background-color:#3691db">业务咨询({{ totaldata.ywzxcount }}次)</th>
30 30
       </tr>
31
-      <tr v-for="(item,index) in chapterList1" v-if="index%3==0" :key="index">
31
+      <tr v-for="(item,index) in chapterList1" v-if="index%3==0" :key="'ywzx'+index">
32 32
         <th>{{ chapterList1[index]==null?"":chapterList1[index].F_Name }}</th>
33 33
         <td @click="btnDetail(chapterList1[index].F_Type)">{{ chapterList1[index]==null?"":chapterList1[index].COUNT }}</td>
34 34
         <th>{{ chapterList1[index+1]==null?"":chapterList1[index+1].F_Name }}</th>
@@ -37,9 +37,9 @@
37 37
         <td @click="btnDetail(chapterList1[index+2].F_Type)">{{ chapterList1[index+2]==null?"":chapterList1[index+2].COUNT }}</td>
38 38
       </tr>
39 39
       <tr>
40
-        <th colspan="6" style="background-color:#3691db">故障报修({{ totaldata[2].zscount }}次)</th>
40
+        <th colspan="6" style="background-color:#3691db">故障报修({{ totaldata.gzbxcount }}次)</th>
41 41
       </tr>
42
-      <tr v-for="(item,index) in chapterList2" v-if="index%3==0" :key="index">
42
+      <tr v-for="(item,index) in chapterList2" v-if="index%3==0" :key="'gzbx'+index">
43 43
         <th>{{ chapterList2[index]==null?"":chapterList2[index].F_Name }}</th>
44 44
         <td @click="btnDetail(chapterList2[index].F_Type)">{{ chapterList2[index]==null?"":chapterList2[index].COUNT }}</td>
45 45
         <th>{{ chapterList2[index+1]==null?"":chapterList2[index+1].F_Name }}</th>
@@ -48,9 +48,9 @@
48 48
         <td @click="btnDetail(chapterList2[index+2].F_Type)">{{ chapterList2[index+2]==null?"":chapterList2[index+2].COUNT }}</td>
49 49
       </tr>
50 50
       <tr>
51
-        <th colspan="6" style="background-color:#3691db">综合调度({{ totaldata[1].zscount }}次)</th>
51
+        <th colspan="6" style="background-color:#3691db">综合调度({{ totaldata.zhddcount }}次)</th>
52 52
       </tr>
53
-      <tr v-for="(item,index) in chapterList3" v-if="index%3==0" :key="index">
53
+      <tr v-for="(item,index) in chapterList3" v-if="index%3==0" :key="'zhdd'+index">
54 54
         <th>{{ chapterList3[index]==null?"":chapterList3[index].F_Name }}</th>
55 55
         <td @click="btnDetail(chapterList3[index].F_Type)">{{ chapterList3[index]==null?"":chapterList3[index].COUNT }}</td>
56 56
         <th>{{ chapterList3[index+1]==null?"":chapterList3[index+1].F_Name }}</th>
@@ -59,9 +59,9 @@
59 59
         <td @click="btnDetail(chapterList3[index+2].F_Type)">{{ chapterList3[index+2]==null?"":chapterList3[index+2].COUNT }}</td>
60 60
       </tr>
61 61
       <tr>
62
-        <th colspan="6" style="background-color:#3691db">车辆调度({{ totaldata[3].zscount }}次)</th>
62
+        <th colspan="6" style="background-color:#3691db">车辆调度({{ totaldata.clddcount }}次)</th>
63 63
       </tr>
64
-      <tr v-for="(item,index) in chapterList4" v-if="index%3==0" :key="index">
64
+      <tr v-for="(item,index) in chapterList4" v-if="index%3==0" :key="'cldd'+index">
65 65
         <th>{{ chapterList4[index]==null?"":chapterList4[index].T_Woname }}</th>
66 66
         <td @click="btnDetail(chapterList4[index].T_Woid)">{{ chapterList4[index]==null?"":chapterList4[index].COUNT }}</td>
67 67
         <th>{{ chapterList4[index+1]==null?"":chapterList4[index+1].T_Woname }}</th>
@@ -94,7 +94,12 @@ export default {
94 94
       chapterList2: [],
95 95
       chapterList3: [],
96 96
       chapterList4: [],
97
-      totaldata: [],
97
+      totaldata: {
98
+        ywzxcount:0,
99
+        zhddcount:0,
100
+        gzbxcount:0,
101
+        clddcount:0
102
+      },
98 103
       deptidArr: [],
99 104
       dataLists: [],
100 105
       ruleForm: {
@@ -129,7 +134,21 @@ export default {
129 134
             this.chapterList2 = response.data.gzbxdt
130 135
             this.chapterList3 = response.data.zhdddt
131 136
             this.chapterList4 = response.data.cldddt
132
-            this.totaldata = response.data.zongshudt
137
+            const totalarr = response.data.zongshudt
138
+            for(var i=0;i< totalarr.length;i++){
139
+              if(totalarr[i].F_Type==1000){
140
+                this.totaldata.ywzxcount =  totalarr[i].zscount
141
+              }
142
+              if(totalarr[i].F_Type==2000){
143
+                this.totaldata.zhddcount =  totalarr[i].zscount
144
+              }
145
+              if(totalarr[i].F_Type==3000){
146
+                this.totaldata.gzbxcount =  totalarr[i].zscount
147
+              }
148
+              if(totalarr[i].F_Type==4000){
149
+                this.totaldata.clddcount =  totalarr[i].zscount
150
+              }
151
+            }
133 152
           }
134 153
         })
135 154
         resolve()

+ 54 - 6
CallCenterWeb.UI/RMYY/src/views/reportForm/deptTransfer/index.vue

@@ -19,20 +19,31 @@
19 19
       <el-form-item>
20 20
         <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
21 21
         <el-button type="primary" size="medium" @click="btn_export">导出</el-button>
22
+        <el-button
23
+          type="primary"
24
+          class="filter-btn"
25
+          icon="el-icon-s-tools"
26
+          @click="btn_add_list"
27
+        >
28
+          设置列
29
+        </el-button>
22 30
       </el-form-item>
23 31
     </el-form>
24
-    <el-table :data="dataLists" border highlight-current-row stripe>
25
-      <el-table-column :formatter="formtOrder" prop="F_transfertodept" label="科室" align="center" min-width />
26
-      <el-table-column prop="transfercount" label="转接电话量" align="center" min-width />
27
-      <el-table-column prop="jietongliang" label="接通量" align="center" min-width />
28
-      <el-table-column prop="weijietongliang" label="未接通量" align="center" min-width />
29
-      <el-table-column prop="jietonglv" label="接通率" align="center" min-width />
32
+    <el-table ref="multipleTable" :data="dataLists" border highlight-current-row stripe>
33
+      <el-table-column v-if="fieldListFlag.F_transfertodept" :formatter="formtOrder" prop="F_transfertodept" label="科室" align="center" min-width />
34
+      <el-table-column v-if="fieldListFlag.transfercount" prop="transfercount" label="转接电话量" align="center" min-width />
35
+      <el-table-column v-if="fieldListFlag.jietongliang" prop="jietongliang" label="接通量" align="center" min-width />
36
+      <el-table-column v-if="fieldListFlag.weijietongliang" prop="weijietongliang" label="未接通量" align="center" min-width />
37
+      <el-table-column v-if="fieldListFlag.jietonglv" prop="jietonglv" label="接通率" align="center" min-width />
30 38
     </el-table>
31 39
   </div>
32 40
 </template>
33 41
 
34 42
 <script>
35 43
 // import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
44
+import addDefinedList from '@/components/context/addDefinedList'
45
+import { GetFiledState, AddFiled } from '@/api/commonAPI'
46
+import fieldDATA from '@/utils/fieldsData.js'
36 47
 import {
37 48
   GetTansferCallReport,
38 49
   getTransferListExpt
@@ -47,6 +58,7 @@ export default {
47 58
   },
48 59
   data() {
49 60
     return {
61
+      fieldListFlag: {},
50 62
       deptidArr: [],
51 63
       dataLists: [],
52 64
       ruleForm: {
@@ -58,6 +70,7 @@ export default {
58 70
   computed: {},
59 71
   created() {
60 72
     // this.getNowTime()
73
+    this.getFiledTabDetail(this.$route.path.split('/').join('_'))
61 74
     this.getList()
62 75
   },
63 76
   mounted() {},
@@ -94,6 +107,41 @@ export default {
94 107
       }
95 108
       exportExcel(exporParams, getTransferListExpt)
96 109
     },
110
+    btn_add_list() {
111
+      this.$layer.iframe({
112
+        content: {
113
+          content: addDefinedList, // 传递的组件对象
114
+          parent: this, // 当前的vue对象
115
+          data: {
116
+            definedId: this.$route.path
117
+          } // props
118
+        },
119
+        area: ['70%', '30%'],
120
+        title: '自定义字段'
121
+      })
122
+    },
123
+    getFiledTabDetail(TableId) {
124
+      GetFiledState(TableId).then((res) => {
125
+        if (res.F_Fileds) {
126
+          this.fieldListFlag = fieldDATA.getFieldListFlag(res.F_Fileds)
127
+          this.$refs['multipleTable'].doLayout()
128
+        } else {
129
+          const Fileds = fieldDATA.getOptionsValue(fieldDATA[TableId])
130
+          AddFiled({
131
+            TableId,
132
+            Fileds
133
+          })
134
+            .then((response) => {
135
+              if (response.state.toLowerCase() === 'success') {
136
+                this.getFiledTabDetail(TableId)
137
+              }
138
+            })
139
+            .catch(() => {
140
+              this.loading = false
141
+            })
142
+        }
143
+      })
144
+    },
97 145
     formtOrder(row, column) {
98 146
       if (row.F_transfertodept) {
99 147
         return this.$store.getters.deptmap[parseInt(row.F_transfertodept)].text

+ 0 - 30
CallCenterWeb.UI/RMYY/src/views/reportForm/handymanForm/index.vue

@@ -21,36 +21,6 @@
21 21
           <el-option v-for="item in assignman" :key="item.usercode" :label="item.username" :value="item.usercode" />
22 22
         </el-select>
23 23
       </el-form-item>
24
-      <!-- <el-form-item label="业务类别">
25
-        <el-select
26
-          v-model="searchData.type"
27
-          clearable
28
-          placeholder="请选择业务类别"
29
-          size="medium"
30
-          @change="changeOrder"
31
-        >
32
-          <el-option
33
-            v-for="item in orderData"
34
-            :key="item.id"
35
-            :label="item.text"
36
-            :value="item.id"
37
-          />
38
-        </el-select>
39
-      </el-form-item>
40
-      <el-form-item label="工单类别">
41
-        <el-cascader
42
-          ref="cascader"
43
-          v-model="searchData.loweltype"
44
-          :options="subclassData"
45
-          :props="defaultProps"
46
-          size="medium"
47
-          placeholder="请选择工单类别"
48
-          filterable
49
-          clearable
50
-          @change="handleChange"
51
-        />
52
-      </el-form-item> -->
53
-
54 24
       <el-form-item>
55 25
         <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
56 26
         <el-button type="primary" size="medium" @click="btn_export">导出</el-button>

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

@@ -5,6 +5,7 @@
5 5
         v-model="keyword"
6 6
         placeholder="请输入角色代码"
7 7
         class="filter-item"
8
+        clearable
8 9
       />
9 10
       <el-button
10 11
         type="primary"
@@ -161,7 +162,7 @@ export default {
161 162
         const params = {
162 163
           pageindex: this.pageParams.pageindex, // 第几页
163 164
           pagesize: this.pageParams.pagesize, // 每页几条信息
164
-          keyword: this.keyword.replace(/\s+/g, ""), //	项目名称,项目类型,项目负责人
165
+          rolecode: this.keyword.replace(/\s+/g, ""), //	项目名称,项目类型,项目负责人
165 166
           stime: this.searchDate && this.searchDate[0],
166 167
           etime: this.searchDate && this.searchDate[1],
167 168
         };

+ 2 - 0
CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/index.vue

@@ -37,6 +37,8 @@
37 37
             <el-table-column prop="F_UserName" label="姓名" align="center" min-width="" />
38 38
             <el-table-column prop="F_DeptName" label="部门" align="center" min-width="" />
39 39
             <el-table-column prop="F_RoleName" label="角色" align="center" min-width="" />
40
+            <el-table-column prop="F_Title" label="职称" align="center" min-width="" />
41
+            <el-table-column prop="F_Job" label="职务" align="center" min-width="" />
40 42
             <el-table-column prop="F_Telephone" label="电话" align="center" min-width="" />
41 43
             <el-table-column label="启用禁用状态" align="center" min-width="">
42 44
               <template slot-scope="scope">

+ 5 - 3
CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/dataDictionary/index.vue

@@ -8,9 +8,10 @@
8 8
             @click="btn_addL">添加</el-button>
9 9
         </div>
10 10
 
11
-        <el-table v-loading="loadingL" :data="dicLLists" border stripe highlight-current-row
11
+        <el-table v-loading="loadingL" :data="dicLLists" height="600" border stripe highlight-current-row
12 12
           @row-click="handleTableClick">
13
-          <el-table-column prop="sort" label="字典编号" align="center" min-width="" />
13
+          <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
14
+          <!-- <el-table-column prop="sort" label="字典编号" align="center" min-width="" /> -->
14 15
           <el-table-column prop="name" label="字典名称" align="center" min-width="" />
15 16
           <el-table-column prop="flag" label="字典标识" align="center" min-width="" />
16 17
           <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
@@ -36,7 +37,8 @@
36 37
             @click="btn_addR">添加</el-button>
37 38
         </div>
38 39
         <el-table v-loading="loadingR" :data="dicRLists" border highlight-current-row stripe>
39
-          <el-table-column prop="F_Sort" label="排序编号" align="center" min-width="" />
40
+          <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
41
+          <!-- <el-table-column prop="F_Sort" label="排序编号" align="center" min-width="" /> -->
40 42
           <el-table-column prop="F_DictionaryFlag" label="字典标识" align="center" min-width="" />
41 43
           <el-table-column prop="F_Name" label="字典项名称" align="center" min-width="" />
42 44
           <el-table-column prop="F_Describe" label="描述" align="center" min-width="" />

+ 4 - 3
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingList/components/addOrEdit.vue

@@ -72,7 +72,7 @@
72 72
             </el-form-item>
73 73
           </el-col>
74 74
         </el-row>
75
-        <el-row>
75
+        <el-row v-if="type&&type==9017">
76 76
           <el-col :span="24">
77 77
             <el-form-item label="是否出生" prop="birth">
78 78
               <el-radio v-model="ruleForm.birth" :label="0">否</el-radio>
@@ -154,6 +154,7 @@ export default {
154 154
   data() {
155 155
     return {
156 156
       cid: '',
157
+      type:'',
157 158
       typeList: [],
158 159
       carArr: [],
159 160
       repairman: [], // 申请人数据
@@ -331,7 +332,7 @@ export default {
331 332
       this.$refs.ruleForm.validate((valid) => {
332 333
         if (valid) {
333 334
           // 添加
334
-          if (!this.wid) {
335
+          if (!this.rowid) {
335 336
             const datas = {
336 337
               callid: this.cid,
337 338
               LeaveRecordId: this.fid,
@@ -387,7 +388,7 @@ export default {
387 388
                 if (response.state.toLowerCase() === 'success') {
388 389
                   this.$parent.$layer.closeAll()
389 390
                   // this.$parent.$layer.close(this.layerid)
390
-                  // this.$parent.$parent.getList() // 重新加载父级数据
391
+                  this.$parent.getList() // 重新加载父级数据
391 392
                   this.$message({
392 393
                     message: '恭喜你,编辑工单成功!',
393 394
                     type: 'success',

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

@@ -32,7 +32,7 @@
32 32
           </el-button>
33 33
         </template>
34 34
       </el-table-column>
35
-      <el-table-column :show-overflow-tooltip="true" prop="F_Type" label="类别" align="center">
35
+      <el-table-column prop="F_Type" label="类别" align="center">
36 36
         <template slot-scope="scope">
37 37
           <div>{{ $store.getters.workTypeMap[parseInt(scope.row.F_Type)].text }}</div>
38 38
         </template>

+ 45 - 19
CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingReport/index.vue

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="app-container">
3 3
     <div class="filter-container">
4
-      <el-input v-model="keyword" placeholder="请输入关键词" class="filter-item" size="medium"/>
4
+      <el-input v-model="keyword" placeholder="请输入关键词" class="filter-item" size="medium" />
5 5
       <el-date-picker v-model="startTime" size="medium" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
6 6
         range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
7 7
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
@@ -11,26 +11,18 @@
11 11
     </div>
12 12
     <el-table v-loading="loading" :data="dataLists" border stripe>
13 13
       <el-table-column :show-overflow-tooltip="true" prop="F_WorkOrderCode" label="工单编号" align="center" />
14
-      <el-table-column :show-overflow-tooltip="true" prop="F_Type" label="类别" align="center">
15
-        <template slot-scope="scope">
16
-          <div v-if="scope.row.F_Type==1">院区转运患者</div>
17
-          <div v-if="scope.row.F_Type==2">转运物资</div>
18
-          <div v-if="scope.row.F_Type==3">转运消供器械</div>
19
-          <div v-if="scope.row.F_Type==4">转运设备</div>
20
-        </template>
14
+      <el-table-column :show-overflow-tooltip="true" :formatter="formtOrder" prop="F_Type" label="类别" align="center">
21 15
       </el-table-column>
16
+      <el-table-column :show-overflow-tooltip="true" prop="F_Content" label="工单内容" align="center" />
22 17
       <el-table-column :show-overflow-tooltip="true" prop="F_CarMessage" label="车辆信息" align="center" />
18
+      <el-table-column :show-overflow-tooltip="true" :formatter="formtCar" prop="F_CarTypeName" label="车辆类型"
19
+        align="center" />
23 20
       <el-table-column :show-overflow-tooltip="true" prop="F_DepartPlace" label="出发地点" align="center" />
24 21
       <el-table-column :show-overflow-tooltip="true" prop="F_Destination" label="目的地" align="center" />
25 22
       <el-table-column :show-overflow-tooltip="true" prop="F_DriverName" label="司机" align="center" />
23
+      <el-table-column :show-overflow-tooltip="true" prop="F_DriverPhon" label="司机电话" align="center" />
26 24
       <el-table-column :show-overflow-tooltip="true" prop="F_CreateTime" label="申请时间" align="center" />
27
-      <el-table-column :show-overflow-tooltip="true" prop="F_ProposerName" label="调度员" align="center" />
28
-      <el-table-column :show-overflow-tooltip="true" prop="F_CarType" label="车辆类型" align="center">
29
-        <template slot-scope="scope">
30
-          <div v-if="scope.row.F_CarType==1">大车</div>
31
-          <div v-if="scope.row.F_CarType==2">小车</div>
32
-        </template>
33
-      </el-table-column>
25
+      <el-table-column :show-overflow-tooltip="true" prop="F_ControlManName" label="调度员" align="center" />
34 26
       <el-table-column :show-overflow-tooltip="true" prop="F_Remark" label="备注" align="center" />
35 27
     </el-table>
36 28
     <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
@@ -40,7 +32,8 @@
40 32
 <script>
41 33
   import {
42 34
     getListExpt,
43
-    getListExptIsdc
35
+    getListExptIsdc,
36
+    getCarType
44 37
   } from '@/api/vehicleDispatch/vehicleScheduling.js'
45 38
   import Pagination from '@/components/context/Pagination'
46 39
   import {
@@ -54,11 +47,12 @@
54 47
     },
55 48
     data() {
56 49
       return {
50
+        carArr: [],
57 51
         loading: false,
58 52
         keyword: '',
59 53
         startTime: '',
60 54
         orderId: '',
61
-        exporParams:{},
55
+        exporParams: {},
62 56
         pageParams: {
63 57
           pageindex: 1,
64 58
           pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
@@ -68,6 +62,7 @@
68 62
       }
69 63
     },
70 64
     created() {
65
+      this.getCarType()
71 66
       this.getList()
72 67
 
73 68
       document.onkeyup = (e) => {
@@ -87,7 +82,9 @@
87 82
             pagesize: this.pageParams.pagesize, // 每页几条信息
88 83
             keyword: this.keyword.replace(/\s+/g, '')
89 84
           }
90
-          this.exporParams = Object.assign({isdc: 1},params)
85
+          this.exporParams = Object.assign({
86
+            isdc: 1
87
+          }, params)
91 88
           getListExpt(params).then((response) => {
92 89
             this.loading = false
93 90
             if (response.rows.length > 0) {
@@ -98,12 +95,41 @@
98 95
           resolve()
99 96
         })
100 97
       },
98
+      getCarType() {
99
+        const params = {
100
+          Flag: 'CLLX',
101
+          Name: ''
102
+        }
103
+        getCarType(params).then(res => {
104
+          this.carArr = res.rows
105
+        })
106
+      },
107
+      formtOrder(row, column) {
108
+        if (row.F_Type) {
109
+          return this.$store.getters.workTypeMap[parseInt(row.F_Type)].text
110
+        } else {
111
+          return '-'
112
+        }
113
+      },
114
+      formtCar(row, column) {
115
+        if (row.F_CarType) {
116
+          var carname = ''
117
+          this.carArr.forEach(function(val) {
118
+            if (row.F_CarType == val.F_DictionaryValueId) {
119
+              carname = val.F_Name
120
+            }
121
+          })
122
+          return carname
123
+        }else{
124
+          return '-'
125
+        }
126
+      },
101 127
       btn_search() {
102 128
         this.pageParams.pageindex = 1
103 129
         this.getList()
104 130
       },
105 131
       btn_export() {
106
-        exportExcel(this.exporParams,getListExpt)
132
+        exportExcel(this.exporParams, getListExptIsdc)
107 133
       }
108 134
 
109 135
     }