liuzhihui 2 gadi atpakaļ
vecāks
revīzija
1af6712f43

+ 68 - 61
CallCenterWeb.UI/RMYY/src/api/commonAPI.js

@@ -1,171 +1,178 @@
1 1
 // 公共接口
2
-import request from "@/utils/request";
2
+import request from '@/utils/request'
3 3
 // 获取老患者信息
4 4
 export function getoldmsg(params) {
5 5
   return request({
6
-    url: "Customer/GetList",
7
-    method: "get",
6
+    url: 'Customer/GetList',
7
+    method: 'get',
8 8
     params
9
-  });
9
+  })
10 10
 }
11 11
 // 获取坐席组
12 12
 export function getSeatGroup(params) {
13 13
   return request({
14
-    url: "SeatGroup/GetSeatList",
15
-    method: "get",
14
+    url: 'SeatGroup/GetSeatList',
15
+    method: 'get',
16 16
     params
17
-  });
17
+  })
18 18
 }
19 19
 
20 20
 // 获取角色
21 21
 export function getRoleSelect(params) {
22 22
   return request({
23
-    url: "Role/GetList",
24
-    method: "get",
23
+    url: 'Role/GetList',
24
+    method: 'get',
25 25
     params
26
-  });
26
+  })
27 27
 }
28 28
 
29 29
 // 获取院区
30 30
 export function getListyqlistall(params) {
31 31
   return request({
32
-    url: "Worepair/GetListyqlistall",
33
-    method: "get",
32
+    url: 'Worepair/GetListyqlistall',
33
+    method: 'get',
34 34
     params
35
-  });
35
+  })
36 36
 }
37 37
 // 获取科室
38 38
 export function getWorkOrderGetDept(params) {
39 39
   return request({
40
-    url: "WorkOrderBase/GetDept",
41
-    method: "get",
40
+    url: 'WorkOrderBase/GetDept',
41
+    method: 'get',
42 42
     params
43
-  });
43
+  })
44 44
 }
45 45
 // 获取人员
46 46
 export function GetPerson(params) {
47 47
   return request({
48
-    url: "WorkOrderBase/GetPerson",
49
-    method: "get",
48
+    url: 'WorkOrderBase/GetPerson',
49
+    method: 'get',
50 50
     params
51
-  });
51
+  })
52
+}
53
+export function GetUsersByDeptId(params) {
54
+  return request({
55
+    url: 'WorkOrderBase/GetUsersByDeptId',
56
+    method: 'get',
57
+    params
58
+  })
52 59
 }
53 60
 // 获取人员-转运用
54 61
 export function GetTransPson(params) {
55 62
   return request({
56
-    url: "WorkOrderBase/GetTransPson",
57
-    method: "get",
63
+    url: 'WorkOrderBase/GetTransPson',
64
+    method: 'get',
58 65
     params
59
-  });
66
+  })
60 67
 }
61 68
 // 上传图片
62 69
 export function UploadImage64(data) {
63 70
   return request({
64
-    url: "WorkOrderBase/UploadImage64",
65
-    method: "post",
71
+    url: 'WorkOrderBase/UploadImage64',
72
+    method: 'post',
66 73
     data
67
-  });
74
+  })
68 75
 }
69 76
 // 获取工单类型
70 77
 export function getOrderTypeList(typeid, pid) {
71 78
   return request({
72
-    url: "WorkOrderBase/GetGongDanType",
73
-    method: "get",
79
+    url: 'WorkOrderBase/GetGongDanType',
80
+    method: 'get',
74 81
     params: {
75 82
       typeid,
76 83
       pid
77 84
     }
78
-  });
85
+  })
79 86
 }
80 87
 // 数据字典
81 88
 export function GetDicValue(Flag) {
82 89
   return request({
83
-    url: "Dictionary/GetDicValueList",
84
-    method: "get",
90
+    url: 'Dictionary/GetDicValueList',
91
+    method: 'get',
85 92
     params: {
86 93
       Flag
87 94
     }
88
-  });
95
+  })
89 96
 }
90 97
 // 工单状态
91 98
 export function GetTypeState(params) {
92 99
   return request({
93
-    url: "T_Dis_WorkOrder/GetTypeState",
94
-    method: "get",
100
+    url: 'T_Dis_WorkOrder/GetTypeState',
101
+    method: 'get',
95 102
     params
96
-  });
103
+  })
97 104
 }
98 105
 // 保存自定义列
