liuyifan vor 5 Jahren
Ursprung
Commit
195ea93065

+ 1 - 0
CallCenterWeb.UI/src/store/getters.js

@@ -4,6 +4,7 @@ const getters = {
4 4
   serverConfig: state => state.serverConfig.config, // 配置信息
5 5
   token: state => state.user.token,
6 6
   rolecode: state => state.user.rolecode, //角色编号
7
+  rolename: state => state.user.rolename, //用户角色
7 8
   avatar: state => state.user.avatar, // 头像
8 9
   userid: state => state.user.userid, // 当前用户id
9 10
   username: state => state.user.name, // 用户名

+ 6 - 0
CallCenterWeb.UI/src/store/modules/user.js

@@ -7,6 +7,7 @@ const user = {
7 7
   state: {
8 8
     token: getToken(),
9 9
     rolecode: '',
10
+    rolename: '',
10 11
     name: '',
11 12
     usercode: '',
12 13
     userRole: '',
@@ -27,6 +28,9 @@ const user = {
27 28
     SET_ROLE_CODE: (state, rolecode) => {
28 29
       state.rolecode = rolecode
29 30
     },
31
+    SET_ROLE_NAME: (state, rolename) => {
32
+      state.rolename = rolename
33
+    },
30 34
     SET_NAME: (state, name) => {
31 35
       state.name = name
32 36
     },
@@ -74,6 +78,7 @@ const user = {
74 78
           setToken(data.token)
75 79
           commit('SET_TOKEN', data.token)
76 80
           commit('SET_ROLE_CODE', data.role_code)
81
+          commit('SET_ROLE_NAME', data.role_name)
77 82
           commit('SET_GROUPCODE', data.group.toLowerCase()) // 用户的坐席组code
78 83
           resolve()
79 84
         }).catch(error => {
@@ -127,6 +132,7 @@ const user = {
127 132
       return new Promise(resolve => {
128 133
         commit('SET_TOKEN', '')
129 134
         commit('SET_ROLE_CODE', '')
135
+        commit('SET_ROLE_NAME', '')
130 136
         commit('SET_GROUPID', '')
131 137
         commit('SET_EXT', '')
132 138
         removeToken()

+ 1 - 0
CallCenterWeb.UI/src/views/commodityManagement/commodityLabel/index.vue

@@ -111,6 +111,7 @@ export default {
111 111
               } 
112 112
             }
113 113
           }
114
+          this.selectedData.F_TagName = ""
114 115
         })
115 116
         resolve()
116 117
       })

+ 7 - 0
CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/searchFilter.vue

@@ -180,6 +180,13 @@ export default {
180 180
         cancelButtonText: '取消',
181 181
         type: 'warning'
182 182
       }).then(() => {
183
+        if (this.selectedId.length === 0) {
184
+          this.$message({
185
+            message: '请选择一条数据!',
186
+            type: 'warning'
187
+          })
188
+          return
189
+        }
183 190
         let deleteIds = this.selectedId.join(',')
184 191
         const data = {
185 192
           ids: ',' + deleteIds + ','

+ 1 - 1
CallCenterWeb.UI/src/views/commodityManagement/commodityType/components/addOrEdit.vue

@@ -123,7 +123,7 @@ export default {
123 123
         if (response.state.toLowerCase() === 'success') {
124 124
           const res = response.data[0]
125 125
           this.ruleForm.ClassName = res.text //分类名称
126
-          this.ruleForm.ClassShortName = res.F_ClassShortName //分类简写
126
+          this.ruleForm.ClassShortName = res.code //分类简写
127 127
         }
128 128
       })
129 129
     },

+ 28 - 4
CallCenterWeb.UI/src/views/custodianManagement/orderListCustodian/index.vue

@@ -54,8 +54,7 @@
54 54
         <template slot-scope="scope">
55 55
           <el-button v-permission="'HY_sorting'" type="text" @click="btn_sorting(scope.row.F_Id)">分拣</el-button>
56 56
           <el-button v-permission="'HY_ship'" type="text" @click="btn_ship(scope.row.F_Id)">发货</el-button>
57
-          <!-- <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
58
-          <el-button v-permission="'HY_afterSales'" type="text" @click="btn_afterSales(scope.row.F_Id)">售后</el-button> -->
57
+          <el-button v-permission="'HY_sold_out'" type="text" @click="btn_sold_out(scope.row.F_Id)">无货</el-button>
59 58
         </template>
60 59
       </el-table-column>
61 60
     </el-table>
@@ -212,7 +211,7 @@ export default {
212 211
     },
213 212
     //分拣
214 213
     btn_sorting(orderid) {
215
-      this.$confirm('您确定分拣吗?', '提示', {
214
+      this.$confirm('您确定分拣吗?', '提示', {
216 215
           confirmButtonText: '确定',
217 216
           cancelButtonText: '取消',
218 217
           type: 'warning'
@@ -237,7 +236,7 @@ export default {
237 236
     },
238 237
     //发货
239 238
     btn_ship(orderid) {
240
-      this.$confirm('您确定发货吗?', '提示', {
239
+      this.$confirm('您确定发货吗?', '提示', {
241 240
           confirmButtonText: '确定',
242 241
           cancelButtonText: '取消',
243 242
           type: 'warning'
@@ -260,6 +259,31 @@ export default {
260 259
           });          
261 260
       });
262 261
     },
262
+    //无货
263
+    btn_sold_out(orderid) {
264
+      this.$confirm('您确定无货吗?', '提示', {
265
+          confirmButtonText: '确定',
266
+          cancelButtonText: '取消',
267
+          type: 'warning'
268
+        }).then(() => {
269
+          const data = {
270
+            orderid: orderid,
271
+            state: 4, //订单状态 —— 4 无货
272
+            remark: '', //备注
273
+          }
274
+          checkOrderCustodian(data).then(response => {
275
+            if (response.state.toLowerCase() === 'success') {
276
+              this.getList()
277
+              this.$message.success('操作成功!')
278
+            }
279
+          })
280
+        }).catch(() => {
281
+          this.$message({
282
+            type: 'info',
283
+            message: '已取消操作'
284
+          });          
285
+      });
286
+    },
263 287
     //批量分拣
264 288
     btn_batch_sorting() {
265 289
       if (this.selectedIds.length <= 0) {

+ 3 - 2
CallCenterWeb.UI/src/views/personalInfo/index.vue

@@ -7,7 +7,7 @@
7 7
           <el-col :md="4">
8 8
             <img :src="!avatar ? '/static/img/user.png' : avatar" class="avatar" alt="头像">
9 9
             <div>
10
-              <el-tooltip class="item" effect="dark" content="后台需要增加修改头像的接口" placement="top-start">
10
+              <el-tooltip class="item" effect="dark" content="修改头像" placement="top-start">
11 11
                 <el-button type="text" class="btn_avat" @click="toggleShow">修改头像</el-button>
12 12
               </el-tooltip>
13 13
               <avatar-upload
@@ -26,7 +26,7 @@
26 26
           <el-col :md="20">
27 27
             <p class="head_con">登录账号:{{ usercode }}</p>
28 28
             <p class="head_con">姓名:{{ username }}</p>
29
-            <p class="head_con">角色权限:{{ userRole }}</p>
29
+            <p class="head_con">用户角色:{{ rolename }}</p>
30 30
             <p v-if="seatflag" class="head_con">分机号:{{ extension }}</p>
31 31
           </el-col>
32 32
         </div>
@@ -109,6 +109,7 @@ export default {
109 109
       'seatflag',
110 110
       'extension',
111 111
       'mobile',
112
+      'rolename',
112 113
     ])
113 114
   },
114 115
   created() {

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

@@ -54,7 +54,7 @@
54 54
 </template>
55 55
 <script>
56 56
 import { getTreeList, getScoreList, deleteType, deleteScore } from '@/api/systemSetup/roleSetting/department'
57
-import { getTeamLists, deleteTeam,getDepidTeam} from '@/api/systemSetup/sysSetting/teamManagement'
57
+import { getTeamLists, deleteTeam, getDepidTeam } from '@/api/systemSetup/sysSetting/teamManagement'
58 58
 import addOrEditKnowledge from './component/addOrEdit'
59 59
 import addOrEditTeam from './component/addOrEditTeam'
60 60
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
@@ -207,13 +207,13 @@ export default {
207 207
     },
208 208
     treeNodeClick(data) {
209 209
       this.treeclickId = data.id
210
-      if(data.children.length==0){
211
-        this.depId=data.id
210
+      if (data.id !== 0) {
211
+        this.depId = data.id
212 212
         console.log(data)
213
-        this.depName=data.label
213
+        this.depName = data.label
214 214
         this.getList()
215
-      }else{
216
-        this.depId=0
215
+      } else {
216
+        this.depId = 0
217 217
       }
218 218
     },
219 219
     //获取团队列表数据
@@ -259,7 +259,7 @@ export default {
259 259
     },
260 260
     //右边编辑功能
261 261
     btn_editR(editId) {
262
-      if(this.depId !==0){
262
+      if (this.depId !== 0){
263 263
           this.$layer.iframe({
264 264
           content: {
265 265
             content: addOrEditTeam, // 传递的组件对象
@@ -269,7 +269,7 @@ export default {
269 269
           area: ['40%', '320px'],
270 270
           title: '编辑团队管理信息'
271 271
         })
272
-      }else{
272
+      } else {
273 273
         this.$message.info('请选择部门')
274 274
       }
275 275
     },

+ 7 - 2
CallCenterWeb.UI/src/views/systemSetup/roleSetting/menuSetup/components/addOrEditMenu.vue

@@ -6,10 +6,11 @@
6 6
           v-model="parentids"
7 7
           :options="menuDropDatas"
8 8
           :props="props"
9
-          placeholder="请选择父级分类,默认是顶级分类"
9
+          :placeholder="classificationReminder"
10 10
           clearable
11 11
           filterable
12 12
           change-on-select
13
+          :disabled="judgmentAddEdit"
13 14
           style="width: 100%;"/>
14 15
       </el-form-item>
15 16
       <el-form-item label="菜单名称" prop="name">
@@ -130,7 +131,9 @@ export default {
130 131
         label: 'text'
131 132
       },
132 133
       iconDatas,
133
-      loading: false
134
+      loading: false,
135
+      judgmentAddEdit: false,
136
+      classificationReminder: '请选择父级分类,默认是顶级分类',
134 137
     }
135 138
   },
136 139
   created() {
@@ -139,6 +142,7 @@ export default {
139 142
       if (this.rowid) {
140 143
         this.ruleForm.id = this.rowid
141 144
         this.getMenuDetail(this.rowid)
145
+        this.judgmentAddEdit = true
142 146
       }
143 147
     })
144 148
   },
@@ -197,6 +201,7 @@ export default {
197 201
           this.ruleForm.sort = res.sort // 排列序号
198 202
           this.ruleForm.imgUrl = res.imgUrl // icon
199 203
           this.ruleForm.remark = res.remark // 备注信息
204
+          this.classificationReminder = res.name //父级分类名称
200 205
         }
201 206
       })
202 207
     },

+ 3 - 3
CallCenterWeb.UI/src/views/systemSetup/roleSetting/roleSetup/addOrEditRole.vue

@@ -4,8 +4,8 @@
4 4
       <el-form-item label="用户角色" prop="role_name">
5 5
         <el-input v-model="ruleForm.role_name" placeholder="请输入用户角色"/>
6 6
       </el-form-item>
7
-      <el-form-item label="用户编码" prop="role_code">
8
-        <el-input v-model="ruleForm.role_code" placeholder="请输入用户编码"/>
7
+      <el-form-item label="角色编码" prop="role_code">
8
+        <el-input v-model="ruleForm.role_code" placeholder="请输入角色编码"/>
9 9
       </el-form-item>
10 10
       <el-form-item label="备注" prop="role_remark">
11 11
         <el-input v-model="ruleForm.role_remark" type="textarea" autosize placeholder="请输入备注"/>
@@ -48,7 +48,7 @@ export default {
48 48
       ruleForm: {
49 49
         role_id: '', // 角色id
50 50
         role_name: '', // 角色名称
51
-        role_code: '', // 角色编
51
+        role_code: '', // 角色编
52 52
         role_remark: '' // 备注
53 53
       },
54 54
       rules: {

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

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="app-container role_setup">
3 3
     <div class="filter-container">
4
-      <el-input v-model="keyword" placeholder="请输入角色编" class="filter-item"/>
4
+      <el-input v-model="keyword" placeholder="请输入角色编" class="filter-item"/>
5 5
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
6 6
       <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
7 7
       <el-button v-permission="'HY_edit'" type="primary" class="filter-item" icon="el-icon-edit" @click="btn_edit">编辑</el-button>
@@ -23,7 +23,7 @@
23 23
           @row-click="handleTableClick">
24 24
           <el-table-column type="index" label="编号" align="center" fixed width="80"/>
25 25
           <el-table-column prop="F_RoleName" label="用户角色" align="center" min-width=""/>
26
-          <el-table-column prop="F_RoleCode" label="角色编" align="center" min-width=""/>
26
+          <el-table-column prop="F_RoleCode" label="角色编" align="center" min-width=""/>
27 27
           <el-table-column prop="F_CreateOn" label="创建时间" align="center" min-width=""/>
28 28
           <el-table-column prop="F_LastModifyOn" label="最后修改时间" align="center" min-width=""/>
29 29
           <el-table-column prop="F_Remark" label="备注" align="center" min-width=""/>
@@ -108,6 +108,7 @@ export default {
108 108
             this.pageParams.total = response.data.Totals
109 109
             this.roleLists = response.data.Rows
110 110
             this.$refs.treeRef.setCheckedKeys([])// 清空权限树的选中状态
111
+            this.role_id = ''
111 112
           }
112 113
         })
113 114
         resolve()