See999 vor 4 Jahren
Ursprung
Commit
e05fe722c2

+ 34 - 36
src/pages/console/managementConsole/index.vue Datei anzeigen

@@ -26,14 +26,14 @@
26 26
         </div>
27 27
       </div>
28 28
       <!--<div class="consoleOne">-->
29
-        <!--<img src="../../../assets/images/A3.jpg" alt="" />-->
30
-        <!--<div class="consoleRight">-->
31
-          <!--<div>-->
32
-            <!--<p class="rightName">应用管理</p>-->
33
-            <!--<p class="rightTip">管理员可以添加或者停用应用</p>-->
34
-          <!--</div>-->
35
-          <!--<van-icon name="arrow" />-->
36
-        <!--</div>-->
29
+      <!--<img src="../../../assets/images/A3.jpg" alt="" />-->
30
+      <!--<div class="consoleRight">-->
31
+      <!--<div>-->
32
+      <!--<p class="rightName">应用管理</p>-->
33
+      <!--<p class="rightTip">管理员可以添加或者停用应用</p>-->
34
+      <!--</div>-->
35
+      <!--<van-icon name="arrow" />-->
36
+      <!--</div>-->
37 37
       <!--</div>-->
38 38
       <div class="consoleOne" @click="toOrgSetting()">
39 39
         <img src="../../../assets/images/A4.jpg" alt="" />
@@ -57,41 +57,39 @@
57 57
       </div>
58 58
     </div>
59 59
     <!--<div class="transfer">-->
60
-      <!--<img src="../../../assets/images/A6.jpg" alt="" />-->
61
-      <!--<div class="transferRight">-->
62
-        <!--<p class="rightName">员工管理</p>-->
63
-        <!--<van-icon name="arrow" />-->
64
-      <!--</div>-->
60
+    <!--<img src="../../../assets/images/A6.jpg" alt="" />-->
61
+    <!--<div class="transferRight">-->
62
+    <!--<p class="rightName">员工管理</p>-->
63
+    <!--<van-icon name="arrow" />-->
64
+    <!--</div>-->
65 65
     <!--</div>-->
66 66
   </div>
67 67
 </template>
68 68
 <script>
69
-  // import "../libs/rem.js";
70
-  import { setRem } from "@/libs/functionRem";
69
+// import "../libs/rem.js";
70
+import { setRem } from "@/libs/functionRem";
71 71
 