99 106
 export function AddFiled(data) {
100 107
   return request({
101
-    url: "CustomFiled/AddFiled",
102
-    method: "post",
108
+    url: 'CustomFiled/AddFiled',
109
+    method: 'post',
103 110
     data
104
-  });
111
+  })
105 112
 }
106 113
 // 获取自定义列
107 114
 export function GetFiledState(TableId) {
108 115
   return request({
109
-    url: "/CustomFiled/GetTab",
110
-    method: "get",
116
+    url: '/CustomFiled/GetTab',
117
+    method: 'get',
111 118
     params: {
112 119
       TableId
113 120
     }
114
-  });
121
+  })
115 122
 }
116 123
 // 签入签出
117 124
 export function Teljournal(params) {
118 125
   return request({
119
-    url: "Home/Teljournal",
120
-    method: "get",
126
+    url: 'Home/Teljournal',
127
+    method: 'get',
121 128
     params
122
-  });
129
+  })
123 130
 }
124 131
 // 工单消息
125 132
 export function getMsg(params) {
126 133
   return request({
127
-    url: "InternalMessages/GetMsg",
128
-    method: "get",
134
+    url: 'InternalMessages/GetMsg',
135
+    method: 'get',
129 136
     params
130
-  });
137
+  })
131 138
 }
132 139
 // 工单消息
133 140
 export function updateState(params) {
134 141
   return request({
135
-    url: "InternalMessages/UpdateState",
136
-    method: "post",
142
+    url: 'InternalMessages/UpdateState',
143
+    method: 'post',
137 144
     data: params
138
-  });
145
+  })
139 146
 }
140 147
 // 获取值班人员
141 148
 export function getClassByDeptId(params) {
142 149
   return request({
143
-    url: "WorkOrderBase/GetPersonByDeptId",
144
-    method: "get",
150
+    url: 'WorkOrderBase/GetPersonByDeptId',
151
+    method: 'get',
145 152
     params
146
-  });
153
+  })
147 154
 }
148 155
 // 清空排班信息
149 156
 export function getDelClass(params) {
150 157
   return request({
151
-    url: "GroupClass/DelClass",
152
-    method: "get",
158
+    url: 'GroupClass/DelClass',
159
+    method: 'get',
153 160
     params
154
-  });
161
+  })
155 162
 }
156 163
 // 获取标本tree
157 164
 export function GetBBXXList(params) {
158 165
   return request({
159
-    url: "GongDanType/GetBBXXList",
160
-    method: "get",
166
+    url: 'GongDanType/GetBBXXList',
167
+    method: 'get',
161 168
     params
162
-  });
169
+  })
163 170
 }
164 171
 // 获取标本tree
165 172
 export function GetCount(params) {
166 173
   return request({
167
-    url: "WorkCommon/GetCount",
168
-    method: "get",
174
+    url: 'WorkCommon/GetCount',
175
+    method: 'get',
169 176
     params
170
-  });
177
+  })
171 178
 }

+ 8 - 4
CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/muterManage/addOrEditMuter.vue

@@ -3,7 +3,7 @@
3 3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="130px">
4 4
 
5 5
       <el-form-item label="父级类型">
6
-        <el-input v-model="parentText" :disabled="true" placeholder="暂无"/>
6
+        <el-input v-model="parentTexts" :disabled="true" placeholder="暂无"/>
7 7
       </el-form-item>
8 8
       <el-form-item label="等级">
9 9
         <el-input v-model="ruleForm.F_TypeId" :disabled="true" placeholder="暂无"/>
@@ -75,6 +75,7 @@ export default {
75 75
   },
