liuzhihui 2 years ago
parent
commit
dcd00bbc8a

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

@@ -1709,6 +1709,10 @@
1709 1709
           this.zhddtransferForm.detailists = arrlist;
1710 1710
         }
1711 1711
         if (formName === "evaluateForm") {
1712
+          if(this.evaluateForm.Attitude == 0 || this.evaluateForm.Quality == 0 || this.evaluateForm.Efficiency == 0){
1713
+            this.$message.warning("请选择星级评级");
1714
+            return;
1715
+          }
1712 1716
           if (
1713 1717
             this.evaluateForm.Attitude < 3 ||
1714 1718
             this.evaluateForm.Quality < 3 ||
@@ -1721,6 +1725,10 @@
1721 1725
           }
1722 1726
         }
1723 1727
         if (formName === "schedulingEvaluateForm") {
1728
+          if(this.schedulingEvaluateForm.Attitude == 0 || this.schedulingEvaluateForm.Quality == 0 || this.schedulingEvaluateForm.Efficiency == 0){
1729
+            this.$message.warning("请选择星级评级");
1730
+            return;
1731
+          }
1724 1732
           if (
1725 1733
             this.schedulingEvaluateForm.Attitude < 3 ||
1726 1734
             this.schedulingEvaluateForm.Quality < 3 ||
@@ -1733,6 +1741,10 @@
1733 1741
           }
1734 1742
         }