72
-  export default {
73
-    methods: {
74
-      toStaffManage(){
75
-        this.$router.push({path: "/manageconsole/staff"});
76
-      },
77
-      toPermissionManage() {
78
-        this.$router.push({path: "/manageconsole/role"});
79
-
80
-      },
81
-      toOrgSetting() {
82
-        this.$router.push({path: ""});
83
-      },
84
-      toSettingManage(){
85
-        this.$router.push({path: ""});
86
-
87
-      },
88
-    },create(){
89
-      setRem()
72
+export default {
73
+  methods: {
74
+    toStaffManage() {
75
+      this.$router.push({ path: "/manageconsole/staff" });
76
+    },
77
+    toPermissionManage() {
78
+      this.$router.push({ path: "/manageconsole/role" });
79
+    },
80
+    toOrgSetting() {
81
+      this.$router.push({ path: "" });
82
+    },
83
+    toSettingManage() {
84
+      this.$router.push({ path: "" });
90 85
     }
91
-  };
86
+  },
87
+  create() {
88
+    setRem();
89
+  }
90
+};
92 91
 </script>
93 92
 
94
-
95 93
 <style lang="scss" scoped>
96 94
 .page_managementConsole {
97 95
   height: 100%;
@@ -124,7 +122,7 @@
124 122
     display: flex;
125 123
     align-items: center;
126 124
     justify-content: space-between;
127
-    border-bottom: 1px solid #9b9b9b;
125
+    border-bottom: 1px solid #e5e5e5;
128 126
     img {
129 127
       width: 2rem;
130 128
       height: 2rem;

+ 31 - 34
src/pages/console/managementConsole/staff_role/employeeList/index.vue Datei anzeigen

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_employeeList">
3 3
     <div class="editRoleTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">员工列表</span>
6 6
       <span @click="save()">保存</span>
7 7
     </div>
@@ -19,8 +19,12 @@
19 19
           <van-checkbox :name="item.id"></van-checkbox>
20 20
           <div class="checkUserBox">
21 21
             <img v-if="item.avatar.length > 0" :src="item.avatar" alt="" />
22
-            <img v-if="item.avatar.length == 0" src="../../../../../assets/images/default_avatar.jpg" alt="" />
23
-            <p>{{item.user_name}}</p>
22
+            <img
23
+              v-if="item.avatar.length == 0"
24
+              src="../../../../../assets/images/default_avatar.jpg"
25
+              alt=""
26
+            />
27
+            <p>{{ item.user_name }}</p>
24 28
           </div>
25 29
         </div>
26 30
       </van-checkbox-group>
@@ -29,55 +33,50 @@
29 33
 </template>
30 34
 
31 35
 <script>
32
-  import { setRem } from "@/libs/functionRem";
33
-  import { GetAllStaff,AddUserRole } from "@/api/admin_user";
36
+import { setRem } from "@/libs/functionRem";
37
+import { GetAllStaff, AddUserRole } from "@/api/admin_user";
34 38
 export default {
35 39
   data() {
36 40
     return {
37 41
       allChecked: false,
38 42
       result: [],
39
-      admin_user:[]
43
+      admin_user: []
40 44
     };
41 45
   },
42 46
   methods: {
43
-    save(){
47
+    save() {
44 48
       let params = {
45 49
         id: this.$route.query.id,
46
-        ids:this.result.join(",")
47
-      }
50
+        ids: this.result.join(",")
51
+      };
48 52
       AddUserRole(params).then(response => {
49 53
         if (response.data.state === 1) {
50
-            this.$router.go(-1)
54
+          this.$router.go(-1);
51 55
         } else {
52 56
           this.$toast({
53 57
             message: response.data.msg
54 58
           });
55 59
         }
56 60
       });
57
-
58
-
59
-
60
-
61 61
     },
62 62
     GetAllStaff: function() {
63 63
       GetAllStaff().then(response => {
64 64
         if (response.data.state === 1) {
65
-            this.admin_user = response.data.data.admins;
66
-            console.log(this.admin_user)
67
-            for (let i = 0; i < this.admin_user.length; i++){
68
-              if(this.admin_user[i].role_ids.length > 0){
69
-                let  isExist = -1
70
-                let ids = this.admin_user[i].role_ids.split(",")
71
-                console.log(ids)
72
-                isExist = ids.indexOf(this.$route.query.id.toString())
73
-                console.log(isExist)
65
+          this.admin_user = response.data.data.admins;
66
+          console.log(this.admin_user);
67
+          for (let i = 0; i < this.admin_user.length; i++) {
68
+            if (this.admin_user[i].role_ids.length > 0) {
69
+              let isExist = -1;
70
+              let ids = this.admin_user[i].role_ids.split(",");
71
+              console.log(ids);
72
+              isExist = ids.indexOf(this.$route.query.id.toString());
73
+              console.log(isExist);
74 74
 
75
-                if(isExist >= 0){
76
-                  this.admin_user.splice(i, 1)
77
-                  i = i -1
78
-                }
75
+              if (isExist >= 0) {
76
+                this.admin_user.splice(i, 1);
77
+                i = i - 1;
78
+              }
79 79
             }
80
-
81 80
           }
82 81
         } else {
83 82
           this.$toast({
@@ -89,10 +88,8 @@ export default {
89 88
 
90 89
     checkAll() {
91 90
       if (this.allChecked == false) {
92
-        for (let i = 0; i < this.admin_user.length; i++){
93
-
94
-          this.result.push(this.admin_user[i].user_id)
95
-
91
+        for (let i = 0; i < this.admin_user.length; i++) {
92
+          this.result.push(this.admin_user[i].user_id);
96 93
         }
97 94
         this.allChecked = true;
98 95
       } else {
@@ -109,10 +106,10 @@ export default {
109 106
       }
110 107
     }
111 108
   },
112
-  created(){
109
+  created() {
113 110
     //获取没被禁用的用户
114 111
     this.GetAllStaff();
115
-    setRem()
112
+    setRem();
116 113
   }
117 114
 };
118 115
 </script>

+ 52 - 64
src/pages/console/managementConsole/staff_role/newAddRole/index.vue Datei anzeigen

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_newAddRole">
3 3
     <div class="newAddRoleTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">新增角色</span>
6 6
     </div>
7 7
     <div class="roleDescription">
@@ -11,66 +11,59 @@
11 11
         label="角色名称"
12 12
         placeholder="请填写角色名称"
13 13
       />
14
-      <van-field
15
-        v-model="desc"
16
-        label="角色描述"
17
-        placeholder="请填写角色描述"
18
-      />
14
+      <van-field v-model="desc" label="角色描述" placeholder="请填写角色描述" />
19 15
     </div>
20 16
     <div class="keep" @click="save()">保存</div>
21 17
   </div>
22 18
 </template>
23 19
 
24 20
 <script>
25
-  import {CreateRole} from "@/api/admin_user";
26
-  import {setRem} from "@/libs/functionRem";
27
-
21
+import { CreateRole } from "@/api/admin_user";
22
+import { setRem } from "@/libs/functionRem";
23
+
24
+export default {
25
+  data() {
26
+    return {
27
+      name: "",
28
+      desc: ""
29
+    };
30
+  },
31
+  methods: {
32
+    save() {
33
+      if (this.name.length == 0) {
34
+        this.$toast({
35
+          message: "角色名字不能为空!"
36
+        });
37
+        return;
38
+      }
28 39
 
29
-  export default {
30
-    data() {
31
-      return {
32
-        name: "",
33
-        desc: "",
40
+      let params = {
41
+        name: this.name,
42
+        desc: this.desc
34 43
       };
35
-    },
36
-    methods: {
37
-      save() {
38
-        if (this.name.length == 0) {
44
+      CreateRole(params).then(response => {
45
+        if (response.data.state === 1) {
46
+          this.$toast({ message: "新增成功" });
47
+          this.$router.go(-1);
48
+        } else {
39 49
           this.$toast({
40
-            message: "角色名字不能为空!"
50
+            message: response.data.msg
41 51
           });
42
-          return;
43
-        }
44
-
45
-        let params = {
46
-          name: this.name,
47
-          desc: this.desc
48 52
         }
49
-        CreateRole(params).then(response => {
50
-          if (response.data.state === 1) {
51
-            this.$toast({message: "新增成功"});
52
-            this.$router.go(-1)
53
-          } else {
54
-            this.$toast({
55
-              message: response.data.msg
56
-            });
57
-          }
58
-        });
59
-      }
60
-
61
-    }, created() {
62
-      setRem()
63
-
53
+      });
64 54
     }
65
-  };
55
+  },
56
+  created() {
57
+    setRem();
58
+  }
59
+};
66 60
 </script>
67 61
 
68
-
69 62
 <style lang="scss" scoped>
70
-  .page_newAddRole {
71
-    height: 100%;
72
-    overflow-y: auto;
73
-    background: #fafafa;
63
+.page_newAddRole {
64
+  height: 100%;
65
+  overflow-y: auto;
66
+  background: #fafafa;
74 67
 
75 68
   .newAddRoleTitle {
76 69
     background: #fff;
@@ -94,10 +87,9 @@
94 87
   .roleDescription {
95 88
     margin: 0.875rem 0 2rem;
96 89
 
97
-  .van-cell {
98
-    font-size: 1rem;
99
-  }
100
-
90
+    .van-cell {
91
+      font-size: 1rem;
92
+    }
101 93
   }
102 94
   .keep {
103 95
     width: 90%;
@@ -109,22 +101,18 @@
109 101
     margin: 0 auto;
110 102
     border-radius: 1.875rem;
111 103
   }
112
-
113
-  }
114
-  ::-webkit-scrollbar {
115
-    width: 0;
116
-  }
104
+}
105
+::-webkit-scrollbar {
106
+  width: 0;
107
+}
117 108
 </style>
118 109
 <style lang="scss">
119
-  .page_newAddRole {
120
-
110
+.page_newAddRole {
121 111
   .roleDescription {
122
-
123
-  .van-cell__value {
124
-    display: flex;
125
-    align-items: center;
126
-  }
127
-
128
-  }
112
+    .van-cell__value {
113
+      display: flex;
114
+      align-items: center;
115
+    }
129 116
   }
117
+}
130 118
 </style>

+ 91 - 90
src/pages/console/managementConsole/staff_role/newAddStaff/index.vue Datei anzeigen

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_addStaff">
3 3
     <div class="editStaffTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">新增员工</span>
6 6
       <p @click="save(1)">保存</p>
7 7
     </div>
@@ -34,94 +34,95 @@
34 34
 </template>
35 35
 
36 36
 <script>
37
-  import { AdminInitData,CreateAdminUser } from "@/api/admin_user";
38
-  import { checkMobile } from "@/utils/tools";
39
-  import { setRem } from "@/libs/functionRem";
37
+import { AdminInitData, CreateAdminUser } from "@/api/admin_user";
38
+import { checkMobile } from "@/utils/tools";
39
+import { setRem } from "@/libs/functionRem";
40 40
 
41
-
42
-  export default {
43
-    data() {
44
-      return {
45
-        name:"",
46
-        tel:"",
47
-        role_ids: [],
48
-        title:"",
49
-        value1: "",
50
-        roles:[],
51
-      };
52
-    },methods:{
53
-      GetAdminUserInitData(){
54
-        AdminInitData().then(response => {
55
-          if (response.data.state === 1) {
56
-            for (let i =0; i < response.data.data.roles.length; i++){
57
-              if(!response.data.data.roles[i].is_super_admin){
58
-                this.roles.push(response.data.data.roles[i])
59
-              }
41
+export default {
42
+  data() {
43
+    return {
44
+      name: "",
45
+      tel: "",
46
+      role_ids: [],
47
+      title: "",
48
+      value1: "",
49
+      roles: []
50
+    };
51
+  },
52
+  methods: {
53
+    GetAdminUserInitData() {
54
+      AdminInitData().then(response => {
55
+        if (response.data.state === 1) {
56
+          for (let i = 0; i < response.data.data.roles.length; i++) {
57
+            if (!response.data.data.roles[i].is_super_admin) {
58
+              this.roles.push(response.data.data.roles[i]);
60 59
             }
61
-          } else {
62
-            this.$toast({
63
-              message: response.data.msg
64
-            });
65 60
           }
66
-        });
67
-      },save(type){
68
-
69
-        if (this.name.trim().length == 0) {
70
-          this.$toast({
71
-            message: "姓名不能为空!"
72
-          });
73
-          return;
74
-        }
75
-        if (!checkMobile(this.tel)) {
76
-          this.$toast({
77
-            message: "请填写正确的手机号码!"
78
-          });
79
-          return;
80
-        }
81
-        if (this.role_ids.length <= 0) {
61
+        } else {
82 62
           this.$toast({
83
-            message: "至少选择一种角色"
63
+            message: response.data.msg
84 64
           });
85
-          return;
86 65
         }
66
+      });
67
+    },
68
+    save(type) {
69
+      if (this.name.trim().length == 0) {
70
+        this.$toast({
71
+          message: "姓名不能为空!"
72
+        });
73
+        return;
74
+      }
75
+      if (!checkMobile(this.tel)) {
76
+        this.$toast({
77
+          message: "请填写正确的手机号码!"
78
+        });
79
+        return;
80
+      }
81
+      if (this.role_ids.length <= 0) {
82
+        this.$toast({
83
+          message: "至少选择一种角色"
84
+        });
85
+        return;
86
+      }
87 87
 
88
-        let params = {
89
-          name:this.name,
90
-          mobile: this.tel,
91
-          role_ids:  this.role_ids.join(","),
92
-          title : this.title,
93
-        }
94
-        CreateAdminUser(params).then(response => {
95
-          if (response.data.state === 1) {
96
-            this.$toast({message: "新增成功"});
97
-            if(type == 1) {
98
-              this.$router.go(-1)
99
-            }else{
100
-              this.name = ""
101
-              this.mobile = ""
102
-              this.role_ids = []
103
-              this.title = ""
104
-            }
88
+      let params = {
89
+        name: this.name,
90
+        mobile: this.tel,
91
+        role_ids: this.role_ids.join(","),
92
+        title: this.title
93
+      };
94
+      CreateAdminUser(params).then(response => {
95
+        if (response.data.state === 1) {
96
+          this.$toast({ message: "新增成功" });
97
+          if (type == 1) {
98
+            this.$router.go(-1);
105 99
           } else {
106
-            this.$toast({
107
-              message: response.data.msg
108
-            });
100
+            this.name = "";
101
+            this.mobile = "";
102
+            this.role_ids = [];
103
+            this.title = "";
109 104
           }
110
-        });
111
-      }
112
-    },created(){
113
-      this.GetAdminUserInitData()
114
-      this.role_ids.push(this.$route.query.id)
115
-      setRem()
105
+        } else {
106
+          this.$toast({
107
+            message: response.data.msg
108
+          });
109
+        }
110
+      });
116 111
     }
117
-  };
112
+  },
113
+  created() {
114
+    this.GetAdminUserInitData();
115
+    this.role_ids.push(this.$route.query.id);
116
+    setRem();
117
+  }
118
+};
118 119
 </script>
119 120
 
120 121
 <style lang="scss" scoped>
121
-  .page_addStaff {
122
-    height: 100%;
123
-    overflow: hidden;
124
-    background: #fafafa;
122
+.page_addStaff {
123
+  height: 100%;
124
+  overflow: hidden;
125
+  background: #fafafa;
125 126
   .editStaffTitle {
126 127
     height: 3.125rem;
127 128
     display: flex;
@@ -148,12 +149,12 @@
148 149
     color: #989898;
149 150
   }
150 151
   .staffBox {
151
-  .van-cell {
152
-    font-size: 1rem;
153
-  }
154
-  .newCell {
155
-    padding-right: 0;
156
-  }
152
+    .van-cell {
153
+      font-size: 1rem;
154
+    }
155
+    .newCell {
156
+      padding-right: 0;
157
+    }
157 158
   }
158 159
   .van-cell__title {
159 160
     display: flex;
@@ -174,19 +175,19 @@
174 175
     display: flex;
175 176
     align-items: center;
176 177
     padding-left: 1rem;
177
-  .addIcon {
178
-    color: #338afb;
179
-    font-size: 1.5rem;
180
-    margin-right: 0.625rem;
181
-  }
182
-  }
178
+    .addIcon {
179
+      color: #338afb;
180
+      font-size: 1.5rem;
181
+      margin-right: 0.625rem;
182
+    }
183 183
   }
184
+}
184 185
 </style>
185 186
 <style lang="scss">
186
-  .page_editStaff {
187
+.page_editStaff {
187 188
   .van-cell__value {
188 189
     display: flex;
189 190
     align-items: center;
190 191
   }
191
-  }
192
+}
192 193
 </style>

+ 85 - 90
src/pages/console/managementConsole/staff_role/userManage/index.vue Datei anzeigen

@@ -2,90 +2,89 @@
2 2
   <div class="page_staffManagement">
3 3
     <van-sticky>
4 4
       <div class="staffManagementTitle">
5
-        <i class="iconfont icon-zuojiantou jiantou"></i>
5
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
6 6
         <span class="titleName">员工管理</span>
7 7
       </div>
8 8
     </van-sticky>
9 9
     <div class="staffBox">
10 10
       <div
11 11
         class="staffOne"
12
-        v-for="(item,index) in admin_user"
12
+        v-for="(item, index) in admin_user"
13 13
         :key="index"
14 14
         v-if="admin_user.length > 0"
15 15
       >
16
-        <img v-if="item.avatar.length > 0" :src="item.avatar" alt/>
16
+        <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
17 17
         <img
18 18
           v-if="item.avatar.length == 0"
19 19
           src="../../../../../assets/images/default_avatar.jpg"
20 20
           alt
21 21
         />
22 22
         <p>
23
-          <span>{{item.user_name}}</span>
24
-          <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
23
+          <span>{{ item.user_name }}</span>
24
+          <i
25
+            @click="goEditStaff(item.user_id)"
26
+            class="iconfont icon-bianji bianji"
27
+          ></i>
25 28
         </p>
26 29
       </div>
27 30
     </div>
28 31
   </div>
29 32
 </template>
30 33
 <script>
31
-  // import "../libs/rem.js";
32
-  import {setRem} from "@/libs/functionRem";
33
-  import {GetAllStaff} from "@/api/admin_user";
34
-
35
-  export default {
36
-    data() {
37
-      return {
38
-        active: 0,
39
-        admin_user: [],
40
-
41
-      };
42
-    },
43
-    methods: {
44
-      GetAllStaff: function () {
45
-        GetAllStaff().then(response => {
46
-          if (response.data.state === 1) {
47
-              this.admin_user = response.data.data.admins;
48
-              for (let i = 0; i < this.admin_user.length; i++){
49
-                if(this.admin_user[i].role_ids.length > 0){
50
-                  let  isExist = -1
51
-                  let ids = this.admin_user[i].role_ids.split(",")
52
-                  isExist = ids.indexOf(this.$route.query.id.toString())
53
-                  if(isExist < 0){
54
-                    this.admin_user.splice(i, 1)
55
-                    i = i -1
56
-                  }
57
-                }
34
+// import "../libs/rem.js";
35
+import { setRem } from "@/libs/functionRem";
36
+import { GetAllStaff } from "@/api/admin_user";
37
+
38
+export default {
39
+  data() {
40
+    return {
41
+      active: 0,
42
+      admin_user: []
43
+    };
44
+  },
45
+  methods: {
46
+    GetAllStaff: function() {
47
+      GetAllStaff().then(response => {
48
+        if (response.data.state === 1) {
49
+          this.admin_user = response.data.data.admins;
50
+          for (let i = 0; i < this.admin_user.length; i++) {
51
+            if (this.admin_user[i].role_ids.length > 0) {
52
+              let isExist = -1;
53
+              let ids = this.admin_user[i].role_ids.split(",");
54
+              isExist = ids.indexOf(this.$route.query.id.toString());
55
+              if (isExist < 0) {
56
+                this.admin_user.splice(i, 1);
57
+                i = i - 1;
58 58
               }
59
-
60
-          } else {
61
-            this.$toast({
62
-              message: response.data.msg
63
-            });
59
+            }
64 60
           }
65
-        });
66
-      },
67
-      goEditStaff: function (id) {
68
-        this.$router.push({path: "/staff/editstaff?id=" + id});
69
-      }, goAddStaff: function () {
70
-
71
-        this.$router.push({path: "/staff/addstaff"});
72
-
73
-      }
61
+        } else {
62
+          this.$toast({
63
+            message: response.data.msg
64
+          });
65
+        }
66
+      });
74 67
     },
75
-    created() {
76
-      setRem();
77
-      //获取没被禁用的用户
78
-      this.GetAllStaff();
79
-
68
+    goEditStaff: function(id) {
69
+      this.$router.push({ path: "/staff/editstaff?id=" + id });
70
+    },
71
+    goAddStaff: function() {
72
+      this.$router.push({ path: "/staff/addstaff" });
80 73
     }
81
-  };
74
+  },
75
+  created() {
76
+    setRem();
77
+    //获取没被禁用的用户
78
+    this.GetAllStaff();
79
+  }
80
+};
82 81
 </script>
83 82
 
84 83
 <style lang="scss" scoped>
85
-  .page_staffManagement {
86
-    height: 100%;
87
-    overflow-y: auto;
88
-    background: #fafafa;
84
+.page_staffManagement {
85
+  height: 100%;
86
+  overflow-y: auto;
87
+  background: #fafafa;
89 88
 
90 89
   .staffManagementTitle {
91 90
     background: #fff;
@@ -93,12 +92,12 @@
93 92
     height: 3.125rem;
94 93
     display: flex;
95 94
     align-items: center;
96
-    justify-content: space-between;
97 95
   }
98 96
 
99 97
   .jiantou {
100 98
     font-size: 1.5rem;
101 99
     font-weight: 600;
100
+    margin-right: 7rem;
102 101
   }
103 102
 
104 103
   .titleName {
@@ -114,47 +113,43 @@
114 113
     padding-left: 0.875rem;
115 114
     background: #fff;
116 115
 
117
-  .staffOne {
118
-    display: flex;
119
-    align-items: center;
120
-    height: 3.75rem;
116
+    .staffOne {
117
+      display: flex;
118
+      align-items: center;
119
+      height: 3.75rem;
121 120
 
122
-  img {
123
-    width: 2.5rem;
124
-    height: 2.5rem;
125
-    margin-right: 0.875rem;
126
-  }
127
-
128
-  p {
129
-    display: flex;
130
-    align-items: center;
131
-    justify-content: space-between;
132
-    padding-right: 0.875rem;
133
-    flex: 1;
134
-    height: 100%;
135
-    box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
136
-  }
121
+      img {
122
+        width: 2.5rem;
123
+        height: 2.5rem;
124
+        margin-right: 0.875rem;
125
+      }
137 126
 
138
-  .bianji {
139
-    font-size: 1.25rem;
140
-    color: #cccccc;
141
-  }
127
+      p {
128
+        display: flex;
129
+        align-items: center;
130
+        justify-content: space-between;
131
+        padding-right: 0.875rem;
132
+        flex: 1;
133
+        height: 100%;
134
+        box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
135
+      }
142 136
 
137
+      .bianji {
138
+        font-size: 1.25rem;
139
+        color: #cccccc;
140
+      }
141
+    }
143 142
   }
144
-  }
145
-  }
146
-  ::-webkit-scrollbar {
147
-    width: 0;
148
-  }
143
+}
144
+::-webkit-scrollbar {
145
+  width: 0;
146
+}
149 147
 </style>
150 148
 
151 149
 <style lang="scss">
152
-  .page_staffManagement {
153
-
150
+.page_staffManagement {
154 151
   .van-tabs__line {
155 152
     background: #5b98ff;
156 153
   }
157
-
158
-  }
154
+}
159 155
 </style>
160
-

+ 30 - 58
src/pages/doctorAdvice/components/DoctorManagement.vue Datei anzeigen

@@ -55,36 +55,22 @@
55 55
                   </span>
56 56
                 </div>
57 57
                 <div class="orderContent" v-if="i < 3">
58
-                  <div class="flexBox">
59
-                    <p v-if="it.parent_id === 0">
60
-                      {{ it.advice_name }} {{ it.advice_desc
61
-                      }}{{ it.drug_spec_unit }} {{ it.prescribing_number
62
-                      }}{{ it.prescribing_number_unit }} {{ it.single_dose
63
-                      }}{{ it.single_dose_unit }} {{ it.delivery_way }}
64
-                      {{ it.execution_frequency }}
65
-                    </p>
66
-                    <van-icon
67
-                      class="ellipsis"
68
-                      name="ellipsis"
69
-                      @click="DeleteOne(it.id)"
70
-                    />
71
-                  </div>
58
+                  <p v-if="it.parent_id === 0">
59
+                    {{ it.advice_name }} {{ it.advice_desc
60
+                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number
61
+                    }}{{ it.prescribing_number_unit }} {{ it.single_dose
62
+                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}
63
+                    {{ it.execution_frequency }}
64
+                  </p>
72 65
                   <div v-for="(i, index) in childList" :key="index">
73
-                    <div v-if="i.parent_id == it.id" class="flexBox">
74
-                      <p>
75
-                        ▲ {{ i.advice_name }} {{ i.advice_desc
76
-                        }}{{ i.drug_spec_unit }} {{ i.prescribing_number
77
-                        }}{{ i.prescribing_number_unit }} {{ i.single_dose
78
-                        }}{{ i.single_dose_unit }}
79
-                        {{ i.delivery_way }}
80
-                        {{ i.execution_frequency }}
81
-                      </p>
82
-                      <van-icon
83
-                        class="ellipsis"
84
-                        name="ellipsis"
85
-                        @click="DeleteChild(i.id, index, i.execution_state)"
86
-                      />
87
-                    </div>
66
+                    <p v-if="i.parent_id == it.id">
67
+                      ▲ {{ i.advice_name }} {{ i.advice_desc
68
+                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number
69
+                      }}{{ i.prescribing_number_unit }} {{ i.single_dose
70
+                      }}{{ i.single_dose_unit }}
71
+                      {{ i.delivery_way }}
72
+                      {{ i.execution_frequency }}
73
+                    </p>
88 74
                   </div>
89 75
                 </div>
90 76
                 <div
@@ -112,36 +98,22 @@
112 98
                   </span>
113 99
                 </div>
114 100
                 <div class="orderContent" v-if="i < 3">
115
-                  <div class="flexBox">
116
-                    <p>
117
-                      {{ it.advice_name }} {{ it.advice_desc
118
-                      }}{{ it.drug_spec_unit }} {{ it.prescribing_number
119
-                      }}{{ it.prescribing_number_unit }} {{ it.single_dose
120
-                      }}{{ it.single_dose_unit }} {{ it.delivery_way }}
121
-                      {{ it.execution_frequency }}
122
-                    </p>
123
-                    <van-icon
124
-                      class="ellipsis"
125
-                      name="ellipsis"
126
-                      @click="DeleteTemporary(it.id)"
127
-                    />
128
-                  </div>
101
+                  <p>
102
+                    {{ it.advice_name }} {{ it.advice_desc
103
+                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number
104
+                    }}{{ it.prescribing_number_unit }} {{ it.single_dose
105
+                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}
106
+                    {{ it.execution_frequency }}
107
+                  </p>
129 108
                   <div v-for="(i, index) in childList" :key="index">
130
-                    <div v-if="i.parent_id == it.id" class="flexBox">
131
-                      <p>
132
-                        ▲ {{ i.advice_name }} {{ i.advice_desc
133
-                        }}{{ i.drug_spec_unit }} {{ i.prescribing_number
134
-                        }}{{ i.prescribing_number_unit }} {{ i.single_dose
135
-                        }}{{ i.single_dose_unit }}
136
-                        {{ i.delivery_way }}
137
-                        {{ i.execution_frequency }}
138
-                      </p>
139
-                      <van-icon
140
-                        class="ellipsis"
141
-                        name="ellipsis"
142
-                        @click="DeleteChild(i.id, index, it.execution_state)"
143
-                      />
144
-                    </div>
109
+                    <p v-if="i.parent_id == it.id">
110
+                      ▲ {{ i.advice_name }} {{ i.advice_desc
111
+                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number
112
+                      }}{{ i.prescribing_number_unit }} {{ i.single_dose
113
+                      }}{{ i.single_dose_unit }}
114
+                      {{ i.delivery_way }}
115
+                      {{ i.execution_frequency }}
116
+                    </p>
145 117
                   </div>
146 118
                 </div>
147 119
                 <div

+ 1 - 4
src/pages/doctorAdvice/index.vue Datei anzeigen

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_doctorAdvice">
3 3
     <div class="doctorAdviceTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <div class="patientName" @click="show = true">
6 6
         {{ patientName }}
7 7
         <van-icon name="arrow-down" />
@@ -366,9 +366,6 @@ export default {
366 366
         }
367 367
       });
368 368
     },
369
-    toReturn() {
370
-      this.$router.push("/patients");
371
-    },
372 369
     getPatientDetail(patientid) {
373 370
       getPatientDetail(patientid).then(response => {
374 371
         if (response.data.state === 1) {

+ 12 - 3
src/pages/my/feedBack.vue Datei anzeigen

@@ -15,7 +15,12 @@
15 15
     </div>
16 16
     <div class="feedBackTip">反馈标题</div>
17 17
     <div>
18
-      <van-field v-model="form.title" type="text" maxlength="30" placeholder="请填写标题30个字以内" />
18
+      <van-field
19
+        v-model="form.title"
20
+        type="text"
21
+        maxlength="30"
22
+        placeholder="请填写标题30个字以内"
23
+      />
19 24
     </div>
20 25
     <div class="feedBackTip">
21 26
       反馈内容
@@ -45,8 +50,12 @@
45 50
     <div class="feedBackTip">接受电话处理时间</div>
46 51
     <div class="typeBox1">
47 52
       <p :class="time == 1 ? 'active' : ''" @click="clickTime(1)">任何时间</p>
48
-      <p :class="time == 2 ? 'active' : ''" @click="clickTime(2)">09:00~12:00</p>
49
-      <p :class="time == 3 ? 'active' : ''" @click="clickTime(3)">13:00~18:00</p>
53
+      <p :class="time == 2 ? 'active' : ''" @click="clickTime(2)">
54
+        09:00~12:00
55
+      </p>
56
+      <p :class="time == 3 ? 'active' : ''" @click="clickTime(3)">
57
+        13:00~18:00
58
+      </p>
50 59
       <p :class="time == 4 ? 'active' : ''" @click="clickTime(4)">从不接受</p>
51 60
     </div>
52 61
     <div>

Datei-Diff unterdrückt, da er zu groß ist
+ 4246 - 4248
src/pages/org/index.vue