问题修改

CallCenterWeb.UI/src/store/getters.js

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

CallCenterWeb.UI/src/store/modules/user.js

@@ -7,6 +7,7 @@ const user = {
   state: {
     token: getToken(),
     rolecode: '',
+    rolename: '',
     name: '',
     usercode: '',
     userRole: '',
@@ -27,6 +28,9 @@ const user = {
     SET_ROLE_CODE: (state, rolecode) => {
       state.rolecode = rolecode
     },
+    SET_ROLE_NAME: (state, rolename) => {
+      state.rolename = rolename
+    },
     SET_NAME: (state, name) => {
       state.name = name
     },
@@ -74,6 +78,7 @@ const user = {
           setToken(data.token)
           commit('SET_TOKEN', data.token)
           commit('SET_ROLE_CODE', data.role_code)
+          commit('SET_ROLE_NAME', data.role_name)
           commit('SET_GROUPCODE', data.group.toLowerCase()) // 用户的坐席组code
           resolve()
         }).catch(error => {
@@ -127,6 +132,7 @@ const user = {
       return new Promise(resolve => {
         commit('SET_TOKEN', '')
         commit('SET_ROLE_CODE', '')
+        commit('SET_ROLE_NAME', '')
         commit('SET_GROUPID', '')
         commit('SET_EXT', '')
         removeToken()

CallCenterWeb.UI/src/views/commodityManagement/commodityLabel/index.vue

@@ -111,6 +111,7 @@ export default {
               } 
             }
           }
+          this.selectedData.F_TagName = ""
         })
         resolve()
       })

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/searchFilter.vue

@@ -180,6 +180,13 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        if (this.selectedId.length === 0) {
+          this.$message({
+            message: '请选择一条数据!',
+            type: 'warning'
+          })
+          return
+        }
         let deleteIds = this.selectedId.join(',')
         const data = {
           ids: ',' + deleteIds + ','

CallCenterWeb.UI/src/views/commodityManagement/commodityType/components/addOrEdit.vue

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

CallCenterWeb.UI/src/views/custodianManagement/orderListCustodian/index.vue

@@ -54,8 +54,7 @@
         <template slot-scope="scope">
           <el-button v-permission="'HY_sorting'" type="text" @click="btn_sorting(scope.row.F_Id)">分拣</el-button>
           <el-button v-permission="'HY_ship'" type="text" @click="btn_ship(scope.row.F_Id)">发货</el-button>
-          <!-- <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
-          <el-button v-permission="'HY_afterSales'" type="text" @click="btn_afterSales(scope.row.F_Id)">售后</el-button> -->
+          <el-button v-permission="'HY_sold_out'" type="text" @click="btn_sold_out(scope.row.F_Id)">无货</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -212,7 +211,7 @@ export default {
     },
     //分拣
     btn_sorting(orderid) {
-      this.$confirm('您确定要分拣吗?', '提示', {
+      this.$confirm('您确定分拣吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -237,7 +236,7 @@ export default {
     },
     //发货
     btn_ship(orderid) {
-      this.$confirm('您确定要发货吗?', '提示', {
+      this.$confirm('您确定发货吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -260,6 +259,31 @@ export default {
           });          
       });
     },
+    //无货
+    btn_sold_out(orderid) {
+      this.$confirm('您确定无货吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const data = {
+            orderid: orderid,
+            state: 4, //订单状态 —— 4 无货
+            remark: '', //备注
+          }
+          checkOrderCustodian(data).then(response => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('操作成功!')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          });          
+      });
+    },
     //批量分拣
     btn_batch_sorting() {
       if (this.selectedIds.length <= 0) {

CallCenterWeb.UI/src/views/personalInfo/index.vue

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

CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/index.vue

@@ -54,7 +54,7 @@
 </template>
 <script>
 import { getTreeList, getScoreList, deleteType, deleteScore } from '@/api/systemSetup/roleSetting/department'
-import { getTeamLists, deleteTeam,getDepidTeam} from '@/api/systemSetup/sysSetting/teamManagement'
+import { getTeamLists, deleteTeam, getDepidTeam } from '@/api/systemSetup/sysSetting/teamManagement'
 import addOrEditKnowledge from './component/addOrEdit'
 import addOrEditTeam from './component/addOrEditTeam'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
@@ -207,13 +207,13 @@ export default {
     },
     treeNodeClick(data) {
       this.treeclickId = data.id
-      if(data.children.length==0){
-        this.depId=data.id
+      if (data.id !== 0) {
+        this.depId = data.id
         console.log(data)
-        this.depName=data.label
+        this.depName = data.label
         this.getList()
-      }else{
-        this.depId=0
+      } else {
+        this.depId = 0
       }
     },
     //获取团队列表数据
@@ -259,7 +259,7 @@ export default {
     },
     //右边编辑功能
     btn_editR(editId) {
-      if(this.depId !==0){
+      if (this.depId !== 0){
           this.$layer.iframe({
           content: {
             content: addOrEditTeam, // 传递的组件对象
@@ -269,7 +269,7 @@ export default {
           area: ['40%', '320px'],
           title: '编辑团队管理信息'
         })
-      }else{
+      } else {
         this.$message.info('请选择部门')
       }
     },

CallCenterWeb.UI/src/views/systemSetup/roleSetting/menuSetup/components/addOrEditMenu.vue

@@ -6,10 +6,11 @@
           v-model="parentids"
           :options="menuDropDatas"
           :props="props"
-          placeholder="请选择父级分类,默认是顶级分类"
+          :placeholder="classificationReminder"
           clearable
           filterable
           change-on-select
+          :disabled="judgmentAddEdit"
           style="width: 100%;"/>
       </el-form-item>
       <el-form-item label="菜单名称" prop="name">
@@ -130,7 +131,9 @@ export default {
         label: 'text'
       },
       iconDatas,
-      loading: false
+      loading: false,
+      judgmentAddEdit: false,
+      classificationReminder: '请选择父级分类，默认是顶级分类',
     }
   },
   created() {
@@ -139,6 +142,7 @@ export default {
       if (this.rowid) {
         this.ruleForm.id = this.rowid
         this.getMenuDetail(this.rowid)
+        this.judgmentAddEdit = true
       }
     })
   },
@@ -197,6 +201,7 @@ export default {
           this.ruleForm.sort = res.sort // 排列序号
           this.ruleForm.imgUrl = res.imgUrl // icon
           this.ruleForm.remark = res.remark // 备注信息
+          this.classificationReminder = res.name //父级分类名称
         }
       })
     },

CallCenterWeb.UI/src/views/systemSetup/roleSetting/roleSetup/addOrEditRole.vue

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

CallCenterWeb.UI/src/views/systemSetup/roleSetting/roleSetup/index.vue

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