76 76
   data() {
77 77
     return {
78
+      parentTexts:"",
78 79
       ruleForm: {
79 80
         F_ParentID: 0, // 父id
80 81
         F_TypeId: 0, // 四大类id
@@ -101,6 +102,7 @@ export default {
101 102
     }
102 103
   },
103 104
   created() {
105
+    this.parentTexts = this.parentText
104 106
     if (this.rowid) {
105 107
       this.ruleForm.F_Id = this.rowid
106 108
       this.getDetail(this.rowid)
@@ -166,9 +168,11 @@ export default {
166 168
       getOrderType(rid).then(response => {
167 169
         if (response.state.toLowerCase() === 'success') {
168 170
           const res = response.data
169
-          const parTypeText = this.$store.getters.bbxxTypeMap[parseInt(res.F_ParentID)].text
170
-          this.ruleForm.F_ParentID = res.F_ParentID // 父id
171
-          this.parentText = parTypeText || '暂无'
171
+          if(res.F_ParentID!=0){
172
+            this.ruleForm.F_ParentID = res.F_ParentID || '0' // 父id
173
+            // const parTypeText = this.$store.getters.bbxxTypeMap[parseInt(res.F_ParentID)].text
174
+            this.parentTexts =  this.$store.getters.bbxxTypeMap[parseInt(res.F_ParentID)].text || '暂无'
175
+          }
172 176
           this.ruleForm.F_Name = res.F_Name // 角色名称
173 177
           this.ruleForm.F_Remark = res.F_Remark // 角色编号
174 178
           this.ruleForm.F_Sort = res.F_Sort // 备注

+ 7 - 5
CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/orderTypeManage/addOrEditOrderType.vue

@@ -3,7 +3,7 @@
3 3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="130px">
4 4
 
5 5
       <el-form-item label="父级类型">
6
-        <el-input v-model="parentText" :disabled="true" placeholder="暂无" />
6
+        <el-input v-model="parentTexts" :disabled="true" placeholder="暂无" />
7 7
       </el-form-item>
8 8
       <el-form-item label="工单等级">
9 9
         <el-input v-model="ruleForm.F_TypeId" :disabled="true" placeholder="暂无" />
@@ -60,7 +60,7 @@
60 60
     GetYuanqu
61 61
   } from "@/api/telCall/report";
62 62
   import {
63
-    GetPerson
63
+    GetUsersByDeptId
64 64
   } from '@/api/commonAPI'
65 65
   import {
66 66
     getDeptTree
@@ -114,6 +114,7 @@
114 114
     },
115 115
     data() {
116 116
       return {
117
+        parentTexts:"",
117 118
         ruleForm: {
118 119
           F_ParentID: 0, // 父id
119 120
           F_GDId: '', // 工单类型id
@@ -138,7 +139,7 @@
138 139
         rules: {
139 140
           F_Name: [{
140 141
             required: true,
141
-            message: '请输入工单名称',
142
+            message: '请选择工单类型',
142 143
             trigger: 'blur'
143 144
           }]
144 145
         },
@@ -156,6 +157,7 @@
156 157
       }
157 158
     },
158 159
     created() {
160
+      this.parentTexts = this.parentText
159 161
       this.getHos()
160 162
       this.getTreeList()
161 163
       if (this.rowid) {
@@ -219,7 +221,7 @@
219 221
         const params = {
220 222
           deptid: id
221 223
         }
222
-        GetPerson(params).then((res) => {
224
+        GetUsersByDeptId(params).then((res) => {
223 225
           // this.autolist[index].personarr = res.rows
224 226
           this.$set(this.autolist[index],'personarr',res.rows)
225 227
         })
@@ -294,7 +296,7 @@
294 296
             const res = response.data
295 297
             const parTypeText = this.$store.getters.workTypeMap[parseInt(res.fid)].text
296 298
             this.ruleForm.F_ParentID = res.fid // 父id
297
-            this.parentText = parTypeText || '暂无'
299
+            this.parentTexts = parTypeText || '暂无'
298 300
             this.ruleForm.F_Name = res.name // 角色名称
299 301
             this.ruleForm.F_Remark = res.remark // 角色编号
300 302
             this.ruleForm.F_Sort = res.sort // 备注

+ 2 - 1
CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/orderTypeManage/index.vue

@@ -17,7 +17,7 @@
17 17
         <el-alert :closable="false" title="权限树" type="success" />
18 18
         <div class="filter-container">
19 19
           <el-button v-permission="'add_orderType'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_addR()">添加</el-button>
20
-          <el-button v-permission="'edit_orderType'" type="primary" class="filter-item" icon="el-icon-edit" @click="btn_editR">编辑</el-button>
20
+          <el-button v-permission="'edit_orderType'" v-if="deleteState" type="primary" class="filter-item" icon="el-icon-edit" @click="btn_editR">编辑</el-button>
21 21
           <el-button v-permission="'delete_orderType'" v-if="deleteState" type="primary" class="filter-item" icon="el-icon-delete" @click="btn_deleteR">删除</el-button>
22 22
         </div>
23 23
         <el-tree ref="treeRef" :data="treelists" node-key="id" highlight-current-row @node-click="handleNodeClick" />
@@ -89,6 +89,7 @@ export default {
89 89
     },
90 90
     // 点击某一行的table
91 91
     handleTableClick(row, event, column) {
92
+      this.deleteState = false //不显示修改删除
92 93
       this.dicState = 1
93 94
       this.orderGradeR = 0
94 95
       this.rowid = row.id