weieryang il y a 3 ans
Parent
commit
e1e7756f44

+ 1 - 1
CallCenterWeb.UI/RMYY/src/api/comDispatch/addOrEditDispatch.js

15
     params
15
     params
16
   })
16
   })
17
 }
17
 }
18
-//
18
+// 详情
19
 export function GetOrderDetail(params) {
19
 export function GetOrderDetail(params) {
20
   return request({
20
   return request({
21
     url: 'Scheduling/GetWorkOrder',
21
     url: 'Scheduling/GetWorkOrder',

+ 16 - 0
CallCenterWeb.UI/RMYY/src/api/orderManagement/ywzxOrder.js

24
     params
24
     params
25
   })
25
   })
26
 }
26
 }
27
+// 删除
28
+export function getDelWorkOrder(params) {
29
+  return request({
30
+    url: 'Con_WorkOrder/DelWorkOrder',
31
+    method: 'get',
32
+    params
33
+  })
34
+}
35
+// 撤回
36
+export function getWithdrawWorkOrder(params) {
37
+  return request({
38
+    url: 'Con_WorkOrder/WithdrawWorkOrder',
39
+    method: 'get',
40
+    params
41
+  })
42
+}

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

188
 } from '@/api/faultRepairManagement/faultRepair'
188
 } from '@/api/faultRepairManagement/faultRepair'
189
 
189
 
190
 import {
190
 import {
191
-	schedulRetractOrder,
192
-  	deleteSchedulingOrder,
193
-} from "@/api/orderManagement/orderList";
191
+  schedulRetractOrder,
192
+  	deleteSchedulingOrder
193
+} from '@/api/orderManagement/orderList'
194
 import {
194
 import {
195
   getSureWorkOrder,
195
   getSureWorkOrder,
196
   getBackWorkOrder,
196
   getBackWorkOrder,
197
-  getDealWorkOrder
197
+  getDealWorkOrder,
198
+  getDelWorkOrder,
199
+  getWithdrawWorkOrder
198
 } from '@/api/orderManagement/ywzxOrder'
200
 } from '@/api/orderManagement/ywzxOrder'