1735 1743
         if (formName === "carEvaluteForm") {
1744
+          if(this.carEvaluteForm.Attitude == 0 || this.carEvaluteForm.Quality == 0 || this.carEvaluteForm.Efficiency == 0){
1745
+            this.$message.warning("请选择星级评级");
1746
+            return;
1747
+          }
1736 1748
           if (
1737 1749
             this.carEvaluteForm.Attitude < 3 ||
1738 1750
             this.carEvaluteForm.Quality < 3 ||

+ 3 - 2
CallCenterWeb.UI/RMYY/src/store/getters.js

@@ -23,6 +23,7 @@ const getters = {
23 23
   teamId: state => state.user.teamId, // 小组id
24 24
   name: state => state.user.name, // 用户姓名
25 25
   location: state => state.user.location, // 科室位置
26
+  allowdept: state => state.user.allowdept, // 允用科室
26 27
 
27 28
   deptments: state => state.deptment.deptments, // 部门信息
28 29
   deptmap: state => state.deptment.deptmap, // 部门map信息
@@ -78,5 +79,5 @@ const getters = {
78 79
   currentName: state => state.lineChatSocket.currentName, // 聊天成员会话name
79 80
   chatUserCode: state => state.lineChatSocket.chatUserCode, // 客服code
80 81
   collUserCode: state => state.lineChatSocket.collUserCode // 同事code
81
-};
82
-export default getters;
82
+}
83
+export default getters

+ 7 - 2
CallCenterWeb.UI/RMYY/src/store/modules/user.js

@@ -22,7 +22,8 @@ const user = {
22 22
     menus: [], // 菜单数据
23 23
     mobile: '', // 手机
24 24
     teamName: '', // 部门名称
25
-    teamId: ''
25
+    teamId: '',
26
+    allowdept: ''
26 27
   },
27 28
 
28 29
   mutations: {
@@ -64,6 +65,9 @@ const user = {
64 65
     },
65 66
     SET_TEAMID: (state, teamId) => {
66 67
       state.teamId = teamId // 部门id
68
+    },
69
+    SET_ALLOWDEPT: (state, allowdept) => {
70
+      state.allowdept = allowdept // 允用科室
67 71
     }
68 72
   },
69 73
 
@@ -134,7 +138,8 @@ const user = {
134 138
             commit('SET_CODE', data.User.F_UserCode) // 用户编号
135 139
             commit('SET_MOBILE', data.User.F_Telephone) // 手机
136 140
             commit('SET_LOCATION', data.Dept.F_Location) // 科室位置
137
-            commit('SET_EXT', window.localStorage.getItem('ext')) // 分机号
141
+            commit('SET_EXT', window.localStorage.getItem('ext')) // 分机号ssss
142
+            commit('SET_ALLOWDEPT', data.User.F_AllowDepartment) // 允用科室
138 143
             window.localStorage.setItem('deptCode', data.Dept.F_DeptCode)
139 144
             window.localStorage.setItem(
140 145
               'deptCode',

+ 3 - 3
CallCenterWeb.UI/RMYY/src/views/layout/components/Sidebar/index.vue

@@ -2,7 +2,7 @@
2 2
   <el-scrollbar wrap-class="scrollbar-wrapper">
3 3
     <div class="logo">
4 4
       <transition name="el-fade-in-linear">
5
-        <h1 v-show="sidebar.opened" class="title">综合保障服务中心</h1>
5
+        <h1 v-show="sidebar.opened" class="title">综合服务保障调度平台</h1>
6 6
       </transition>
7 7
     </div>
8 8
 
@@ -78,10 +78,10 @@ export default {
78 78
   .title {
79 79
     margin-top: 0;
80 80
     margin-bottom: 0;
81
-    margin-left: 12px;
81
+    margin-left: 5px;
82 82
     display: inline-block;
83 83
     vertical-align: middle;
84
-    font-size: 20px;
84
+    font-size: 17px;
85 85
     font-family: "microsoft yahei" 微软雅黑;
86 86
   }
87 87
 }

+ 22 - 14
CallCenterWeb.UI/RMYY/src/views/login/changeDept.vue

@@ -16,6 +16,7 @@
16 16
 
17 17
 <script>
18 18
   import { getChangeDeptId } from "@/api/login"
19
+  import { mapGetters } from 'vuex'
19 20
    export default {
20 21
      name: 'changeDept',
21 22
      props:{
@@ -30,24 +31,33 @@
30 31
          onchangedept:""
31 32
        }
32 33
      },
34
+     computed: {
35
+       ...mapGetters([
36
+         "allowdept"
37
+       ])
38
+     },
33 39
      created() {
40
+       console.log(this.allowdept)
34 41
        this.getData()
35 42
      },
36 43
      methods:{
37 44
        getData(){
38
-         var str = window.localStorage.getItem('storageAllowUserDept')//获取允用科室ids
39
-         var arr = []
40
-         if (str.indexOf(',') >= 0) {
41
-           for (var i = 0; i < str.split(",").length; i++) {
42
-             if (this.$store.getters.deptmap[parseInt(str.split(",")[i])]) {
43
-               arr.push({
44
-                 deptname: this.$store.getters.deptmap[parseInt(str.split(",")[i])].text,
45
-                 deptid: str.split(",")[i]
46
-               })
45
+         this.$store.dispatch("GetInfo").then((res) => {
46
+           const data = res.data
47
+           var str =  data.User.F_AllowDepartment
48
+           var arr = []
49
+           if (str.indexOf(',') >= 0) {
50
+             for (var i = 0; i < str.split(",").length; i++) {
51
+               if (this.$store.getters.deptmap[parseInt(str.split(",")[i])]) {
52
+                 arr.push({
53
+                   deptname: this.$store.getters.deptmap[parseInt(str.split(",")[i])].text,
54
+                   deptid: str.split(",")[i]
55
+                 })
56
+               }
47 57
              }
58
+             this.allowData = arr
48 59
            }
49
-           this.allowData = arr
50
-         }
60
+         })
51 61
          console.log(this.allowData)
52 62
        },
53 63
        handleSelectionChange(val) {
@@ -64,9 +74,7 @@
64 74
              this.$parent.$message.success(res.message)
65 75
              this.onchangedept = ""
66 76
              this.$store.dispatch("GetInfo").then((res) => {
67
-               // const data = res.data;
68
-               // window.localStorage.setItem("storageUsertx", data.User.F_See);
69
-               // this.$parent.upDataUsertx();
77
+               //重新存用户数据
70 78
              });
71 79
            }
72 80
          })

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

@@ -12,7 +12,7 @@
12 12
         auto-complete="on"
13 13
         label-position="left"
14 14
       >
15
-        <p class="loginp">郑州人民医院综合保障服务中心</p>
15
+        <p class="loginp">郑州人民医院综合服务保障调度平台</p>
16 16
         <el-select
17 17
           v-model="userRole"
18 18
           placeholder="请选择您的角色"
@@ -481,7 +481,8 @@ $dark_gray: #889aa4;
481 481
     font-size: 24px;
482 482
     position: absolute;
483 483
     top: -25%;
484
-    right: 2%;
484
+    right: -32%;
485
+    width: 480px;
485 486
   }
486 487
 
487 488
   .signin_right {