199
 import {
201
 import {
200
   postDispatchCheckWorkOrder,
202
   postDispatchCheckWorkOrder,
217
       wocode: '',
219
       wocode: '',
218
       dialogStatus: {
220
       dialogStatus: {
219
         dialog_zixingjiejue: false,
221
         dialog_zixingjiejue: false,
220
-	dialog_zhdd_chehui: false,
222
+        dialog_zhdd_chehui: false,
221
         dialog_zhdd_shanchu: false,
223
         dialog_zhdd_shanchu: false,
222
         dialog_pingjia: false,
224
         dialog_pingjia: false,
223
         dialog_fanxiu: false,
225
         dialog_fanxiu: false,
228
         dialog_ywzx_chuli: false,
230
         dialog_ywzx_chuli: false,
229
         dialog_ywzx_jiedan: false,
231
         dialog_ywzx_jiedan: false,
230
         dialog_ywzx_tuihui: false,
232
         dialog_ywzx_tuihui: false,
231
-	dialog_zhdd_bianji: false,
233
+        dialog_yw_chehui: false,
234
+        dialog_yw_shanchu: false,
235
+        dialog_yw_bianji: false,
236
+        dialog_zhdd_bianji: false,
232
         dialog_haocai: false,
237
         dialog_haocai: false,
233
         dialog_dispatch_tuihui: false,
238
         dialog_dispatch_tuihui: false,
234
-	dialog_zhdd_chehui: {
235
-          text: "确定要撤回吗?",
239
+        dialog_schbianji: false,
240
+        dialog_schshanchu: false,
241
+        dialog_schchehui: false,
242
+        dialog_yw_shanchu: {
243
+          text: '确定要删除吗?',
244
+          action: getDelWorkOrder,
245
+          type: 'confirm'
246
+        },
247
+        dialog_yw_chehui: {
248
+          text: '确定要撤回吗?',
249
+          action: getWithdrawWorkOrder,
250
+          type: 'confirm'
251
+        },
252
+        dialog_zhdd_chehui: {
253
+          text: '确定要撤回吗?',
236
           action: schedulRetractOrder,
254
           action: schedulRetractOrder,
237
-          type: "confirm",
255
+          type: 'confirm'
238
         },
256
         },
239
         dialog_zhdd_shanchu: {
257
         dialog_zhdd_shanchu: {
240
-          text: "确定要删除吗?",
258
+          text: '确定要删除吗?',
241
           action: deleteSchedulingOrder,
259
           action: deleteSchedulingOrder,
242
-          type: "confirm",
260
+          type: 'confirm'
243
         },
261
         },
244
         dialog_dispatch_daoda: false,
262
         dialog_dispatch_daoda: false,
245
         dialog_ywzx_jiedan: {
263
         dialog_ywzx_jiedan: {
286
           text: '确定要撤回吗?',
304
           text: '确定要撤回吗?',
287
           action: postwithdrawDispatchWorkOrder,
305
           action: postwithdrawDispatchWorkOrder,
288
           type: 'confirm'
306
           type: 'confirm'
307
+        },
308
+        dialog_schshanchu: {
309
+          text: '确定要删除吗?',
310
+          action: postDelDispatchWorkOrder,
311
+          type: 'confirm'
312
+        },
313
+        dialog_schchehui: {
314
+          text: '确定要撤回吗?',
315
+          action: postwithdrawDispatchWorkOrder,
316
+          type: 'confirm'
289
         }
317
         }
290
       },
318
       },
291
       evaluateText: [
319
       evaluateText: [
416
         type: 'warning'
444
         type: 'warning'
417
       }).then(() => {
445
       }).then(() => {
418
         new Promise((resolve) => {
446
         new Promise((resolve) => {
419
-          if (this.optionName == 'ywzx_jiedan' || this.optionName == 'ywzx_tuihui' || this.optionName == 'dispatch_jiedan') {
447
+          if (this.optionName == 'ywzx_jiedan' || this.optionName == 'ywzx_tuihui' || this.optionName == 'dispatch_jiedan' || this.optionName == 'schshanchu' || this.optionName == 'yw_shanchu') {
420
             var params = {
448
             var params = {
421
               WorkOrderCode: this.wocode
449
               WorkOrderCode: this.wocode
422
             }
450
             }

+ 160 - 155
CallCenterWeb.UI/RMYY/src/views/AnnounceManagement/Notice/index.vue

3
     <div class="filter-container">
3
     <div class="filter-container">
4
       <el-input v-model="keyword" placeholder="请输入标题或内容" class="filter-item" size="medium" clearable />
4
       <el-input v-model="keyword" placeholder="请输入标题或内容" class="filter-item" size="medium" clearable />
5
       <el-button type="primary" class="filter-item" @click="btn_search">搜索</el-button>
5
       <el-button type="primary" class="filter-item" @click="btn_search">搜索</el-button>
6
-      <el-button type="primary" class="filter-item" @click="btn_add()">发布公告</el-button>
7
-      <el-button type="danger" class="filter-item" @click="btn_del">批量删除</el-button>
6
+      <el-button v-if="isnotice == '0'" type="primary" class="filter-item" @click="btn_add()">发布公告</el-button>
7
+      <el-button v-if="isnotice == '0'" type="danger" class="filter-item" @click="btn_del">批量删除</el-button>
8
     </div>
8
     </div>
9
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
9
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
10
       <el-table-column type="selection" width="55" />
10
       <el-table-column type="selection" width="55" />
19
       <el-table-column prop="F_CreateOn" label="发布时间" align="center" min-width />
19
       <el-table-column prop="F_CreateOn" label="发布时间" align="center" min-width />
20
       <el-table-column prop="F_EndDate" label="有效期" align="center" min-width />
20
       <el-table-column prop="F_EndDate" label="有效期" align="center" min-width />
21
       <el-table-column prop="F_Frequency" label="点击量" align="center" min-width />
21
       <el-table-column prop="F_Frequency" label="点击量" align="center" min-width />
22
-      <el-table-column label="操作" align="center"  v-if="isnotice == '0'">
22
+      <el-table-column v-if="isnotice == '0'" label="操作" align="center">
23
         <template slot-scope="scope">
23
         <template slot-scope="scope">
24
           <el-button type="text" @click="btn_edit(scope.row.F_NoticeId)">编辑</el-button>
24
           <el-button type="text" @click="btn_edit(scope.row.F_NoticeId)">编辑</el-button>
25
           <el-button type="text" @click="btn_top(scope.row.F_NoticeId)">置顶</el-button>
25
           <el-button type="text" @click="btn_top(scope.row.F_NoticeId)">置顶</el-button>
27
         </template>
27
         </template>
28
       </el-table-column>
28
       </el-table-column>
29
     </el-table>
29
     </el-table>
30
-    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
31
-      :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
30
+    <pagination
31
+      v-show="pageParams.total > 0"
32
+      :total="pageParams.total"
33
+      :pageindex.sync="pageParams.pageindex"
34
+      :pagesize.sync="pageParams.pagesize"
35
+      class="pagination"
36
+      @pagination="getList" />
32
   </div>
37
   </div>
33
 </template>
38
 </template>
34
 
39
 
35
 <script>
40
 <script>
36
-  import {
37
-    getGetList,
38
-    getAddNotice,
39
-    getSeeNotice,
40
-    getDelNotice,
41
-    getTopNotice
42
-  } from '@/api/AnnounceManagement/announce'
43
-  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
44
-  import noticeAddOrEdit from './components/AddOrEdit.vue'
45
-  import Detail from './components/detail.vue'
46
-  export default {
47
-    name: 'Notice',
48
-    components: {
49
-      Pagination
41
+import {
42
+  getGetList,
43
+  getAddNotice,
44
+  getSeeNotice,
45
+  getDelNotice,
46
+  getTopNotice
47
+} from '@/api/AnnounceManagement/announce'
48
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
49
+import noticeAddOrEdit from './components/AddOrEdit.vue'
50
+import Detail from './components/detail.vue'
51
+export default {
52
+  name: 'Notice',
53
+  components: {
54
+    Pagination
55
+  },
56
+  props: {
57
+  },
58
+  data() {
59
+    return {
60
+      loading: false,
61
+      isnotice: '0',
62
+      keyword: '',
63
+      pageParams: {
64
+        pageindex: 1, // 当前第几页
65
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
66
+        total: 1 // 总共多少数据
67
+      },
68
+      multipleSelection: [], // 选中的数据
69
+      selectArr: [],
70
+      dataLists: [] // 列表数据
71
+    }
72
+  },
73
+  watch: {
74
+    // '$route'(to, from) {
75
+    //   console.log(from)
76
+    //   if (from.name == "Dashboard") {
77
+    //     this.isnotice = this.$route.params.isNotice
78
+    //   }else{
79
+    //     this.isnotice = '0'
80
+    //   }
81
+    // }
82
+  },
83
+  activated() {
84
+    this.isnotice = this.$route.params.isNotice || '0'
85
+  },
86
+  created() {
87
+    this.getList()
88
+  },
89
+  methods: {
90
+    // 复选框状态改变
91
+    changeSelects(val) {
92
+      this.multipleSelection = val
93
+      this.selectArr = val.map(item => item.F_NoticeId)
50
     },
94
     },
51
-    props: {
95
+    getList() {
96
+      const params = {
97
+        page: this.pageParams.pageindex,
98
+        pagesize: this.pageParams.pagesize,
99
+        content: this.keyword
100
+      }
101
+      getGetList(params).then(res => {
102
+        this.dataLists = res.rows
103
+        this.pageParams.total = res.total
104
+      })
52
     },
105
     },
53
-    watch: {
54
-      // '$route'(to, from) {
55
-      //   console.log(from)
56
-      //   if (from.name == "Dashboard") {
57
-      //     this.isnotice = this.$route.params.isNotice
58
-      //   }else{
59
-      //     this.isnotice = '0'
60
-      //   }
61
-      // }
106
+    btn_search() {
107
+      this.getList()
62
     },
108
     },
63
-    data() {
64
-      return {
65
-        loading: false,
66
-        isnotice: '0',
67
-        keyword: '',
68
-        pageParams: {
69
-          pageindex: 1, // 当前第几页
70
-          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
71
-          total: 1 // 总共多少数据
109
+    // 添加
110
+    btn_add() {
111
+      this.$layer.iframe({
112
+        content: {
113
+          content: noticeAddOrEdit, // 传递的组件对象
114
+          parent: this, // 当前的vue对象
115
+          data: {
116
+
117
+          } // props
72
         },
118
         },
73
-        multipleSelection: [], // 选中的数据
74
-        selectArr: [],
75
-        dataLists: [] // 列表数据
76
-      }
119
+        area: ['70%', '72%'],
120
+        title: '添加公告'
121
+      })
77
     },
122
     },
78
-    activated() {
79
-      this.isnotice = this.$route.params.isNotice||'0'
123
+    btn_edit(id) {
124
+      this.$layer.iframe({
125
+        content: {
126
+          content: noticeAddOrEdit, // 传递的组件对象
127
+          parent: this, // 当前的vue对象
128
+          data: {
129
+            rowid: id.toString()
130
+          } // props
131
+        },
132
+        area: ['70%', '72%'],
133
+        title: '编辑公告'
134
+      })
80
     },
135
     },
81
-    created() {
82
-      this.getList()
136
+    btn_detail(rowdata) {
137
+      this.$layer.iframe({
138
+        content: {
139
+          content: Detail, // 传递的组件对象
140
+          parent: this, // 当前的vue对象
141
+          data: {
142
+            rowdata: rowdata.toString()
143
+          } // props
144
+        },
145
+        area: ['70%', '70%'],
146
+        title: '公告详情'
147
+      })
83
     },
148
     },
84
-    methods: {
85
-      // 复选框状态改变
86
-      changeSelects(val) {
87
-        this.multipleSelection = val
88
-        this.selectArr = val.map(item => item.F_NoticeId)
89
-      },
90
-      getList() {
91
-        const params = {
92
-          page: this.pageParams.pageindex,
93
-          pagesize: this.pageParams.pagesize,
94
-          content: this.keyword
95
-        }
96
-        getGetList(params).then(res => {
97
-          this.dataLists = res.rows
98
-          this.pageParams.total = res.total
99
-        })
100
-      },
101
-      btn_search() {
102
-        this.getList()
103
-      },
104
-      // 添加
105
-      btn_add() {
106
-        this.$layer.iframe({
107
-          content: {
108
-            content: noticeAddOrEdit, // 传递的组件对象
109
-            parent: this, // 当前的vue对象
110
-            data: {
111
-
112
-            } // props
113
-          },
114
-          area: ['70%', '72%'],
115
-          title: '添加公告'
116
-        })
117
-      },
118
-      btn_edit(id) {
119
-        this.$layer.iframe({
120
-          content: {
121
-            content: noticeAddOrEdit, // 传递的组件对象
122
-            parent: this, // 当前的vue对象
123
-            data: {
124
-              rowid: id.toString()
125
-            } // props
126
-          },
127
-          area: ['70%', '72%'],
128
-          title: '编辑公告'
129
-        })
130
-      },
131
-      btn_detail(rowdata) {
132
-        this.$layer.iframe({
133
-          content: {
134
-            content: Detail, // 传递的组件对象
135
-            parent: this, // 当前的vue对象
136
-            data: {
137
-              rowdata: rowdata.toString()
138
-            } // props
139
-          },
140
-          area: ['70%', '70%'],
141
-          title: '公告详情'
142
-        })
143
-      },
144
-      btn_top(rid) {
145
-        this.$confirm('您确定要将此公告置顶吗?', '提示', {
146
-            confirmButtonText: '确定',
147
-            cancelButtonText: '取消',
148
-            type: 'warning'
149
-          })
150
-          .then(() => {
151
-            const params = {
152
-              noticeid: rid
149
+    btn_top(rid) {
150
+      this.$confirm('您确定要将此公告置顶吗?', '提示', {
151
+        confirmButtonText: '确定',
152
+        cancelButtonText: '取消',
153
+        type: 'warning'
154
+      })
155
+        .then(() => {
156
+          const params = {
157
+            noticeid: rid
158
+          }
159
+          getTopNotice(params).then(res => {
160
+            if (res.state == 'success') {
161
+              this.$message.success('操作成功')
162
+              this.getList()
153
             }
163
             }
154
-            getTopNotice(params).then(res => {
155
-              if (res.state == 'success') {
156
-                this.$message.success('操作成功')
157
-                this.getList()
158
-              }
159
-            })
160
           })
164
           })
161
-          .catch(() => {
162
-            this.$message('已取消')
163
-          })
164
-      },
165
-      btn_delete(rid) {
166
-        this.ondel(rid)
167
-      },
168
-      btn_del() {
169
-        if (this.multipleSelection.length <= 0) {
170
-          this.$message.warning('没有可删除的选项')
171
-          return
172
-        }
173
-        const rid = this.selectArr.toString()
174
-        this.ondel(rid)
175
-      },
176
-      ondel(rid) {
177
-        this.$confirm('您确定要将此公告删除吗?', '提示', {
178
-            confirmButtonText: '确定',
179
-            cancelButtonText: '取消',
180
-            type: 'warning'
181
-          })
182
-          .then(() => {
183
-            const params = {
184
-              ids: rid
165
+        })
166
+        .catch(() => {
167
+          this.$message('已取消')
168
+        })
169
+    },
170
+    btn_delete(rid) {
171
+      this.ondel(rid)
172
+    },
173
+    btn_del() {
174
+      if (this.multipleSelection.length <= 0) {
175
+        this.$message.warning('没有可删除的选项')
176
+        return
177
+      }
178
+      const rid = this.selectArr.toString()
179
+      this.ondel(rid)
180
+    },
181
+    ondel(rid) {
182
+      this.$confirm('您确定要将此公告删除吗?', '提示', {
183
+        confirmButtonText: '确定',
184
+        cancelButtonText: '取消',
185
+        type: 'warning'
186
+      })
187
+        .then(() => {
188
+          const params = {
189
+            ids: rid
190
+          }
191
+          getDelNotice(params).then(res => {
192
+            if (res.state == 'success') {
193
+              this.$message.success('删除成功')
194
+              this.getList()
185
             }
195
             }
186
-            getDelNotice(params).then(res => {
187
-              if (res.state == 'success') {
188
-                this.$message.success('删除成功')
189
-                this.getList()
190
-              }
191
-            })
192
           })
196
           })
193
-          .catch(() => {
194
-            this.$message('已取消')
195
-          })
196
-      }
197
+        })
198
+        .catch(() => {
199
+          this.$message('已取消')
200
+        })
197
     }
201
     }
198
   }
202
   }
203
+}
199
 </script>
204
 </script>
200
 
205
 
201
 <style rel="stylesheet/scss" lang="scss" scoped>
206
 <style rel="stylesheet/scss" lang="scss" scoped>

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

169
   },
169
   },
170
   created() {
170
   created() {
171
     this.genderParams()
171
     this.genderParams()
172
-    console.log(this.iswomanage, '777')
172
+    console.log(this.r2type, '777')
173
   },
173
   },
174
   methods: {
174
   methods: {
175
     genderParams() {
175
     genderParams() {

+ 81 - 36
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/addOrEditDispatch.vue

2
   <div>
2
   <div>
3
     <el-form :model="ruleForm" label-width="150px" class="order_form">
3
     <el-form :model="ruleForm" label-width="150px" class="order_form">
4
       <el-col :span="24">
4
       <el-col :span="24">
5
+        <el-row v-if="JSON.stringify(orderTypeData)==='{}'">
6
+          <el-col :span="10">
7
+            <el-form-item label="业务类别" prop="F_Type1">
8
+              <select-order-type
9
+                v-if="OrderDetailFlag"
10
+                :first-order-type="firstOrderTypeParam"
11
+                @post-first-order-type="getFirstOrderType" />
12
+            </el-form-item>
13
+          </el-col>
14
+          <el-col :span="10">
15
+            <el-form-item label="工单类别" prop="F_Type2">
16
+              <select-order-type-two
17
+                v-if="OrderDetailFlag"
18
+                :second-order-type="secondOrderTypeParam"
19
+                @post-second-order-type="getSecondOrderType" />
20
+            </el-form-item>
21
+          </el-col>
22
+        </el-row>
5
         <el-row>
23
         <el-row>
6
           <el-col :span="12">
24
           <el-col :span="12">
7
             <el-form-item label="申请部门" prop="hosname">
25
             <el-form-item label="申请部门" prop="hosname">
69
         <el-row v-if="type2Arr[0]==2002">
87
         <el-row v-if="type2Arr[0]==2002">
70
           <el-col>
88
           <el-col>
71
             <el-form-item label="物资信息">
89
             <el-form-item label="物资信息">
72
-              <el-button @click="addItem()">添加</el-button>
90
+              <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
73
             </el-form-item>
91
             </el-form-item>
74
           </el-col>
92
           </el-col>
75
         </el-row>
93
         </el-row>
97
         <el-row v-if="type2Arr[0]==2003">
115
         <el-row v-if="type2Arr[0]==2003">
98
           <el-col>
116
           <el-col>
99
             <el-form-item label="病床信息">
117
             <el-form-item label="病床信息">
100
-              <el-button @click="addItem()">添加</el-button>
118
+              <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
101
             </el-form-item>
119
             </el-form-item>
102
           </el-col>
120
           </el-col>
103
         </el-row>
121
         </el-row>
125
         <el-row v-if="type2Arr[0]==2006">
143
         <el-row v-if="type2Arr[0]==2006">
126
           <el-col>
144
           <el-col>
127
             <el-form-item label="标本信息">
145
             <el-form-item label="标本信息">
128
-              <el-button @click="addItem()">添加</el-button>
146
+              <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
129
             </el-form-item>
147
             </el-form-item>
130
           </el-col>
148
           </el-col>
131
         </el-row>
149
         </el-row>
153
         <el-row v-if="type2Arr[0]==9010">
171
         <el-row v-if="type2Arr[0]==9010">
154
           <el-col>
172
           <el-col>
155
             <el-form-item label="药品信息">
173
             <el-form-item label="药品信息">
156
-              <el-button @click="addItem()">添加</el-button>
174
+              <el-button icon="el-icon-plus" @click="addItem()">添加</el-button>
157
             </el-form-item>
175
             </el-form-item>
158
           </el-col>
176
           </el-col>
159
         </el-row>
177
         </el-row>
210
             </el-form-item>
228
             </el-form-item>
211
           </el-col>
229
           </el-col>
212
         </el-row>
230
         </el-row>
213
-        <el-row v-if="iswomanage!=1">
231
+        <el-row>
214
           <el-col :span="24">
232
           <el-col :span="24">
215
             <el-form-item label="下步流程" prop="opt">
233
             <el-form-item label="下步流程" prop="opt">
216
               <el-radio-group v-model="ruleForm.opt">
234
               <el-radio-group v-model="ruleForm.opt">
250
 
268
 
251
 <script>
269
 <script>
252
 // import { addWorkOrder, getModelDetail, updateWorkOrder } from '@/api/comDispatch/hospitalBedTransfer'
270
 // import { addWorkOrder, getModelDetail, updateWorkOrder } from '@/api/comDispatch/hospitalBedTransfer'
253
-import { GetDicValueList, GetequipList, AddSchedulingWorkOrder, UpdateSchedulingWorkOrder } from '@/api/comDispatch/addOrEditDispatch'
271
+import { GetDicValueList, GetequipList, AddSchedulingWorkOrder, UpdateSchedulingWorkOrder, GetOrderDetail } from '@/api/comDispatch/addOrEditDispatch'
254
 import {
272
 import {
255
   GetPerson
273
   GetPerson
256
 } from '@/api/commonAPI'
274
 } from '@/api/commonAPI'
291
       },
309
       },
292
       imgUrl: this.$store.getters.serverConfig.BASE_API + 'FaultRepair/UploadFile',
310
       imgUrl: this.$store.getters.serverConfig.BASE_API + 'FaultRepair/UploadFile',
293
       type2Arr: [],
311
       type2Arr: [],
312
+      firstOrderTypeParam: {
313
+        typeid: 1,
314
+        name: '',
315
+        pid: 0
316
+      },
294
       hospitalsParam: {
317
       hospitalsParam: {
295
         id: 0,
318
         id: 0,
296
         name: ''
319
         name: ''
321
       drugArr: [],
344
       drugArr: [],
322
       ruleForm: {
345
       ruleForm: {
323
         orderType: 2003, // 工单类型
346
         orderType: 2003, // 工单类型
347
+        F_Type2: '',
324
         hospital: 0, // 院区
348
         hospital: 0, // 院区
325
         department: '', // 科室
349
         department: '', // 科室
326
         deptid: 0, // 科室id
350
         deptid: 0, // 科室id
340
   watch: {
364
   watch: {
341
     'orderTypeData.F_Type2': function() {
365
     'orderTypeData.F_Type2': function() {
342
       this.type2Arr = this.orderTypeData.type2Arr
366
       this.type2Arr = this.orderTypeData.type2Arr
367
+      this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
343
       console.log(this.type2Arr)
368
       console.log(this.type2Arr)
344
     }
369
     }
345
   },
370
   },
349
     this.getbeds()
374
     this.getbeds()
350
     this.getbiaoben()
375
     this.getbiaoben()
351
     this.getdrugs()
376
     this.getdrugs()
352
-    if (this.ordreId) {
377
+    if (this.wid) {
353
       this.getDetail()
378
       this.getDetail()
354
     }
379
     }
355
     console.log(this.iswomanage, '444')
380
     console.log(this.iswomanage, '444')
485
     // },
510
     // },
486
     getDetail() {
511
     getDetail() {
487
       const datas = {
512
       const datas = {
488
-        id: this.ordreId
513
+        WorkOrderCode: this.wid
489
       }
514
       }
490
       // 详情
515
       // 详情
491
-      getModelDetail(datas).then(response => {
516
+      GetOrderDetail(datas).then(response => {
492
         if (response.state.toLowerCase() === 'success') {
517
         if (response.state.toLowerCase() === 'success') {
493
-          this.ruleForm.bedNumber = Number(response.model.F_BedNeedMessage.match(/\d/g)[0])
494
-          this.hospitalsParam.name = response.model.HosName
495
-          this.ruleForm.hospital = response.model.F_HosId
496
-          this.ruleForm.deptid = response.model.F_ProposerDeptId
497
-          this.ruleForm.department = response.model.F_ProposerDeptName
498
-          this.departmentsParam.name = response.model.F_ProposerDeptName
499
-          this.repairmanParam.name = response.model.F_ProposerCode
500
-          this.ruleForm.usercode = response.model.F_ProposerCode
501
-          this.ruleForm.phone = response.model.F_ProposerPhon
502
-          this.ruleForm.remark = response.model.F_Remark
518
+          const res = response.data[0]
519
+          this.firstOrderTypeParam.name = res.TypeName
520
+          this.$emit('r2type', res.F_WorkOrderCategory)
521
+          this.ruleForm.F_Type2 = res.F_WorkOrderCategory
522
+          if (res.F_WorkOrderCategory) {
523
+            this.type2Arr = this.$store.getters.workTypeMap[parseInt(res.F_WorkOrderCategory)].ids.slice(1)
524
+            console.log(this.type2Arr, '111')
525
+          }
526
+          if (res.F_CreateUserDept) {
527
+            this.deptidArr = this.$store.getters.deptmap[parseInt(res.F_CreateUserDept)].ids
528
+            this.getRepairman(res.F_CreateUserDept, 0)
529
+            this.ruleForm.ApplicationDept = res.F_CreateUserDept
530
+            this.ruleForm.Applicant = res.F_CreateUser
531
+          }
532
+          if (res.F_DealDept) {
533
+            this.ruleForm.opt = '2'
534
+            this.deptidArr1 = this.$store.getters.deptmap[parseInt(res.F_DealDept)].ids
535
+            // console.log(this.$store.getters.deptmap[parseInt(res.F_DealDept)].ids)
536
+            this.getRepairman1(res.F_DealDept, 0)
537
+            this.ruleForm.DealDept = res.F_DealDept
538
+            this.ruleForm.clid = res.F_DealMan
539
+          }
540
+          this.ruleForm.cfnum = res.F_RemindCount
541
+          this.ruleForm.phone = res.F_Phone
542
+          this.ruleForm.position = res.F_Location
543
+          this.ruleForm.toplace = res.F_ToPlace
544
+          this.ruleForm.content = res.F_Content
545
+          const arr = []
546
+          res.PSInfo.forEach(function(v, n) {
547
+            arr.push({
548
+              devname: v.F_DicName + ',' + v.F_DicId,
549
+              num: v.F_Number
550
+            })
551
+          })
552
+          this.devList = arr
503
         }
553
         }
504
       }).catch(() => {
554
       }).catch(() => {
505
       })
555
       })
506
     },
556
     },
507
     submitForm() {
557
     submitForm() {
508
-      console.log(this.devList)
509
       const details = []
558
       const details = []
510
       this.devList.forEach(function(v, n) {
559
       this.devList.forEach(function(v, n) {
511
         details.push({
560
         details.push({
514
           F_Number: v.num
563
           F_Number: v.num
515
         })
564
         })
516
       })
565
       })
517
-      console.log(details)
518
-      console.log(this.orderTypeData)
519
       if (this.ruleForm.repairImageid === '') {
566
       if (this.ruleForm.repairImageid === '') {
520
         this.ruleForm.repairImageid = ''
567
         this.ruleForm.repairImageid = ''
521
       } else {
568
       } else {
539
         // Applicantsphone: this.ruleForm.phone,
586
         // Applicantsphone: this.ruleForm.phone,
540
         phone: this.ruleForm.phone,
587
         phone: this.ruleForm.phone,
541
         Location: this.ruleForm.position,
588
         Location: this.ruleForm.position,
542
-        WorkOrderCategory: this.orderTypeData.F_Type2,
589
+        WorkOrderCategory: this.ruleForm.F_Type2,
543
         ToPlace: this.ruleForm.toplace,
590
         ToPlace: this.ruleForm.toplace,
544
         Content: this.ruleForm.content,
591
         Content: this.ruleForm.content,
545
         DealDept: this.ruleForm.DealDept,
592
         DealDept: this.ruleForm.DealDept,
548
         detailists: details
595
         detailists: details
549
       }
596
       }
550
       var editdatas = {
597
       var editdatas = {
598
+        usertype: '0',
551
         WorkOrderCode: this.wid,
599
         WorkOrderCode: this.wid,
552
         ApplicationDept: this.ruleForm.ApplicationDept,
600
         ApplicationDept: this.ruleForm.ApplicationDept,
553
         Applicant: this.ruleForm.Applicant,
601
         Applicant: this.ruleForm.Applicant,
554
         phone: this.ruleForm.phone,
602
         phone: this.ruleForm.phone,
555
         Location: this.ruleForm.position,
603
         Location: this.ruleForm.position,
556
-        WorkOrderCategory: this.orderTypeData.F_Type2,
604
+        WorkOrderCategory: this.ruleForm.F_Type2,
557
         ToPlace: this.ruleForm.toplace,
605
         ToPlace: this.ruleForm.toplace,
558
         Content: this.ruleForm.content,
606
         Content: this.ruleForm.content,
559
         DealDept: this.ruleForm.DealDept,
607
         DealDept: this.ruleForm.DealDept,
560
         DealMan: this.ruleForm.clid,
608
         DealMan: this.ruleForm.clid,
561
-        File: this.ruleForm.repairImageid
562
-        // detailists: details
609
+        File: this.ruleForm.repairImageid,
610
+        detailists: details
563
       }
611
       }
564
       // 添加
612
       // 添加
565
-      if (this.ordreId) {
613
+      if (this.wid) {
566
         editdatas.usertype = 0
614
         editdatas.usertype = 0
567
         UpdateSchedulingWorkOrder(editdatas).then(response => {
615
         UpdateSchedulingWorkOrder(editdatas).then(response => {
568
           if (response.state.toLowerCase() === 'success') {
616
           if (response.state.toLowerCase() === 'success') {
569
-            if (this.layerid) {
570
-              this.$parent.$layer.close(this.layerid)
571
-              this.$parent.getList() // 重新加载父级数据
572
-            }
617
+            this.$parent.$layer.closeAll()
618
+            // this.$parent.$layer.close(this.layerid)
619
+            // this.$parent.getList() // 重新加载父级数据
573
             this.$message.success('恭喜你,修改成功!')
620
             this.$message.success('恭喜你,修改成功!')
574
           }
621
           }
575
         }).catch(() => {
622
         }).catch(() => {
577
       } else {
624
       } else {
578
         AddSchedulingWorkOrder(datas).then(response => {
625
         AddSchedulingWorkOrder(datas).then(response => {
579
           if (response.state.toLowerCase() === 'success') {
626
           if (response.state.toLowerCase() === 'success') {
580
-            if (this.layerid) {
581
-              this.$parent.$layer.close(this.layerid)
582
-              this.$parent.getList() // 重新加载父级数据
583
-            }
584
-            // this.resetForm()
627
+            this.$parent.$layer.closeAll()
628
+            // this.$parent.$layer.close(this.layerid)
629
+            // this.$parent.getList() // 重新加载父级数据
585
             this.$message.success('恭喜你,添加成功!')
630
             this.$message.success('恭喜你,添加成功!')
586
           }
631
           }
587
         }).catch(() => {
632
         }).catch(() => {

+ 78 - 76
CallCenterWeb.UI/RMYY/src/views/layout/components/Navbar/sendmsg.vue

5
         <el-row>
5
         <el-row>
6
           <el-col :span="18">
6
           <el-col :span="18">
7
             <el-form-item label="角色" prop="roleid">
7
             <el-form-item label="角色" prop="roleid">
8
-              <el-select @change="onChange()" v-model="ruleForm.roleid" placeholder="请选择角色">
9
-                <el-option v-for="item in roles" :key="item.F_RoleId" :label="item.F_RoleName+'-'+item.F_RoleCode" :value="item.F_RoleId">
10
-                </el-option>
8
+              <el-select v-model="ruleForm.roleid" placeholder="请选择角色" @change="onChange()">
9
+                <el-option v-for="item in roles" :key="item.F_RoleId" :label="item.F_RoleName+'-'+item.F_RoleCode" :value="item.F_RoleId"/>
11
               </el-select>
10
               </el-select>
12
-              <el-select @change="$forceUpdate()" v-model="ruleForm.userid" placeholder="请选择用户">
13
-                <el-option v-for="item in users" :key="item.F_UserId" :label="item.F_UserName+'-'+item.F_UserCode" :value="item.F_UserId">
14
-                </el-option>
11
+              <el-select v-model="ruleForm.userid" placeholder="请选择用户" @change="$forceUpdate()">
12
+                <el-option v-for="item in users" :key="item.F_UserId" :label="item.F_UserName+'-'+item.F_UserCode" :value="item.F_UserId"/>
15
               </el-select>
13
               </el-select>
16
             </el-form-item>
14
             </el-form-item>
17
           </el-col>
15
           </el-col>
42
 </template>
40
 </template>
43
 
41
 
44
 <script>
42
 <script>
45
-  import {
46
-    getRoleList,
47
-    getUserListIndex,
48
-    getSaveChatInfo
49
-  } from '@/api/AnnounceManagement/chart'
50
-  export default {
51
-    name: 'sendMsg',
52
-    props: {
53
-      layerid: {
54
-        type: String,
55
-        default: ''
56
-      },
57
-      roleid:{
58
-        type: Number,
59
-        default: ''
60
-      },
61
-      userid:{
62
-        type: Number,
63
-        default: ''
64
-      }
65
-    },
66
-    data() {
67
-      return {
68
-        ruleForm: {
69
-
70
-        },
71
-        roles: [],
72
-        users: [],
73
-        options: []
74
-      }
43
+import {
44
+  getRoleList,
45
+  getUserListIndex,
46
+  getSaveChatInfo
47
+} from '@/api/AnnounceManagement/chart'
48
+export default {
49
+  name: 'SendMsg',
50
+  props: {
51
+    layerid: {
52
+      type: String,
53
+      default: ''
75
     },
54
     },
76
-    created() {
77
-      if(this.roleid){
78
-        this.ruleForm.roleid = this.roleid
79
-        this.getUserList(this.roleid)
80
-        this.ruleForm.userid = this.userid
81
-      }
82
-      this.getRole()
55
+    roleid: {
56
+      type: Number,
57
+      default: ''
83
     },
58
     },
84
-    methods: {
85
-      getRole() {
86
-        const params = {}
87
-        getRoleList(params).then(res => {
88
-          if (res.state == 'success') {
89
-            this.roles = res.data
90
-          }
91
-        })
92
-      },
93
-      onChange() {
94
-        this.ruleForm.userid=''
95
-        this.getUserList(this.ruleForm.roleid)
59
+    userid: {
60
+      type: Number,
61
+      default: ''
62
+    }
63
+  },
64
+  data() {
65
+    return {
66
+      ruleForm: {
67
+
96
       },
68
       },
97
-      getUserList(pid) {
98
-        const params = {
99
-          roleid: pid
69
+      roles: [],
70
+      users: [],
71
+      options: []
72
+    }
73
+  },
74
+  created() {
75
+    if (this.roleid) {
76
+      this.ruleForm.roleid = this.roleid
77
+      this.getUserList(this.roleid)
78
+      this.ruleForm.userid = this.userid
79
+    }
80
+    this.getRole()
81
+  },
82
+  methods: {
83
+    getRole() {
84
+      const params = {}
85
+      getRoleList(params).then(res => {
86
+        if (res.state == 'success') {
87
+          this.roles = res.data
100
         }
88
         }
101
-        getUserListIndex(params).then(res => {
102
-          if (res.state == 'success') {
103
-            this.users = res.data
104
-          }
105
-        })
106
-      },
107
-      submitForm() {
108
-        const params = {
109
-          Content: this.ruleForm.con,
110
-          ToUserId: this.ruleForm.userid||'0',
111
-          ToRoleId: this.ruleForm.roleid,
112
-          IsToAll: this.ruleForm.IsToAll
89
+      })
90
+    },
91
+    onChange() {
92
+      this.ruleForm.userid = ''
93
+      this.getUserList(this.ruleForm.roleid)
94
+    },
95
+    getUserList(pid) {
96
+      const params = {
97
+        roleid: pid
98
+      }
99
+      getUserListIndex(params).then(res => {
100
+        if (res.state == 'success') {
101
+          this.users = res.data
113
         }
102
         }
114
-        getSaveChatInfo(params).then((response) => {
115
-          if(response.state=='success'){
116
-            this.$message.success('发送成功')
117
-            this.ruleForm.con=''
118
-          }
119
-        })
103
+      })
104
+    },
105
+    submitForm() {
106
+      if (!this.ruleForm.con) {
107
+        this.$message.error('请输入发送内容')
108
+        return
120
       }
109
       }
110
+      const params = {
111
+        Content: this.ruleForm.con,
112
+        ToUserId: this.ruleForm.userid || '0',
113
+        ToRoleId: this.ruleForm.roleid,
114
+        IsToAll: this.ruleForm.IsToAll
115
+      }
116
+      getSaveChatInfo(params).then((response) => {
117
+        if (response.state == 'success') {
118
+          this.$message.success('发送成功')
119
+          this.ruleForm.con = ''
120
+        }
121
+      })
121
     }
122
     }
122
   }
123
   }
124
+}
123
 </script>
125
 </script>
124
 
126
 
125
 <style rel="stylesheet/scss" lang="scss">
127
 <style rel="stylesheet/scss" lang="scss">

+ 140 - 201
CallCenterWeb.UI/RMYY/src/views/orderManage/components/addOrEditInfOrder.vue

221
   getTouSuSelect
221
   getTouSuSelect
222
 } from '@/api/orderManagement/orderList'
222
 } from '@/api/orderManagement/orderList'
223
 import {
223
 import {
224
-  validateTel
225
-} from '@/utils/validate'
226
-import {
227
-  mapGetters
228
-} from 'vuex'
229
-import {
230
   GetPerson
224
   GetPerson
231
 } from '@/api/commonAPI'
225
 } from '@/api/commonAPI'
232
 export default {
226
 export default {
248
       type: String,
242
       type: String,
249
       default: ''
243
       default: ''
250
     },
244
     },
251
-    // callid:{
252
-    //   type:String,
253
-    //   default:''
245
+    // callid: {
246
+    //   type: String,
247
+    //   default: ''
254
     // },
248
     // },
255
     // rowid: {
249
     // rowid: {
256
     //   type: Number,
250
     //   type: Number,
337
           message: '请输入工单内容',
331
           message: '请输入工单内容',
338
           trigger: 'blur'
332
           trigger: 'blur'
339
         }],
333
         }],
340
-        // F_DealOpinions: [{
341
-        //   required: true,
342
-        //   message: '请输入处理意见',
343
-        //   trigger: 'blur'
344
-        // }],
345
         F_FirstCheckHospital: [{
334
         F_FirstCheckHospital: [{
346
           required: true,
335
           required: true,
347
           message: '请输入首次检查医院',
336
           message: '请输入首次检查医院',
357
           message: '请选择发现时间',
346
           message: '请选择发现时间',
358
           trigger: 'change'
347
           trigger: 'change'
359
         }],
348
         }],
360
-        // F_ServiceItems: [{
361
-        //   required: true,
362
-        //   message: '请选择服务项目',
363
-        //   trigger: 'change'
364
-        // }],
365
         F_Cathetertype: [{
349
         F_Cathetertype: [{
366
           required: true,
350
           required: true,
367
           message: '请输入置管类型',
351
           message: '请输入置管类型',
408
           trigger: 'change'
392
           trigger: 'change'
409
         }]
393
         }]
410
       },
394
       },
395
+      F_Type2: '',
411
       ruleForm: {
396
       ruleForm: {
412
         F_CallID: '',
397
         F_CallID: '',
413
         F_ID: '',
398
         F_ID: '',
414
         F_Source: '电话', // 业务类别
399
         F_Source: '电话', // 业务类别
415
         F_Type1: '', // 工单类别
400
         F_Type1: '', // 工单类别
416
-        F_TypeName1: '', // 工单类别
401
+        // F_TypeName1: '', // 工单类别
417
         F_Type2: '', // 工单子类
402
         F_Type2: '', // 工单子类
418
-        F_TypeName2: '', // 工单子类
403
+        // F_TypeName2: '', // 工单子类
419
         // F_Type3: '', // 工单三类
404
         // F_Type3: '', // 工单三类
420
         // F_TypeName3: '', // 工单三类
405
         // F_TypeName3: '', // 工单三类
421
         identification: '',
406
         identification: '',
454
       isButton: true
439
       isButton: true
455
     }
440
     }
456
   },
441
   },
457
-  computed: {
458
-    ...mapGetters(['screenState'])
459
-  },
460
   watch: {
442
   watch: {
461
     'orderTypeData.F_Type2': function() {
443
     'orderTypeData.F_Type2': function() {
462
-      this.typeSecondState(this.orderTypeData.F_Type2)
444
+      // this.typeSecondState(this.orderTypeData.F_Type2)
445
+      this.ruleForm.type2Arr = this.orderTypeData.type2Arr
463
       this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
446
       this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
464
       this.ruleForm.identification = this.orderTypeData.identification
447
       this.ruleForm.identification = this.orderTypeData.identification
465
-      this.ruleForm.type2Arr = this.orderTypeData.type2Arr
466
       // console.log(this.orderTypeData, '999')
448
       // console.log(this.orderTypeData, '999')
467
       if (this.orderTypeData.type2Arr[0] == '8023') {
449
       if (this.orderTypeData.type2Arr[0] == '8023') {
468
         this.zpdptname = '建议部门'
450
         this.zpdptname = '建议部门'
492
     this.gettsSelect()
474
     this.gettsSelect()
493
   },
475
   },
494
   methods: {
476
   methods: {
495
-    submitForm() {
496
-      if (JSON.stringify(this.orderTypeData) !== '{}') {
497
-        console.log(this.orderTypeData)
498
-        this.getParentOrderType()
477
+    // 获取详情
478
+    OrderDetail() {
479
+      const params = {
480
+        WorkOrderCode: this.wid
499
       }
481
       }
482
+      GetOrderDetail(params).then((response) => {
483
+        this.loading = false
484
+        if (response.state.toLowerCase() === 'success') {
485
+          const res = response.data[0]
486
+          if (res) {
487
+            this.rowid = res.F_ID
488
+            this.ruleForm.F_ID = res.F_ID
489
+            this.ruleForm.F_Source = res.F_Source // 业务类别
490
+            this.ruleForm.F_Type1 = res.F_type1 // 工单类别
491
+            this.firstOrderTypeParam.name = res.typename1
492
+            this.$emit('r2type', res.F_type2)
493
+            this.ruleForm.F_Type2 = res.F_type2 // 工单子类
494
+            this.F_Type2 = res.F_type2
495
+            if (res.F_type2) {
496
+              this.ruleForm.type2Arr = this.$store.getters.workTypeMap[parseInt(res.F_type2)].ids.slice(1)
497
+            }
498
+            this.ruleForm.F_Customer = res.F_Customer // 姓名
499
+            this.ruleForm.F_Sex = res.F_Sex.toString() // 性别
500
+            this.ruleForm.F_Phon = res.F_Phon // 电话
501
+            this.ruleForm.F_CusAddress = res.F_CusAddress // 家庭住址
502
+            this.ruleForm.F_IdCard = res.F_IdCard // 身份证号
503
+            this.ruleForm.F_ServiceItems = res.F_ServiceItems // 服务项目
504
+            this.ruleForm.F_Address = res.F_Address // 地区
505
+            this.ruleForm.F_FirstCheckHospital = res.F_FirstCheckHospital // 首次检查医院
506
+            this.ruleForm.F_NoduleSize = res.F_NoduleSize // 肺结节大小
507
+            this.ruleForm.F_FirstFindTime = res.F_FirstFindTime // 首次发现肺结节时间
508
+            this.ruleForm.F_Urgency = res.F_Urgency.toString() // 紧急程度
509
+            this.ruleForm.F_Cathetertype = res.F_Cathetertype // 置管类型
510
+            this.ruleForm.F_Catheterdept = res.F_Catheterdept // 置管科室
511
+            this.ruleForm.F_Cathetertime = res.F_Cathetertime // 置管时间
512
+            this.ruleForm.F_BedNum = res.F_BedNum // 床号
513
+            this.ruleForm.F_InpatientNum = res.F_InpatientNum // 住院号
514
+            if (res.F_DealType === '立即办理') {
515
+              this.ruleForm.opt = '1'
516
+            } else if (res.F_DealType === '提交审核') {
517
+              this.ruleForm.opt = '2'
518
+            } else if (res.F_DealType === '转派') {
519
+              this.ruleForm.opt = '3'
520
+            }
521
+            this.ruleForm.F_WorkOrderContents = res.F_WorkOrderContents // 工单内容
522
+            this.ruleForm.F_DealOpinions = res.F_DealOpinions // 处理意见
523
+            this.ruleForm.F_FullName = res.F_FullName
524
+            this.ruleForm.F_IDNumber = res.F_IDNumber
525
+            this.ruleForm.F_Relationship = res.F_Relationship
526
+            // console.log(this.ruleForm.type2Arr, '99')
527
+            if (this.ruleForm.type2Arr[0] == '8023') {
528
+              this.zpdptname = '建议部门'
529
+              this.zppername = '建议人'
530
+            }
531
+            if (this.ruleForm.type2Arr[0] == '8015') {
532
+              this.zpdptname = '投诉部门'
533
+              this.zppername = '投诉人'
534
+            }
535
+            if (this.ruleForm.type2Arr[0] == '8031') {
536
+              this.zpdptname = '表扬部门'
537
+              this.zppername = '表扬人'
538
+            }
539
+            if (res.F_ComplaintDept) {
540
+              this.deptidArr = this.$store.getters.deptmap[parseInt(res.F_ComplaintDept)].ids
541
+              this.getRepairman(res.F_ComplaintDept, 0)
542
+              this.ruleForm.F_ComplaintDept = res.F_ComplaintDept
543
+              this.ruleForm.F_ComplaintUser = res.F_ComplaintUser
544
+            }
545
+            if (res.DealDept) {
546
+              this.deptidArr1 = this.$store.getters.deptmap[parseInt(res.DealDept)].ids
547
+              console.log(this.$store.getters.deptmap[parseInt(res.DealDept)].ids, '00000')
548
+              this.getRepairman1(res.DealDept, 0)
549
+              this.ruleForm.clbm = res.DealDept
550
+              this.ruleForm.clid = res.DealUser
551
+            }
552
+          }
553
+        }
554
+      }).catch(() => {
555
+      })
556
+    },
557
+    submitForm() {
558
+      // if (JSON.stringify(this.orderTypeData) !== '{}') {
559
+      //   console.log(this.orderTypeData)
560
+      //   this.getParentOrderType()
561
+      // }
500
       this.$refs.ruleForm.validate((valid) => {
562
       this.$refs.ruleForm.validate((valid) => {
501
         if (valid) {
563
         if (valid) {
502
           this.loading = true
564
           this.loading = true
516
             F_FullName: this.ruleForm.F_FullName, // 患者姓名
578
             F_FullName: this.ruleForm.F_FullName, // 患者姓名
517
             F_Relationship: this.ruleForm.F_Relationship, // 患者关系
579
             F_Relationship: this.ruleForm.F_Relationship, // 患者关系
518
             F_IDNumber: this.ruleForm.F_IDNumber, // 患者身份证
580
             F_IDNumber: this.ruleForm.F_IDNumber, // 患者身份证
519
-            // F_ServiceItems: this.ruleForm.F_ServiceItems, // 服务项目
520
-            // F_ServiceItems: this.ruleForm.F_Type2, // 服务项目用工单类别最后一级代替
521
             F_Address: this.ruleForm.F_Address, // 地区
581
             F_Address: this.ruleForm.F_Address, // 地区
522
             F_FirstCheckHospital: this.ruleForm.F_FirstCheckHospital, // 首次检查医院
582
             F_FirstCheckHospital: this.ruleForm.F_FirstCheckHospital, // 首次检查医院
523
             F_NoduleSize: this.ruleForm.F_NoduleSize, // 肺结节大小
583
             F_NoduleSize: this.ruleForm.F_NoduleSize, // 肺结节大小
566
           }
626
           }
567
           if (this.wid) {
627
           if (this.wid) {
568
             // 编辑
628
             // 编辑
629
+            params.F_Type2 = this.F_Type2
569
             updateWorkOrder(params)
630
             updateWorkOrder(params)
570
               .then((response) => {
631
               .then((response) => {
571
                 this.loading = false
632
                 this.loading = false
632
         resolve()
693
         resolve()
633
       })
694
       })
634
     },
695
     },
635
-    getRepairman(id, state) {
636
-      return new Promise((resolve) => {
637
-        const params = {
638
-          deptid: id // 字典管理的工单标识
639
-        }
640
-        GetPerson(params).then((res) => {
641
-          if (state === 0) {
642
-            this.repairman = res.rows
643
-          } else if (state === 1) {
644
-            this.assignman = res.rows
645
-          }
646
-        })
647
-        resolve()
648
-      })
649
-    },
650
     changeRepairman(data) {
696
     changeRepairman(data) {
651
-      // this.ruleForm.repairmanid = data
652
-      // const user = this.repairman.find((o) => {
653
-      //   return o.usercode === data.toString()
654
-      // })
655
-      // if (user) {
656
-      //   this.ruleForm.repairmanphone = user.usertelphone
657
-      //   this.ruleForm.repairmanCallNumber = user.usertelphone
658
-      // }
697
+
659
     },
698
     },
660
     changeRepairman1(data) {
699
     changeRepairman1(data) {
661
-      // this.ruleForm.repairmanid = data
662
-      // const user = this.repairman.find((o) => {
663
-      //   return o.usercode === data.toString()
664
-      // })
665
-      // if (user) {
666
-      //   this.ruleForm.repairmanphone = user.usertelphone
667
-      //   this.ruleForm.repairmanCallNumber = user.usertelphone
668
-      // }
700
+
669
     },
701
     },
670
     genderParams() {
702
     genderParams() {
671
       this.ruleForm.F_Customer = this.personParmsData.F_Customer // 姓名
703
       this.ruleForm.F_Customer = this.personParmsData.F_Customer // 姓名
676
     },
708
     },
677
 
709
 
678
     // 一级改变时触发
710
     // 一级改变时触发
679
-    getFirstOrderType(data) {
680
-      this.ruleForm.F_Type1 = data.value
681
-      this.ruleForm.F_TypeName1 = data.name
682
-      this.secondOrderTypeParam.typeid = 2
683
-      this.secondOrderTypeParam.pid = data.value
684
-    },
685
-
711
+    // getFirstOrderType(data) {
712
+    //   this.ruleForm.F_Type1 = data.value
713
+    //   this.ruleForm.F_TypeName1 = data.name
714
+    //   this.secondOrderTypeParam.typeid = 2
715
+    //   this.secondOrderTypeParam.pid = data.value
716
+    // },
686
     // 二级改变时触发
717
     // 二级改变时触发
687
-    getSecondOrderType(data) {
688
-      this.ruleForm.F_Type2 = data.value
689
-      this.ruleForm.F_TypeName2 = data.name
690
-      this.typeSecondState(data.value)
691
-      this.thirdOrderTypeParam.typeid = 3
692
-      this.thirdOrderTypeParam.pid = data.value
693
-    },
718
+    // getSecondOrderType(data) {
719
+    //   this.ruleForm.F_Type2 = data.value
720
+    //   this.ruleForm.F_TypeName2 = data.name
721
+    //   this.typeSecondState(data.value)
722
+    //   this.thirdOrderTypeParam.typeid = 3
723
+    //   this.thirdOrderTypeParam.pid = data.value
724
+    // },
694
     // 三级改变时触发
725
     // 三级改变时触发
695
     // getThirdOrderType(data) {
726
     // getThirdOrderType(data) {
696
     //   this.ruleForm.F_Type3 = data.value
727
     //   this.ruleForm.F_Type3 = data.value
701
     //   this.ruleForm.F_ServiceItems = data.value
732
     //   this.ruleForm.F_ServiceItems = data.value
702
     //   this.ruleForm.F_ServiceItems = data.name
733
     //   this.ruleForm.F_ServiceItems = data.name
703
     // },
734
     // },
704
-    typeSecondState(data) {
705
-      switch (data) {
706
-        // case 1001: // 健康咨询
707
-        //   this.ruleForm.opt = '1'
708
-        //   break
709
-        // case 1002: // 投诉建议
710
-        //   this.ruleForm.opt = '2'
711
-        //   break
712
-        // case 1003: // 外聘专家咨询
713
-        //   this.ruleForm.opt = '1'
714
-        //   break
715
-        // case 1004: // 家庭预约上门
716
-        //   this.ruleForm.opt = '3'
717
-        //   break
718
-        // case 1005: // 静脉置管维护
719
-        //   this.ruleForm.opt = '3'
720
-        //   break
721
-        // default:
722
-        //   this.ruleForm.opt = '1'
723
-        //   break
724
-      }
725
-    },
726
-    // 获取详情
727
-    OrderDetail() {
728
-      return new Promise((resolve) => {
729
-        const params = {
730
-          WorkOrderCode: this.wid
731
-        }
732
-        GetOrderDetail(params).then((response) => {
733
-          this.loading = false
734
-          if (response.state.toLowerCase() === 'success') {
735
-            const res = response.data[0]
736
-            if (res) {
737
-              this.rowid = res.F_ID
738
-              this.ruleForm.F_ID = res.F_ID
739
-              this.ruleForm.F_Source = res.F_Source // 业务类别
740
-              this.ruleForm.F_Type1 = res.F_type1 // 工单类别
741
-              this.ruleForm.F_TypeName1 = res.typename1 // 工单类别
742
-              this.firstOrderTypeParam.name = res.typename1
743
-              this.$emit('r2type', res.F_type2)
744
-              this.ruleForm.F_Type2 = res.F_type2 // 工单子类
745
-              // this.typeSecondState(res.F_type2)
746
-              this.ruleForm.F_TypeName2 = res.typename2 // 工单子类
747
-              this.secondOrderTypeParam.name = res.typename2
748
-              // this.ruleForm.F_Type3 = res.F_type3 // 工单三类
749
-              // this.ruleForm.F_TypeName3 = res.typename3 // 工单三类
750
-              // this.thirdOrderTypeParam.name = res.typename3
751
-              this.ruleForm.F_Customer = res.F_Customer // 姓名
752
-              this.ruleForm.F_Sex = res.F_Sex.toString() // 性别
753
-              this.ruleForm.F_Phon = res.F_Phon // 电话
754
-              this.ruleForm.F_CusAddress = res.F_CusAddress // 家庭住址
755
-              this.ruleForm.F_IdCard = res.F_IdCard // 身份证号
756
-              this.ruleForm.F_ServiceItems = res.F_ServiceItems // 服务项目
757
-
758
-              // this.inServicesParam.name = res.F_ServiceItems // 服务项目
759
-
760
-              this.ruleForm.F_Address = res.F_Address // 地区
761
-              this.ruleForm.F_FirstCheckHospital = res.F_FirstCheckHospital // 首次检查医院
762
-              this.ruleForm.F_NoduleSize = res.F_NoduleSize // 肺结节大小
763
-              this.ruleForm.F_FirstFindTime = res.F_FirstFindTime // 首次发现肺结节时间
764
-              this.ruleForm.F_Urgency = res.F_Urgency.toString() // 紧急程度
765
-              this.ruleForm.F_Cathetertype = res.F_Cathetertype // 置管类型
766
-              this.ruleForm.F_Catheterdept = res.F_Catheterdept // 置管科室
767
-              this.ruleForm.F_Cathetertime = res.F_Cathetertime // 置管时间
768
-              this.ruleForm.F_BedNum = res.F_BedNum // 床号
769
-              this.ruleForm.F_InpatientNum = res.F_InpatientNum // 住院号
770
-              if (res.F_DealType === '立即办理') {
771
-                this.ruleForm.opt = '1'
772
-              } else if (res.F_DealType === '提交审核') {
773
-                this.ruleForm.opt = '2'
774
-              } else if (res.F_DealType === '转派') {
775
-                this.ruleForm.opt = '3'
776
-              }
777
-              this.ruleForm.F_WorkOrderContents = res.F_WorkOrderContents // 工单内容
778
-              this.ruleForm.F_DealOpinions = res.F_DealOpinions // 处理意见
779
-              // this.OrderDetailFlag = true
780
-              this.ruleForm.F_FullName = res.F_FullName
781
-              this.ruleForm.F_IDNumber = res.F_IDNumber
782
-              this.ruleForm.F_Relationship = res.F_Relationship
783
-              if (res.F_type2) {
784
-                this.ruleForm.type2Arr = this.$store.getters.workTypeMap[parseInt(res.F_type2)].ids.slice(1)
785
-              }
786
-              // console.log(this.ruleForm.type2Arr, '99')
787
-              if (this.ruleForm.type2Arr[0] == '8023') {
788
-                this.zpdptname = '建议部门'
789
-                this.zppername = '建议人'
790
-              }
791
-              if (this.ruleForm.type2Arr[0] == '8015') {
792
-                this.zpdptname = '投诉部门'
793
-                this.zppername = '投诉人'
794
-              }
795
-              if (this.ruleForm.type2Arr[0] == '8031') {
796
-                this.zpdptname = '表扬部门'
797
-                this.zppername = '表扬人'
798
-              }
799
-              if (res.F_ComplaintDept) {
800
-                this.deptidArr = this.$store.getters.deptmap[parseInt(res.F_ComplaintDept)].ids
801
-                this.getRepairman(res.F_ComplaintDept, 0)
802
-                this.ruleForm.F_ComplaintDept = res.F_ComplaintDept
803
-                this.ruleForm.F_ComplaintUser = res.F_ComplaintUser
804
-              }
805
-              if (res.DealDept) {
806
-                this.deptidArr1 = this.$store.getters.deptmap[parseInt(res.DealDept)].ids
807
-                console.log(this.$store.getters.deptmap[parseInt(res.DealDept)].ids, '00000')
808
-                this.getRepairman1(res.DealDept, 0)
809
-                this.ruleForm.clbm = res.DealDept
810
-                this.ruleForm.clid = res.DealUser
811
-              }
812
-            }
813
-          }
814
-        })
815
-        resolve()
816
-      })
817
-    },
735
+    // typeSecondState(data) {
736
+    // switch (data) {
737
+    // case 1001: // 健康咨询
738
+    //   this.ruleForm.opt = '1'
739
+    //   break
740
+    // case 1002: // 投诉建议
741
+    //   this.ruleForm.opt = '2'
742
+    //   break
743
+    // case 1003: // 外聘专家咨询
744
+    //   this.ruleForm.opt = '1'
745
+    //   break
746
+    // case 1004: // 家庭预约上门
747
+    //   this.ruleForm.opt = '3'
748
+    //   break
749
+    // case 1005: // 静脉置管维护
750
+    //   this.ruleForm.opt = '3'
751
+    //   break
752
+    // default:
753
+    //   this.ruleForm.opt = '1'
754
+    //   break
755
+    // }
756
+    // },
818
 
757
 
819
-    getParentOrderType() {
820
-      this.ruleForm.F_Type1 = this.orderTypeData.F_Type1
821
-      this.ruleForm.F_TypeName1 = this.orderTypeData.F_TypeName1
822
-      this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
823
-      this.ruleForm.F_TypeName2 = this.orderTypeData.F_TypeName2
824
-      this.ruleForm.F_Type3 = this.orderTypeData.F_Type3
825
-      this.ruleForm.F_TypeName3 = this.orderTypeData.F_TypeName3
826
-      this.ruleForm.identification = this.orderTypeData.identification
827
-      this.ruleForm.type2Arr = this.orderTypeData.type2Arr
828
-    },
758
+    // getParentOrderType() {
759
+    //   this.ruleForm.F_Type1 = this.orderTypeData.F_Type1
760
+    //   this.ruleForm.F_TypeName1 = this.orderTypeData.F_TypeName1
761
+    //   this.ruleForm.F_Type2 = this.orderTypeData.F_Type2
762
+    //   this.ruleForm.F_TypeName2 = this.orderTypeData.F_TypeName2
763
+    //   this.ruleForm.F_Type3 = this.orderTypeData.F_Type3
764
+    //   this.ruleForm.F_TypeName3 = this.orderTypeData.F_TypeName3
765
+    //   this.ruleForm.identification = this.orderTypeData.identification
766
+    //   this.ruleForm.type2Arr = this.orderTypeData.type2Arr
767
+    // },
829
     // 重置工单
768
     // 重置工单
830
     resetForm() {
769
     resetForm() {
831
       this.ruleForm.F_Source = '' // 业务类别
770
       this.ruleForm.F_Source = '' // 业务类别

+ 131 - 64
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

3
     <div class="filter-container">
3
     <div class="filter-container">
4
       <!-- <el-input v-model="searchData.name" placeholder="请输入姓名" class="filter-item" size="medium" /> -->
4
       <!-- <el-input v-model="searchData.name" placeholder="请输入姓名" class="filter-item" size="medium" /> -->
5
       <!-- <el-input v-model="searchData.phone" placeholder="请输入电话" class="filter-item" size="medium" /> -->
5
       <!-- <el-input v-model="searchData.phone" placeholder="请输入电话" class="filter-item" size="medium" /> -->
6
-      <el-input v-model="searchData.wocode" placeholder="请输入工单编号" class="filter-item" size="medium" />
6
+      <el-input
7
+        v-model="searchData.wocode"
8
+        placeholder="请输入工单编号"
9
+        class="filter-item"
10
+        size="medium"
11
+      />
7
       <el-date-picker
12
       <el-date-picker
8
         v-model="searchTime"
13
         v-model="searchTime"
9
         type="daterange"
14
         type="daterange"
14
         range-separator="至"
19
         range-separator="至"
15
         start-placeholder="开始日期"
20
         start-placeholder="开始日期"
16
         end-placeholder="结束日期"
21
         end-placeholder="结束日期"
17
-        size="medium" />
18
-      <el-select v-model="searchData.type" clearable placeholder="请选择业务类别" size="medium" @change="changeOrder">
19
-        <el-option v-for="item in orderData" :key="item.id" :label="item.text" :value="item.id" />
22
+        size="medium"
23
+      />
24
+      <el-select
25
+        v-model="searchData.type"
26
+        clearable
27
+        placeholder="请选择业务类别"
28
+        size="medium"
29
+        @change="changeOrder"
30
+      >
31
+        <el-option
32
+          v-for="item in orderData"
33
+          :key="item.id"
34
+          :label="item.text"
35
+          :value="item.id"
36
+        />
20
       </el-select>
37
       </el-select>
21
       <el-cascader
38
       <el-cascader
22
         ref="cascader"
39
         ref="cascader"
27
         placeholder="请选择工单类别"
44
         placeholder="请选择工单类别"
28
         filterable
45
         filterable
29
         clearable
46
         clearable
30
-        @change="handleChange" />
31
-      <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="btn_search">
47
+        @change="handleChange"
48
+      />
49
+      <el-button
50
+        type="primary"
51
+        class="filter-btn"
52
+        icon="el-icon-search"
53
+        @click="btn_search"
54
+      >
32
         搜索
55
         搜索
33
       </el-button>
56
       </el-button>
34
       <el-button
57
       <el-button
36
         type="primary"
59
         type="primary"
37
         class="filter-btn"
60
         class="filter-btn"
38
         icon="el-icon-s-tools"
61
         icon="el-icon-s-tools"
39
-        @click="btn_add_list">
62
+        @click="btn_add_list"
63
+      >
40
         设置列
64
         设置列
41
       </el-button>
65
       </el-button>
42
     </div>
66
     </div>
45
       <el-tab-pane label="待处理" name="0" />
69
       <el-tab-pane label="待处理" name="0" />
46
       <el-tab-pane label="已处理" name="1" />
70
       <el-tab-pane label="已处理" name="1" />
47
     </el-tabs>
71
     </el-tabs>
48
-    <el-table v-loading="loading" ref="multipleTable" :data="dataLists" border stripe row-key="F_Id">
72
+    <el-table
73
+      v-loading="loading"
74
+      ref="multipleTable"
75
+      :data="dataLists"
76
+      border
77
+      stripe
78
+      row-key="F_Id"
79
+    >
49
       <!-- <el-table-column type="index" label="编号" align="center" fixed width="60" /> -->
80
       <!-- <el-table-column type="index" label="编号" align="center" fixed width="60" /> -->
50
-      <el-table-column v-if="fieldListFlag.F_WoCode" prop="F_WoCode" label="工单编号" align="center" min-width="110">
81
+      <el-table-column
82
+        v-if="fieldListFlag.F_WoCode"
83
+        prop="F_WoCode"
84
+        label="工单编号"
85
+        align="center"
86
+        min-width="110"
87
+      >
51
         <template slot-scope="scope">
88
         <template slot-scope="scope">
52
-          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row)">
89
+          <el-button
90
+            type="text"
91
+            size="small"
92
+            @click="hadndleOrderCode(scope.row)"
93
+          >
53
             {{ scope.row.F_WoCode }}
94
             {{ scope.row.F_WoCode }}
54
           </el-button>
95
           </el-button>
55
         </template>
96
         </template>
56
       </el-table-column>
97
       </el-table-column>
57
-      <el-table-column v-if="fieldListFlag.F_ProposerName" prop="F_ProposerName" label="姓名" align="center" min-width />
98
+      <el-table-column
99
+        v-if="fieldListFlag.F_ProposerName"
100
+        prop="F_ProposerName"
101
+        label="姓名"
102
+        align="center"
103
+        min-width
104
+      />
58
       <el-table-column
105
       <el-table-column
59
         v-if="fieldListFlag.F_SonType"
106
         v-if="fieldListFlag.F_SonType"
60
         :formatter="formtOrder"
107
         :formatter="formtOrder"
61
         prop="F_SonType"
108
         prop="F_SonType"
62
         label="工单类别"
109
         label="工单类别"
63
-        align="center" />
64
-      <el-table-column v-if="fieldListFlag.F_Content" prop="F_Content" label="工单内容" align="center" />
65
-      <el-table-column v-if="fieldListFlag.StateName" prop="StateName" label="工单状态" align="center" />
66
-      <el-table-column v-if="fieldListFlag.F_CreateTime" prop="F_CreateTime" label="创建时间" align="center" />
67
-      <el-table-column label="操作" align="center" class-name="oparate_btn" fixed="right">
110
+        align="center"
111
+      />
112
+      <el-table-column
113
+        v-if="fieldListFlag.F_Content"
114
+        prop="F_Content"
115
+        label="工单内容"
116
+        align="center"
117
+      />
118
+      <el-table-column
119
+        v-if="fieldListFlag.StateName"
120
+        prop="StateName"
121
+        label="工单状态"
122
+        align="center"
123
+      />
124
+      <el-table-column
125
+        v-if="fieldListFlag.F_CreateTime"
126
+        prop="F_CreateTime"
127
+        label="创建时间"
128
+        align="center"
129
+      />
130
+      <el-table-column
131
+        label="操作"
132
+        align="center"
133
+        class-name="oparate_btn"
134
+        fixed="right"
135
+      >
68
         <template slot-scope="scope">
136
         <template slot-scope="scope">
69
           <el-button
137
           <el-button
70
             v-for="item in scope.row.Buttons"
138
             v-for="item in scope.row.Buttons"
71
             :key="item.key"
139
             :key="item.key"
72
             type="text"
140
             type="text"
73
-            @click="btnClickEvents(item, scope.row.F_WoCode, scope.row)">
141
+            @click="btnClickEvents(item, scope.row.F_WoCode, scope.row)"
142
+          >
74
             {{ item.value }}
143
             {{ item.value }}
75
           </el-button>
144
           </el-button>
76
         </template>
145
         </template>
82
       :pageindex.sync="pageParams.pageindex"
151
       :pageindex.sync="pageParams.pageindex"
83
       :pagesize.sync="pageParams.pagesize"
152
       :pagesize.sync="pageParams.pagesize"
84
       class="pagination"
153
       class="pagination"
85
-      @pagination="getList" />
86
-    <order-button-operation ref="butOption" :name.sync="buttonName" @refList="refList" />
154
+      @pagination="getList"
155
+    />
156
+    <order-button-operation
157
+      ref="butOption"
158
+      :name.sync="buttonName"
159
+      @refList="refList"
160
+    />
87
   </div>
161
   </div>
88
 </template>
162
 </template>
89
 
163
 
90
 <script>
164
 <script>
91
-import {
92
-  getOrderTypeDrop
93
-} from '@/api/systemSetup/roleSetting/menuSetup'
165
+import { getOrderTypeDrop } from '@/api/systemSetup/roleSetting/menuSetup'
94
 import {
166
 import {
95
   getorderList,
167
   getorderList,
96
   deleteOrder,
168
   deleteOrder,
103
   schedulRetractOrder,
175
   schedulRetractOrder,
104
   updateSchedulingOrder,
176
   updateSchedulingOrder,
105
   deleteSchedulingOrder,
177
   deleteSchedulingOrder,
106
-  getSchedulingOrder,
178
+  getSchedulingOrder
107
 } from '@/api/orderManagement/orderList'
179
 } from '@/api/orderManagement/orderList'
108
 
180
 
109
-import {
110
-  getOrderTypeList
111
-} from '@/api/commonAPI'
112
-import {
113
-  GetFiledState,
114
-  AddFiled
115
-} from '@/api/commonAPI'
181
+import { getOrderTypeList } from '@/api/commonAPI'
182
+import { GetFiledState, AddFiled } from '@/api/commonAPI'
116
 import fieldDATA from '@/utils/fieldsData.js'
183
 import fieldDATA from '@/utils/fieldsData.js'
117
 import addDefinedList from '@/components/context/addDefinedList'
184
 import addDefinedList from '@/components/context/addDefinedList'
118
 import addOrEditFaultRepair from '../../faultRepair/clinicalReporting/components/addRepairbase.vue'
185
 import addOrEditFaultRepair from '../../faultRepair/clinicalReporting/components/addRepairbase.vue'
119
 import RepairEdit from './repairEdit.vue'
186
 import RepairEdit from './repairEdit.vue'
120
-import scheduleEdit from "./scheduleEdit.vue";
187
+import scheduleEdit from './scheduleEdit.vue'
121
 import addOrEditOrder from '../../callScreen/components/AddOrEditOrder.vue'
188
 import addOrEditOrder from '../../callScreen/components/AddOrEditOrder.vue'
122
 import detail from '../components/orderDetail.vue'
189
 import detail from '../components/orderDetail.vue'
123
 import askDetail from '../components/askdetail.vue'
190
 import askDetail from '../components/askdetail.vue'
204
       if (this.buttonName === 'chehuibianji') {
271
       if (this.buttonName === 'chehuibianji') {
205
         this.btn_edit(wocode)
272
         this.btn_edit(wocode)
206
       }
273
       }
207
-      if (this.buttonName === "zhdd_bianji") {
208
-        this.btn_zhddjiedit(wocode, row.F_Type, row.F_SonType);
274
+      if (this.buttonName === 'zhdd_bianji') {
275
+        this.btn_zhddjiedit(wocode, row.F_Type, row.F_SonType)
209
       }
276
       }
210
       if (this.buttonName === 'ywzx_bianji') {
277
       if (this.buttonName === 'ywzx_bianji') {
211
         this.btn_ywzxedit(wocode, row.F_Type, row.F_SonType)
278
         this.btn_ywzxedit(wocode, row.F_Type, row.F_SonType)
233
           data: {
300
           data: {
234
             wid: rid,
301
             wid: rid,
235
             rtype: rtype.toString(),
302
             rtype: rtype.toString(),
236
-	    r2type: r2type.toString(),
237
-	    iswomanage: '1',
238
-	    isedit: '1'
239
-	  } // props
240
-	},
241
-	area: ['70%', '70%'],
242
-	title: '编辑工单'
303
+            r2type: r2type.toString(),
304
+            iswomanage: '1',
305
+            isedit: '1'
306
+          } // props
307
+        },
308
+        area: ['70%', '70%'],
309
+        title: '编辑工单'
243
       })
310
       })
244
     },
311
     },
245
     btn_zhddjiedit(rid, rtype, r2type) {
312
     btn_zhddjiedit(rid, rtype, r2type) {
246
-      console.log(rid);
313
+      console.log(rid)
247
       this.$layer.iframe({
314
       this.$layer.iframe({
248
         content: {
315
         content: {
249
           content: scheduleEdit, // 传递的组件对象
316
           content: scheduleEdit, // 传递的组件对象
250
           parent: this, // 当前的vue对象
317
           parent: this, // 当前的vue对象
251
           data: {
318
           data: {
252
-            ordreId: rid,
253
-          }, // props
319
+            ordreId: rid
320
+          } // props
254
         },
321
         },
255
-        area: ["70%", "70%"],
256
-        title: "编辑工单",
257
-      });
322
+        area: ['70%', '70%'],
323
+        title: '编辑工单'
324
+      })
258
     },
325
     },
259
     getList() {
326
     getList() {
260
       this.loading = true
327
       this.loading = true
361
     // },
428
     // },
362
     // 综合调度工单删除
429
     // 综合调度工单删除
363
     btn_deleteSchedulingOrder(operateId) {
430
     btn_deleteSchedulingOrder(operateId) {
364
-      this.deleteId = [];
365
-      this.deleteId.push(operateId);
366
-      this.$confirm("此操作将永久删除当前工单, 是否继续?", "提示", {
367
-        confirmButtonText: "确定",
368
-        cancelButtonText: "取消",
369
-        type: "warning",
431
+      this.deleteId = []
432
+      this.deleteId.push(operateId)
433
+      this.$confirm('此操作将永久删除当前工单, 是否继续?', '提示', {
434
+        confirmButtonText: '确定',
435
+        cancelButtonText: '取消',
436
+        type: 'warning'
370
       })
437
       })
371
         .then(() => {
438
         .then(() => {
372
           deleteSchedulingOrder(this.deleteId).then((response) => {
439
           deleteSchedulingOrder(this.deleteId).then((response) => {
373
-            if (response.state.toLowerCase() === "success") {
374
-              this.getList();
375
-              this.$message.success("删除成功!");
440
+            if (response.state.toLowerCase() === 'success') {
441
+              this.getList()
442
+              this.$message.success('删除成功!')
376
             }
443
             }
377
-          });
444
+          })
378
         })
445
         })
379
         .catch(() => {
446
         .catch(() => {
380
-          this.$message.info("已取消删除");
381
-        });
447
+          this.$message.info('已取消删除')
448
+        })
382
     },
449
     },
383
     hadndleOrderCode(row) {
450
     hadndleOrderCode(row) {
384
       if (row.F_Type === 3000) {
451
       if (row.F_Type === 3000) {
520
 </script>
587
 </script>
521
 
588
 
522
 <style rel="stylesheet/scss" lang="scss" scoped>
589
 <style rel="stylesheet/scss" lang="scss" scoped>
523
-  /deep/.el-tabs__item {
524
-    width: 185px !important;
525
-    text-align: center;
526
-    font-size: 16px !important;
527
-    font-weight: 600;
528
-  }
590
+/deep/.el-tabs__item {
591
+  width: 185px !important;
592
+  text-align: center;
593
+  font-size: 16px !important;
594
+  font-weight: 600;
595
+}
529
 </style>
596
 </style>

+ 137 - 137
CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/scheduleEdit.vue

251
   GetDicValueList,
251
   GetDicValueList,
252
   GetequipList,
252
   GetequipList,
253
   UpdateSchedulingWorkOrder,
253
   UpdateSchedulingWorkOrder,
254
-  GetWorkOrder,
255
-} from "@/api/comDispatch/addOrEditDispatch";
256
-import { GetPerson } from "@/api/commonAPI";
254
+  GetOrderDetail
255
+} from '@/api/comDispatch/addOrEditDispatch'
256
+import { GetPerson } from '@/api/commonAPI'
257
 export default {
257
 export default {
258
-  name: "AddOrEditDispatch",
258
+  name: 'ScheduleEdit',
259
   props: {
259
   props: {
260
     ordreId: {
260
     ordreId: {
261
       type: String,
261
       type: String,
262
-      default: "",
262
+      default: ''
263
     },
263
     },
264
     orderTypeData: {
264
     orderTypeData: {
265
       type: Object,
265
       type: Object,
266
       default() {
266
       default() {
267
-        return {};
268
-      },
267
+        return {}
268
+      }
269
     },
269
     },
270
     layerid: {
270
     layerid: {
271
       type: String,
271
       type: String,
272
-      default: "",
272
+      default: ''
273
     },
273
     },
274
     callid: {
274
     callid: {
275
       type: String,
275
       type: String,
276
-      default: "",
276
+      default: ''
277
     },
277
     },
278
     wid: {
278
     wid: {
279
       type: String,
279
       type: String,
280
-      default: "",
280
+      default: ''
281
     },
281
     },
282
     iswomanage: {
282
     iswomanage: {
283
       type: String,
283
       type: String,
284
-      default: "",
285
-    },
284
+      default: ''
285
+    }
286
   },
286
   },
287
   data() {
287
   data() {
288
     return {
288
     return {
289
       headers: {
289
       headers: {
290
-        Authorization: localStorage.getItem("Admin-Token"),
290
+        Authorization: localStorage.getItem('Admin-Token')
291
       },
291
       },
292
       imgUrl:
292
       imgUrl:
293
-        this.$store.getters.serverConfig.BASE_API + "FaultRepair/UploadFile",
293
+        this.$store.getters.serverConfig.BASE_API + 'FaultRepair/UploadFile',
294
       type2Arr: [],
294
       type2Arr: [],
295
       hospitalsParam: {
295
       hospitalsParam: {
296
         id: 0,
296
         id: 0,
297
-        name: "",
297
+        name: ''
298
       },
298
       },
299
       departmentsParam: {
299
       departmentsParam: {
300
         id: 0,
300
         id: 0,
301
-        name: "",
301
+        name: ''
302
       },
302
       },
303
       repairmanParam: {
303
       repairmanParam: {
304
         id: 0,
304
         id: 0,
305
-        name: "",
305
+        name: ''
306
       },
306
       },
307
       devList: [
307
       devList: [
308
         {
308
         {
309
-          devname: "",
310
-          num: 1,
311
-        },
309
+          devname: '',
310
+          num: 1
311
+        }
312
       ],
312
       ],
313
       detailists: [],
313
       detailists: [],
314
       deptidArr: [],
314
       deptidArr: [],
316
       repairman: [],
316
       repairman: [],
317
       repairman1: [],
317
       repairman1: [],
318
       equipArr: [
318
       equipArr: [
319
-        { label: "设备1", value: "01" },
320
-        { label: "设备2", value: "02" },
319
+        { label: '设备1', value: '01' },
320
+        { label: '设备2', value: '02' }
321
       ],
321
       ],
322
       goodsArr: [
322
       goodsArr: [
323
-        { label: "物资1", value: "01" },
324
-        { label: "物资2", value: "02" },
323
+        { label: '物资1', value: '01' },
324
+        { label: '物资2', value: '02' }
325
       ],
325
       ],
326
       bedsArr: [
326
       bedsArr: [
327
-        { label: "床1", value: "01" },
328
-        { label: "床2", value: "02" },
327
+        { label: '床1', value: '01' },
328
+        { label: '床2', value: '02' }
329
       ],
329
       ],
330
       specimenArr: [
330
       specimenArr: [
331
-        { label: "标本1", value: "01" },
332
-        { label: "标本2", value: "02" },
331
+        { label: '标本1', value: '01' },
332
+        { label: '标本2', value: '02' }
333
       ],
333
       ],
334
       drugArr: [
334
       drugArr: [
335
-        { label: "药1", value: "01" },
336
-        { label: "药2", value: "02" },
335
+        { label: '药1', value: '01' },
336
+        { label: '药2', value: '02' }
337
       ],
337
       ],
338
       ruleForm: {
338
       ruleForm: {
339
-        Applicant: "", // 申请人
340
-        ApplicationDept: "", // 申请部门
341
-        Phone: "", // 联系电话
342
-        WorkOrderCategory: "", // 工单类别
343
-        Content: "", // 工单内容
344
-        Location: "", // 科室位置
345
-        ToPlace: "", // 送达地点
346
-        File: "", // 文件
347
-        DealDept: "", // 处理部门
348
-        DealMan: "", // 从节目
349
-        WorkOrderCode: "", // 工单编号
350
-      },
351
-    };
339
+        Applicant: '', // 申请人
340
+        ApplicationDept: '', // 申请部门
341
+        Phone: '', // 联系电话
342
+        WorkOrderCategory: '', // 工单类别
343
+        Content: '', // 工单内容
344
+        Location: '', // 科室位置
345
+        ToPlace: '', // 送达地点
346
+        File: '', // 文件
347
+        DealDept: '', // 处理部门
348
+        DealMan: '', // 从节目
349
+        WorkOrderCode: '' // 工单编号
350
+      }
351
+    }
352
   },
352
   },
353
 
353
 
354
   created() {
354
   created() {
355
-    this.getequis();
356
-    this.getgoods();
357
-    this.getbeds();
358
-    this.getbiaoben();
359
-    this.getdrugs();
360
-    console.log(this.ordreId);
355
+    this.getequis()
356
+    this.getgoods()
357
+    this.getbeds()
358
+    this.getbiaoben()
359
+    this.getdrugs()
360
+    console.log(this.ordreId)
361
     if (this.ordreId) {
361
     if (this.ordreId) {
362
-      this.getDetail();
362
+      this.getDetail()
363
     }
363
     }
364
-    console.log(this.iswomanage, "444");
364
+    console.log(this.iswomanage, '444')
365
   },
365
   },
366
   methods: {
366
   methods: {
367
     addItem() {
367
     addItem() {
368
       const params = {
368
       const params = {
369
-        devname: "",
370
-        num: 1,
371
-      };
372
-      this.devList.push(params);
369
+        devname: '',
370
+        num: 1
371
+      }
372
+      this.devList.push(params)
373
     },
373
     },
374
     removeItem(index) {
374
     removeItem(index) {
375
-      console.log(index);
376
-      this.devList.splice(index, 1);
375
+      console.log(index)
376
+      this.devList.splice(index, 1)
377
     },
377
     },
378
     selectChange(val) {
378
     selectChange(val) {
379
-      console.log(val);
379
+      console.log(val)
380
     },
380
     },
381
     getDeptid(data) {
381
     getDeptid(data) {
382
-      this.ruleForm.ApplicationDept = data[data.length - 1];
383
-      this.getRepairman(data[data.length - 1], 0);
382
+      this.ruleForm.ApplicationDept = data[data.length - 1]
383
+      this.getRepairman(data[data.length - 1], 0)
384
     },
384
     },
385
     getDeptid1(data) {
385
     getDeptid1(data) {
386
-      this.ruleForm.DealDept = data[data.length - 1];
387
-      this.getRepairman1(data[data.length - 1], 0);
386
+      this.ruleForm.DealDept = data[data.length - 1]
387
+      this.getRepairman1(data[data.length - 1], 0)
388
     },
388
     },
389
     getRepairman(id, state) {
389
     getRepairman(id, state) {
390
       return new Promise((resolve) => {
390
       return new Promise((resolve) => {
391
         const params = {
391
         const params = {
392
-          deptid: id, // 字典管理的工单标识
393
-        };
392
+          deptid: id // 字典管理的工单标识
393
+        }
394
         GetPerson(params).then((res) => {
394
         GetPerson(params).then((res) => {
395
           if (state === 0) {
395
           if (state === 0) {
396
-            this.repairman = res.rows;
396
+            this.repairman = res.rows
397
           } else if (state === 1) {
397
           } else if (state === 1) {
398
-            this.assignman = res.rows;
398
+            this.assignman = res.rows
399
           }
399
           }
400
-        });
401
-        resolve();
402
-      });
400
+        })
401
+        resolve()
402
+      })
403
     },
403
     },
404
     getRepairman1(id, state) {
404
     getRepairman1(id, state) {
405
       return new Promise((resolve) => {
405
       return new Promise((resolve) => {
406
         const params = {
406
         const params = {
407
-          deptid: id, // 字典管理的工单标识
408
-        };
407
+          deptid: id // 字典管理的工单标识
408
+        }
409
         GetPerson(params).then((res) => {
409
         GetPerson(params).then((res) => {
410
           if (state === 0) {
410
           if (state === 0) {
411
-            this.repairman1 = res.rows;
411
+            this.repairman1 = res.rows
412
           } else if (state === 1) {
412
           } else if (state === 1) {
413
-            this.assignman1 = res.rows;
413
+            this.assignman1 = res.rows
414
           }
414
           }
415
-        });
416
-        resolve();
417
-      });
415
+        })
416
+        resolve()
417
+      })
418
     },
418
     },
419
     changeRepairman(data) {},
419
     changeRepairman(data) {},
420
     changeRepairman1(data) {},
420
     changeRepairman1(data) {},
421
     handle_success(res) {
421
     handle_success(res) {
422
-      this.ruleForm.repairImageid += res.data[0].F_FileId + ",";
422
+      this.ruleForm.repairImageid += res.data[0].F_FileId + ','
423
     },
423
     },
424
     getequis() {
424
     getequis() {
425
-      const params = {};
425
+      const params = {}
426
       GetequipList(params).then((res) => {
426
       GetequipList(params).then((res) => {
427
-        this.equipArr = res.data;
428
-      });
427
+        this.equipArr = res.data
428
+      })
429
     },
429
     },
430
     getgoods() {
430
     getgoods() {
431
       const params = {
431
       const params = {
432
-        Flag: "WZXX",
433
-        Name: "",
434
-      };
432
+        Flag: 'WZXX',
433
+        Name: ''
434
+      }
435
       GetDicValueList(params).then((res) => {
435
       GetDicValueList(params).then((res) => {
436
-        this.goodsArr = res.rows;
437
-      });
436
+        this.goodsArr = res.rows
437
+      })
438
     },
438
     },
439
     getbeds() {
439
     getbeds() {
440
       const params = {
440
       const params = {
441
-        Flag: "BCXX",
442
-        Name: "",
443
-      };
441
+        Flag: 'BCXX',
442
+        Name: ''
443
+      }
444
       GetDicValueList(params).then((res) => {
444
       GetDicValueList(params).then((res) => {
445
-        this.bedsArr = res.rows;
446
-      });
445
+        this.bedsArr = res.rows
446
+      })
447
     },
447
     },
448
     getbiaoben() {
448
     getbiaoben() {
449
       const params = {
449
       const params = {
450
-        Flag: "BBXX",
451
-        Name: "",
452
-      };
450
+        Flag: 'BBXX',
451
+        Name: ''
452
+      }
453
       GetDicValueList(params).then((res) => {
453
       GetDicValueList(params).then((res) => {
454
-        this.specimenArr = res.rows;
455
-      });
454
+        this.specimenArr = res.rows
455
+      })
456
     },
456
     },
457
     getdrugs() {
457
     getdrugs() {
458
       const params = {
458
       const params = {
459
-        Flag: "YPXX",
460
-        Name: "",
461
-      };
459
+        Flag: 'YPXX',
460
+        Name: ''
461
+      }
462
       GetDicValueList(params).then((res) => {
462
       GetDicValueList(params).then((res) => {
463
-        this.drugArr = res.rows;
464
-      });
463
+        this.drugArr = res.rows
464
+      })
465
     },
465
     },
466
     getDetail() {
466
     getDetail() {
467
       const datas = {
467
       const datas = {
468
         WorkOrderCode: this.ordreId,
468
         WorkOrderCode: this.ordreId,
469
-        type: 0,
470
-      };
469
+        type: 0
470
+      }
471
       // 详情 GetWorkOrder
471
       // 详情 GetWorkOrder
472
       GetWorkOrder(datas)
472
       GetWorkOrder(datas)
473
         .then((response) => {
473
         .then((response) => {
474
-          if (response.state.toLowerCase() === "success") {
475
-            console.log(response);
476
-            const res = response.data[0];
474
+          if (response.state.toLowerCase() === 'success') {
475
+            console.log(response)
476
+            const res = response.data[0]
477
 
477
 
478
-            this.ruleForm.Applicant = res.F_Applicant; // 申请人
479
-            this.ruleForm.ApplicationDept = res.F_ApplicationDept; // 申请部门
480
-            this.ruleForm.Location = res.F_Location; // 科室位置
481
-            this.ruleForm.Phone = res.F_Phone; // 联系电话
482
-            this.ruleForm.WorkOrderCategory = res.F_WorkOrderCategory; // 工单类别
483
-            this.ruleForm.WorkOrderCode = res.F_WorkOrderCode; // 工单编号
478
+            this.ruleForm.Applicant = res.F_Applicant // 申请人
479
+            this.ruleForm.ApplicationDept = res.F_ApplicationDept // 申请部门
480
+            this.ruleForm.Location = res.F_Location // 科室位置
481
+            this.ruleForm.Phone = res.F_Phone // 联系电话
482
+            this.ruleForm.WorkOrderCategory = res.F_WorkOrderCategory // 工单类别
483
+            this.ruleForm.WorkOrderCode = res.F_WorkOrderCode // 工单编号
484
 
484
 
485
             // this.ruleForm.Content = res.F_Content; // 工单内容
485
             // this.ruleForm.Content = res.F_Content; // 工单内容
486
             //
486
             //
488
             // this.ruleForm.File = res.FileUrl; // 文件
488
             // this.ruleForm.File = res.FileUrl; // 文件
489
             // this.ruleForm.DealDept = res.F_DealDept; // 处理部门
489
             // this.ruleForm.DealDept = res.F_DealDept; // 处理部门
490
             // this.ruleForm.DealMan = res.F_DealMan; // 处理人
490
             // this.ruleForm.DealMan = res.F_DealMan; // 处理人
491
-            console.log(this.ruleForm);
491
+            console.log(this.ruleForm)
492
           }
492
           }
493
         })
493
         })
494
-        .catch(() => {});
494
+        .catch(() => {})
495
     },
495
     },
496
     submitForm() {
496
     submitForm() {
497
-      console.log(this.devList);
498
-      const details = [];
499
-      this.devList.forEach(function (v, n) {
497
+      console.log(this.devList)
498
+      const details = []
499
+      this.devList.forEach(function(v, n) {
500
         details.push({
500
         details.push({
501
-          F_DicId: v.devname.split(",")[1],
502
-          F_DicName: v.devname.split(",")[0],
503
-          F_Number: v.num,
504
-        });
505
-      });
506
-      console.log(details);
507
-      console.log(this.orderTypeData);
508
-      if (this.ruleForm.repairImageid === "") {
509
-        this.ruleForm.repairImageid = "";
501
+          F_DicId: v.devname.split(',')[1],
502
+          F_DicName: v.devname.split(',')[0],
503
+          F_Number: v.num
504
+        })
505
+      })
506
+      console.log(details)
507
+      console.log(this.orderTypeData)
508
+      if (this.ruleForm.repairImageid === '') {
509
+        this.ruleForm.repairImageid = ''
510
       } else {
510
       } else {
511
         this.ruleForm.repairImageid = this.ruleForm.repairImageid.slice(
511
         this.ruleForm.repairImageid = this.ruleForm.repairImageid.slice(
512
           0,
512
           0,
513
           this.ruleForm.repairImageid.length - 1
513
           this.ruleForm.repairImageid.length - 1
514
-        );
514
+        )
515
       }
515
       }
516
 
516
 
517
       var datas = {
517
       var datas = {
527
         DealDept: this.ruleForm.DealDept, // 处理部门
527
         DealDept: this.ruleForm.DealDept, // 处理部门
528
         DealMan: this.ruleForm.DealMan, // 从节目
528
         DealMan: this.ruleForm.DealMan, // 从节目
529
         WorkOrderCode: this.ruleForm.WorkOrderCode, // 工单编号
529
         WorkOrderCode: this.ruleForm.WorkOrderCode, // 工单编号
530
-        detailists: details,
531
-      };
532
-      console.log(datas);
530
+        detailists: details
531
+      }
532
+      console.log(datas)
533
       // 添加
533
       // 添加
534
       if (this.ordreId) {
534
       if (this.ordreId) {
535
         UpdateSchedulingWorkOrder(datas)
535
         UpdateSchedulingWorkOrder(datas)
536
           .then((response) => {
536
           .then((response) => {
537
-            if (response.state.toLowerCase() === "success") {
537
+            if (response.state.toLowerCase() === 'success') {
538
               if (this.layerid) {
538
               if (this.layerid) {
539
-                this.$parent.$layer.close(this.layerid);
540
-                this.$parent.getList(); // 重新加载父级数据
539
+                this.$parent.$layer.close(this.layerid)
540
+                this.$parent.getList() // 重新加载父级数据
541
               }
541
               }
542
-              this.$message.success("恭喜你,修改成功!");
542
+              this.$message.success('恭喜你,修改成功!')
543
             }
543
             }
544
           })
544
           })
545
-          .catch(() => {});
545
+          .catch(() => {})
546
       }
546
       }
547
-    },
547
+    }
548
     // resetForm() {
548
     // resetForm() {
549
     //   this.$refs.ruleForm.resetFields()
549
     //   this.$refs.ruleForm.resetFields()
550
     //   this.itemessageList = [
550
     //   this.itemessageList = [
563
     //     }
563
     //     }
564
     //   ]
564
     //   ]
565
     // }
565
     // }
566
-  },
567
-};
566
+  }
567
+}
568
 </script>
568
 </script>
569
 <style rel="stylesheet/scss" lang="scss">
569
 <style rel="stylesheet/scss" lang="scss">
570
 .addOp span {
570
 .addOp span {

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

90
   schedulRetractOrder,
90
   schedulRetractOrder,
91
   updateSchedulingOrder,
91
   updateSchedulingOrder,
92
   deleteSchedulingOrder,
92
   deleteSchedulingOrder,
93
-  getSchedulingOrder,
93
+  getSchedulingOrder
94
 } from '@/api/orderManagement/orderList'
94
 } from '@/api/orderManagement/orderList'
95
 import {
95
 import {
96
   getOrderTypeDrop
96
   getOrderTypeDrop
182
     btnClickEvents(button, wocode, row) {
182
     btnClickEvents(button, wocode, row) {
183
       this.buttonName = button.key
183
       this.buttonName = button.key
184
       this.$refs.butOption.butOptionMethod(this.buttonName, wocode, row)
184
       this.$refs.butOption.butOptionMethod(this.buttonName, wocode, row)
185
-      if (this.buttonName === 'bianji') {
186
-        this.btn_edit(wocode, row.F_Type)
185
+      if (this.buttonName === 'bianji' || this.buttonName === 'schbianji' || this.buttonName === 'yw_bianji') {
186
+        this.btn_edit(wocode, row.F_Type, row.F_SonType)
187
       }
187
       }
188
     },
188
     },
189
     getList() {
189
     getList() {
249
       })
249
       })
250
     },
250
     },
251
     // 编辑
251
     // 编辑
252
-    btn_edit(rid, rtype) {
252
+    btn_edit(rid, rtype, r2type) {
253
       this.$layer.iframe({
253
       this.$layer.iframe({
254
         content: {
254
         content: {
255
           content: addOrEditOrder, // 传递的组件对象
255
           content: addOrEditOrder, // 传递的组件对象
257
           data: {
257
           data: {
258
             wid: rid,
258
             wid: rid,
259
             rtype: rtype.toString(),
259
             rtype: rtype.toString(),
260
+            r2type: r2type.toString(),
260
             iswomanage: '1',
261
             iswomanage: '1',
261
             isedit: '1'
262
             isedit: '1'
262
           } // props
263
           } // props

+ 297 - 272
CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/index.vue

4
       <el-row :gutter="20">
4
       <el-row :gutter="20">
5
         <el-col :span="6">
5
         <el-col :span="6">
6
           <el-alert :closable="false" title="部门列表" type="success" />
6
           <el-alert :closable="false" title="部门列表" type="success" />
7
-          <el-tree ref="treeRef" :props="defaultProps" :data="treelists" node-key="id" :highlight-current='true'
8
-            :default-expand-all='false' @node-click="handleNodeClick" />
7
+          <el-tree
8
+            ref="treeRef"
9
+            :props="defaultProps"
10
+            :data="treelists"
11
+            :highlight-current="true"
12
+            :default-expand-all="false"
13
+            node-key="id"
14
+            @node-click="handleNodeClick" />
9
         </el-col>
15
         </el-col>
10
         <el-col :span="18">
16
         <el-col :span="18">
11
           <el-alert :closable="false" title="用户列表" type="success" style="margin-bottom: 5px;" />
17
           <el-alert :closable="false" title="用户列表" type="success" style="margin-bottom: 5px;" />
12
-          <el-alert :closable="false" title="上传文件需要严格按照下载的EXCEL模板进行填写!" type="warning" style="margin-bottom: 7px;">
13
-          </el-alert>
18
+          <el-alert :closable="false" title="上传文件需要严格按照下载的EXCEL模板进行填写!" type="warning" style="margin-bottom: 7px;"/>
14
           <el-input v-model="keyword" placeholder="请输入工号,姓名,电话" class="filter-item" size="medium" clearable />
19
           <el-input v-model="keyword" placeholder="请输入工号,姓名,电话" class="filter-item" size="medium" clearable />
15
           <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
20
           <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
16
-          <el-button v-permission="'add_userManage'" type="primary" class="filter-item" icon="el-icon-plus"
21
+          <el-button
22
+            v-permission="'add_userManage'"
23
+            type="primary"
24
+            class="filter-item"
25
+            icon="el-icon-plus"
17
             @click="btn_add">添加</el-button>
26
             @click="btn_add">添加</el-button>
18
-          <el-button type="primary" class="filter-item" icon="el-icon-upload2" @click='btn_onimport'>批量导入</el-button>
19
-          <el-button type="primary" class="filter-item" icon="el-icon-download" @click='btn_export'>批量导出</el-button>
20
-          <a href="/static/xls/userImport.xls" download="用户模板.xls" title="点击下载模板"
27
+          <el-button type="primary" class="filter-item" icon="el-icon-upload2" @click="btn_onimport">批量导入</el-button>
28
+          <el-button type="primary" class="filter-item" icon="el-icon-download" @click="btn_export">批量导出</el-button>
29
+          <a
30
+            href="/static/xls/userImport.xls"
31
+            download="用户模板.xls"
32
+            title="点击下载模板"
21
             style="line-height: 32px;color: #409EFF;font-size: 14px;">点击下载用户模板</a>
33
             style="line-height: 32px;color: #409EFF;font-size: 14px;">点击下载用户模板</a>
22
           <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
34
           <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
23
             <!-- <el-table-column type="selection" width="40" /> -->
35
             <!-- <el-table-column type="selection" width="40" /> -->
24
             <el-table-column prop="F_UserCode" label="工号" align="center" min-width="" />
36
             <el-table-column prop="F_UserCode" label="工号" align="center" min-width="" />
25
             <el-table-column prop="F_UserName" label="姓名" align="center" min-width="" />
37
             <el-table-column prop="F_UserName" label="姓名" align="center" min-width="" />
26
             <el-table-column prop="F_DeptName" label="部门" align="center" min-width="" />
38
             <el-table-column prop="F_DeptName" label="部门" align="center" min-width="" />
39
+            <el-table-column prop="F_RoleName" label="角色" align="center" min-width="" />
27
             <el-table-column prop="F_Telephone" label="电话" align="center" min-width="" />
40
             <el-table-column prop="F_Telephone" label="电话" align="center" min-width="" />
28
             <el-table-column label="启用禁用状态" align="center" min-width="">
41
             <el-table-column label="启用禁用状态" align="center" min-width="">
29
               <template slot-scope="scope">
42
               <template slot-scope="scope">
30
-                <span style="color: #F56C6C;" v-if="scope.row.F_EnableFlag==0">禁用</span>
31
-                <span style="color: #67C23A;" v-if="scope.row.F_EnableFlag==1">启用</span>
43
+                <span v-if="scope.row.F_EnableFlag==0" style="color: #F56C6C;">禁用</span>
44
+                <span v-if="scope.row.F_EnableFlag==1" style="color: #67C23A;">启用</span>
32
               </template>
45
               </template>
33
             </el-table-column>
46
             </el-table-column>
34
             <el-table-column label="操作" width="200" align="center" class-name="oparate_btn" fixed="right">
47
             <el-table-column label="操作" width="200" align="center" class-name="oparate_btn" fixed="right">
35
               <template slot-scope="scope">
48
               <template slot-scope="scope">
36
-                <el-button type="danger" plain v-if="scope.row.F_EnableFlag==1" @click="onOff(scope.row.F_UserId)">禁用
49
+                <el-button v-if="scope.row.F_EnableFlag==1" type="danger" plain @click="onOff(scope.row.F_UserId)">禁用
37
                 </el-button>
50
                 </el-button>
38
-                <el-button type="success" plain v-if="scope.row.F_EnableFlag==0" @click="onOpen(scope.row.F_UserId)">启用
51
+                <el-button v-if="scope.row.F_EnableFlag==0" type="success" plain @click="onOpen(scope.row.F_UserId)">启用
39
                 </el-button>
52
                 </el-button>
40
-                <el-button v-permission="'edit_userManage'" size="mini" plain type="primary"
53
+                <el-button
54
+                  v-permission="'edit_userManage'"
55
+                  size="mini"
56
+                  plain
57
+                  type="primary"
41
                   @click="btn_edit(scope.row.F_UserId.toString(),scope.row.F_UserCode.toString())">编辑</el-button>
58
                   @click="btn_edit(scope.row.F_UserId.toString(),scope.row.F_UserCode.toString())">编辑</el-button>
42
               </template>
59
               </template>
43
             </el-table-column>
60
             </el-table-column>
44
           </el-table>
61
           </el-table>
45
-          <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
46
-            :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
62
+          <pagination
63
+            v-show="pageParams.total > 0"
64
+            :total="pageParams.total"
65
+            :pageindex.sync="pageParams.pageindex"
66
+            :pagesize.sync="pageParams.pagesize"
67
+            class="pagination"
68
+            @pagination="getList" />
47
         </el-col>
69
         </el-col>
48
       </el-row>
70
       </el-row>
49
     </div>
71
     </div>
50
-    <el-dialog title="导入用户" :visible.sync="dialogTableVisible">
51
-      <el-upload :headers="headers" style="margin-bottom: 30px;" :data="importData" :on-success="handle_success"
52
-        :limit="1" :action="importUrl">
72
+    <el-dialog :visible.sync="dialogTableVisible" title="导入用户">
73
+      <el-upload
74
+        :headers="headers"
75
+        :data="importData"
76
+        :on-success="handle_success"
77
+        :limit="1"
78
+        :action="importUrl"
79
+        style="margin-bottom: 30px;">
53
         <el-button slot="trigger" size="small" type="primary">上传文件</el-button>
80
         <el-button slot="trigger" size="small" type="primary">上传文件</el-button>
54
       </el-upload>
81
       </el-upload>
55
       <!-- <div style="margin-top: 15px;">
82
       <!-- <div style="margin-top: 15px;">
60
 </template>
87
 </template>
61
 
88
 
62
 <script>
89
 <script>
63
-  import {
64
-    getUserAccountLists,
65
-    deleteUserAccount,
66
-    getDelUsers,
67
-    getUserInput,
68
-    getUserExport
69
-  } from '@/api/systemSetup/roleSetting/userManage'
70
-  import {
71
-    getDeptTree
72
-  } from '@/api/systemSetup/roleSetting/userManage'
73
-  import {
74
-    pickerOptions,
75
-    buildTree,
76
-    filterTreeDatas
77
-  } from '@/utils'
78
-  import {
79
-    exportExcel
80
-  } from '@/utils'
81
-  import addOrEdit from './addOrEdit'
82
-  import modifyPass from './modifyPass.vue'
83
-  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
90
+import {
91
+  getUserAccountLists,
92
+  deleteUserAccount,
93
+  getDelUsers,
94
+  getUserInput,
95
+  getUserExport
96
+} from '@/api/systemSetup/roleSetting/userManage'
97
+import {
98
+  getDeptTree
99
+} from '@/api/systemSetup/roleSetting/userManage'
100
+import {
101
+  pickerOptions,
102
+  buildTree,
103
+  filterTreeDatas
104
+} from '@/utils'
105
+import {
106
+  exportExcel
107
+} from '@/utils'
108
+import addOrEdit from './addOrEdit'
109
+import modifyPass from './modifyPass.vue'
110
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
84
 
111
 
85
-  export default {
86
-    name: 'UserManage',
87
-    components: {
88
-      Pagination
112
+export default {
113
+  name: 'UserManage',
114
+  components: {
115
+    Pagination
116
+  },
117
+  filters: {
118
+    userSeatFlagFilter(status) {
119
+      const statusMap = {
120
+        0: '非话务',
121
+        1: '话务'
122
+      }
123
+      return statusMap[status]
89
     },
124
     },
90
-    filters: {
91
-      userSeatFlagFilter(status) {
92
-        const statusMap = {
93
-          0: '非话务',
94
-          1: '话务'
95
-        }
96
-        return statusMap[status]
125
+    userDeleteFlagFilter(status) {
126
+      const statusMap = {
127
+        0: '启用',
128
+        2: '禁用'
129
+      }
130
+      return statusMap[status]
131
+    }
132
+  },
133
+  data() {
134
+    return {
135
+      loading: false,
136
+      dialogTableVisible: false,
137
+      roleId: '',
138
+      keyword: '',
139
+      deptid: '',
140
+      treelists: [], // 菜单树数据
141
+      parentid: '-1',
142
+      pageParams: {
143
+        pageindex: 1, // 当前第几页
144
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
145
+        total: 0 // 总共多少数据
146
+      },
147
+      defaultProps: {
148
+        children: 'children',
149
+        label: 'text',
150
+        value: 'id'
151
+      },
152
+      importData: {
153
+        deptid: ''
97
       },
154
       },
98
-      userDeleteFlagFilter(status) {
99
-        const statusMap = {
100
-          0: '启用',
101
-          2: '禁用'
155
+      // repairImageid: '',
156
+      headers: {
157
+        Authorization: localStorage.getItem('Admin-Token')
158
+      },
159
+      importUrl: this.$store.getters.serverConfig.BASE_API + 'UserAccount/UserInput',
160
+      multipleSelection: [], // 选中的数据
161
+      dataLists: [], // 列表数据
162
+      // 自定义菜单下拉数据的key值
163
+      props: {
164
+        value: 'id',
165
+        label: 'text'
166
+      }
167
+    }
168
+  },
169
+  created() {
170
+    this.getList()
171
+    this.getTreeList()
172
+    document.onkeyup = (e) => {
173
+      if (e.keyCode === 13) {
174
+        this.getList()
175
+      }
176
+    }
177
+  },
178
+  methods: {
179
+    getList() {
180
+      this.loading = true
181
+      return new Promise((resolve) => {
182
+        const params = {
183
+          page: this.pageParams.pageindex, // 第几页
184
+          pagesize: this.pageParams.pagesize, // 每页几条信息
185
+          key: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
186
+          deptid: this.deptid
102
         }
187
         }
103
-        return statusMap[status]
188
+        getUserAccountLists(params).then((response) => {
189
+          this.loading = false
190
+          this.pageParams.total = response.total
191
+          this.dataLists = response.rows
192
+        })
193
+        resolve()
194
+      })
195
+    },
196
+    btn_onimport() {
197
+      if (this.deptid == '') {
198
+        this.$message.warning('请选择部门')
199
+        return
104
       }
200
       }
201
+      this.dialogTableVisible = true
105
     },
202
     },
106
-    data() {
107
-      return {
108
-        loading: false,
109
-        dialogTableVisible: false,
110
-        roleId: '',
111
-        keyword: '',
112
-        deptid: '',
113
-        treelists: [], // 菜单树数据
114
-        parentid: '-1',
115
-        pageParams: {
116
-          pageindex: 1, // 当前第几页
117
-          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
118
-          total: 0 // 总共多少数据
119
-        },
120
-        defaultProps: {
121
-          children: 'children',
122
-          label: 'text',
123
-          value: 'id'
124
-        },
125
-        importData: {
126
-          deptid: ''
203
+    // 复选框状态改变
204
+    changeSelects(val) {
205
+      this.multipleSelection = val
206
+    },
207
+    btn_search() {
208
+      this.pageParams.pageindex = 1
209
+      this.getList()
210
+    },
211
+    btn_add() {
212
+      this.$layer.iframe({
213
+        content: {
214
+          content: addOrEdit, // 传递的组件对象
215
+          parent: this, // 当前的vue对象
216
+          data: {
217
+            addDeptid: this.deptid.toString()
218
+          } // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
127
         },
219
         },
128
-        // repairImageid: '',
129
-        headers: {
130
-          Authorization: localStorage.getItem('Admin-Token')
220
+        area: ['60%', '60%'],
221
+        title: '添加用户信息'
222
+      })
223
+    },
224
+    btn_edit(editId, usercode) {
225
+      this.$layer.iframe({
226
+        content: {
227
+          content: addOrEdit, // 传递的组件对象
228
+          parent: this, // 当前的vue对象
229
+          data: {
230
+            rowid: editId,
231
+            usercodeList: usercode
232
+          } // props
131
         },
233
         },
132
-        importUrl: this.$store.getters.serverConfig.BASE_API + 'UserAccount/UserInput',
133
-        multipleSelection: [], // 选中的数据
134
-        dataLists: [], // 列表数据
135
-        // 自定义菜单下拉数据的key值
136
-        props: {
137
-          value: 'id',
138
-          label: 'text'
139
-        }
140
-      }
234
+        area: ['60%', '60%'],
235
+        title: '编辑用户信息'
236
+      })
141
     },
237
     },
142
-    created() {
143
-      this.getList()
144
-      this.getTreeList()
145
-      document.onkeyup = (e) => {
146
-        if (e.keyCode === 13) {
147
-          this.getList()
148
-        }
149
-      }
238
+    btn_modifyPass(editId) {
239
+      this.$layer.iframe({
240
+        content: {
241
+          content: modifyPass, // 传递的组件对象
242
+          parent: this, // 当前的vue对象
243
+          data: {
244
+            rowid: editId
245
+          } // props
246
+        },
247
+        area: ['40%', '360px'],
248
+        title: '修改密码'
249
+      })
150
     },
250
     },
151
-    methods: {
152
-      getList() {
153
-        this.loading = true
154
-        return new Promise((resolve) => {
251
+    btn_delete(id) {
252
+      this.$confirm('您确定要将此用户信息删除吗?', '提示', {
253
+        confirmButtonText: '确定',
254
+        cancelButtonText: '取消',
255
+        type: 'warning'
256
+      })
257
+        .then(() => {
155
           const params = {
258
           const params = {
156
-            page: this.pageParams.pageindex, // 第几页
157
-            pagesize: this.pageParams.pagesize, // 每页几条信息
158
-            key: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
159
-            deptid: this.deptid
259
+            ids: id,
260
+            state: 1 // 0启用1删除2禁用
160
           }
261
           }
161
-          getUserAccountLists(params).then((response) => {
162
-            this.loading = false
163
-            if (response.rows.length > 0) {
164
-              this.pageParams.total = response.total
165
-              this.dataLists = response.rows
262
+          deleteUserAccount(params).then((response) => {
263
+            if (response.state.toLowerCase() === 'success') {
264
+              this.getList()
265
+              this.$message.success('删除成功!')
166
             }
266
             }
167
           })
267
           })
168
-          resolve()
169
         })
268
         })
170
-      },
171
-      btn_onimport() {
172
-        if (this.deptid == '') {
173
-          this.$message.warning('请选择部门')
174
-          return;
175
-        }
176
-        this.dialogTableVisible = true
177
-      },
178
-      // 复选框状态改变
179
-      changeSelects(val) {
180
-        this.multipleSelection = val
181
-      },
182
-      btn_search() {
183
-        this.pageParams.pageindex = 1
184
-        this.getList()
185
-      },
186
-      btn_add() {
187
-        this.$layer.iframe({
188
-          content: {
189
-            content: addOrEdit, // 传递的组件对象
190
-            parent: this, // 当前的vue对象
191
-            data: {
192
-              addDeptid: this.deptid.toString()
193
-            } // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
194
-          },
195
-          area: ['60%', '60%'],
196
-          title: '添加用户信息'
197
-        })
198
-      },
199
-      btn_edit(editId, usercode) {
200
-        this.$layer.iframe({
201
-          content: {
202
-            content: addOrEdit, // 传递的组件对象
203
-            parent: this, // 当前的vue对象
204
-            data: {
205
-              rowid: editId,
206
-              usercodeList: usercode
207
-            } // props
208
-          },
209
-          area: ['60%', '60%'],
210
-          title: '编辑用户信息'
211
-        })
212
-      },
213
-      btn_modifyPass(editId) {
214
-        this.$layer.iframe({
215
-          content: {
216
-            content: modifyPass, // 传递的组件对象
217
-            parent: this, // 当前的vue对象
218
-            data: {
219
-              rowid: editId
220
-            } // props
221
-          },
222
-          area: ['40%', '360px'],
223
-          title: '修改密码'
269
+        .catch(() => {
270
+          this.$message.info('已取消删除')
224
         })
271
         })
225
-      },
226
-      btn_delete(id) {
227
-        this.$confirm('您确定要将此用户信息删除吗?', '提示', {
228
-            confirmButtonText: '确定',
229
-            cancelButtonText: '取消',
230
-            type: 'warning'
231
-          })
232
-          .then(() => {
233
-            const params = {
234
-              ids: id,
235
-              state: 1 // 0启用1删除2禁用
236
-            }
237
-            deleteUserAccount(params).then((response) => {
238
-              if (response.state.toLowerCase() === 'success') {
239
-                this.getList()
240
-                this.$message.success('删除成功!')
241
-              }
242
-            })
243
-          })
244
-          .catch(() => {
245
-            this.$message.info('已取消删除')
246
-          })
247
-      },
248
-      onOpen(id) {
249
-        this.$confirm('您确定要将此用户启用吗?', '提示', {
250
-            confirmButtonText: '确定',
251
-            cancelButtonText: '取消',
252
-            type: 'warning'
253
-          })
254
-          .then(() => {
255
-            const params = {
256
-              ids: id,
257
-              state: 1
258
-            }
259
-            getDelUsers(params).then((response) => {
260
-              if (response.state.toLowerCase() === 'success') {
261
-                this.getList()
262
-                this.$message.success('启用成功!')
263
-              }
264
-            })
265
-          })
266
-          .catch(() => {
267
-            this.$message('已取消')
268
-          })
269
-      },
270
-      onOff(id) {
271
-        this.$confirm('您确定要将此用户禁用吗?', '提示', {
272
-            confirmButtonText: '确定',
273
-            cancelButtonText: '取消',
274
-            type: 'warning'
275
-          })
276
-          .then(() => {
277
-            const params = {
278
-              ids: id,
279
-              state: 0
272
+    },
273
+    onOpen(id) {
274
+      this.$confirm('您确定要将此用户启用吗?', '提示', {
275
+        confirmButtonText: '确定',
276
+        cancelButtonText: '取消',
277
+        type: 'warning'
278
+      })
279
+        .then(() => {
280
+          const params = {
281
+            ids: id,
282
+            state: 1
283
+          }
284
+          getDelUsers(params).then((response) => {
285
+            if (response.state.toLowerCase() === 'success') {
286
+              this.getList()
287
+              this.$message.success('启用成功!')
280
             }
288
             }
281
-            getDelUsers(params).then((response) => {
282
-              if (response.state.toLowerCase() === 'success') {
283
-                this.getList()
284
-                this.$message.success('禁用成功!')
285
-              }
286
-            })
287
           })
289
           })
288
-          .catch(() => {
289
-            this.$message('已取消')
290
-          })
291
-      },
292
-      //树
293
-      getTreeList() {
294
-        return new Promise((resolve) => {
295
-          getDeptTree(this.parentid).then((response) => {
290
+        })
291
+        .catch(() => {
292
+          this.$message('已取消')
293
+        })
294
+    },
295
+    onOff(id) {
296
+      this.$confirm('您确定要将此用户禁用吗?', '提示', {
297
+        confirmButtonText: '确定',
298
+        cancelButtonText: '取消',
299
+        type: 'warning'
300
+      })
301
+        .then(() => {
302
+          const params = {
303
+            ids: id,
304
+            state: 0
305
+          }
306
+          getDelUsers(params).then((response) => {
296
             if (response.state.toLowerCase() === 'success') {
307
             if (response.state.toLowerCase() === 'success') {
297
-              this.treelists = response.data
308
+              this.getList()
309
+              this.$message.success('禁用成功!')
298
             }
310
             }
299
           })
311
           })
300
-          resolve()
301
         })
312
         })
302
-      },
303
-      handleNodeClick(data) {
304
-        console.log(data)
305
-        if(data.parentid!='-1'){
306
-          this.deptid = data.id
307
-          this.importData.deptid = data.id
308
-          this.getList()
309
-        }
310
-      },
311
-      handle_success(res) {
312
-        if(res.state=='success'){
313
-          this.dialogTableVisible=false
314
-          this.getList()
315
-          this.$message.success('导入成功')
316
-        }
317
-      },
318
-      // btn_import() {
319
-      //   return new Promise((resolve) => {
320
-      //     const params = {
321
-      //       deptid: this.deptid
322
-      //     }
323
-      //     getUserInput(params).then((response) => {
324
-      //       if (response.state.toLowerCase() === 'success') {
313
+        .catch(() => {
314
+          this.$message('已取消')
315
+        })
316
+    },
317
+    // 树
318
+    getTreeList() {
319
+      return new Promise((resolve) => {
320
+        getDeptTree(this.parentid).then((response) => {
321
+          if (response.state.toLowerCase() === 'success') {
322
+            this.treelists = response.data
323
+          }
324
+        })
325
+        resolve()
326
+      })
327
+    },
328
+    handleNodeClick(data) {
329
+      console.log(data)
330
+      if (data.parentid != '-1') {
331
+        this.deptid = data.id
332
+        this.importData.deptid = data.id
333
+        this.getList()
334
+      }
335
+    },
336
+    handle_success(res) {
337
+      if (res.state == 'success') {
338
+        this.dialogTableVisible = false
339
+        this.getList()
340
+        this.$message.success('导入成功')
341
+      }
342
+    },
343
+    // btn_import() {
344
+    //   return new Promise((resolve) => {
345
+    //     const params = {
346
+    //       deptid: this.deptid
347
+    //     }
348
+    //     getUserInput(params).then((response) => {
349
+    //       if (response.state.toLowerCase() === 'success') {
325
 
350
 
326
-      //       }
327
-      //     })
328
-      //     resolve()
329
-      //   })
330
-      // },
331
-      btn_export() {
332
-        const exportparams = {
333
-          page: this.pageParams.pageindex, // 第几页
334
-          pagesize: this.pageParams.pagesize, // 每页几条信息
335
-          key: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
336
-          deptid: this.deptid,
337
-          isexport: 1
338
-        }
339
-        exportExcel(exportparams, getUserExport)
351
+    //       }
352
+    //     })
353
+    //     resolve()
354
+    //   })
355
+    // },
356
+    btn_export() {
357
+      const exportparams = {
358
+        page: this.pageParams.pageindex, // 第几页
359
+        pagesize: this.pageParams.pagesize, // 每页几条信息
360
+        key: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
361
+        deptid: this.deptid,
362
+        isexport: 1
340
       }
363
       }
364
+      exportExcel(exportparams, getUserExport)
341
     }
365
     }
342
   }
366
   }
367
+}
343
 </script>
368
 </script>
344
 
369
 
345
 <style rel="stylesheet/scss" lang="scss" scoped>
370
 <style rel="stylesheet/scss" lang="scss" scoped>

+ 4 - 1
CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/orderTypeManage/addOrEditOrderType.vue

186
           this.ruleForm.F_RepairTimeLimit = res.fxtime
186
           this.ruleForm.F_RepairTimeLimit = res.fxtime
187
           this.ruleForm.F_Identification = res.identification
187
           this.ruleForm.F_Identification = res.identification
188
           this.ruleForm.F_AutoDept = res.autodept
188
           this.ruleForm.F_AutoDept = res.autodept
189
-          this.deptidArr = this.$store.getters.deptmap[parseInt(res.autodept)].ids
189
+          this.ruleForm.F_CanReplayCount = res.canreplaycount
190
+          if (res.autodept) {
191
+            this.deptidArr = this.$store.getters.deptmap[parseInt(res.autodept)].ids
192
+          }
190
         }
193
         }
191
       })
194
       })
192
     },
195
     },

+ 207 - 133
CallCenterWeb.UI/RMYY/src/views/testing/scoreTesting/index.vue

4
       <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
4
       <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
5
         <el-form-item label="受话坐席">
5
         <el-form-item label="受话坐席">
6
           <el-select v-model="ruleForm.callzx" placeholder="请选择受话坐席" clearable>
6
           <el-select v-model="ruleForm.callzx" placeholder="请选择受话坐席" clearable>
7
-            <el-option v-for="item in seatData" :key="item.F_UserId" :label="item.F_UserName" :value="item.F_UserCode">
8
-            </el-option>
7
+            <el-option v-for="item in seatData" :key="item.F_UserId" :label="item.F_UserName" :value="item.F_UserCode"/>
9
           </el-select>
8
           </el-select>
10
         </el-form-item>
9
         </el-form-item>
11
         <el-form-item label="分机号">
10
         <el-form-item label="分机号">
22
           </el-select>
21
           </el-select>
23
         </el-form-item> -->
22
         </el-form-item> -->
24
         <el-form-item label="通话时间">
23
         <el-form-item label="通话时间">
25
-          <el-date-picker clearable v-model="ruleForm.searchDate" class="filter-item" type="daterange" format="yyyy年MM月dd日"
26
-            value-format="yyyy-MM-dd" align="left" unlink-panels range-separator="至" start-placeholder="开始日期"
24
+          <el-date-picker
25
+            v-model="ruleForm.searchDate"
26
+            clearable
27
+            class="filter-item"
28
+            type="daterange"
29
+            format="yyyy年MM月dd日"
30
+            value-format="yyyy-MM-dd"
31
+            align="left"
32
+            unlink-panels
33
+            range-separator="至"
34
+            start-placeholder="开始日期"
27
             end-placeholder="结束日期" />
35
             end-placeholder="结束日期" />
28
         </el-form-item>
36
         </el-form-item>
29
         <el-form-item label="呼叫方向">
37
         <el-form-item label="呼叫方向">
30
-          <el-select clearable v-model="ruleForm.CallWhere" class="filter-item" filterable clearable placeholder="请选择呼叫方向"
38
+          <el-select
39
+            v-model="ruleForm.CallWhere"
40
+            clearable
41
+            class="filter-item"
42
+            filterable
43
+            clearable
44
+            placeholder="请选择呼叫方向"
31
             size="medium">
45
             size="medium">
32
             <el-option :value="0" label="呼入" />
46
             <el-option :value="0" label="呼入" />
33
             <el-option :value="1" label="呼出" />
47
             <el-option :value="1" label="呼出" />
34
           </el-select>
48
           </el-select>
35
         </el-form-item>
49
         </el-form-item>
36
-       <!-- <el-form-item label="呼叫类型">
50
+        <!-- <el-form-item label="呼叫类型">
37
           <el-select v-model="ruleForm.CallType" class="filter-item" filterable clearable placeholder="请选择呼叫类型"
51
           <el-select v-model="ruleForm.CallType" class="filter-item" filterable clearable placeholder="请选择呼叫类型"
38
             size="medium">
52
             size="medium">
39
             <el-option :value="1" label="正常通话" />
53
             <el-option :value="1" label="正常通话" />
67
       </el-form>
81
       </el-form>
68
     </div>
82
     </div>
69
     <el-table :data="dataLists" border stripe>
83
     <el-table :data="dataLists" border stripe>
70
-      <el-table-column type="index" width="50" label="编号" align="center" min-width="">
71
-      </el-table-column>
84
+      <el-table-column type="index" width="50" label="编号" align="center" min-width=""/>
72
       <el-table-column prop="CallNumber" label="电话号码" align="center" min-width />
85
       <el-table-column prop="CallNumber" label="电话号码" align="center" min-width />
73
       <el-table-column label="录音质检" align="center" min-width>
86
       <el-table-column label="录音质检" align="center" min-width>
74
         <template slot-scope="scope">
87
         <template slot-scope="scope">
77
       </el-table-column>
90
       </el-table-column>
78
       <el-table-column label="呼叫方向" align="center" min-width>
91
       <el-table-column label="呼叫方向" align="center" min-width>
79
         <template slot-scope="scope">
92
         <template slot-scope="scope">
80
-          <span v-if='scope.row.CallType==0'>呼入</span>
81
-          <span v-if='scope.row.CallType!=0'>呼出</span>
93
+          <span v-if="scope.row.CallType==0">呼入</span>
94
+          <span v-if="scope.row.CallType!=0">呼出</span>
82
         </template>
95
         </template>
83
       </el-table-column>
96
       </el-table-column>
84
       <el-table-column prop="UserCode" label="坐席工号" align="center" min-width />
97
       <el-table-column prop="UserCode" label="坐席工号" align="center" min-width />
85
-      <el-table-column prop="UserName1" label="坐席姓名" align="center" min-width />
98
+      <el-table-column :formatter="formtName" prop="UserName1" label="坐席姓名" align="center" min-width />
86
       <el-table-column prop="ExtNumber" label="分机号" align="center" min-width />
99
       <el-table-column prop="ExtNumber" label="分机号" align="center" min-width />
87
       <el-table-column prop="BeginTime" label="通话开始时间" align="center" min-width />
100
       <el-table-column prop="BeginTime" label="通话开始时间" align="center" min-width />
88
       <el-table-column prop="EndTime" label="通话结束时间" align="center" min-width />
101
       <el-table-column prop="EndTime" label="通话结束时间" align="center" min-width />
89
-      <el-table-column prop="TalkLongTime" label="通话时长" align="center" min-width />
90
-      <el-table-column prop="RingLongTime" label="振铃时长" align="center" min-width />
102
+      <el-table-column :formatter="formtTime" prop="TalkLongTime" label="通话时长" align="center" min-width />
103
+      <el-table-column :formatter="formtTime1" prop="RingLongTime" label="振铃时长" align="center" min-width />
91
     </el-table>
104
     </el-table>
92
-    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
93
-      :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
105
+    <pagination
106
+      v-show="pageParams.total > 0"
107
+      :total="pageParams.total"
108
+      :pageindex.sync="pageParams.pageindex"
109
+      :pagesize.sync="pageParams.pagesize"
110
+      class="pagination"
111
+      @pagination="getList" />
94
   </div>
112
   </div>
95
 </template>
113
 </template>
96
 
114
 
97
 <script>
115
 <script>
98
-  import {
99
-    getList,
100
-    getPhoneType,
101
-    getSeatType
102
-  } from '@/api/testing/scoreTesting'
103
-  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
104
-  import audioPlayer from '../components/audioplay'
105
-  export default {
106
-    name: 'ScoreTesting',
107
-    components: {
108
-      Pagination
109
-    },
110
-    filters: {},
111
-    data() {
112
-      return {
113
-        ruleForm: {
114
-          callzx: '',
115
-          callNum: '',
116
-          tel: '',
117
-          isquatity:'',
118
-          searchDate: '',
119
-          CallWhere: '',
120
-          // CallType: '',
121
-          // isreutrn: '',
122
-          // phoneType: '',
123
-          // searchT: 1
124
-        },
125
-        phoneData: [],
126
-        seatData: [],
127
-        recordpath: '', // 录音的路径
128
-        dataLists: [], // 列表数据
129
-        pageParams: {
130
-          pageindex: 1, // 当前第几页
131
-          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
132
-          total: 0 // 总共多少数据
133
-        },
116
+import {
117
+  getList,
118
+  getPhoneType,
119
+  getSeatType
120
+} from '@/api/testing/scoreTesting'
121
+import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
122
+import audioPlayer from '../components/audioplay'
123
+export default {
124
+  name: 'ScoreTesting',
125
+  components: {
126
+    Pagination
127
+  },
128
+  filters: {},
129
+  data() {
130
+    return {
131
+      ruleForm: {
132
+        callzx: '',
133
+        callNum: '',
134
+        tel: '',
135
+        isquatity: '',
136
+        searchDate: '',
137
+        CallWhere: ''
138
+        // CallType: '',
139
+        // isreutrn: '',
140
+        // phoneType: '',
141
+        // searchT: 1
142
+      },
143
+      phoneData: [],
144
+      seatData: [],
145
+      recordpath: '', // 录音的路径
146
+      dataLists: [], // 列表数据
147
+      pageParams: {
148
+        pageindex: 1, // 当前第几页
149
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
150
+        total: 0 // 总共多少数据
134
       }
151
       }
135
-    },
136
-    created() {
137
-      this.getList()
138
-      this.getPhone()
139
-      this.getSeat()
140
-      document.onkeyup = (e) => {
141
-        if (e.keyCode === 13) {
142
-          this.getList()
143
-        }
152
+    }
153
+  },
154
+  created() {
155
+    this.getList()
156
+    this.getPhone()
157
+    this.getSeat()
158
+    document.onkeyup = (e) => {
159
+      if (e.keyCode === 13) {
160
+        this.getList()
144
       }
161
       }
145
-    },
146
-    mounted() {
147
-      // this.timer = setInterval(() => {
148
-      //   this.getList()
149
-      // }, 12000)
150
-    },
151
-    methods: {
152
-      getList() {
153
-        this.loading = true
154
-        return new Promise((resolve) => {
155
-          const params = {
156
-            page: this.pageParams.pageindex, // 第几页
157
-            pagesize: this.pageParams.pagesize, // 每页几条信息
158
-            usercode: this.ruleForm.callzx, //	否	string	模糊查询(呼叫号码) CallNumber
159
-            extnumber: this.ruleForm.callNum,
160
-            phone: this.ruleForm.tel, //	否	string	模糊查询(呼叫号码)
161
-            // actiontype: this.ruleForm.CallType,
162
-            starttime: this.ruleForm.searchDate && this.ruleForm.searchDate[0],
163
-            endtime: this.ruleForm.searchDate && this.ruleForm.searchDate[1],
164
-            calltype: this.ruleForm.CallWhere, // 呼叫方向
165
-            // phoneType: this.ruleForm.phoneType,
166
-            // islike: this.ruleForm.searchT
162
+    }
163
+  },
164
+  mounted() {
165
+    // this.timer = setInterval(() => {
166
+    //   this.getList()
167
+    // }, 12000)
168
+  },
169
+  methods: {
170
+    getList() {
171
+      this.loading = true
172
+      return new Promise((resolve) => {
173
+        const params = {
174
+          page: this.pageParams.pageindex, // 第几页
175
+          pagesize: this.pageParams.pagesize, // 每页几条信息
176
+          usercode: this.ruleForm.callzx, //	否	string	模糊查询(呼叫号码) CallNumber
177
+          extnumber: this.ruleForm.callNum,
178
+          phone: this.ruleForm.tel, //	否	string	模糊查询(呼叫号码)
179
+          // actiontype: this.ruleForm.CallType,
180
+          starttime: this.ruleForm.searchDate && this.ruleForm.searchDate[0],
181
+          endtime: this.ruleForm.searchDate && this.ruleForm.searchDate[1],
182
+          calltype: this.ruleForm.CallWhere // 呼叫方向
183
+          // phoneType: this.ruleForm.phoneType,
184
+          // islike: this.ruleForm.searchT
185
+        }
186
+        getList(params).then((response) => {
187
+          this.loading = false
188
+          if (response.state.toLowerCase() === 'success') {
189
+            // this.recordpath = response.data.recordpath
190
+            this.pageParams.total = response.total
191
+            this.dataLists = response.rows
167
           }
192
           }
168
-          getList(params).then((response) => {
169
-            this.loading = false
170
-            if (response.state.toLowerCase() === 'success') {
171
-              // this.recordpath = response.data.recordpath
172
-              this.pageParams.total = response.total
173
-              this.dataLists = response.rows
174
-            }
175
-          })
176
-          resolve()
177
         })
193
         })
178
-      },
179
-      btn_search() {
180
-        this.getList()
181
-      },
182
-      getPhone() {
183
-        return new Promise((resolve) => {
184
-          const params = {
185
-            flag: "dhly"
194
+        resolve()
195
+      })
196
+    },
197
+    btn_search() {
198
+      this.getList()
199
+    },
200
+    getPhone() {
201
+      return new Promise((resolve) => {
202
+        const params = {
203
+          flag: 'dhly'
204
+        }
205
+        getPhoneType(params).then((response) => {
206
+          if (response.state.toLowerCase() === 'success') {
207
+            this.phoneData = response.data
186
           }
208
           }
187
-          getPhoneType(params).then((response) => {
188
-            if (response.state.toLowerCase() === 'success') {
189
-              this.phoneData = response.data
190
-            }
191
-          })
192
-          resolve()
193
         })
209
         })
194
-      },
195
-      getSeat() {
196
-        return new Promise((resolve) => {
197
-          const params = {
210
+        resolve()
211
+      })
212
+    },
213
+    getSeat() {
214
+      return new Promise((resolve) => {
215
+        const params = {
198
 
216
 
217
+        }
218
+        getSeatType(params).then((response) => {
219
+          if (response.state.toLowerCase() === 'success') {
220
+            this.seatData = response.data
199
           }
221
           }
200
-          getSeatType(params).then((response) => {
201
-            if (response.state.toLowerCase() === 'success') {
202
-              this.seatData = response.data
203
-            }
204
-          })
205
-          resolve()
206
-        })
207
-      },
208
-      // 播放录音
209
-      playSound(rec_file, row) {
210
-        this.$layer.iframe({
211
-          content: {
212
-            content: audioPlayer, // 传递的组件对象
213
-            parent: this, // 当前的vue对象
214
-            data: {
215
-              recFiles: rec_file,
216
-              rowdata: row,
217
-              isScore: 0 //0质检1结果
218
-            } // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
219
-          },
220
-          area: ['50%', '80%'],
221
-          shadeClose: true,
222
-          title: '录音播放下载及质检'
223
         })
222
         })
224
-      },
223
+        resolve()
224
+      })
225
+    },
226
+    formtName(val) {
227
+      if (!val.UserName1) {
228
+        return '-'
229
+      } else {
230
+        return val.UserName1
231
+      }
232
+    },
233
+    formtTime(val) {
234
+      if (!val.TalkLongTime) {
235
+        return '0秒'
236
+      }
237
+      var secondTime = parseInt(val.TalkLongTime)
238
+      var minuteTime = 0
239
+      var hourTime = 0
240
+      if (secondTime > 60) {
241
+        minuteTime = parseInt(secondTime / 60)
242
+        secondTime = parseInt(secondTime % 60)
243
+        if (minuteTime > 60) {
244
+          hourTime = parseInt(minuteTime / 60)
245
+          minuteTime = parseInt(minuteTime % 60)
246
+        }
247
+      }
248
+      var result = '' + parseInt(secondTime) + '秒'
249
+      if (minuteTime > 0) {
250
+        result = '' + parseInt(minuteTime) + '分' + result
251
+      }
252
+      if (hourTime > 0) {
253
+        result = '' + parseInt(hourTime) + '小时' + result
254
+      }
255
+      return result
256
+    },
257
+    formtTime1(val) {
258
+      if (!val.RingLongTime) {
259
+        return '0秒'
260
+      }
261
+      var secondTime = parseInt(val.RingLongTime)
262
+      var minuteTime = 0
263
+      var hourTime = 0
264
+      if (secondTime > 60) {
265
+        minuteTime = parseInt(secondTime / 60)
266
+        secondTime = parseInt(secondTime % 60)
267
+        if (minuteTime > 60) {
268
+          hourTime = parseInt(minuteTime / 60)
269
+          minuteTime = parseInt(minuteTime % 60)
270
+        }
271
+      }
272
+      var result = '' + parseInt(secondTime) + '秒'
273
+      if (minuteTime > 0) {
274
+        result = '' + parseInt(minuteTime) + '分' + result
275
+      }
276
+      if (hourTime > 0) {
277
+        result = '' + parseInt(hourTime) + '小时' + result
278
+      }
279
+      return result
280
+    },
281
+
282
+    // 播放录音
283
+    playSound(rec_file, row) {
284
+      this.$layer.iframe({
285
+        content: {
286
+          content: audioPlayer, // 传递的组件对象
287
+          parent: this, // 当前的vue对象
288
+          data: {
289
+            recFiles: rec_file,
290
+            rowdata: row,
291
+            isScore: 0 // 0质检1结果
292
+          } // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
293
+        },
294
+        area: ['50%', '80%'],
295
+        shadeClose: true,
296
+        title: '录音播放下载及质检'
297
+      })
225
     }
298
     }
226
   }
299
   }
300
+}
227
 </script>
301
 </script>
228
 
302
 
229
 <style rel="stylesheet/scss" lang="scss" scoped>
303
 <style rel="stylesheet/scss" lang="scss" scoped>