See999 před 4 roky
rodič
revize
5443ad3d9e
37 změnil soubory, kde provedl 5862 přidání a 5447 odebrání
  1. 93 83
      src/pages/allDoctorAdvice/index.vue
  2. 47 15
      src/pages/configureCenter/editBed.vue
  3. 35 12
      src/pages/configureCenter/editGrouping.vue
  4. 27 12
      src/pages/configureCenter/editPartion.vue
  5. 3 2
      src/pages/console/managementConsole/index.vue
  6. 214 200
      src/pages/console/managementConsole/staff_role/addStaff/index.vue
  7. 336 310
      src/pages/console/managementConsole/staff_role/editRole/index.vue
  8. 24 12
      src/pages/console/managementConsole/staff_role/employeeList/index.vue
  9. 1 0
      src/pages/console/managementConsole/staff_role/newAddRole/index.vue
  10. 84 73
      src/pages/console/managementConsole/staff_role/newAddStaff/index.vue
  11. 94 58
      src/pages/console/managementConsole/staff_role/privilegeManagement/index.vue
  12. 54 45
      src/pages/console/managementConsole/staff_role/staffManagement/index.vue
  13. 1 1
      src/pages/console/managementConsole/staff_role/subPurview/index.vue
  14. 10 9
      src/pages/console/managementConsole/staff_role/userManage/index.vue
  15. 6 0
      src/pages/doctorAdvice/index.vue
  16. 10 2
      src/pages/home/forgetPassword/index.vue
  17. 16 3
      src/pages/home/noPassword/index.vue
  18. 1 0
      src/pages/home/register/name.vue
  19. 24 4
      src/pages/home/register/register.vue
  20. 2 1
      src/pages/homeIndex/index.vue
  21. 1 0
      src/pages/my/aboutUs.vue
  22. 11 4
      src/pages/my/index.vue
  23. 278 271
      src/pages/my/modifyPassword.vue
  24. 8 6
      src/pages/my/myInfo.vue
  25. 10 4
      src/pages/my/organizationInfo.vue
  26. 4254 4255
      src/pages/org/index.vue
  27. 57 16
      src/pages/patientCenter/editOrg/index.vue
  28. 1 0
      src/pages/patientManagement/components/Blood.vue
  29. 1 0
      src/pages/patientManagement/components/Member.vue
  30. 8 4
      src/pages/patientManagement/components/Slow.vue
  31. 23 4
      src/pages/patientManagement/patientManagement.vue
  32. 24 4
      src/pages/patients/addPatient.vue
  33. 52 7
      src/pages/patients/editPatient.vue
  34. 11 4
      src/pages/search/index.vue
  35. 20 1
      src/pages/shop/index.vue
  36. 19 23
      src/router/index.js
  37. 2 2
      src/styles/newStyle.scss

+ 93 - 83
src/pages/allDoctorAdvice/index.vue Zobrazit soubor

@@ -2,7 +2,7 @@
2 2
   <div class="page_allDoctorManagement">
3 3
     <van-sticky>
4 4
       <div class="allDoctorManagementTitle">
5
-        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
5
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
6 6
         <span class="titleName">{{ patient_name }}的医嘱</span>
7 7
       </div>
8 8
     </van-sticky>
@@ -13,17 +13,30 @@
13 13
         :key="index"
14 14
       >
15 15
         <div v-for="(it, i) in item.child" :key="i">
16
-          <div style="display:flex;justify-content:space-between;align-items:center">
17
-            <p class="time" v-if="i<1">
16
+          <div
17
+            style="display:flex;justify-content:space-between;align-items:center"
18
+          >
19
+            <p class="time" v-if="i < 1">
18 20
               {{ it.advice_date ? getTime(it.advice_date) : "" }}
19 21
             </p>
20
-            <span v-if="i<1"><van-icon class="ellipsis" name="ellipsis" @click="DeleteFive(item.start_time,item.child[0].execution_staff,index)" /></span>
21
-            </div>
22
+            <span v-if="i < 1"
23
+              ><van-icon
24
+                class="ellipsis"
25
+                name="ellipsis"
26
+                @click="
27
+                  DeleteFive(
28
+                    item.start_time,
29
+                    item.child[0].execution_staff,
30
+                    index
31
+                  )
32
+                "
33
+            /></span>
34
+          </div>
22 35
           <div class="statOrder">
23 36
             <div v-if="it.advice_type == 1 && it.parent_id == 0">
24 37
               <div class="statOrderTitle">
25
-                <span v-if="i<1">长期医嘱</span>
26
-                <span style="margin-left:1rem" v-if="i<1">
38
+                <span v-if="i < 1">长期医嘱</span>
39
+                <span style="margin-left:1rem" v-if="i < 1">
27 40
                   {{ getTimes(it.start_time) }}
28 41
                 </span>
29 42
               </div>
@@ -36,14 +49,14 @@
36 49
                     }}{{ it.single_dose_unit }} {{ it.delivery_way }}
37 50
                     {{ it.execution_frequency }}
38 51
                   </p>
39
-                   <van-icon
40
-                  class="ellipsis"
41
-                  name="ellipsis"
42
-                  @click="toDelete(it.id,it.execution_state,i)"
43
-                />
52
+                  <van-icon
53
+                    class="ellipsis"
54
+                    name="ellipsis"
55
+                    @click="toDelete(it.id, it.execution_state, i)"
56
+                  />
44 57
                 </div>
45 58
                 <div v-for="(i, index) in childList" :key="index">
46
-                 <div style="display:flex;justify-content:space-between" >
59
+                  <div style="display:flex;justify-content:space-between">
47 60
                     <p>
48 61
                       ▲ {{ i.advice_name }} {{ i.advice_desc
49 62
                       }}{{ i.drug_spec_unit }} {{ i.prescribing_number
@@ -52,46 +65,46 @@
52 65
                       {{ i.delivery_way }}
53 66
                       {{ i.execution_frequency }}
54 67
                     </p>
55
-                       <van-icon
56
-                        class="ellipsis"
57
-                        name="ellipsis"
58
-                        @click="Delete(i.id,i.execution_state,index)"
59
-                       />
68
+                    <van-icon
69
+                      class="ellipsis"
70
+                      name="ellipsis"
71
+                      @click="Delete(i.id, i.execution_state, index)"
72
+                    />
60 73
                   </div>
61 74
                 </div>
62
-                  <div class="doctorBox">
63
-                      <p>开嘱医生:{{ getDoctor(it.advice_doctor)}}</p>
64
-                      <p>执行护士:{{ getDoctor(it.execution_staff) }}</p>
65
-                      <p>核对护士:{{ getDoctor(it.checker) }}</p>
66
-                  </div>
67
-               </div>
68
-             </div>
75
+                <div class="doctorBox">
76
+                  <p>开嘱医生:{{ getDoctor(it.advice_doctor) }}</p>
77
+                  <p>执行护士:{{ getDoctor(it.execution_staff) }}</p>
78
+                  <p>核对护士:{{ getDoctor(it.checker) }}</p>
79
+                </div>
80
+              </div>
81
+            </div>
69 82
 
70 83
             <div
71 84
               class="statOrder"
72 85
               v-if="it.advice_type == 3 && it.parent_id == 0"
73 86
             >
74 87
               <div class="longOrderTitle">
75
-                <span v-if="i<1">临时医嘱</span>
76
-                <span style="margin-left:1rem" v-if="i<1">
88
+                <span v-if="i < 1">临时医嘱</span>
89
+                <span style="margin-left:1rem" v-if="i < 1">
77 90
                   {{ getTimes(item.child[0].start_time) }}
78 91
                 </span>
79 92
               </div>
80 93
               <div class="orderContent">
81 94
                 <div style="display:flex;justify-content:space-between">
82
-                    <p>
83
-                      {{ it.advice_name }} {{ it.advice_desc
84
-                      }}{{ it.drug_spec_unit }} {{ it.prescribing_number
85
-                      }}{{ it.prescribing_number_unit }} {{ it.single_dose
86
-                      }}{{ it.single_dose_unit }} {{ it.delivery_way }}
87
-                      {{ it.execution_frequency }}
88
-                    </p>
89
-                      <van-icon
90
-                        class="ellipsis"
91
-                        name="ellipsis"
92
-                        @click="DeleteTwo(it.id,it.execution_state,index)"
93
-                       />
94
-                 </div>
95
+                  <p>
96
+                    {{ it.advice_name }} {{ it.advice_desc
97
+                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number
98
+                    }}{{ it.prescribing_number_unit }} {{ it.single_dose
99
+                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}
100
+                    {{ it.execution_frequency }}
101
+                  </p>
102
+                  <van-icon
103
+                    class="ellipsis"
104
+                    name="ellipsis"
105
+                    @click="DeleteTwo(it.id, it.execution_state, index)"
106
+                  />
107
+                </div>
95 108
                 <div v-for="(i, index) in childList" :key="index">
96 109
                   <div style="display:flex;justify-content:space-between">
97 110
                     <p v-if="i.parent_id == it.id">
@@ -102,17 +115,15 @@
102 115
                       {{ i.delivery_way }}
103 116
                       {{ i.execution_frequency }}
104 117
                     </p>
105
-                     <van-icon
106
-                        class="ellipsis"
107
-                        name="ellipsis"
108
-                        @click="DeleteThree(i.id,i.execution_state,index)"
109
-                       />
118
+                    <van-icon
119
+                      class="ellipsis"
120
+                      name="ellipsis"
121
+                      @click="DeleteThree(i.id, i.execution_state, index)"
122
+                    />
110 123
                   </div>
111 124
                 </div>
112 125
               </div>
113
-              <div
114
-                class="doctorBox"
115
-              >
126
+              <div class="doctorBox">
116 127
                 <p>开嘱医生:{{ getDoctor(it.advice_doctor) }}</p>
117 128
                 <p>执行护士:{{ getDoctor(it.execution_staff) }}</p>
118 129
                 <p>核对护士:{{ getDoctor(it.checker) }}</p>
@@ -120,46 +131,45 @@
120 131
             </div>
121 132
           </div>
122 133
         </div>
123
-
124 134
       </div>
125 135
 
126
-        <van-action-sheet
127
-          v-model="newShow"
128
-          :actions="actions1"
129
-          cancel-text="取消"
130
-          @cancel="onCancel"
131
-          @select="onSelect"
132
-        />
136
+      <van-action-sheet
137
+        v-model="newShow"
138
+        :actions="actions1"
139
+        cancel-text="取消"
140
+        @cancel="onCancel"
141
+        @select="onSelect"
142
+      />
133 143
 
134
-         <van-action-sheet
135
-          v-model="newShowOne"
136
-          :actions="actions2"
137
-          cancel-text="取消"
138
-          @cancel="onCancelOne"
139
-          @select="onSelectOne"
140
-        />
144
+      <van-action-sheet
145
+        v-model="newShowOne"
146
+        :actions="actions2"
147
+        cancel-text="取消"
148
+        @cancel="onCancelOne"
149
+        @select="onSelectOne"
150
+      />
141 151
 
142
-          <van-action-sheet
143
-          v-model="newShowTwo"
144
-          :actions="actions3"
145
-          cancel-text="取消"
146
-          @cancel="onCancelTwo"
147
-          @select="onSelectTwo"
148
-        />
149
-         <van-action-sheet
150
-          v-model="newShowThree"
151
-          :actions="actions3"
152
-          cancel-text="取消"
153
-          @cancel="onCancelThree"
154
-          @select="onSelectThree"
155
-        />
152
+      <van-action-sheet
153
+        v-model="newShowTwo"
154
+        :actions="actions3"
155
+        cancel-text="取消"
156
+        @cancel="onCancelTwo"
157
+        @select="onSelectTwo"
158
+      />
159
+      <van-action-sheet
160
+        v-model="newShowThree"
161
+        :actions="actions3"
162
+        cancel-text="取消"
163
+        @cancel="onCancelThree"
164
+        @select="onSelectThree"
165
+      />
156 166
 
157
-        <van-action-sheet
158
-          v-model="newShowFour"
159
-          :actions="actions4"
160
-          cancel-text="取消"
161
-          @cancel="onCancelFour"
162
-          @select="onSelectFour"
167
+      <van-action-sheet
168
+        v-model="newShowFour"
169
+        :actions="actions4"
170
+        cancel-text="取消"
171
+        @cancel="onCancelFour"
172
+        @select="onSelectFour"
163 173
       />
164 174
     </div>
165 175
   </div>

+ 47 - 15
src/pages/configureCenter/editBed.vue Zobrazit soubor

@@ -1,15 +1,21 @@
1 1
 <template>
2
-  <div class="page_newBed">
2
+  <div class="page_editBed">
3 3
     <div class="newBedTitle">
4 4
       <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
5 5
       <span class="titleName">编辑床位</span>
6
-        <div style="margin-left:80px">
7
-        <span @click="spread" id="copy">修改</span>
8
-      </div>
6
+      <span @click="spread" id="copy">修改</span>
9 7
     </div>
10 8
     <div class="infoBox">
11
-      <van-field v-model="name" required label="床位号" placeholder="请输入" :readonly="readonly"/>
12 9
       <van-field
10
+        :class="readonly ? 'changeColor' : ''"
11
+        v-model="name"
12
+        required
13
+        label="床位号"
14
+        placeholder="请输入"
15
+        :readonly="readonly"
16
+      />
17
+      <van-field
18
+        :class="readonly ? 'changeColor' : ''"
13 19
         label="所属分区"
14 20
         v-model="zone"
15 21
         right-icon="arrow"
@@ -19,10 +25,16 @@
19 25
         @click="clickType"
20 26
       />
21 27
       <van-popup v-model="show" position="bottom" :style="{ height: '40%' }">
22
-        <van-picker :columns="columns" show-toolbar @confirm="confirmZone" @cancel="cancelZone"/>
28
+        <van-picker
29
+          :columns="columns"
30
+          show-toolbar
31
+          @confirm="confirmZone"
32
+          @cancel="cancelZone"
33
+        />
23 34
       </van-popup>
24 35
 
25 36
       <van-field
37
+        :class="readonly ? 'changeColor' : ''"
26 38
         label="所属分组"
27 39
         v-model="group"
28 40
         right-icon="arrow"
@@ -32,7 +44,12 @@
32 44
         @click="clickTypeOne"
33 45
       />
34 46
       <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
35
-        <van-picker :columns="columns1" show-toolbar @confirm="confirmGroup" @cancel="cancelGroup"/>
47
+        <van-picker
48
+          :columns="columns1"
49
+          show-toolbar
50
+          @confirm="confirmGroup"
51
+          @cancel="cancelGroup"
52
+        />
36 53
       </van-popup>
37 54
     </div>
38 55
   </div>
@@ -202,7 +219,7 @@ export default {
202 219
 </script>
203 220
 
204 221
 <style lang="scss" scoped>
205
-.page_newBed {
222
+.page_editBed {
206 223
   height: 100%;
207 224
   overflow: hidden;
208 225
   overflow-y: auto;
@@ -213,11 +230,15 @@ export default {
213 230
     height: 3.125rem;
214 231
     display: flex;
215 232
     align-items: center;
233
+    justify-content: space-between;
234
+    span {
235
+      font-size: 1rem;
236
+    }
216 237
   }
217 238
   .jiantou {
218 239
     font-size: 1.5rem;
219 240
     font-weight: 600;
220
-    margin-right: 7rem;
241
+    margin-right: 1rem;
221 242
   }
222 243
   .titleName {
223 244
     font-size: 1.125rem;
@@ -241,13 +262,24 @@ export default {
241 262
 }
242 263
 </style>
243 264
 <style lang="scss">
244
-.infoBox {
245
-  .van-field__body {
246
-    width: 100%;
265
+.page_editBed {
266
+  .changeColor {
267
+    .van-field__control {
268
+      color: #9b9b9b !important;
269
+    }
247 270
   }
248
-  .van-cell__value {
249
-    display: flex;
250
-    align-items: center;
271
+  .infoBox {
272
+    .van-field__body {
273
+      width: 100%;
274
+    }
275
+    .van-cell__value {
276
+      display: flex;
277
+      align-items: center;
278
+      font-size: 1rem;
279
+    }
280
+    .van-cell__title {
281
+      font-size: 1rem;
282
+    }
251 283
   }
252 284
 }
253 285
 </style>

+ 35 - 12
src/pages/configureCenter/editGrouping.vue Zobrazit soubor

@@ -1,14 +1,19 @@
1 1
 <template>
2
-  <div class="page_newGrouping">
2
+  <div class="page_editGrouping">
3 3
     <div class="newGroupingTitle">
4 4
       <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
5
-      <span class="titleName">编辑分组</span>
6
-       <div style="margin-left:80px">
7
-        <span @click="spread" id="copy">修改</span>
8
-      </div>
5
+      <span class="titleName">编辑分组</span>
6
+      <span @click="spread" id="copy">修改</span>
9 7
     </div>
10 8
     <div class="infoBox">
11
-      <van-field v-model="name" required label="分组名称" placeholder="请输入" :readonly="readonly" />
9
+      <van-field
10
+        :class="readonly ? 'changeColor' : ''"
11
+        v-model="name"
12
+        required
13
+        label="分组名称"
14
+        placeholder="请输入"
15
+        :readonly="readonly"
16
+      />
12 17
     </div>
13 18
   </div>
14 19
 </template>
@@ -75,7 +80,7 @@ export default {
75 80
 </script>
76 81
 
77 82
 <style lang="scss" scoped>
78
-.page_newGrouping {
83
+.page_editGrouping {
79 84
   height: 100%;
80 85
   overflow: hidden;
81 86
   overflow-y: auto;
@@ -86,11 +91,15 @@ export default {
86 91
     height: 3.125rem;
87 92
     display: flex;
88 93
     align-items: center;
94
+    justify-content: space-between;
95
+    span {
96
+      font-size: 1rem;
97
+    }
89 98
   }
90 99
   .jiantou {
91 100
     font-size: 1.5rem;
92 101
     font-weight: 600;
93
-    margin-right: 7rem;
102
+    margin-right: 1rem;
94 103
   }
95 104
   .titleName {
96 105
     font-size: 1.125rem;
@@ -119,10 +128,24 @@ export default {
119 128
 }
120 129
 </style>
121 130
 <style lang="scss">
122
-.infoBox {
123
-  .van-cell__value {
124
-    display: flex;
125
-    align-items: center;
131
+.page_editGrouping {
132
+  .changeColor {
133
+    .van-field__control {
134
+      color: #9b9b9b !important;
135
+    }
136
+  }
137
+  .infoBox {
138
+    .van-field__body {
139
+      width: 100%;
140
+    }
141
+    .van-cell__value {
142
+      display: flex;
143
+      align-items: center;
144
+      font-size: 1rem;
145
+    }
146
+    .van-cell__title {
147
+      font-size: 1rem;
148
+    }
126 149
   }
127 150
 }
128 151
 </style>

+ 27 - 12
src/pages/configureCenter/editPartion.vue Zobrazit soubor

@@ -1,14 +1,13 @@
1 1
 <template>
2
-  <div class="page_newPartition">
2
+  <div class="page_editPartition">
3 3
     <div class="newPartitionTitle">
4 4
       <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
5 5
       <span class="titleName">编辑分区</span>
6
-      <div style="margin-left:80px">
7
-        <span @click="spread" id="copy">修改</span>
8
-      </div>
6
+      <span @click="spread" id="copy">修改</span>
9 7
     </div>
10 8
     <div class="infoBox">
11 9
       <van-field
10
+        :class="readonly ? 'changeColor' : ''"
12 11
         v-model="form.name"
13 12
         required
14 13
         label="分区名称"
@@ -16,6 +15,7 @@
16 15
         :readonly="readonly"
17 16
       />
18 17
       <van-field
18
+        :class="readonly ? 'changeColor' : ''"
19 19
         label="分区类型"
20 20
         v-model="type"
21 21
         right-icon="arrow"
@@ -189,7 +189,7 @@ export default {
189 189
 </script>
190 190
 
191 191
 <style lang="scss" scoped>
192
-.page_newPartition {
192
+.page_editPartition {
193 193
   height: 100%;
194 194
   overflow: hidden;
195 195
   overflow-y: auto;
@@ -200,11 +200,15 @@ export default {
200 200
     height: 3.125rem;
201 201
     display: flex;
202 202
     align-items: center;
203
+    justify-content: space-between;
204
+    span {
205
+      font-size: 1rem;
206
+    }
203 207
   }
204 208
   .jiantou {
205 209
     font-size: 1.5rem;
206 210
     font-weight: 600;
207
-    margin-right: 7rem;
211
+    margin-right: 1rem;
208 212
   }
209 213
   .titleName {
210 214
     font-size: 1.125rem;
@@ -228,13 +232,24 @@ export default {
228 232
 }
229 233
 </style>
230 234
 <style lang="scss">
231
-.infoBox {
232
-  .van-field__body {
233
-    width: 100%;
235
+.page_editPartition {
236
+  .changeColor {
237
+    .van-field__control {
238
+      color: #9b9b9b !important;
239
+    }
234 240
   }
235
-  .van-cell__value {
236
-    display: flex;
237
-    align-items: center;
241
+  .infoBox {
242
+    .van-field__body {
243
+      width: 100%;
244
+    }
245
+    .van-cell__value {
246
+      display: flex;
247
+      align-items: center;
248
+      font-size: 1rem;
249
+    }
250
+    .van-cell__title {
251
+      font-size: 1rem;
252
+    }
238 253
   }
239 254
 }
240 255
 </style>

+ 3 - 2
src/pages/console/managementConsole/index.vue Zobrazit soubor

@@ -82,11 +82,11 @@ export default {
82 82
     },
83 83
     toSettingManage() {
84 84
       this.$router.push({ path: "/configurecenter" });
85
-    },
85
+    }
86 86
   },
87 87
   create() {
88 88
     setRem();
89
-  },
89
+  }
90 90
 };
91 91
 </script>
92 92
 
@@ -144,6 +144,7 @@ export default {
144 144
     }
145 145
     .van-icon-arrow {
146 146
       color: #9f9f9f;
147
+      font-size: 1rem;
147 148
     }
148 149
   }
149 150
   .transfer {

+ 214 - 200
src/pages/console/managementConsole/staff_role/addStaff/index.vue Zobrazit soubor

@@ -7,7 +7,12 @@
7 7
     </div>
8 8
     <div class="editStaffTip">必填</div>
9 9
     <div class="staffBox">
10
-      <van-field v-model="name" label="姓名" clearable placeholder="请输入姓名"/>
10
+      <van-field
11
+        v-model="name"
12
+        label="姓名"
13
+        clearable
14
+        placeholder="请输入姓名"
15
+      />
11 16
       <van-field
12 17
         v-model="tel"
13 18
         type="tel"
@@ -20,7 +25,7 @@
20 25
         <!-- 使用 title 插槽来自定义标题 -->
21 26
         <template slot="title">
22 27
           <span class="custom-title">角色</span>
23
-          <div style="width:76%;margin-left:3.3rem">
28
+          <div style="width:76%">
24 29
             <van-checkbox-group v-model="role_ids">
25 30
               <van-checkbox
26 31
                 style="width: 30%;"
@@ -28,7 +33,7 @@
28 33
                 shape="square"
29 34
                 v-for="(item, index) in roles"
30 35
                 :key="index"
31
-              >{{item.name}}
36
+                >{{ item.name }}
32 37
               </van-checkbox>
33 38
             </van-checkbox-group>
34 39
           </div>
@@ -37,15 +42,21 @@
37 42
       <van-cell class="newCell">
38 43
         <!-- 使用 title 插槽来自定义标题 -->
39 44
         <template slot="title">
40
-          <span class="custom-title" style="width:90px">职称</span>
45
+          <span class="custom-title">职称</span>
41 46
           <div style="display:flex;">
42
-            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
43
-              <span>{{type_name}}</span>
44
-              <van-icon name="arrow-down"/>
47
+            <div
48
+              style="margin-right:2rem;display: flex;align-items: center;"
49
+              @click="show1 = true"
50
+            >
51
+              <span>{{ type_name }}</span>
52
+              <van-icon name="arrow-down" />
45 53
             </div>
46
-            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show2 = true">
47
-              <span>{{titles_name}}</span>
48
-              <van-icon name="arrow-down"/>
54
+            <div
55
+              style="margin-right:2rem;display: flex;align-items: center;"
56
+              @click="show2 = true"
57
+            >
58
+              <span>{{ titles_name }}</span>
59
+              <van-icon name="arrow-down" />
49 60
             </div>
50 61
           </div>
51 62
         </template>
@@ -53,208 +64,206 @@
53 64
     </div>
54 65
     <div class="editStaffTip">选填</div>
55 66
     <div class="staffBox">
56
-      <van-field v-model="title" label="职位" placeholder="请填写"/>
67
+      <van-field v-model="title" label="职位" placeholder="请填写" />
57 68
     </div>
58 69
     <div class="addnewStaff" @click="save(2)">
59
-      <van-icon class="addIcon" name="add"/>
70
+      <van-icon class="addIcon" name="add" />
60 71
       <p>保存并继续新增员工</p>
61 72
     </div>
62 73
     <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
63
-      <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
74
+      <van-picker
75
+        show-toolbar
76
+        :columns="user_type_name"
77
+        @cancel="onCancel"
78
+        @confirm="onUserTypeConfirm"
79
+      />
64 80
     </van-popup>
65 81
     <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
66
-      <van-picker show-toolbar :columns="user_titles_name" @cancel="onCancel" @confirm="onUserTitleConfirm"/>
82
+      <van-picker
83
+        show-toolbar
84
+        :columns="user_titles_name"
85
+        @cancel="onCancel"
86
+        @confirm="onUserTitleConfirm"
87
+      />
67 88
     </van-popup>
68
-
69 89
   </div>
70 90
 </template>
71 91
 
72 92
 <script>
73
-  import {AdminInitData, CreateAdminUser} from "@/api/admin_user";
74
-  import {checkMobile} from "@/utils/tools";
75
-  import {setRem} from "@/libs/functionRem";
76
-
77
-  export default {
78
-    data() {
79
-      return {
80
-        name: "",
81
-        tel: "",
82
-        role_ids: [],
83
-        title: "",
84
-        value1: "",
85
-        roles: [],
86
-        show1: false,
87
-        show2: false,
88
-        type_name:"",
89
-        titles_name:"",
90
-        user_type:2,
91
-        user_title:1,
92
-
93
-        user_types: [
94
-          {index: 2, name: '医生'},
95
-          {index: 3, name: '护士'}
96
-        ],
97
-        user_titles: [
98
-          {index: 1, name: '医士'},
99
-          {index: 2, name: '医师'},
100
-          {index: 3, name: '住院医师'},
101
-          {index: 4, name: '主治医师'},
102
-          {index: 5, name: '副主任医师'},
103
-          {index: 6, name: '主任医师'},
104
-          {index: 7, name: '护士'},
105
-          {index: 8, name: '护师'},
106
-          {index: 9, name: '主管护师'},
107
-          {index: 10, name: '副主任护师'},
108
-          {index: 11, name: '主任护师'},
109
-          {index: 12, name: '运营专员'},
110
-          {index: 13, name: '运营主管'}
111
-        ],
112
-
113
-        user_type_name: [
114
-          '医生',
115
-          '护士'
116
-        ],
117
-
118
-        user_titles_name: [
119
-          '医士',
120
-          '医师',
121
-          '住院医师',
122
-          '主治医师',
123
-          '副主任医师',
124
-          '主任医师',
125
-          '护士',
126
-          '护师',
127
-          '主管护师',
128
-          '副主任护师',
129
-          '主任护师',
130
-          '运营专员',
131
-          '运营主管'
132
-        ],
133
-
134
-      };
135
-    },
136
-    methods: {
137
-      onUserTypeConfirm(value, index){
138
-        this.show1 = false
139
-        for (let i = 0; i < this.user_types.length; i++){
140
-          if (this.user_types[i].name == value){
141
-            this.user_type = this.user_types[i].index
142
-            this.type_name= this.user_types[i].name
143
-
144
-          }
145
-
93
+import { AdminInitData, CreateAdminUser } from "@/api/admin_user";
94
+import { checkMobile } from "@/utils/tools";
95
+import { setRem } from "@/libs/functionRem";
96
+
97
+export default {
98
+  data() {
99
+    return {
100
+      name: "",
101
+      tel: "",
102
+      role_ids: [],
103
+      title: "",
104
+      value1: "",
105
+      roles: [],
106
+      show1: false,
107
+      show2: false,
108
+      type_name: "",
109
+      titles_name: "",
110
+      user_type: 2,
111
+      user_title: 1,
112
+
113
+      user_types: [
114
+        { index: 2, name: "医生" },
115
+        { index: 3, name: "护士" }
116
+      ],
117
+      user_titles: [
118
+        { index: 1, name: "医士" },
119
+        { index: 2, name: "医师" },
120
+        { index: 3, name: "住院医师" },
121
+        { index: 4, name: "主治医师" },
122
+        { index: 5, name: "副主任医师" },
123
+        { index: 6, name: "主任医师" },
124
+        { index: 7, name: "护士" },
125
+        { index: 8, name: "护师" },
126
+        { index: 9, name: "主管护师" },
127
+        { index: 10, name: "副主任护师" },
128
+        { index: 11, name: "主任护师" },
129
+        { index: 12, name: "运营专员" },
130
+        { index: 13, name: "运营主管" }
131
+      ],
132
+
133
+      user_type_name: ["医生", "护士"],
134
+
135
+      user_titles_name: [
136
+        "医士",
137
+        "医师",
138
+        "住院医师",
139
+        "主治医师",
140
+        "副主任医师",
141
+        "主任医师",
142
+        "护士",
143
+        "护师",
144
+        "主管护师",
145
+        "副主任护师",
146
+        "主任护师",
147
+        "运营专员",
148
+        "运营主管"
149
+      ]
150
+    };
151
+  },
152
+  methods: {
153
+    onUserTypeConfirm(value, index) {
154
+      this.show1 = false;
155
+      for (let i = 0; i < this.user_types.length; i++) {
156
+        if (this.user_types[i].name == value) {
157
+          this.user_type = this.user_types[i].index;
158
+          this.type_name = this.user_types[i].name;
146 159
         }
160
+      }
161
+    },
162
+    onUserTitleConfirm(value, index) {
163
+      this.show2 = false;
147 164
 
148
-      },
149
-      onUserTitleConfirm(value, index){
150
-        this.show2 = false
151
-
152
-        for (let i = 0; i < this.user_titles.length; i++){
153
-          if (this.user_titles[i].name == value){
154
-            this.user_title = this.user_titles[i].index
155
-            this.titles_name= this.user_titles[i].name
156
-
157
-          }
165
+      for (let i = 0; i < this.user_titles.length; i++) {
166
+        if (this.user_titles[i].name == value) {
167
+          this.user_title = this.user_titles[i].index;
168
+          this.titles_name = this.user_titles[i].name;
158 169
         }
170
+      }
171
+    },
172
+    onCancel() {
173
+      this.show1 = false;
174
+      this.show2 = false;
175
+    },
159 176
 
160
-
161
-      },
162
-      onCancel() {
163
-        this.show1 = false
164
-        this.show2 = false
165
-
166
-
167
-      },
168
-
169
-      GetAdminUserInitData() {
170
-        AdminInitData().then(response => {
171
-          if (response.data.state === 1) {
172
-            for (let i = 0; i < response.data.data.roles.length; i++) {
173
-              if (!response.data.data.roles[i].is_super_admin) {
174
-                if(this.$store.getters.user.admin.is_super_admin){
177
+    GetAdminUserInitData() {
178
+      AdminInitData().then(response => {
179
+        if (response.data.state === 1) {
180
+          for (let i = 0; i < response.data.data.roles.length; i++) {
181
+            if (!response.data.data.roles[i].is_super_admin) {
182
+              if (this.$store.getters.user.admin.is_super_admin) {
183
+                this.roles.push(response.data.data.roles[i]);
184
+              } else {
185
+                if (
186
+                  response.data.data.roles[i].is_system != 1 &&
187
+                  response.data.data.roles[i].name != "子管理员"
188
+                ) {
175 189
                   this.roles.push(response.data.data.roles[i]);
176
-                }else{
177
-                  if(response.data.data.roles[i].is_system != 1 && response.data.data.roles[i].name != "子管理员"){
178
-                    this.roles.push(response.data.data.roles[i]);
179
-                  }
180
-
181 190
                 }
182 191
               }
183 192
             }
184
-          } else {
185
-            this.$toast({
186
-              message: response.data.msg
187
-            });
188 193
           }
189
-        });
190
-      },
191
-      save(type) {
192
-        if (this.name.trim().length == 0) {
193
-          this.$toast({
194
-            message: "姓名不能为空!"
195
-          });
196
-          return;
197
-        }
198
-        if (!checkMobile(this.tel)) {
199
-          this.$toast({
200
-            message: "请填写正确的手机号码!"
201
-          });
202
-          return;
203
-        }
204
-        if (this.role_ids.length <= 0) {
194
+        } else {
205 195
           this.$toast({
206
-            message: "至少选择一种角色"
196
+            message: response.data.msg
207 197
           });
208
-          return;
209 198
         }
210
-
211
-        let params = {
212
-          name: this.name,
213
-          mobile: this.tel,
214
-          role_ids: this.role_ids.join(","),
215
-          title: this.title,
216
-          user_type: this.user_type,
217
-          user_title: this.user_title
218
-        };
219
-        CreateAdminUser(params).then(response => {
220
-          if (response.data.state === 1) {
221
-            this.$toast({message: "新增成功"});
222
-            if (type == 1) {
223
-              this.$router.go(-1);
224
-            } else {
225
-              this.name = "";
226
-              this.tel = "";
227
-              this.role_ids = [];
228
-              this.title = "";
229
-              this.user_type = 2
230
-              this.user_title = 1
231
-              this.titles_name = this.user_titles_name[0]
232
-              this.type_name = this.user_type_name[0]
233
-
234
-            }
235
-          } else {
236
-            this.$toast({
237
-              message: response.data.msg
238
-            });
239
-          }
199
+      });
200
+    },
201
+    save(type) {
202
+      if (this.name.trim().length == 0) {
203
+        this.$toast({
204
+          message: "姓名不能为空!"
240 205
         });
206
+        return;
207
+      }
208
+      if (!checkMobile(this.tel)) {
209
+        this.$toast({
210
+          message: "请填写正确的手机号码!"
211
+        });
212
+        return;
213
+      }
214
+      if (this.role_ids.length <= 0) {
215
+        this.$toast({
216
+          message: "至少选择一种角色"
217
+        });
218
+        return;
241 219
       }
242
-    },
243
-    created() {
244
-      this.GetAdminUserInitData();
245
-      this.titles_name = this.user_titles_name[0]
246
-      this.type_name = this.user_type_name[0]
247 220
 
248
-      setRem();
221
+      let params = {
222
+        name: this.name,
223
+        mobile: this.tel,
224
+        role_ids: this.role_ids.join(","),
225
+        title: this.title,
226
+        user_type: this.user_type,
227
+        user_title: this.user_title
228
+      };
229
+      CreateAdminUser(params).then(response => {
230
+        if (response.data.state === 1) {
231
+          this.$toast({ message: "新增成功" });
232
+          if (type == 1) {
233
+            this.$router.go(-1);
234
+          } else {
235
+            this.name = "";
236
+            this.tel = "";
237
+            this.role_ids = [];
238
+            this.title = "";
239
+            this.user_type = 2;
240
+            this.user_title = 1;
241
+            this.titles_name = this.user_titles_name[0];
242
+            this.type_name = this.user_type_name[0];
243
+          }
244
+        } else {
245
+          this.$toast({
246
+            message: response.data.msg
247
+          });
248
+        }
249
+      });
249 250
     }
250
-  };
251
+  },
252
+  created() {
253
+    this.GetAdminUserInitData();
254
+    this.titles_name = this.user_titles_name[0];
255
+    this.type_name = this.user_type_name[0];
256
+
257
+    setRem();
258
+  }
259
+};
251 260
 </script>
252 261
 
253 262
 <style lang="scss" scoped>
254
-  .page_addStaff {
255
-    height: 100%;
256
-    overflow: hidden;
257
-    background: #fafafa;
263
+.page_addStaff {
264
+  height: 100%;
265
+  overflow: hidden;
266
+  background: #fafafa;
258 267
 
259 268
   .editStaffTitle {
260 269
     height: 3.125rem;
@@ -264,6 +273,9 @@
264 273
     width: 100%;
265 274
     padding: 0 1.125rem;
266 275
     background: #fff;
276
+    p {
277
+      font-size: 1rem;
278
+    }
267 279
   }
268 280
 
269 281
   .jiantou {
@@ -286,15 +298,13 @@
286 298
   }
287 299
 
288 300
   .staffBox {
301
+    .van-cell {
302
+      font-size: 1rem;
303
+    }
289 304
 
290
-  .van-cell {
291
-    font-size: 1rem;
292
-  }
293
-
294
-  .newCell {
295
-    padding-right: 0;
296
-  }
297
-
305
+    .newCell {
306
+      padding-right: 0;
307
+    }
298 308
   }
299 309
   .van-cell__title {
300 310
     display: flex;
@@ -309,6 +319,10 @@
309 319
     margin-bottom: 0.625rem;
310 320
   }
311 321
 
322
+  .custom-title {
323
+    width: 5.625rem;
324
+  }
325
+
312 326
   .addnewStaff {
313 327
     height: 2.8125rem;
314 328
     line-height: 2.8125rem;
@@ -318,23 +332,23 @@
318 332
     display: flex;
319 333
     align-items: center;
320 334
     padding-left: 1rem;
335
+    p {
336
+      font-size: 1rem;
337
+    }
321 338
 
322
-  .addIcon {
323
-    color: #338afb;
324
-    font-size: 1.5rem;
325
-    margin-right: 0.625rem;
326
-  }
327
-
328
-  }
339
+    .addIcon {
340
+      color: #338afb;
341
+      font-size: 1.5rem;
342
+      margin-right: 0.625rem;
343
+    }
329 344
   }
345
+}
330 346
 </style>
331 347
 <style lang="scss">
332
-  .page_editStaff {
333
-
348
+.page_editStaff {
334 349
   .van-cell__value {
335 350
     display: flex;
336 351
     align-items: center;
337 352
   }
338
-
339
-  }
353
+}
340 354
 </style>

+ 336 - 310
src/pages/console/managementConsole/staff_role/editRole/index.vue Zobrazit soubor

@@ -1,276 +1,304 @@
1 1
 <template>
2 2
   <div class="page_editRole">
3
-    <div class="editRoleTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5
-      <span class="titleName">新增角色</span>
6
-      <span @click="editRole()">保存</span>
7
-    </div>
3
+    <van-sticky>
4
+      <div class="editRoleTitle">
5
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
6
+        <span class="titleName">新增角色</span>
7
+        <span @click="editRole()">保存</span>
8
+      </div>
9
+    </van-sticky>
8 10
     <div class="roleDescription">
9
-      <van-field v-model="name" class="input1" required label="角色名称" placeholder="请填写角色名称" readonly>
10
-        <van-button slot="button" size="small" @click="del()" v-if="is_system == 0">删除角色</van-button>
11
+      <van-field
12
+        v-model="name"
13
+        class="input1"
14
+        required
15
+        label="角色名称"
16
+        placeholder="请填写角色名称"
17
+        readonly
18
+      >
19
+        <van-button
20
+          slot="button"
21
+          size="small"
22
+          @click="del()"
23
+          v-if="is_system == 0"
24
+          >删除角色</van-button
25
+        >
11 26
       </van-field>
12
-      <van-field v-model="desc" label="角色描述" placeholder="请填写角色描述"/>
27
+      <van-field v-model="desc" label="角色描述" placeholder="请填写角色描述" />
13 28
     </div>
14 29
     <div class="disposeBox">
15 30
       <p class="disposeTitle">应用权限配置</p>
16 31
       <div class="disposeOne" v-for="(item, index) in allPurview" :key="index">
17 32
         <div class="disposeImg">
18
-          <img :src="item.icon_url" alt/>
33
+          <img :src="item.icon_url" alt />
19 34
         </div>
20 35
         <div class="disposeTxt" v-if="!item.no_sub" @click="toSubPurview(item)">
21 36
           <div>
22
-            <p class="disposeName">{{item.name}}</p>
23
-            <p class="disposeTip">{{item.desc}}</p>
37
+            <p class="disposeName">{{ item.name }}</p>
38
+            <p class="disposeTip">{{ item.desc }}</p>
24 39
           </div>
25
-          <van-icon class="arrow" name="arrow"/>
40
+          <van-icon class="arrow" name="arrow" />
26 41
         </div>
27 42
 
28 43
         <div class="disposeTxt" v-if="item.no_sub">
29 44
           <div>
30
-            <p class="disposeName">{{item.name}}</p>
31
-            <p style="visibility: hidden;">1</p>
45
+            <p class="disposeName">{{ item.name }}</p>
46
+            <!-- <p style="visibility: hidden;">1</p> -->
32 47
           </div>
33
-          <van-switch @change="changePurviewStatus(item)" v-model="item.isCheck" size="24"/>
48
+          <van-switch
49
+            @change="changePurviewStatus(item)"
50
+            v-model="item.isCheck"
51
+            size="24"
52
+          />
34 53
         </div>
35 54
       </div>
36 55
     </div>
37 56
   </div>
38 57
 </template>
39 58
 
40
-
41 59
 <script>
42
-  import {setRem} from "@/libs/functionRem";
43
-  import {GetAllPurview,GetRoleInfo,EditRoleInfo,DeleteRoleInfo,EditPurview,GetAllRole} from "@/api/admin_user";
44
-  import {Dialog} from "vant";
45
-
46
-  export default {
47
-    data() {
48
-      return {
49
-        desc: "",
50
-        name: "",
51
-        checked: false,
52
-        allPurview: [],
53
-        rolePurview:null,
54
-        is_system:0,
55
-        ids:[],
56
-      };
57
-    }, created() {
58
-      setRem()
59
-
60
-      this.GetAllPurview()
61
-
62
-
63
-    }, methods: {
64
-      changePurviewStatus(value){
65
-        let purview_ids  = ""
66
-        let type = 0
67
-        if (value.pid == 0){ //当前页面只存在pid为0的数据,而且会出现开关按钮的情况只会是拥有一个子节点
68
-
69
-          if(value.sub_purview.length > 0) {
70
-
71
-            purview_ids = value.id + "," + value.sub_purview[0].id
72
-          }else{
73
-            purview_ids = value.id
74
-          }
75
-        }
76
-        if (value.isCheck){
77
-          type = 1 //打开
78
-        }else{
79
-          type = 2 //关闭
80
-        }
81
-
82
-
83
-        let params = {
84
-          id : this.$route.query.id,
85
-          purview_id:purview_ids,
86
-          type : type,
60
+import { setRem } from "@/libs/functionRem";
61
+import {
62
+  GetAllPurview,
63
+  GetRoleInfo,
64
+  EditRoleInfo,
65
+  DeleteRoleInfo,
66
+  EditPurview,
67
+  GetAllRole
68
+} from "@/api/admin_user";
69
+import { Dialog } from "vant";
70
+
71
+export default {
72
+  data() {
73
+    return {
74
+      desc: "",
75
+      name: "",
76
+      checked: false,
77
+      allPurview: [],
78
+      rolePurview: null,
79
+      is_system: 0,
80
+      ids: []
81
+    };
82
+  },
83
+  created() {
84
+    setRem();
85
+
86
+    this.GetAllPurview();
87
+  },
88
+  methods: {
89
+    changePurviewStatus(value) {
90
+      let purview_ids = "";
91
+      let type = 0;
92
+      if (value.pid == 0) {
93
+        //当前页面只存在pid为0的数据,而且会出现开关按钮的情况只会是拥有一个子节点
94
+
95
+        if (value.sub_purview.length > 0) {
96
+          purview_ids = value.id + "," + value.sub_purview[0].id;
97
+        } else {
98
+          purview_ids = value.id;
87 99
         }
100
+      }
101
+      if (value.isCheck) {
102
+        type = 1; //打开
103
+      } else {
104
+        type = 2; //关闭
105
+      }
106
+
107
+      let params = {
108
+        id: this.$route.query.id,
109
+        purview_id: purview_ids,
110
+        type: type
111
+      };
88 112
 
89
-        EditPurview(params).then(response => {
90
-          if (response.data.state === 1) {
91
-            if(type == 1){
92
-              value.isCheck = true
93
-            }else{
94
-              value.isCheck = false
95
-            }
113
+      EditPurview(params).then(response => {
114
+        if (response.data.state === 1) {
115
+          if (type == 1) {
116
+            value.isCheck = true;
96 117
           } else {
97
-            if(type == 1){
98
-              value.isCheck = false
99
-            }else{
100
-              value.isCheck = true
101
-            }
102
-            this.$toast({
103
-              message: response.data.msg
104
-            });
118
+            value.isCheck = false;
105 119
           }
106
-        });
107
-
108
-
109
-
110
-      },
111
-      toSubPurview(purview){
112
-        if(purview.module == 3) {
113
-          this.$router.push({path: "/role/subpurview?id=" + this.$route.query.id + "&pid=" + purview.id + "&module=" + purview.module + "&title=" + purview.name})
114
-        }else if(purview.module == 4 || purview.module == 6){
115
-          this.$router.push({path: "/role/otherpurview?id=" + this.$route.query.id + "&pid=" + purview.id + "&module=" + purview.module + "&title=" + purview.name})
116
-
117
-        }
118
-
119
-      },
120
-      del(){
121
-        Dialog.confirm({
122
-          message: "是否删除该角色?"
123
-        }).then(() => {
124
-          let params = {
125
-            role_id: this.$route.query.id,
126
-            enable:false,
120
+        } else {
121
+          if (type == 1) {
122
+            value.isCheck = false;
123
+          } else {
124
+            value.isCheck = true;
127 125
           }
128
-          DeleteRoleInfo(params).then(response => {
129
-            if (response.data.state === 1) {
130
-              this.$toast({
131
-                message: "删除成功"
132
-              });
133
-              this.$router.go(-1)
134
-            } else {
135
-              this.$toast({
136
-                message: response.data.msg
137
-              });
138
-            }
126
+          this.$toast({
127
+            message: response.data.msg
139 128
           });
140
-
129
+        }
130
+      });
131
+    },
132
+    toSubPurview(purview) {
133
+      if (purview.module == 3) {
134
+        this.$router.push({
135
+          path:
136
+            "/role/subpurview?id=" +
137
+            this.$route.query.id +
138
+            "&pid=" +
139
+            purview.id +
140
+            "&module=" +
141
+            purview.module +
142
+            "&title=" +
143
+            purview.name
141 144
         });
142
-      },
143
-      editRole(){
145
+      } else if (purview.module == 4 || purview.module == 6) {
146
+        this.$router.push({
147
+          path:
148
+            "/role/otherpurview?id=" +
149
+            this.$route.query.id +
150
+            "&pid=" +
151
+            purview.id +
152
+            "&module=" +
153
+            purview.module +
154
+            "&title=" +
155
+            purview.name
156
+        });
157
+      }
158
+    },
159
+    del() {
160
+      Dialog.confirm({
161
+        message: "是否删除该角色?"
162
+      }).then(() => {
144 163
         let params = {
145
-          id: this.$route.query.id,
146
-          desc:this.desc,
147
-        }
148
-        EditRoleInfo(params).then(response => {
164
+          role_id: this.$route.query.id,
165
+          enable: false
166
+        };
167
+        DeleteRoleInfo(params).then(response => {
149 168
           if (response.data.state === 1) {
150 169
             this.$toast({
151
-              message: "修改成功"
170
+              message: "删除成功"
152 171
             });
172
+            this.$router.go(-1);
153 173
           } else {
154 174
             this.$toast({
155 175
               message: response.data.msg
156 176
             });
157 177
           }
158 178
         });
159
-
160
-
161
-      },
162
-      GetRoleInfo(role_id) {
163
-        let params = {
164
-          id: role_id,
179
+      });
180
+    },
181
+    editRole() {
182
+      let params = {
183
+        id: this.$route.query.id,
184
+        desc: this.desc
185
+      };
186
+      EditRoleInfo(params).then(response => {
187
+        if (response.data.state === 1) {
188
+          this.$toast({
189
+            message: "修改成功"
190
+          });
191
+        } else {
192
+          this.$toast({
193
+            message: response.data.msg
194
+          });
165 195
         }
166
-        GetRoleInfo(params).then(response => {
167
-          if (response.data.state === 1) {
168
-            this.rolePurview = response.data.data.role_purview
169
-            this.name =  response.data.data.role.name
170
-            this.desc = response.data.data.role.intro
171
-            this.is_system = response.data.data.role.is_system
172
-
173
-            this.ids = this.rolePurview.PurviewIds.split(',')
174
-
175
-            for(let a = 0; a < this.ids.length; a++ ){
176
-                for (let i = 0; i < this.allPurview.length; i++){
177
-                  if (parseInt(this.ids[a]) == this.allPurview[i].id){
178
-                      this.allPurview[i].isCheck = true
179
-                    }
180
-                }
196
+      });
197
+    },
198
+    GetRoleInfo(role_id) {
199
+      let params = {
200
+        id: role_id
201
+      };
202
+      GetRoleInfo(params).then(response => {
203
+        if (response.data.state === 1) {
204
+          this.rolePurview = response.data.data.role_purview;
205
+          this.name = response.data.data.role.name;
206
+          this.desc = response.data.data.role.intro;
207
+          this.is_system = response.data.data.role.is_system;
208
+
209
+          this.ids = this.rolePurview.PurviewIds.split(",");
210
+
211
+          for (let a = 0; a < this.ids.length; a++) {
212
+            for (let i = 0; i < this.allPurview.length; i++) {
213
+              if (parseInt(this.ids[a]) == this.allPurview[i].id) {
214
+                this.allPurview[i].isCheck = true;
215
+              }
181 216
             }
182
-
183
-          } else {
184
-            this.$toast({
185
-              message: response.data.msg
186
-            });
187 217
           }
188
-        });
189
-
190
-      },GetOtherPurview(){
191
-        let params = {
192
-          module: 7,
193
-          id: 0,
218
+        } else {
219
+          this.$toast({
220
+            message: response.data.msg
221
+          });
194 222
         }
195
-        GetAllPurview(params).then(response => {
196
-          if (response.data.state === 1) {
197
-            for (let i = 0; i < response.data.data.purviews.length; i++) {
198
-              response.data.data.purviews[i]["no_sub"] = true
199
-              this.allPurview.push(response.data.data.purviews[i])
200
-            }
201
-
202
-          } else {
203
-            this.$toast({
204
-              message: response.data.msg
205
-            });
223
+      });
224
+    },
225
+    GetOtherPurview() {
226
+      let params = {
227
+        module: 7,
228
+        id: 0
229
+      };
230
+      GetAllPurview(params).then(response => {
231
+        if (response.data.state === 1) {
232
+          for (let i = 0; i < response.data.data.purviews.length; i++) {
233
+            response.data.data.purviews[i]["no_sub"] = true;
234
+            this.allPurview.push(response.data.data.purviews[i]);
206 235
           }
207
-        });
208
-
209
-      } ,GetAllPurview() {
210
-        let params = {
211
-          module: 3,
212
-          id: 0,
236
+        } else {
237
+          this.$toast({
238
+            message: response.data.msg
239
+          });
213 240
         }
214
-        GetAllPurview(params).then(response => {
215
-          if (response.data.state === 1) {
216
-            for (let i = 0; i < response.data.data.purviews.length; i++) {
217
-              var purview = response.data.data.purviews[i].sub_purview
218
-              if (purview.length > 1) {
219
-                response.data.data.purviews[i]['no_sub'] = false
220
-              } else {
221
-                response.data.data.purviews[i]['no_sub'] = true
222
-              }
223
-              response.data.data.purviews[i]['isCheck'] = false
224
-              this.allPurview.push(response.data.data.purviews[i])
241
+      });
242
+    },
243
+    GetAllPurview() {
244
+      let params = {
245
+        module: 3,
246
+        id: 0
247
+      };
248
+      GetAllPurview(params).then(response => {
249
+        if (response.data.state === 1) {
250
+          for (let i = 0; i < response.data.data.purviews.length; i++) {
251
+            var purview = response.data.data.purviews[i].sub_purview;
252
+            if (purview.length > 1) {
253
+              response.data.data.purviews[i]["no_sub"] = false;
254
+            } else {
255
+              response.data.data.purviews[i]["no_sub"] = true;
225 256
             }
226
-            this.allPurview.push({
227
-              module: 4,
228
-              name: "慢病管理",
229
-              id: 0,
230
-              icon_url: "https://kuyi.shengws.com/S8.png",
231
-              desc: "患者院外监测,患者随访",
232
-              no_sub: false
233
-            })
234
-            this.allPurview.push({
235
-              module: 6,
236
-              name: "SCRM",
237
-              id: 0,
238
-              icon_url: "https://kuyi.shengws.com/S9.png",
239
-              desc: "品牌建设,营销工具",
240
-              no_sub: false
241
-            })
242
-            // this.allPurview.push({
243
-            //   module: 7,
244
-            //   name: "分销商城",
245
-            //   id: 0,
246
-            //   icon_url: "https://kuyi.shengws.com/S10.png",
247
-            //   desc: "一键开店,分销商品",
248
-            //   no_sub: true
249
-            // })
250
-            this.GetOtherPurview()
251
-            this.GetRoleInfo(this.$route.query.id)
252
-
253
-
254
-          } else {
255
-            this.$toast({
256
-              message: response.data.msg
257
-            });
257
+            response.data.data.purviews[i]["isCheck"] = false;
258
+            this.allPurview.push(response.data.data.purviews[i]);
258 259
           }
259
-        });
260
-
261
-      },
262
-
263
-
264
-
260
+          this.allPurview.push({
261
+            module: 4,
262
+            name: "慢病管理",
263
+            id: 0,
264
+            icon_url: "https://kuyi.shengws.com/S8.png",
265
+            desc: "患者院外监测,患者随访",
266
+            no_sub: false
267
+          });
268
+          this.allPurview.push({
269
+            module: 6,
270
+            name: "SCRM",
271
+            id: 0,
272
+            icon_url: "https://kuyi.shengws.com/S9.png",
273
+            desc: "品牌建设,营销工具",
274
+            no_sub: false
275
+          });
276
+          // this.allPurview.push({
277
+          //   module: 7,
278
+          //   name: "分销商城",
279
+          //   id: 0,
280
+          //   icon_url: "https://kuyi.shengws.com/S10.png",
281
+          //   desc: "一键开店,分销商品",
282
+          //   no_sub: true
283
+          // })
284
+          this.GetOtherPurview();
285
+          this.GetRoleInfo(this.$route.query.id);
286
+        } else {
287
+          this.$toast({
288
+            message: response.data.msg
289
+          });
290
+        }
291
+      });
265 292
     }
266
-  };
293
+  }
294
+};
267 295
 </script>
268 296
 
269 297
 <style lang="scss" scoped>
270
-  .page_editRole {
271
-    height: 100%;
272
-    overflow-y: auto;
273
-    background: #fafafa;
298
+.page_editRole {
299
+  height: 100%;
300
+  overflow-y: auto;
301
+  background: #fafafa;
274 302
 
275 303
   .editRoleTitle {
276 304
     background: #fff;
@@ -279,6 +307,9 @@
279 307
     display: flex;
280 308
     align-items: center;
281 309
     justify-content: space-between;
310
+    span {
311
+      font-size: 1rem;
312
+    }
282 313
   }
283 314
 
284 315
   .jiantou {
@@ -288,122 +319,117 @@
288 319
   }
289 320
 
290 321
   .titleName {
291
-    font-size: 1.125rem;
322
+    font-size: 1.125rem !important;
292 323
     font-weight: 600;
293 324
   }
294 325
 
295 326
   .roleDescription {
296 327
     margin: 0.875rem 0;
297 328
 
298
-  .van-cell {
299
-    font-size: 1rem;
300
-  }
301
-
302
-  .input1 {
303
-
304
-  .van-field__body {
305
-    width: 100%;
306
-  }
329
+    .van-cell {
330
+      font-size: 1rem;
331
+    }
307 332
 
308
-  }
333
+    .input1 {
334
+      .van-field__body {
335
+        width: 100%;
336
+      }
337
+    }
309 338
   }
310 339
   .disposeBox {
311 340
     margin-bottom: 1.25rem;
312 341
 
313
-  .disposeTitle {
314
-    height: 2.8125rem;
315
-    line-height: 2.8125rem;
316
-    background: rgba(255, 255, 255, 1);
317
-    box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
318
-    font-weight: bold;
319
-    color: #313234;
320
-    padding-left: 1.125rem;
321
-  }
322
-
323
-  .disposeOne {
324
-    display: flex;
325
-    justify-content: space-between;
326
-    height: 4.0625rem;
327
-    background: #fff;
328
-
329
-  .disposeImg {
330
-    width: 12%;
331
-    padding-left: 1.125rem;
332
-    padding-top: 1.125rem;
333
-
334
-  img {
335
-    width: 1.5rem;
336
-    height: 1.5rem;
337
-  }
338
-
339
-  }
340
-  .disposeTxt {
341
-    width: 86%;
342
-    box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
343
-    display: flex;
344
-    justify-content: space-between;
345
-    align-items: center;
346
-    padding-right: 0.875rem;
347
-  }
348
-
349
-  .noTxt {
350
-    box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.1);
351
-  }
342
+    .disposeTitle {
343
+      height: 2.8125rem;
344
+      line-height: 2.8125rem;
345
+      background: rgba(255, 255, 255, 1);
346
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
347
+      font-weight: bold;
348
+      color: #313234;
349
+      padding-left: 1.125rem;
350
+      font-size: 1rem;
351
+    }
352 352
 
353
-  .disposeName {
354
-    font-size: 1rem;
355
-    color: #313234;
356
-    margin-top: 0.375rem;
357
-  }
353
+    .disposeOne {
354
+      display: flex;
355
+      justify-content: space-between;
356
+      height: 4.0625rem;
357
+      background: #fff;
358 358
 
359
-  .disposeTip {
360
-    font-size: 0.8125rem;
361
-    color: #9b9b9b;
362
-    margin-top: 0.375rem;
363
-  }
364
-
365
-  .arrow {
366
-    color: #9f9f9f;
367
-  }
359
+      .disposeImg {
360
+        width: 12%;
361
+        padding-left: 1.125rem;
362
+        padding-top: 1.125rem;
368 363
 
364
+        img {
365
+          width: 1.5rem;
366
+          height: 1.5rem;
367
+        }
368
+      }
369
+      .disposeTxt {
370
+        width: 86%;
371
+        box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
372
+        display: flex;
373
+        justify-content: space-between;
374
+        align-items: center;
375
+        padding-right: 0.875rem;
376
+      }
377
+
378
+      .noTxt {
379
+        box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.1);
380
+      }
381
+
382
+      .disposeName {
383
+        font-size: 1rem;
384
+        color: #313234;
385
+        margin-top: 0.375rem;
386
+      }
387
+
388
+      .disposeTip {
389
+        font-size: 0.8125rem;
390
+        color: #9b9b9b;
391
+        margin-top: 0.375rem;
392
+      }
393
+
394
+      .arrow {
395
+        color: #9f9f9f;
396
+        font-size: 1rem;
397
+      }
398
+    }
369 399
   }
370
-  }
371
-  }
372
-  ::-webkit-scrollbar {
373
-    width: 0;
374
-  }
400
+}
401
+::-webkit-scrollbar {
402
+  width: 0;
403
+}
375 404
 </style>
376 405
 <style lang="scss">
377
-  .page_editRole {
378
-
406
+.page_editRole {
379 407
   .roleDescription {
380
-
381
-  .van-cell__value {
382
-    display: flex;
383
-    align-items: center;
384
-  }
385
-
386
-  }
408
+    .van-cell__value {
409
+      display: flex;
410
+      align-items: center;
411
+    }
387 412
   }
413
+}
388 414
 </style>
389 415
 
390 416
 <style lang="scss">
391
-  .roleDescription {
392
-
417
+.roleDescription {
393 418
   .input1 {
419
+    .van-field__body {
420
+      width: 100%;
421
+    }
394 422
 
395
-  .van-field__body {
396
-    width: 100%;
423
+    .van-button {
424
+      color: #f44746;
425
+      border: none;
426
+      text-align: right;
427
+      font-size: 1rem;
428
+      padding: 0;
429
+    }
397 430
   }
398
-
399
-  .van-button {
400
-    color: #f44746;
431
+  .van-button--default {
401 432
     border: none;
402
-    text-align: right;
403
-    font-size: 1rem;
404
-    padding: 0;
405
-  }
406
-
407
-  }
408 433
   }
434
+}
409 435
 </style>

+ 24 - 12
src/pages/console/managementConsole/staff_role/employeeList/index.vue Zobrazit soubor

@@ -1,10 +1,12 @@
1 1
 <template>
2 2
   <div class="page_employeeList">
3
-    <div class="editRoleTitle">
4
-      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5
-      <span class="titleName">员工列表</span>
6
-      <span @click="save()">保存</span>
7
-    </div>
3
+    <van-sticky>
4
+      <div class="editRoleTitle">
5
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
6
+        <span class="titleName">员工列表</span>
7
+        <span @click="save()">保存</span>
8
+      </div>
9
+    </van-sticky>
8 10
     <div class="allCheckBox">
9 11
       <div class="allCheck">
10 12
         <van-checkbox v-model="allChecked" @click="checkAll"></van-checkbox>
@@ -45,11 +47,11 @@ export default {
45 47
   },
46 48
   methods: {
47 49
     save() {
48
-      if(this.result.length == 0){
50
+      if (this.result.length == 0) {
49 51
         this.$toast({
50 52
           message: "至少选择一个用户"
51 53
         });
52
-        return
54
+        return;
53 55
       }
54 56
 
55 57
       let params = {
@@ -83,10 +85,12 @@ export default {
83 85
             }
84 86
           }
85 87
           for (let i = 0; i < this.admin_user.length; i++) {
86
-              if(this.admin_user[i].user_id == this.$store.getters.user.org.creator){
87
-                this.admin_user.splice(i, 1);
88
-                i = i - 1;
89
-              }
88
+            if (
89
+              this.admin_user[i].user_id == this.$store.getters.user.org.creator
90
+            ) {
91
+              this.admin_user.splice(i, 1);
92
+              i = i - 1;
93
+            }
90 94
           }
91 95
         } else {
92 96
           this.$toast({
@@ -134,6 +138,9 @@ export default {
134 138
     display: flex;
135 139
     align-items: center;
136 140
     justify-content: space-between;
141
+    span {
142
+      font-size: 1rem;
143
+    }
137 144
   }
138 145
   .jiantou {
139 146
     font-size: 1.5rem;
@@ -141,7 +148,7 @@ export default {
141 148
     margin-right: 1.5rem;
142 149
   }
143 150
   .titleName {
144
-    font-size: 1.125rem;
151
+    font-size: 1.125rem !important;
145 152
     font-weight: 600;
146 153
   }
147 154
   .allCheckBox {
@@ -152,6 +159,7 @@ export default {
152 159
       background: #fff;
153 160
       padding-left: 0.75rem;
154 161
       margin: 1rem 0;
162
+      font-size: 1rem;
155 163
     }
156 164
     .checkOne {
157 165
       background: #fff;
@@ -163,6 +171,7 @@ export default {
163 171
     .checkUserBox {
164 172
       display: flex;
165 173
       align-items: center;
174
+      font-size: 1rem;
166 175
       img {
167 176
         width: 2.5rem;
168 177
         height: 2.5rem;
@@ -171,4 +180,7 @@ export default {
171 180
     }
172 181
   }
173 182
 }
183
+::-webkit-scrollbar {
184
+  width: 0;
185
+}
174 186
 </style>

+ 1 - 0
src/pages/console/managementConsole/staff_role/newAddRole/index.vue Zobrazit soubor

@@ -101,6 +101,7 @@ export default {
101 101
     background: #338afb;
102 102
     margin: 0 auto;
103 103
     border-radius: 1.875rem;
104
+    font-size: 1rem;
104 105
   }
105 106
 }
106 107
 ::-webkit-scrollbar {

+ 84 - 73
src/pages/console/managementConsole/staff_role/newAddStaff/index.vue Zobrazit soubor

@@ -24,20 +24,25 @@
24 24
       <van-cell class="newCell">
25 25
         <!-- 使用 title 插槽来自定义标题 -->
26 26
         <template slot="title">
27
-          <span class="custom-title" style="width:90px">职称</span>
27
+          <span class="custom-title">职称</span>
28 28
           <div style="display:flex;">
29
-            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show1 = true">
30
-              <span>{{type_name}}</span>
31
-              <van-icon name="arrow-down"/>
29
+            <div
30
+              style="margin-right:2rem;display: flex;align-items: center;"
31
+              @click="show1 = true"
32
+            >
33
+              <span>{{ type_name }}</span>
34
+              <van-icon name="arrow-down" />
32 35
             </div>
33
-            <div style="margin-right:2rem;display: flex;align-items: center;" @click="show2 = true">
34
-              <span>{{titles_name}}</span>
35
-              <van-icon name="arrow-down"/>
36
+            <div
37
+              style="margin-right:2rem;display: flex;align-items: center;"
38
+              @click="show2 = true"
39
+            >
40
+              <span>{{ titles_name }}</span>
41
+              <van-icon name="arrow-down" />
36 42
             </div>
37 43
           </div>
38 44
         </template>
39 45
       </van-cell>
40
-
41 46
     </div>
42 47
     <div class="editStaffTip">选填</div>
43 48
     <div class="staffBox">
@@ -48,12 +53,21 @@
48 53
       <p>保存并继续新增员工</p>
49 54
     </div>
50 55
     <van-popup v-model="show1" position="bottom" :style="{ height: '40%' }">
51
-      <van-picker show-toolbar :columns="user_type_name" @cancel="onCancel" @confirm="onUserTypeConfirm"/>
56
+      <van-picker
57
+        show-toolbar
58
+        :columns="user_type_name"
59
+        @cancel="onCancel"
60
+        @confirm="onUserTypeConfirm"
61
+      />
52 62
     </van-popup>
53 63
     <van-popup v-model="show2" position="bottom" :style="{ height: '40%' }">
54
-      <van-picker show-toolbar :columns="user_titles_name" @cancel="onCancel" @confirm="onUserTitleConfirm"/>
64
+      <van-picker
65
+        show-toolbar
66
+        :columns="user_titles_name"
67
+        @cancel="onCancel"
68
+        @confirm="onUserTitleConfirm"
69
+      />
55 70
     </van-popup>
56
-
57 71
   </div>
58 72
 </template>
59 73
 
@@ -73,85 +87,73 @@ export default {
73 87
       roles: [],
74 88
       show1: false,
75 89
       show2: false,
76
-      type_name:"",
77
-      titles_name:"",
78
-      user_type:2,
79
-      user_title:1,
90
+      type_name: "",
91
+      titles_name: "",
92
+      user_type: 2,
93
+      user_title: 1,
80 94
 
81 95
       user_types: [
82
-        {index: 2, name: '医生'},
83
-        {index: 3, name: '护士'}
96
+        { index: 2, name: "医生" },
97
+        { index: 3, name: "护士" }
84 98
       ],
85 99
       user_titles: [
86
-        {index: 1, name: '医士'},
87
-        {index: 2, name: '医师'},
88
-        {index: 3, name: '住院医师'},
89
-        {index: 4, name: '主治医师'},
90
-        {index: 5, name: '副主任医师'},
91
-        {index: 6, name: '主任医师'},
92
-        {index: 7, name: '护士'},
93
-        {index: 8, name: '护师'},
94
-        {index: 9, name: '主管护师'},
95
-        {index: 10, name: '副主任护师'},
96
-        {index: 11, name: '主任护师'},
97
-        {index: 12, name: '运营专员'},
98
-        {index: 13, name: '运营主管'}
100
+        { index: 1, name: "医士" },
101
+        { index: 2, name: "医师" },
102
+        { index: 3, name: "住院医师" },
103
+        { index: 4, name: "主治医师" },
104
+        { index: 5, name: "副主任医师" },
105
+        { index: 6, name: "主任医师" },
106
+        { index: 7, name: "护士" },
107
+        { index: 8, name: "护师" },
108
+        { index: 9, name: "主管护师" },
109
+        { index: 10, name: "副主任护师" },
110
+        { index: 11, name: "主任护师" },
111
+        { index: 12, name: "运营专员" },
112
+        { index: 13, name: "运营主管" }
99 113
       ],
100 114
 
101
-      user_type_name: [
102
-        '医生',
103
-        '护士'
104
-      ],
115
+      user_type_name: ["医生", "护士"],
105 116
 
106 117
       user_titles_name: [
107
-        '医士',
108
-        '医师',
109
-        '住院医师',
110
-        '主治医师',
111
-        '副主任医师',
112
-        '主任医师',
113
-        '护士',
114
-        '护师',
115
-        '主管护师',
116
-        '副主任护师',
117
-        '主任护师',
118
-        '运营专员',
119
-        '运营主管'
120
-      ],
121
-
118
+        "医士",
119
+        "医师",
120
+        "住院医师",
121
+        "主治医师",
122
+        "副主任医师",
123
+        "主任医师",
124
+        "护士",
125
+        "护师",
126
+        "主管护师",
127
+        "副主任护师",
128
+        "主任护师",
129
+        "运营专员",
130
+        "运营主管"
131
+      ]
122 132
     };
123 133
   },
124 134
   methods: {
125
-    onUserTypeConfirm(value, index){
126
-      this.show1 = false
127
-      for (let i = 0; i < this.user_types.length; i++){
128
-        if (this.user_types[i].name == value){
129
-          this.user_type = this.user_types[i].index
130
-          this.type_name= this.user_types[i].name
131
-
135
+    onUserTypeConfirm(value, index) {
136
+      this.show1 = false;
137
+      for (let i = 0; i < this.user_types.length; i++) {
138
+        if (this.user_types[i].name == value) {
139
+          this.user_type = this.user_types[i].index;
140
+          this.type_name = this.user_types[i].name;
132 141
         }
133
-
134 142
       }
135
-
136 143
     },
137
-    onUserTitleConfirm(value, index){
138
-      this.show2 = false
139
-
140
-      for (let i = 0; i < this.user_titles.length; i++){
141
-        if (this.user_titles[i].name == value){
142
-          this.user_title = this.user_titles[i].index
143
-          this.titles_name= this.user_titles[i].name
144
+    onUserTitleConfirm(value, index) {
145
+      this.show2 = false;
144 146
 
147
+      for (let i = 0; i < this.user_titles.length; i++) {
148
+        if (this.user_titles[i].name == value) {
149
+          this.user_title = this.user_titles[i].index;
150
+          this.titles_name = this.user_titles[i].name;
145 151
         }
146 152
       }
147
-
148
-
149 153
     },
150 154
     onCancel() {
151
-      this.show1 = false
152
-      this.show2 = false
153
-
154
-
155
+      this.show1 = false;
156
+      this.show2 = false;
155 157
     },
156 158
     GetAdminUserInitData() {
157 159
       AdminInitData().then(response => {
@@ -217,8 +219,8 @@ export default {
217 219
   },
218 220
   created() {
219 221
     this.GetAdminUserInitData();
220
-    this.titles_name = this.user_titles_name[0]
221
-    this.type_name = this.user_type_name[0]
222
+    this.titles_name = this.user_titles_name[0];
223
+    this.type_name = this.user_type_name[0];
222 224
     this.role_ids.push(this.$route.query.id);
223 225
     setRem();
224 226
   }
@@ -238,6 +240,9 @@ export default {
238 240
     width: 100%;
239 241
     padding: 0 1.125rem;
240 242
     background: #fff;
243
+    p {
244
+      font-size: 1rem;
245
+    }
241 246
   }
242 247
   .jiantou {
243 248
     font-size: 1.5rem;
@@ -273,6 +278,9 @@ export default {
273 278
   .van-checkbox {
274 279
     margin-bottom: 0.625rem;
275 280
   }
281
+  .custom-title {
282
+    width: 5.625rem;
283
+  }
276 284
   .addnewStaff {
277 285
     height: 2.8125rem;
278 286
     line-height: 2.8125rem;
@@ -287,6 +295,9 @@ export default {
287 295
       font-size: 1.5rem;
288 296
       margin-right: 0.625rem;
289 297
     }
298
+    p {
299
+      font-size: 1rem;
300
+    }
290 301
   }
291 302
 }
292 303
 </style>

+ 94 - 58
src/pages/console/managementConsole/staff_role/privilegeManagement/index.vue Zobrazit soubor

@@ -3,9 +3,9 @@
3 3
     <van-sticky>
4 4
       <div class="privilegeManagementTitle">
5 5
         <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
6
-        <span class="titleName" >权限管理</span>
6
+        <span class="titleName">权限管理</span>
7 7
         <div class="iconBox" @click="goToAddRole()">
8
-          <van-icon class="iconOne add" name="add-o"/>
8
+          <van-icon class="iconOne add" name="add-o" />
9 9
         </div>
10 10
       </div>
11 11
     </van-sticky>
@@ -14,30 +14,64 @@
14 14
         <div>
15 15
           <div class="peopleTop">
16 16
             <div class="peopleImg">
17
-              <img v-if="item.name == '医生'" src="../../../../../assets/images/people1.jpg" alt=""/>
18
-              <img v-else-if="item.name == '护士'" src="../../../../../assets/images/people2.jpg" alt=""/>
19
-              <img v-else-if="item.name == '子管理员'" src="../../../../../assets/images/people5.jpg" alt=""/>
20
-              <img v-else-if="item.name == '库存'" src="../../../../../assets/images/people3.jpg" alt=""/>
21
-              <img v-else-if="item.name == '院长'" src="../../../../../assets/images/people4.jpg" alt=""/>
22
-              <img v-else-if="item.name == '运营'"  src="../../../../../assets/images/yy.jpg" alt=""/>
23
-              <img v-else-if="item.name == '技师'"  src="../../../../../assets/images/js.jpg" alt=""/>
24
-              <img v-else  src="../../../../../assets/images/default_avatar.jpg" alt=""/>
25
-
17
+              <img
18
+                v-if="item.name == '医生'"
19
+                src="../../../../../assets/images/people1.jpg"
20
+                alt=""
21
+              />
22
+              <img
23
+                v-else-if="item.name == '护士'"
24
+                src="../../../../../assets/images/people2.jpg"
25
+                alt=""
26
+              />
27
+              <img
28
+                v-else-if="item.name == '子管理员'"
29
+                src="../../../../../assets/images/people5.jpg"
30
+                alt=""
31
+              />
32
+              <img
33
+                v-else-if="item.name == '库存'"
34
+                src="../../../../../assets/images/people3.jpg"
35
+                alt=""
36
+              />
37
+              <img
38
+                v-else-if="item.name == '院长'"
39
+                src="../../../../../assets/images/people4.jpg"
40
+                alt=""
41
+              />
42
+              <img
43
+                v-else-if="item.name == '运营'"
44
+                src="../../../../../assets/images/yy.jpg"
45
+                alt=""
46
+              />
47
+              <img
48
+                v-else-if="item.name == '技师'"
49
+                src="../../../../../assets/images/js.jpg"
50
+                alt=""
51
+              />
52
+              <img
53
+                v-else
54
+                src="../../../../../assets/images/default_avatar.jpg"
55
+                alt=""
56
+              />
26 57
             </div>
27 58
             <div class="peopleTitle">
28
-              <p>{{item.name}}</p>
59
+              <p>{{ item.name }}</p>
29 60
               <div class="setting" @click="goToPermission(item)">
30
-                <van-icon class="setting-o" name="setting-o"/>
31
-                <span >权限配置</span>
61
+                <van-icon class="setting-o" name="setting-o" />
62
+                <span>权限配置</span>
32 63
               </div>
33 64
             </div>
34 65
           </div>
35 66
           <div class="peopleContent">
36 67
             <p>
37
-              {{item.intro}}
68
+              {{ item.intro }}
38 69
             </p>
39 70
             <p class="hasUser">
40
-              该角色目前已配置<span style="color:#338AFB">{{item.staff_number}}</span>个员工
71
+              该角色目前已配置<span style="color:#338AFB">{{
72
+                item.staff_number
73
+              }}</span
74
+              >个员工
41 75
             </p>
42 76
           </div>
43 77
         </div>
@@ -51,52 +85,54 @@
51 85
 </template>
52 86
 
53 87
 <script>
54
-  // import "../libs/rem.js";
55
-  import {GetAllRole} from "@/api/admin_user";
56
-  import {setRem} from "@/libs/functionRem";
88
+// import "../libs/rem.js";
89
+import { GetAllRole } from "@/api/admin_user";
90
+import { setRem } from "@/libs/functionRem";
57 91
 
58
-  export default {
59
-    data() {
60
-      return {
61
-        roles: [],
62
-      };
63
-    },
64
-    methods: {
65
-      GetInitRoles() {
66
-        GetAllRole().then(response => {
67
-          if (response.data.state === 1) {
68
-            console.log(response.data.data.roles.length)
69
-            for (let i = 0; i < response.data.data.roles.length; i++) {
70
-              if (!response.data.data.roles[i].is_super_admin) {
71
-                this.roles.push(response.data.data.roles[i])
72
-              }
92
+export default {
93
+  data() {
94
+    return {
95
+      roles: []
96
+    };
97
+  },
98
+  methods: {
99
+    GetInitRoles() {
100
+      GetAllRole().then(response => {
101
+        if (response.data.state === 1) {
102
+          console.log(response.data.data.roles.length);
103
+          for (let i = 0; i < response.data.data.roles.length; i++) {
104
+            if (!response.data.data.roles[i].is_super_admin) {
105
+              this.roles.push(response.data.data.roles[i]);
73 106
             }
74
-          console.log( this.roles)
75
-          } else {
76
-            this.$toast({
77
-              message: response.data.msg
78
-            });
79 107
           }
80
-        });
81
-      }, goToAddStaff(role) {
82
-        this.$router.push({path: "/role/user?id="+role.id});
83
-      }, goToStaffManage(role) {
84
-        this.$router.push({path: "/role/usermanage?id="+role.id});
85
-
86
-
87
-      }, goToPermission(role) {
88
-        this.$router.push({path:"/role/editrole?id="+role.id})
89
-      },goToAddRole(){
90
-        this.$router.push({path: "/role/addrole"});
91
-      },
92
-    }, created() {
93
-      setRem()
94
-      this.GetInitRoles()
108
+          console.log(this.roles);
109
+        } else {
110
+          this.$toast({
111
+            message: response.data.msg
112
+          });
113
+        }
114
+      });
115
+    },
116
+    goToAddStaff(role) {
117
+      this.$router.push({ path: "/role/user?id=" + role.id });
118
+    },
119
+    goToStaffManage(role) {
120
+      this.$router.push({ path: "/role/usermanage?id=" + role.id });
121
+    },
122
+    goToPermission(role) {
123
+      this.$router.push({ path: "/role/editrole?id=" + role.id });
124
+    },
125
+    goToAddRole() {
126
+      this.$router.push({ path: "/role/addrole" });
95 127
     }
96
-  };
128
+  },
129
+  created() {
130
+    setRem();
131
+    this.GetInitRoles();
132
+  }
133
+};
97 134
 </script>
98 135
 
99
-
100 136
 <style lang="scss" scoped>
101 137
 .page_privilegeManagement {
102 138
   height: 100%;
@@ -176,9 +212,9 @@
176 212
       }
177 213
     }
178 214
     .peopleContent {
179
-      width: 90%;
215
+      width: 92%;
180 216
       float: right;
181
-      padding-left: 1.2rem;
217
+      padding-left: 1.6rem;
182 218
       padding-right: 1.5rem;
183 219
       font-size: 0.8125rem;
184 220
       color: #989898;

+ 54 - 45
src/pages/console/managementConsole/staff_role/staffManagement/index.vue Zobrazit soubor

@@ -14,7 +14,7 @@
14 14
         <div class="staffBox" v-if="admin_user.length > 0">
15 15
           <div
16 16
             class="staffOne"
17
-            v-for="(item,index) in admin_user"
17
+            v-for="(item, index) in admin_user"
18 18
             :key="index"
19 19
             v-if="admin_user.length > 0"
20 20
           >
@@ -25,8 +25,11 @@
25 25
               alt
26 26
             />
27 27
             <p>
28
-              <span>{{item.user_name}}</span>
29
-              <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
28
+              <span>{{ item.user_name }}</span>
29
+              <i
30
+                @click="goEditStaff(item.user_id)"
31
+                class="iconfont icon-bianji bianji"
32
+              ></i>
30 33
             </p>
31 34
           </div>
32 35
         </div>
@@ -35,12 +38,11 @@
35 38
         </div>
36 39
       </van-tab>
37 40
 
38
-
39 41
       <van-tab title="禁用员工">
40 42
         <div class="staffBox" v-if="del_admin_user.length > 0">
41 43
           <div
42 44
             class="staffOne"
43
-            v-for="(item,index) in del_admin_user"
45
+            v-for="(item, index) in del_admin_user"
44 46
             :key="index"
45 47
             v-if="del_admin_user.length > 0"
46 48
           >
@@ -51,8 +53,11 @@
51 53
               alt
52 54
             />
53 55
             <p>
54
-              <span>{{item.user_name}}</span>
55
-              <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
56
+              <span>{{ item.user_name }}</span>
57
+              <i
58
+                @click="goEditStaff(item.user_id)"
59
+                class="iconfont icon-bianji bianji"
60
+              ></i>
56 61
             </p>
57 62
           </div>
58 63
         </div>
@@ -73,65 +78,70 @@ export default {
73 78
     return {
74 79
       active: 0,
75 80
       admin_user: [],
76
-      del_admin_user: [],
77
-
81
+      del_admin_user: []
78 82
     };
79 83
   },
80 84
   methods: {
81 85
     GetAllStaff: function() {
82 86
       GetAllStaff().then(response => {
83 87
         if (response.data.state === 1) {
84
-          for(let i = 0; i < response.data.data.admins.length; i++){
85
-            if(response.data.data.admins[i].status == 1){
86
-              if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员,不展示管理员信息
87
-                  if(response.data.data.admins[i].user_id != response.data.data.org_creator){
88
-                    this.admin_user.push(response.data.data.admins[i])
89
-                  }
90
-              }else{
91
-                this.admin_user.push(response.data.data.admins[i])
92
-
88
+          for (let i = 0; i < response.data.data.admins.length; i++) {
89
+            if (response.data.data.admins[i].status == 1) {
90
+              if (response.data.data.isSubSuperAdmin) {
91
+                //当前用户为子管理员,不展示管理员信息
92
+                if (
93
+                  response.data.data.admins[i].user_id !=
94
+                  response.data.data.org_creator
95
+                ) {
96
+                  this.admin_user.push(response.data.data.admins[i]);
97
+                }
98
+              } else {
99
+                this.admin_user.push(response.data.data.admins[i]);
93 100
               }
94
-            }else{
95
-              if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员,不展示管理员信息
96
-                if(response.data.data.admins[i].user_id != response.data.data.org_creator){
101
+            } else {
102
+              if (response.data.data.isSubSuperAdmin) {
103
+                //当前用户为子管理员,不展示管理员信息
104
+                if (
105
+                  response.data.data.admins[i].user_id !=
106
+                  response.data.data.org_creator
107
+                ) {
97 108
                   // this.admin_user.push(response.data.data.admins[i])
98
-                  this.del_admin_user.push(response.data.data.admins[i])
99
-
109
+                  this.del_admin_user.push(response.data.data.admins[i]);
100 110
                 }
101
-              }else{
111
+              } else {
102 112
                 // this.admin_user.push(response.data.data.admins[i])
103
-                this.del_admin_user.push(response.data.data.admins[i])
104
-
105
-
113
+                this.del_admin_user.push(response.data.data.admins[i]);
106 114
               }
107
-
108
-
109 115
             }
110 116
           }
111 117
 
112
-
113
-          for(let i = 0; i < this.admin_user.length; i++) {
114
-            if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员,不展示管理员和其他子管理信息
115
-              if(this.admin_user[i].is_sub_admin && this.admin_user[i].user_id != this.$store.getters.user.admin.id){
116
-                this.admin_user.splice(i,1)
118
+          for (let i = 0; i < this.admin_user.length; i++) {
119
+            if (response.data.data.isSubSuperAdmin) {
120
+              //当前用户为子管理员,不展示管理员和其他子管理信息
121
+              if (
122
+                this.admin_user[i].is_sub_admin &&
123
+                this.admin_user[i].user_id != this.$store.getters.user.admin.id
124
+              ) {
125
+                this.admin_user.splice(i, 1);
117 126
                 i = i - 1;
118 127
               }
119 128
             }
120 129
           }
121 130
 
122
-
123
-          for(let i = 0; i < this.del_admin_user.length; i++) {
124
-            if(response.data.data.isSubSuperAdmin){ //当前用户为子管理员,不展示管理员和其他子管理信息
125
-              if(this.del_admin_user[i].is_sub_admin && this.del_admin_user[i].user_id != this.$store.getters.user.admin.id){
126
-                this.del_admin_user.splice(i,1)
131
+          for (let i = 0; i < this.del_admin_user.length; i++) {
132
+            if (response.data.data.isSubSuperAdmin) {
133
+              //当前用户为子管理员,不展示管理员和其他子管理信息
134
+              if (
135
+                this.del_admin_user[i].is_sub_admin &&
136
+                this.del_admin_user[i].user_id !=
137
+                  this.$store.getters.user.admin.id
138
+              ) {
139
+                this.del_admin_user.splice(i, 1);
127 140
                 i = i - 1;
128 141
               }
129 142
             }
130 143
           }
131
-
132
-
133
-
134
-          } else {
144
+        } else {
135 145
           this.$toast({
136 146
             message: response.data.msg
137 147
           });
@@ -148,7 +158,6 @@ export default {
148 158
   created() {
149 159
     setRem();
150 160
     this.GetAllStaff();
151
-
152 161
   }
153 162
 };
154 163
 </script>
@@ -184,6 +193,7 @@ export default {
184 193
       display: flex;
185 194
       align-items: center;
186 195
       height: 3.75rem;
196
+      font-size: 1rem;
187 197
       img {
188 198
         width: 2.5rem;
189 199
         height: 2.5rem;
@@ -229,4 +239,3 @@ export default {
229 239
   }
230 240
 }
231 241
 </style>
232
-

+ 1 - 1
src/pages/console/managementConsole/staff_role/subPurview/index.vue Zobrazit soubor

@@ -13,7 +13,7 @@
13 13
       <van-cell center title="功能权限配置"></van-cell>
14 14
     </div>
15 15
     <div class="allBox">
16
-      <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name == '透析记录'" @click="toFunctonPurview(item)">
16
+      <van-cell center is-link :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name == '透析记录'" @click="toFunctonPurview(item)">
17 17
       </van-cell>
18 18
       <van-cell center :title="item.name" v-for="(item, index) in allPurview" :key="index" v-if="item.name != '透析记录'">
19 19
         <van-switch v-model="item.isCheck" slot="right-icon" size="24"  @change="changeStatus(item)" />

+ 10 - 9
src/pages/console/managementConsole/staff_role/userManage/index.vue Zobrazit soubor

@@ -12,8 +12,7 @@
12 12
         v-for="(item, index) in admin_user"
13 13
         :key="index"
14 14
         v-if="admin_user.length > 0"
15
-        @click="goEditStaff(item.user_id,item.is_sub_admin)"
16
-
15
+        @click="goEditStaff(item.user_id, item.is_sub_admin)"
17 16
       >
18 17
         <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
19 18
         <img
@@ -21,7 +20,7 @@
21 20
           src="../../../../../assets/images/default_avatar.jpg"
22 21
           alt
23 22
         />
24
-        <p >
23
+        <p>
25 24
           <span>{{ item.user_name }}</span>
26 25
           <i
27 26
             v-if="!item.is_sub_admin && org_creator != item.user_id"
@@ -42,7 +41,7 @@ export default {
42 41
     return {
43 42
       active: 0,
44 43
       admin_user: [],
45
-      org_creator:0,
44
+      org_creator: 0
46 45
     };
47 46
   },
48 47
   methods: {
@@ -68,8 +67,8 @@ export default {
68 67
         }
69 68
       });
70 69
     },
71
-    goEditStaff: function(id,is_sub_admin) {
72
-      if (!is_sub_admin && org_creator != id){
70
+    goEditStaff: function(id, is_sub_admin) {
71
+      if (!is_sub_admin && org_creator != id) {
73 72
         this.$router.push({ path: "/staff/editstaff?id=" + id });
74 73
       }
75 74
     },
@@ -80,8 +79,8 @@ export default {
80 79
   created() {
81 80
     setRem();
82 81
     //获取没被禁用的用户
83
-    this.org_creator  = this.$store.getters.user.org.creator
84
-    console.log(this.org_creator)
82
+    this.org_creator = this.$store.getters.user.org.creator;
83
+    console.log(this.org_creator);
85 84
     this.GetAllStaff();
86 85
   }
87 86
 };
@@ -138,7 +137,9 @@ export default {
138 137
         padding-right: 0.875rem;
139 138
         flex: 1;
140 139
         height: 100%;
141
-        box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
140
+        // box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.1);
141
+        border-bottom: 1px solid #e5e5e5;
142
+        font-size: 1rem;
142 143
       }
143 144
 
144 145
       .bianji {

+ 6 - 0
src/pages/doctorAdvice/index.vue Zobrazit soubor

@@ -596,10 +596,12 @@ export default {
596 596
     width: 100%;
597 597
     padding: 0 1.125rem;
598 598
     background: #fff;
599
+    font-size: 1rem;
599 600
   }
600 601
   .patientName {
601 602
     display: flex;
602 603
     align-items: center;
604
+    font-size: 1rem;
603 605
   }
604 606
   .jiantou {
605 607
     font-size: 1.5rem;
@@ -612,9 +614,13 @@ export default {
612 614
     right: 0;
613 615
     top: 0;
614 616
     width: 2.625rem;
617
+    height: 2.75rem;
615 618
     text-align: center;
616 619
     background: rgba(255, 255, 255, 1);
617 620
     box-shadow: -2px 0px 12px 0px rgba(91, 91, 91, 0.16);
621
+    display: flex;
622
+    align-items: center;
623
+    justify-content: space-around;
618 624
   }
619 625
   .wap {
620 626
     font-size: 1.875rem;

+ 10 - 2
src/pages/home/forgetPassword/index.vue Zobrazit soubor

@@ -22,8 +22,14 @@
22 22
         <el-form-item required prop="code">
23 23
           <div class="code">
24 24
             <i class="iconfont icon-dunpai dunpai"></i>
25
-            <el-input v-model="forgetForm.code" placeholder="请填写验证码" v-on:input="watchNum"></el-input>
26
-            <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
25
+            <el-input
26
+              v-model="forgetForm.code"
27
+              placeholder="请填写验证码"
28
+              v-on:input="watchNum"
29
+            ></el-input>
30
+            <div class="getCode" @click="getVerifyCode()">
31
+              {{ code_btn_title }}
32
+            </div>
27 33
           </div>
28 34
         </el-form-item>
29 35
         <el-form-item>
@@ -363,6 +369,7 @@ export default {
363 369
     text-align: center;
364 370
     color: #fff;
365 371
     margin-top: 2.875rem;
372
+    font-size: 1rem;
366 373
   }
367 374
   .problem {
368 375
     width: 84%;
@@ -389,6 +396,7 @@ export default {
389 396
   text-align: center;
390 397
   color: #fff;
391 398
   margin-top: 2.875rem;
399
+  font-size: 1rem;
392 400
 }
393 401
 .el-button--medium {
394 402
   padding: 0;

+ 16 - 3
src/pages/home/noPassword/index.vue Zobrazit soubor

@@ -29,16 +29,26 @@
29 29
               v-on:input="watchNum"
30 30
             ></el-input>
31 31
             <div>
32
-              <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
32
+              <div class="getCode" @click="getVerifyCode()">
33
+                {{ code_btn_title }}
34
+              </div>
33 35
             </div>
34 36
           </div>
35 37
         </el-form-item>
36 38
       </el-form>
37 39
     </div>
38
-    <div class="login" @click="NoPassToLogin('NoPassForm')" v-show="loginshow">登录</div>
40
+    <div class="login" @click="NoPassToLogin('NoPassForm')" v-show="loginshow">
41
+      登录
42
+    </div>
39 43
     <div class="logintwo" v-show="loginshowtwo">登录</div>
40 44
     <div class="agreeBox">
41
-      <van-checkbox v-model="checked" v-on:input="watchNum" shape="square" icon-size="14px">我已阅读并同意</van-checkbox>
45
+      <van-checkbox
46
+        v-model="checked"
47
+        v-on:input="watchNum"
48
+        shape="square"
49
+        icon-size="14px"
50
+        >我已阅读并同意</van-checkbox
51
+      >
42 52
       <span class="newColor" @click="agree()">《隐私服务协议》</span>
43 53
       <span class="newColor" @click="agree1()">《用户协议》</span>
44 54
     </div>
@@ -360,6 +370,7 @@ export default {
360 370
     text-align: center;
361 371
     color: #fff;
362 372
     margin-top: 2.875rem;
373
+    font-size: 1rem;
363 374
   }
364 375
   .problem {
365 376
     width: 84%;
@@ -396,6 +407,7 @@ export default {
396 407
   text-align: center;
397 408
   color: #fff;
398 409
   margin-top: 2.875rem;
410
+  font-size: 1rem;
399 411
 }
400 412
 
401 413
 .el-message {
@@ -447,6 +459,7 @@ export default {
447 459
     margin-left: 2.5rem;
448 460
   }
449 461
   .dialog-footer {
462
+    font-size: 1rem;
450 463
     > span:nth-of-type(1) {
451 464
       color: #9b9b9b;
452 465
     }

+ 1 - 0
src/pages/home/register/name.vue Zobrazit soubor

@@ -112,6 +112,7 @@ export default {
112 112
     line-height: 2.875rem;
113 113
     color: #fff;
114 114
     margin-top: 3.125rem;
115
+    font-size: 1rem;
115 116
   }
116 117
 }
117 118
 </style>

+ 24 - 4
src/pages/home/register/register.vue Zobrazit soubor

@@ -21,8 +21,14 @@
21 21
         <el-form-item required prop="code">
22 22
           <div class="code">
23 23
             <i class="iconfont icon-dunpai dunpai"></i>
24
-            <el-input v-model="registerForm.code" placeholder="请填写验证码" v-on:input="watchNum"></el-input>
25
-            <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
24
+            <el-input
25
+              v-model="registerForm.code"
26
+              placeholder="请填写验证码"
27
+              v-on:input="watchNum"
28
+            ></el-input>
29
+            <div class="getCode" @click="getVerifyCode()">
30
+              {{ code_btn_title }}
31
+            </div>
26 32
             <!-- <el-button class="getCode" :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" @click="getCodeAction" v-show="codeshow">{{ code_btn_title }}</el-button>
27 33
             <el-button class="getCodetwo" :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" v-show="codeshowtwo">{{ code_btn_title }}</el-button>-->
28 34
           </div>
@@ -49,10 +55,22 @@
49 55
       </div>
50 56
       <el-input placeholder="请输入密码" prefix-icon="el-icon-lock" v-model="psd" show-password></el-input>-->
51 57
     </div>
52
-    <div class="login" @click="submitRegister('registerForm')" v-show="loginshow">下一步</div>
58
+    <div
59
+      class="login"
60
+      @click="submitRegister('registerForm')"
61
+      v-show="loginshow"
62
+    >
63
+      下一步
64
+    </div>
53 65
     <div class="logintwo" v-show="loginshowtwo">下一步</div>
54 66
     <div class="agreeBox">
55
-      <van-checkbox v-model="checked" v-on:input="watchNum" shape="square" icon-size="14px">我已阅读并同意</van-checkbox>
67
+      <van-checkbox
68
+        v-model="checked"
69
+        v-on:input="watchNum"
70
+        shape="square"
71
+        icon-size="14px"
72
+        >我已阅读并同意</van-checkbox
73
+      >
56 74
       <span class="newColor" @click="agree()">《隐私服务协议》</span>
57 75
       <span class="newColor" @click="agree1()">《用户协议》</span>
58 76
     </div>
@@ -373,6 +391,7 @@ export default {
373 391
     text-align: center;
374 392
     color: #fff;
375 393
     margin-top: 2.875rem;
394
+    font-size: 1rem;
376 395
   }
377 396
   .logintwo {
378 397
     width: 84%;
@@ -384,6 +403,7 @@ export default {
384 403
     text-align: center;
385 404
     color: #fff;
386 405
     margin-top: 2.875rem;
406
+    font-size: 1rem;
387 407
   }
388 408
   .problem {
389 409
     width: 84%;

+ 2 - 1
src/pages/homeIndex/index.vue Zobrazit soubor

@@ -162,7 +162,8 @@ export default {
162 162
         { text: "新款商品", value: 0 },
163 163
         { text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1 },
164 164
         { text: "活动商品", value: 2 }
165
-      ]
165
+      ],
166
+      isSubSuperAdmin: ""
166 167
     };
167 168
   },
168 169
   methods: {

+ 1 - 0
src/pages/my/aboutUs.vue Zobrazit soubor

@@ -86,6 +86,7 @@
86 86
       }
87 87
       .arrow {
88 88
         color: #9f9f9f;
89
+        font-size: 1rem;
89 90
       }
90 91
       .aboutBoxRight {
91 92
         display: flex;

+ 11 - 4
src/pages/my/index.vue Zobrazit soubor

@@ -21,12 +21,14 @@
21 21
             >
22 22
             <p class="signature">{{ roleInfo.message }}</p>
23 23
           </div>
24
-          <van-icon name="arrow" />
24
+          <van-icon name="arrow" class="arrow" />
25 25
         </div>
26 26
       </div>
27
-      <div class="invitebox">
28
-        <img src="../../assets/images/invite.png" alt />
29
-      </div>
27
+      <router-link to="/invite">
28
+        <div class="invitebox">
29
+          <img src="../../assets/images/invite.png" alt />
30
+        </div>
31
+      </router-link>
30 32
 
31 33
       <div class="myInfo" @click="toMyInfo">
32 34
         <div class="myInfoLeft">
@@ -278,6 +280,9 @@ export default {
278 280
       top: 3.375rem;
279 281
       width: 70%;
280 282
       color: #fff;
283
+      .arrow {
284
+        font-size: 1rem;
285
+      }
281 286
     }
282 287
     .userBox {
283 288
       display: flex;
@@ -328,6 +333,7 @@ export default {
328 333
         }
329 334
       }
330 335
       .arrow {
336
+        font-size: 1rem;
331 337
         color: #9f9f9f;
332 338
       }
333 339
     }
@@ -354,6 +360,7 @@ export default {
354 360
         }
355 361
       }
356 362
       .arrow {
363
+        font-size: 1rem;
357 364
         color: #9f9f9f;
358 365
       }
359 366
     }

+ 278 - 271
src/pages/my/modifyPassword.vue Zobrazit soubor

@@ -23,8 +23,14 @@
23 23
         <el-form-item required prop="code">
24 24
           <div class="code">
25 25
             <i class="iconfont icon-dunpai dunpai"></i>
26
-            <el-input v-model="forgetForm.code" placeholder="请填写验证码" v-on:input="watchNum"></el-input>
27
-            <div class="getCode" @click="getVerifyCode()">{{ code_btn_title }}</div>
26
+            <el-input
27
+              v-model="forgetForm.code"
28
+              placeholder="请填写验证码"
29
+              v-on:input="watchNum"
30
+            ></el-input>
31
+            <div class="getCode" @click="getVerifyCode()">
32
+              {{ code_btn_title }}
33
+            </div>
28 34
           </div>
29 35
         </el-form-item>
30 36
         <el-form-item>
@@ -70,178 +76,177 @@
70 76
 </template>
71 77
 
72 78
 <script>
73
-  // import { getCode, NextStep } from "@/api/login/login";
74
-  import "@/styles/newStyle.scss";
75
-  import { getCodeInit, getVerifyCode, forgetPassWord } from "@/api/login";
76
-  import { checkMobile } from "@/utils/tools";
77
-  import { hex_md5 } from "@/utils/md5";
79
+// import { getCode, NextStep } from "@/api/login/login";
80
+import "@/styles/newStyle.scss";
81
+import { getCodeInit, getVerifyCode, forgetPassWord } from "@/api/login";
82
+import { checkMobile } from "@/utils/tools";
83
+import { hex_md5 } from "@/utils/md5";
78 84
 
79
-  export default {
80
-    data() {
81
-      var checkMobileRule = (rule, value, callback) => {
82
-        if (!checkMobile(value)) {
83
-          callback(new Error("请填写正确的手机号"));
84
-        } else {
85
-          callback();
86
-        }
87
-      };
88
-      return {
85
+export default {
86
+  data() {
87
+    var checkMobileRule = (rule, value, callback) => {
88
+      if (!checkMobile(value)) {
89
+        callback(new Error("请填写正确的手机号"));
90
+      } else {
91
+        callback();
92
+      }
93
+    };
94
+    return {
95
+      phone: "",
96
+      code: "",
97
+      psd: "",
98
+      contact: false,
99
+      count_downing: false,
100
+      count_down: 0,
101
+      aespass: "",
102
+      forgetForm: {
89 103
         phone: "",
90
-        code: "",
91
-        psd: "",
92
-        contact: false,
93
-        count_downing: false,
94
-        count_down: 0,
95
-        aespass: "",
96
-        forgetForm: {
97
-          phone: "",
98
-          code: ""
99
-        },
100
-        rules: {
101
-          phone: [
102
-            { required: true, message: "手机号码不能为空" },
103
-            { validator: checkMobileRule }
104
-          ],
105
-          code: [{ required: true, message: "验证码不能为空" }]
106
-        },
107
-        loginshow: false,
108
-        loginshowtwo: true,
109
-        codeshow: false,
110
-        codeshowtwo: true
104
+        code: ""
105
+      },
106
+      rules: {
107
+        phone: [
108
+          { required: true, message: "手机号码不能为空" },
109
+          { validator: checkMobileRule }
110
+        ],
111
+        code: [{ required: true, message: "验证码不能为空" }]
112
+      },
113
+      loginshow: false,
114
+      loginshowtwo: true,
115
+      codeshow: false,
116
+      codeshowtwo: true
117
+    };
118
+  },
119
+  created() {
120
+    this.GetCodeInit();
121
+    this.forgetForm.phone = this.$store.getters.user.admin.mobile;
122
+  },
123
+  methods: {
124
+    modifyAndLogin() {
125
+      if (this.forgetForm.phone.trim().length == 0) {
126
+        this.$toast({
127
+          message: "手机号码不能为空!"
128
+        });
129
+        return;
130
+      }
131
+      if (!checkMobile(this.forgetForm.phone)) {
132
+        this.$toast({
133
+          message: "请填写正确的手机号码!"
134
+        });
135
+        return;
136
+      }
137
+      if (this.forgetForm.code.trim().length == 0) {
138
+        this.$toast({
139
+          message: "验证码不能为空!"
140
+        });
141
+        return;
142
+      }
143
+
144
+      let params = {
145
+        mobile: this.forgetForm.phone,
146
+        code: this.forgetForm.code,
147
+        password: hex_md5(this.psd)
111 148
       };
112
-    },
113
-    created() {
114
-      this.GetCodeInit();
115
-      this.forgetForm.phone = this.$store.getters.user.admin.mobile
116
-    },
117
-    methods: {
118
-      modifyAndLogin() {
119
-        if (this.forgetForm.phone.trim().length == 0) {
120
-          this.$toast({
121
-            message: "手机号码不能为空!"
122
-          });
123
-          return;
124
-        }
125
-        if (!checkMobile(this.forgetForm.phone)) {
149
+      forgetPassWord(params).then(response => {
150
+        if (response.data.state === 1) {
151
+          this.$router.go(-1);
152
+        } else {
126 153
           this.$toast({
127
-            message: "请填写正确的手机号码!"
154
+            message: response.data.msg
128 155
           });
129
-          return;
130 156
         }
131
-        if (this.forgetForm.code.trim().length == 0) {
132
-          this.$toast({
133
-            message: "验证码不能为空!"
134
-          });
135
-          return;
157
+      });
158
+    },
159
+    GetCodeInit() {
160
+      getCodeInit().then(response => {
161
+        if (response.data.state === 1) {
162
+          this.aespass = response.data.data.aespass;
136 163
         }
164
+      });
165
+    },
166
+    getVerifyCode() {
167
+      if (this.forgetForm.phone.length == 0) {
168
+        this.$toast({
169
+          message: "手机号码不能为空!"
170
+        });
171
+        return;
172
+      }
173
+      if (!checkMobile(this.forgetForm.phone)) {
174
+        this.$toast({
175
+          message: "请填写正确的手机号码!"
176
+        });
177
+        return;
178
+      }
137 179
 
138
-        let params = {
139
-          mobile: this.forgetForm.phone,
140
-          code: this.forgetForm.code,
141
-          password: hex_md5(this.psd)
180
+      if (!this.count_downing) {
181
+        let parms = {
182
+          phone: this.forgetForm.phone,
183
+          aespass: this.aespass
142 184
         };
143
-        forgetPassWord(params).then(response => {
185
+        getVerifyCode(parms).then(response => {
144 186
           if (response.data.state === 1) {
145
-            this.$router.go(-1)
146
-          }else{
147
-
148
-            this.$toast({
149
-              message: response.data.msg
150
-            });
187
+            this.count_downing = true;
188
+            this.count_down = 61;
189
+            this.countDown();
151 190
           }
152 191
         });
153
-      },
154
-      GetCodeInit() {
155
-        getCodeInit().then(response => {
156
-          if (response.data.state === 1) {
157
-            this.aespass = response.data.data.aespass;
158
-          }
159
-        });
160
-      },
161
-      getVerifyCode() {
162
-        if (this.forgetForm.phone.length == 0) {
163
-          this.$toast({
164
-            message: "手机号码不能为空!"
165
-          });
166
-          return;
167
-        }
168
-        if (!checkMobile(this.forgetForm.phone)) {
169
-          this.$toast({
170
-            message: "请填写正确的手机号码!"
171
-          });
172
-          return;
173
-        }
174
-
175
-        if (!this.count_downing) {
176
-          let parms = {
177
-            phone: this.forgetForm.phone,
178
-            aespass: this.aespass
179
-          };
180
-          getVerifyCode(parms).then(response => {
181
-            if (response.data.state === 1) {
182
-              this.count_downing = true;
183
-              this.count_down = 61;
184
-              this.countDown();
185
-            }
186
-          });
187
-        }
188
-      },
192
+      }
193
+    },
189 194
 
190
-      callPhone() {
191
-        window.location.href = "tel://075586526342";
192
-      },
193
-      countDown: function() {
194
-        this.count_down = this.count_down - 1;
195
-        if (this.count_down === 0) {
196
-          this.count_downing = false;
197
-          return;
198
-        }
199
-        var t = this;
200
-        setTimeout(() => {
201
-          this.countDown();
202
-        }, 1000);
203
-      },
204
-      watchNum() {
205
-        if (this.forgetForm.phone.length === 11) {
206
-          this.codeshow = true;
207
-          this.codeshowtwo = false;
208
-        } else {
209
-          this.codeshow = false;
210
-          this.codeshowtwo = true;
211
-        }
195
+    callPhone() {
196
+      window.location.href = "tel://075586526342";
197
+    },
198
+    countDown: function() {
199
+      this.count_down = this.count_down - 1;
200
+      if (this.count_down === 0) {
201
+        this.count_downing = false;
202
+        return;
203
+      }
204
+      var t = this;
205
+      setTimeout(() => {
206
+        this.countDown();
207
+      }, 1000);
208
+    },
209
+    watchNum() {
210
+      if (this.forgetForm.phone.length === 11) {
211
+        this.codeshow = true;
212
+        this.codeshowtwo = false;
213
+      } else {
214
+        this.codeshow = false;
215
+        this.codeshowtwo = true;
216
+      }
212 217
 
213
-        if (
214
-          this.forgetForm.phone === "" ||
215
-          this.forgetForm.code === "" ||
216
-          this.psd === ""
217
-        ) {
218
-          this.loginshow = false;
219
-          this.loginshowtwo = true;
220
-        } else {
221
-          this.loginshow = true;
222
-          this.loginshowtwo = false;
223
-        }
224
-      },
225
-      change(value) {
226
-        this.forgetForm.phone = value.replace(/[^0-9]+/g, "");
218
+      if (
219
+        this.forgetForm.phone === "" ||
220
+        this.forgetForm.code === "" ||
221
+        this.psd === ""
222
+      ) {
223
+        this.loginshow = false;
224
+        this.loginshowtwo = true;
225
+      } else {
226
+        this.loginshow = true;
227
+        this.loginshowtwo = false;
227 228
       }
228 229
     },
229
-    computed: {
230
-      code_btn_title: function() {
231
-        if (this.count_down == 0) {
232
-          return "获取验证码";
233
-        } else {
234
-          return "重新发送(" + this.count_down + ")";
235
-        }
230
+    change(value) {
231
+      this.forgetForm.phone = value.replace(/[^0-9]+/g, "");
232
+    }
233
+  },
234
+  computed: {
235
+    code_btn_title: function() {
236
+      if (this.count_down == 0) {
237
+        return "获取验证码";
238
+      } else {
239
+        return "重新发送(" + this.count_down + ")";
236 240
       }
237 241
     }
238
-  };
242
+  }
243
+};
239 244
 </script>
240 245
 
241 246
 <style lang="scss" scoped>
242
-  .page_noPassword {
243
-    overflow: hidden;
244
-    height: 100%;
247
+.page_noPassword {
248
+  overflow: hidden;
249
+  height: 100%;
245 250
   .nopasswordTitle {
246 251
     height: 3.125rem;
247 252
     line-height: 3.125rem;
@@ -260,83 +265,83 @@
260 265
   }
261 266
   .forgetmyInput {
262 267
     margin-top: 4rem;
263
-  .phoneLine {
264
-    width: 84%;
265
-    margin: 0 auto;
266
-    display: flex;
267
-    border-bottom: 1px solid #e6e6e6;
268
-  .mobile {
269
-    float: left;
270
-    color: #acacac;
271
-    font-size: 1.5rem;
272
-    margin-left: 0.375rem;
273
-    line-height: 3.375rem;
274
-    width: 1.5rem;
275
-  }
276
-  .phoneInput {
277
-    width: 95%;
278
-  }
279
-  }
268
+    .phoneLine {
269
+      width: 84%;
270
+      margin: 0 auto;
271
+      display: flex;
272
+      border-bottom: 1px solid #e6e6e6;
273
+      .mobile {
274
+        float: left;
275
+        color: #acacac;
276
+        font-size: 1.5rem;
277
+        margin-left: 0.375rem;
278
+        line-height: 3.375rem;
279
+        width: 1.5rem;
280
+      }
281
+      .phoneInput {
282
+        width: 95%;
283
+      }
284
+    }
280 285
 
281
-  .lock {
282
-    float: left;
283
-    color: #acacac;
284
-    font-size: 1.5rem;
285
-    margin-left: 0.375rem;
286
-    line-height: 3.375rem;
287
-    width: 1.5rem;
288
-  }
289
-  .code {
290
-    line-height: 3.375rem;
291
-    width: 84%;
292
-    height: 3.375rem;
293
-    margin: 0 auto;
294
-    border-bottom: 1px solid #e6e6e6;
295
-    display: flex;
296
-    align-items: center;
286
+    .lock {
287
+      float: left;
288
+      color: #acacac;
289
+      font-size: 1.5rem;
290
+      margin-left: 0.375rem;
291
+      line-height: 3.375rem;
292
+      width: 1.5rem;
293
+    }
294
+    .code {
295
+      line-height: 3.375rem;
296
+      width: 84%;
297
+      height: 3.375rem;
298
+      margin: 0 auto;
299
+      border-bottom: 1px solid #e6e6e6;
300
+      display: flex;
301
+      align-items: center;
297 302
 
298
-  .dunpai {
299
-    float: left;
300
-    color: #acacac;
301
-    font-size: 1.5rem;
302
-    margin-left: 0.375rem;
303
-  }
304
-  .el-input {
305
-    float: left;
306
-    width: 10.6rem;
307
-    border: none;
308
-    padding: 0;
309
-  }
310
-  .el-input__inner {
311
-    padding: 0;
312
-    padding-left: 0.75rem;
313
-  }
314
-  .getCode {
315
-  // float: left;
316
-    width: 5.75rem;
317
-    height: 2rem;
318
-    line-height: 2rem;
319
-    text-align: center;
320
-    color: #fff;
321
-    background: #338afb;
322
-    border-radius: 1.4375rem;
323
-    font-size: 0.8125rem;
324
-  }
325
-  .getCodetwo {
326
-    width: 5.75rem;
327
-    height: 2rem;
328
-  // line-height: 2rem;
329
-    text-align: center;
330
-    color: #fff;
331
-    background: #e5e5e5;
332
-    border-radius: 1.4375rem;
333
-    font-size: 0.8125rem;
334
-  }
303
+      .dunpai {
304
+        float: left;
305
+        color: #acacac;
306
+        font-size: 1.5rem;
307
+        margin-left: 0.375rem;
308
+      }
309
+      .el-input {
310
+        float: left;
311
+        width: 10.6rem;
312
+        border: none;
313
+        padding: 0;
314
+      }
315
+      .el-input__inner {
316
+        padding: 0;
317
+        padding-left: 0.75rem;
318
+      }
319
+      .getCode {
320
+        // float: left;
321
+        width: 5.75rem;
322
+        height: 2rem;
323
+        line-height: 2rem;
324
+        text-align: center;
325
+        color: #fff;
326
+        background: #338afb;
327
+        border-radius: 1.4375rem;
328
+        font-size: 0.8125rem;
329
+      }
330
+      .getCodetwo {
331
+        width: 5.75rem;
332
+        height: 2rem;
333
+        // line-height: 2rem;
334
+        text-align: center;
335
+        color: #fff;
336
+        background: #e5e5e5;
337
+        border-radius: 1.4375rem;
338
+        font-size: 0.8125rem;
339
+      }
335 340
 
336
-  .el-button--primary {
337
-    border-color: transparent;
338
-  }
339
-  }
341
+      .el-button--primary {
342
+        border-color: transparent;
343
+      }
344
+    }
340 345
   }
341 346
   .login {
342 347
     width: 19.25rem;
@@ -353,39 +358,41 @@
353 358
     text-align: center;
354 359
     color: #fff;
355 360
     margin-top: 2.875rem;
361
+    font-size: 1rem;
356 362
   }
357 363
   .problem {
358 364
     width: 84%;
359 365
     font-size: 0.8125rem;
360 366
     margin: 15rem auto 0;
361 367
     text-align: center;
362
-  span {
363
-    color: #338afb;
364
-  }
365
-  }
368
+    span {
369
+      color: #338afb;
370
+    }
366 371
   }
372
+}
367 373
 
368
-  .el-form-item__error {
369
-    margin-left: 2.5rem;
370
-  }
374
+.el-form-item__error {
375
+  margin-left: 2.5rem;
376
+}
371 377
 
372
-  .logintwo {
373
-    width: 19.25rem;
374
-    height: 2.875rem;
375
-    background: #e5e5e5;
376
-    border-radius: 1.4375rem;
377
-    margin: 0 auto;
378
-    line-height: 2.875rem;
379
-    text-align: center;
380
-    color: #fff;
381
-    margin-top: 2.875rem;
382
-  }
383
-  .el-button--medium {
384
-    padding: 0;
385
-  }
378
+.logintwo {
379
+  width: 19.25rem;
380
+  height: 2.875rem;
381
+  background: #e5e5e5;
382
+  border-radius: 1.4375rem;
383
+  margin: 0 auto;
384
+  line-height: 2.875rem;
385
+  text-align: center;
386
+  color: #fff;
387
+  margin-top: 2.875rem;
388
+  font-size: 1rem;
389
+}
390
+.el-button--medium {
391
+  padding: 0;
392
+}
386 393
 </style>
387 394
 <style lang="scss">
388
-  .forgetmyInput {
395
+.forgetmyInput {
389 396
   .el-form-item {
390 397
     margin-bottom: 0;
391 398
   }
@@ -410,18 +417,18 @@
410 417
   }
411 418
 
412 419
   .phoneLine {
413
-  .el-input__clear {
414
-    margin-right: 0.625rem;
415
-  }
416
-  .el-input__icon {
417
-    line-height: 3.375rem;
418
-    font-size: 1.5rem;
419
-  }
420
-  }
420
+    .el-input__clear {
421
+      margin-right: 0.625rem;
422
+    }
423
+    .el-input__icon {
424
+      line-height: 3.375rem;
425
+      font-size: 1.5rem;
426
+    }
421 427
   }
422
-  .myDialog {
423
-    line-height: 50%;
424
-    height: 100%;
428
+}
429
+.myDialog {
430
+  line-height: 50%;
431
+  height: 100%;
425 432
   .el-dialog {
426 433
     border-radius: 10px;
427 434
   }
@@ -437,16 +444,16 @@
437 444
     margin-left: 2.5rem;
438 445
   }
439 446
   .dialog-footer {
440
-  > span:nth-of-type(1) {
441
-    color: #9b9b9b;
442
-  }
443
-  > span:nth-of-type(2) {
444
-    padding: 0 3.125rem;
445
-    color: #e6e6e6;
446
-  }
447
-  > span:nth-of-type(3) {
448
-    color: #000000;
449
-  }
450
-  }
447
+    > span:nth-of-type(1) {
448
+      color: #9b9b9b;
449
+    }
450
+    > span:nth-of-type(2) {
451
+      padding: 0 3.125rem;
452
+      color: #e6e6e6;
453
+    }
454
+    > span:nth-of-type(3) {
455
+      color: #000000;
456
+    }
451 457
   }
458
+}
452 459
 </style>

+ 8 - 6
src/pages/my/myInfo.vue Zobrazit soubor

@@ -17,13 +17,13 @@
17 17
           <van-icon class="arrow" name="arrow" />
18 18
         </div>
19 19
       </div>
20
-        <div class="infoBoxTwo" @click="editName">
21
-          <p>姓名</p>
22
-          <div class="infoBoxOneRight">
23
-            <p>{{ roleInfo.user_name }}</p>
24
-            <van-icon class="arrow" name="arrow" />
25
-          </div>
20
+      <div class="infoBoxTwo" @click="editName">
21
+        <p>姓名</p>
22
+        <div class="infoBoxOneRight">
23
+          <p>{{ roleInfo.user_name }}</p>
24
+          <van-icon class="arrow" name="arrow" />
26 25
         </div>
26
+      </div>
27 27
       <div class="infoBoxTwo" @click="show = true">
28 28
         <p>性别</p>
29 29
         <div class="infoBoxOneRight">
@@ -214,6 +214,7 @@ export default {
214 214
 
215 215
     background: #fff;
216 216
     .infoBoxOne {
217
+      font-size: 1rem;
217 218
       display: flex;
218 219
       align-items: center;
219 220
       justify-content: space-between;
@@ -234,6 +235,7 @@ export default {
234 235
       }
235 236
     }
236 237
     .infoBoxTwo {
238
+      font-size: 1rem;
237 239
       display: flex;
238 240
       align-items: center;
239 241
       justify-content: space-between;

+ 10 - 4
src/pages/my/organizationInfo.vue Zobrazit soubor

@@ -7,8 +7,10 @@
7 7
     <div class="organizeBox">
8 8
       <div class="organizeBoxOne">
9 9
         <div class="organizeBoxOneLeft">
10
-          <span v-if="org_logo==''"><img src="../../assets/images/m01.png" alt /></span>
11
-          <span v-if="org_logo!=''"><img :src="org_logo" alt /></span>
10
+          <span v-if="org_logo == ''"
11
+            ><img src="../../assets/images/m01.png" alt
12
+          /></span>
13
+          <span v-if="org_logo != ''"><img :src="org_logo" alt/></span>
12 14
           <p>{{ org_short_name }}</p>
13 15
         </div>
14 16
         <van-icon class="arrow" name="arrow" />
@@ -28,13 +30,15 @@
28 30
       </div>
29 31
       <div class="organizeBoxTwo">
30 32
         <div>角色</div>
31
-        <div class="rolebox" v-if="role_name !=''">
33
+        <div class="rolebox" v-if="role_name != ''">
32 34
           <div class="roleboxBtn">{{ role_name }}</div>
33 35
         </div>
34 36
       </div>
35 37
       <div class="organizeBoxTwo">
36 38
         <div>职位</div>
37
-        <div class="organizeBoxTwoTxt" v-if="positionName!=''">{{ positionName }}</div>
39
+        <div class="organizeBoxTwoTxt" v-if="positionName != ''">
40
+          {{ positionName }}
41
+        </div>
38 42
       </div>
39 43
     </div>
40 44
   </div>
@@ -165,6 +169,7 @@ export default {
165 169
       border: none;
166 170
     }
167 171
     .organizeBoxOne {
172
+      font-size: 1rem;
168 173
       display: flex;
169 174
       align-items: center;
170 175
       justify-content: space-between;
@@ -192,6 +197,7 @@ export default {
192 197
       color: #8d8d8d;
193 198
     }
194 199
     .organizeBoxTwo {
200
+      font-size: 1rem;
195 201
       display: flex;
196 202
       align-items: center;
197 203
       justify-content: space-between;

Diff nebyl zobrazen, protože je příliš veliký
+ 4254 - 4255
src/pages/org/index.vue


+ 57 - 16
src/pages/patientCenter/editOrg/index.vue Zobrazit soubor

@@ -3,43 +3,56 @@
3 3
     <div class="createOrganizationTitle">
4 4
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5 5
       <span class="titleName">创建医院/组织/团队</span>
6
-       <div style="margin-left:40px">
7
-        <span @click="spread" id="copy">修改</span>
8
-      </div>
6
+      <span @click="spread" id="copy">修改</span>
9 7
     </div>
10 8
     <div class="tips">填写真实信息,获取更精准服务</div>
11 9
     <div class="infoBox">
12 10
       <div class="infoOne">
13 11
         <p class="infoTitle">机构名称</p>
14
-        <van-field v-model="orgForm.org_name" placeholder="请填写机构名称" :readonly="readonly"/>
12
+        <van-field
13
+          :class="readonly ? 'changeColor' : ''"
14
+          v-model="orgForm.org_name"
15
+          placeholder="请填写机构名称"
16
+          :readonly="readonly"
17
+        />
15 18
       </div>
16 19
       <div class="infoOne">
17 20
         <p class="infoTitle">机构类型</p>
18 21
         <van-cell is-link>
19
-          <van-field v-model="type_name" :readonly="readonly" @click="showPopup(1)"></van-field>
22
+          <van-field
23
+            :class="readonly ? 'changeColor' : ''"
24
+            v-model="type_name"
25
+            :readonly="readonly"
26
+            @click="showPopup(1)"
27
+          ></van-field>
20 28
         </van-cell>
21 29
         <van-popup v-model="show1" position="bottom" :style="{ height: '60%' }">
22 30
           <van-area
23 31
             :area-list="orgtype"
24 32
             :columns-placeholder="['请选择', '请选择']"
25
-            @cancel="show1=false"
33
+            @cancel="show1 = false"
26 34
             @confirm="chooseCityTwo"
27 35
             :columns-num="2"
28 36
             @change="onChangeTwo"
29
-           :readonly="readonly"
37
+            :readonly="readonly"
30 38
           />
31 39
         </van-popup>
32 40
       </div>
33 41
       <div class="infoOne">
34 42
         <p class="infoTitle">机构地区</p>
35 43
         <van-cell is-link>
36
-          <van-field v-model="org_area" :readonly="readonly" @click="showPopup(2)"></van-field>
44
+          <van-field
45
+            :class="readonly ? 'changeColor' : ''"
46
+            v-model="org_area"
47
+            :readonly="readonly"
48
+            @click="showPopup(2)"
49
+          ></van-field>
37 50
         </van-cell>
38 51
         <van-popup v-model="show2" position="bottom" :style="{ height: '60%' }">
39 52
           <van-area
40 53
             :area-list="area"
41 54
             :columns-placeholder="['请选择', '请选择', '请选择']"
42
-            @cancel="show2=false"
55
+            @cancel="show2 = false"
43 56
             @confirm="chooseCity"
44 57
             @change="onChange"
45 58
             :readonly="readonly"
@@ -48,15 +61,30 @@
48 61
       </div>
49 62
       <div class="infoOne">
50 63
         <p class="infoTitle">详细地址</p>
51
-        <van-field v-model="orgForm.address" placeholder="请填写" :readonly="readonly"/>
64
+        <van-field
65
+          :class="readonly ? 'changeColor' : ''"
66
+          v-model="orgForm.address"
67
+          placeholder="请填写"
68
+          :readonly="readonly"
69
+        />
52 70
       </div>
53 71
       <div class="infoOne">
54 72
         <p class="infoTitle">联系人</p>
55
-        <van-field v-model="orgForm.contact_name" placeholder="请填写" :readonly="readonly"/>
73
+        <van-field
74
+          :class="readonly ? 'changeColor' : ''"
75
+          v-model="orgForm.contact_name"
76
+          placeholder="请填写"
77
+          :readonly="readonly"
78
+        />
56 79
       </div>
57 80
       <div class="infoOne">
58 81
         <p class="infoTitle">联系电话</p>
59
-        <van-field v-model="orgForm.telephone" placeholder="请填写" :readonly="readonly"/>
82
+        <van-field
83
+          :class="readonly ? 'changeColor' : ''"
84
+          v-model="orgForm.telephone"
85
+          placeholder="请填写"
86
+          :readonly="readonly"
87
+        />
60 88
       </div>
61 89
     </div>
62 90
     <div class="problem">
@@ -4313,7 +4341,7 @@ export default {
4313 4341
       getOrgInformation(id).then(response => {
4314 4342
         if (response.data.state === 1) {
4315 4343
           var information = response.data.data.information;
4316
-         // console.log("information", information);
4344
+          // console.log("information", information);
4317 4345
           var typeName = response.data.data.typeName;
4318 4346
           var name = response.data.data.name;
4319 4347
           this.orgForm.org_name = information.org_name;
@@ -4396,19 +4424,23 @@ export default {
4396 4424
 .page_createOrganization {
4397 4425
   height: 100%;
4398 4426
   overflow: hidden;
4399
-
4427
+  overflow-y: auto;
4400 4428
   .createOrganizationTitle {
4401 4429
     height: 3.125rem;
4402 4430
     line-height: 3.125rem;
4431
+    padding: 0 1.125rem;
4403 4432
     display: flex;
4404 4433
     align-items: center;
4434
+    justify-content: space-between;
4435
+    span {
4436
+      font-size: 1rem;
4437
+    }
4405 4438
   }
4406 4439
 
4407 4440
   .jiantou {
4408
-    margin-left: 1.25rem;
4409 4441
     font-size: 1.5rem;
4410 4442
     font-weight: 600;
4411
-    margin-right: 4.5rem;
4443
+    margin-right: 1rem;
4412 4444
   }
4413 4445
 
4414 4446
   .titleName {
@@ -4431,6 +4463,7 @@ export default {
4431 4463
   .infoOne {
4432 4464
     height: 4.25rem;
4433 4465
     border-bottom: 1px solid #e8e8e8;
4466
+    font-size: 1rem;
4434 4467
   }
4435 4468
 
4436 4469
   .infoTitle {
@@ -4484,6 +4517,13 @@ export default {
4484 4517
 }
4485 4518
 </style>
4486 4519
 <style lang="scss">
4520
+.page_createOrganization {
4521
+  .changeColor {
4522
+    .van-field__control {
4523
+      color: #9b9b9b;
4524
+    }
4525
+  }
4526
+}
4487 4527
 .myDialog {
4488 4528
   line-height: 50%;
4489 4529
   height: 100%;
@@ -4506,6 +4546,7 @@ export default {
4506 4546
   }
4507 4547
 
4508 4548
   .dialog-footer {
4549
+    font-size: 1rem;
4509 4550
     > span:nth-of-type(1) {
4510 4551
       color: #9b9b9b;
4511 4552
     }

+ 1 - 0
src/pages/patientManagement/components/Blood.vue Zobrazit soubor

@@ -320,6 +320,7 @@ export default {
320 320
       display: flex;
321 321
       align-items: center;
322 322
       height: 3.75rem;
323
+      font-size: 1rem;
323 324
       img {
324 325
         width: 2.5rem;
325 326
         height: 2.5rem;

+ 1 - 0
src/pages/patientManagement/components/Member.vue Zobrazit soubor

@@ -174,6 +174,7 @@ export default {
174 174
       display: flex;
175 175
       align-items: center;
176 176
       height: 3.75rem;
177
+      font-size: 1rem;
177 178
       img {
178 179
         width: 2.5rem;
179 180
         height: 2.5rem;

+ 8 - 4
src/pages/patientManagement/components/Slow.vue Zobrazit soubor

@@ -1,20 +1,23 @@
1 1
 <template>
2 2
   <div class="page_patientManagement">
3
-     <div class="patientBox">
3
+    <div class="patientBox">
4 4
       <van-list
5 5
         v-model="loading"
6 6
         :finished="finished"
7 7
         finished-text="没有更多了"
8 8
         @load="onLoad"
9 9
       >
10
-        <div class="patientOne" v-for="(item,index) in patients" :key="index"
11
-        @click="toPatientDetail(item.id)">
10
+        <div
11
+          class="patientOne"
12
+          v-for="(item, index) in patients"
13
+          :key="index"
14
+          @click="toPatientDetail(item.id)"
15
+        >
12 16
           <img :src="item.avatar" alt />
13 17
           <p>{{ item.name }}</p>
14 18
         </div>
15 19
       </van-list>
16 20
     </div>
17
-   </div>
18 21
   </div>
19 22
 </template>
20 23
 
@@ -171,6 +174,7 @@ export default {
171 174
       display: flex;
172 175
       align-items: center;
173 176
       height: 3.75rem;
177
+      font-size: 1rem;
174 178
       img {
175 179
         width: 2.5rem;
176 180
         height: 2.5rem;

+ 23 - 4
src/pages/patientManagement/patientManagement.vue Zobrazit soubor

@@ -10,14 +10,23 @@
10 10
       </div>
11 11
 
12 12
       <div class="searchBox">
13
-        <van-search v-model="value" placeholder="搜索患者透析号/姓名" @search="SearchAllPatient" />
13
+        <van-search
14
+          v-model="value"
15
+          placeholder="搜索患者透析号/姓名"
16
+          @search="SearchAllPatient"
17
+        />
14 18
       </div>
15 19
     </van-sticky>
16 20
     <div class="chooseBox">
17 21
       <van-tabs v-model="active" @change="changeActive">
18 22
         <van-tab title="全部患者">
19 23
           <div class="patientBox">
20
-            <van-list v-model="loading" finished-text="没有更多了" @load="onLoad" :finished="finished">
24
+            <van-list
25
+              v-model="loading"
26
+              finished-text="没有更多了"
27
+              @load="onLoad"
28
+              :finished="finished"
29
+            >
21 30
               <div
22 31
                 class="patientOne"
23 32
                 v-for="(item, index) in patients"
@@ -43,8 +52,17 @@
43 52
     </div>
44 53
     <!-- 弹出层 -->
45 54
     <div>
46
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
47
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
55
+      <van-popup
56
+        v-model="typeShow"
57
+        position="bottom"
58
+        :style="{ height: '40%' }"
59
+      >
60
+        <van-picker
61
+          show-toolbar
62
+          :columns="columns"
63
+          @cancel="onCancel"
64
+          @confirm="onConfirm"
65
+        />
48 66
       </van-popup>
49 67
     </div>
50 68
   </div>
@@ -244,6 +262,7 @@ export default {
244 262
       display: flex;
245 263
       align-items: center;
246 264
       height: 3.75rem;
265
+      font-size: 1rem;
247 266
       img {
248 267
         width: 2.5rem;
249 268
         height: 2.5rem;

+ 24 - 4
src/pages/patients/addPatient.vue Zobrazit soubor

@@ -2,7 +2,7 @@
2 2
   <div class="page_addPatients">
3 3
     <van-sticky>
4 4
       <div class="addPatientsTitle">
5
-        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
5
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
6 6
         <span class="titleName">患者中心</span>
7 7
         <p @click="savePatient">保存</p>
8 8
       </div>
@@ -1034,9 +1034,6 @@ export default {
1034 1034
         "-" +
1035 1035
         birth.substr(6, 2);
1036 1036
     },
1037
-    toReturn() {
1038
-      this.$router.push("/patients");
1039
-    },
1040 1037
     changRadio() {
1041 1038
       if (this.radio === "1") {
1042 1039
         this.showOne = false;
@@ -1067,6 +1064,9 @@ export default {
1067 1064
     width: 100%;
1068 1065
     padding: 0 1.125rem;
1069 1066
     background: #fff;
1067
+    p {
1068
+      font-size: 1rem;
1069
+    }
1070 1070
   }
1071 1071
   .jiantou {
1072 1072
     font-size: 1.5rem;
@@ -1087,6 +1087,7 @@ export default {
1087 1087
   .basicBox {
1088 1088
     .van-cell__value {
1089 1089
       display: flex;
1090
+      font-size: 1rem;
1090 1091
     }
1091 1092
     .van-field__body {
1092 1093
       width: 100%;
@@ -1151,3 +1152,22 @@ export default {
1151 1152
   width: 0;
1152 1153
 }
1153 1154
 </style>
1155
+
1156
+<style lang="scss">
1157
+.basicBox {
1158
+  .van-cell__value {
1159
+    font-size: 1rem;
1160
+  }
1161
+  .van-cell__title {
1162
+    font-size: 1rem;
1163
+  }
1164
+}
1165
+.xtBox {
1166
+  .van-cell__value {
1167
+    font-size: 1rem;
1168
+  }
1169
+  .van-cell__title {
1170
+    font-size: 1rem;
1171
+  }
1172
+}
1173
+</style>

+ 52 - 7
src/pages/patients/editPatient.vue Zobrazit soubor

@@ -2,7 +2,7 @@
2 2
   <div class="page_editPatients">
3 3
     <van-sticky>
4 4
       <div class="addPatientsTitle">
5
-        <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
5
+        <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
6 6
         <span class="titleName">编辑患者</span>
7 7
         <span @click="spread" id="copy">修改</span>
8 8
       </div>
@@ -10,6 +10,7 @@
10 10
     <div class="basicTitle">基本信息</div>
11 11
     <div class="basicBox">
12 12
       <van-field
13
+        :class="readonly ? 'changeColor' : ''"
13 14
         v-model="patientForm.name"
14 15
         required
15 16
         label="姓名"
@@ -17,6 +18,7 @@
17 18
         placeholder="请输入"
18 19
       />
19 20
       <van-field
21
+        :class="readonly ? 'changeColor' : ''"
20 22
         label="性别"
21 23
         v-model="patientForm.sex"
22 24
         right-icon="arrow"
@@ -29,6 +31,7 @@
29 31
         <van-picker :columns="columns" show-toolbar @change="onChange" />
30 32
       </van-popup>
31 33
       <van-field
34
+        :class="readonly ? 'changeColor' : ''"
32 35
         v-model="patientForm.idCard"
33 36
         required
34 37
         label="身份证号"
@@ -37,6 +40,7 @@
37 40
         :readonly="readonly"
38 41
       />
39 42
       <van-field
43
+        :class="readonly ? 'changeColor' : ''"
40 44
         v-model="patientForm.birthday"
41 45
         required
42 46
         label="出生日期"
@@ -44,6 +48,7 @@
44 48
         placeholder="请输入"
45 49
       />
46 50
       <van-field
51
+        :class="readonly ? 'changeColor' : ''"
47 52
         v-model="patientForm.phone"
48 53
         type="tel"
49 54
         required
@@ -75,6 +80,7 @@
75 80
       <div class="basicTitle">血透信息</div>
76 81
       <div class="xtBox">
77 82
         <van-field
83
+          :class="readonly ? 'changeColor' : ''"
78 84
           v-model="patientForm.dialysis"
79 85
           center
80 86
           clearable
@@ -91,6 +97,7 @@
91 97
           >
92 98
         </van-field>
93 99
         <van-field
100
+          :class="readonly ? 'changeColor' : ''"
94 101
           label="患者来源"
95 102
           v-model="patientForm.patientsoure"
96 103
           right-icon="arrow"
@@ -103,6 +110,7 @@
103 110
           <van-picker :columns="columns2" show-toolbar @change="onChange1" />
104 111
         </van-popup>
105 112
         <van-field
113
+          :class="readonly ? 'changeColor' : ''"
106 114
           label="留治状态"
107 115
           v-model="patientForm.lapseto"
108 116
           right-icon="arrow"
@@ -147,11 +155,14 @@
147 155
         </van-cell>
148 156
 
149 157
         <van-field
158
+          :class="readonly ? 'changeColor' : ''"
150 159
           v-model="patientForm.admissionNumber"
160
+          :readonly="readonly"
151 161
           type="text"
152 162
           label="住院(门诊)号"
153 163
         />
154 164
         <van-field
165
+          :class="readonly ? 'changeColor' : ''"
155 166
           label="首次透析日期"
156 167
           v-model="patientForm.fistDate"
157 168
           right-icon="arrow"
@@ -170,6 +181,7 @@
170 181
           />
171 182
         </van-popup>
172 183
         <van-field
184
+          :class="readonly ? 'changeColor' : ''"
173 185
           v-model="patientForm.diagnose"
174 186
           rows="1"
175 187
           autosize
@@ -185,6 +197,7 @@
185 197
       <div class="basicTitle">慢病信息</div>
186 198
       <div class="xtBox">
187 199
         <van-field
200
+          :class="readonly ? 'changeColor' : ''"
188 201
           v-model="patientForm.requipmentId"
189 202
           label="设备ID"
190 203
           placeholder="请输入"
@@ -230,6 +243,7 @@
230 243
       <div class="basicTitle">会员资料</div>
231 244
       <div class="xtBox">
232 245
         <van-field
246
+          :class="readonly ? 'changeColor' : ''"
233 247
           label="首次透析日期"
234 248
           v-model="patientForm.memberFistDate"
235 249
           right-icon="arrow"
@@ -252,6 +266,7 @@
252 266
           />
253 267
         </van-popup>
254 268
         <van-field
269
+          :class="readonly ? 'changeColor' : ''"
255 270
           label="病种"
256 271
           v-model="patientForm.patient_type"
257 272
           right-icon="arrow"
@@ -271,6 +286,7 @@
271 286
           />
272 287
         </van-popup>
273 288
         <van-field
289
+          :class="readonly ? 'changeColor' : ''"
274 290
           label="治疗方式"
275 291
           v-model="patientForm.treatmentMethod"
276 292
           right-icon="arrow"
@@ -1167,6 +1183,9 @@ export default {
1167 1183
     width: 100%;
1168 1184
     padding: 0 1.125rem;
1169 1185
     background: #fff;
1186
+    span {
1187
+      font-size: 1rem;
1188
+    }
1170 1189
   }
1171 1190
   .jiantou {
1172 1191
     font-size: 1.5rem;
@@ -1174,7 +1193,7 @@ export default {
1174 1193
     margin-right: 1.25rem;
1175 1194
   }
1176 1195
   .titleName {
1177
-    font-size: 1.125rem;
1196
+    font-size: 1.125rem !important;
1178 1197
     font-weight: 600;
1179 1198
   }
1180 1199
   .basicTitle {
@@ -1230,11 +1249,11 @@ export default {
1230 1249
     border-radius: 0.9375rem;
1231 1250
   }
1232 1251
   .van-button--small {
1233
-    min-width: 60px !important;
1234
-    height: 30px;
1235
-    padding: 0 8px;
1236
-    font-size: 12px !important;
1237
-    line-height: 28px;
1252
+    min-width: 3.75rem !important;
1253
+    height: 1.875rem;
1254
+    padding: 0 0.5rem;
1255
+    font-size: 0.75rem !important;
1256
+    line-height: 1.75rem;
1238 1257
   }
1239 1258
   .moreInfo {
1240 1259
     text-align: center;
@@ -1257,3 +1276,29 @@ export default {
1257 1276
   width: 0;
1258 1277
 }
1259 1278
 </style>
1279
+
1280
+<style lang="scss">
1281
+.page_editPatients {
1282
+  .changeColor {
1283
+    .van-field__control {
1284
+      color: #9b9b9b !important;
1285
+    }
1286
+  }
1287
+  .basicBox {
1288
+    .van-cell__value {
1289
+      font-size: 1rem;
1290
+    }
1291
+    .van-cell__title {
1292
+      font-size: 1rem;
1293
+    }
1294
+  }
1295
+  .xtBox {
1296
+    .van-cell__value {
1297
+      font-size: 1rem;
1298
+    }
1299
+    .van-cell__title {
1300
+      font-size: 1rem;
1301
+    }
1302
+  }
1303
+}
1304
+</style>

+ 11 - 4
src/pages/search/index.vue Zobrazit soubor

@@ -3,13 +3,17 @@
3 3
     <van-sticky>
4 4
       <div class="header">
5 5
         <i class="iconfont icon-zuojiantou" @click="toHomeIndex"></i>
6
-        <van-search v-model="value" placeholder=" 姓名 / 透析号" @search="toSearchPatient" />
6
+        <van-search
7
+          v-model="value"
8
+          placeholder=" 姓名 / 透析号"
9
+          @search="toSearchPatient"
10
+        />
7 11
       </div>
8 12
     </van-sticky>
9 13
     <div class="searchList">
10 14
       <div
11 15
         class="patientOne"
12
-        v-for="(item,index) in patientList"
16
+        v-for="(item, index) in patientList"
13 17
         :key="index"
14 18
         @click="toPatient(item.id)"
15 19
       >
@@ -26,10 +30,12 @@
26 30
         <ul class="recordList">
27 31
           <li
28 32
             class="recordOne"
29
-            v-for="(item,index) in historyWord"
33
+            v-for="(item, index) in historyWord"
30 34
             :key="index"
31 35
             @click="toSearchPatient(item)"
32
-          >{{item}}</li>
36
+          >
37
+            {{ item }}
38
+          </li>
33 39
         </ul>
34 40
       </div>
35 41
     </div>
@@ -112,6 +118,7 @@ export default {
112 118
       width: 2.5rem;
113 119
       height: 2.5rem;
114 120
       text-align: center;
121
+      font-size: 1rem;
115 122
     }
116 123
     .van-search {
117 124
       padding: 0;

+ 20 - 1
src/pages/shop/index.vue Zobrazit soubor

@@ -1,12 +1,15 @@
1 1
 <template>
2 2
   <div class="page_shop">
3
+    <div class="shopTitle">
4
+      <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
5
+      <span class="titleName">商城</span>
6
+    </div>
3 7
     <iframe
4 8
       src="http://shop.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&wxref=mp.weixin.qq.com#wechat_redirect"
5 9
     ></iframe>
6 10
   </div>
7 11
 </template>
8 12
 
9
-
10 13
 <style lang="scss" scoped>
11 14
 .page_shop {
12 15
   height: 100%;
@@ -14,5 +17,21 @@
14 17
     height: 100%;
15 18
     width: 100%;
16 19
   }
20
+  .shopTitle {
21
+    background: #fff;
22
+    padding: 0 1.125rem;
23
+    height: 3.125rem;
24
+    display: flex;
25
+    align-items: center;
26
+  }
27
+  .jiantou {
28
+    font-size: 1.5rem;
29
+    font-weight: 600;
30
+    margin-right: 8rem;
31
+  }
32
+  .titleName {
33
+    font-size: 1.125rem;
34
+    font-weight: 600;
35
+  }
17 36
 }
18 37
 </style>

+ 19 - 23
src/router/index.js Zobrazit soubor

@@ -63,16 +63,15 @@ export default new Router({
63 63
           path: "/newMy",
64 64
           name: "newMy",
65 65
           component: () => import("@/pages/my/index")
66
-        },
67
-        // 商城
68
-        {
69
-          path: "/shop",
70
-          name: "shop",
71
-          component: () => import("@/pages/shop/index")
72 66
         }
73 67
       ]
74 68
     },
75
-
69
+    // 商城
70
+    {
71
+      path: "/shop",
72
+      name: "shop",
73
+      component: () => import("@/pages/shop/index")
74
+    },
76 75
     {
77 76
       path: "/perfectOrg",
78 77
       component: () => import("@/pages/org"),
@@ -287,7 +286,7 @@ export default new Router({
287 286
       name: "longdialysis",
288 287
       component: () => import("@/pages/allLongDialysis/index")
289 288
     },
290
-    //, 
289
+    //,
291 290
     {
292 291
       path: "/alldoctoradvice",
293 292
       name: "/alldoctoradvice",
@@ -307,16 +306,15 @@ export default new Router({
307 306
     },
308 307
     // 编辑分区
309 308
     {
310
-      path: '/editpartition',
311
-      name: 'editpartition',
312
-      component: () => import('@/pages/configureCenter/editPartion')
313
-
309
+      path: "/editpartition",
310
+      name: "editpartition",
311
+      component: () => import("@/pages/configureCenter/editPartion")
314 312
     },
315 313
     // 编辑分组
316 314
     {
317
-      path: '/editgroup',
318
-      name: 'editgroup',
319
-      component: () => import('@/pages/configureCenter/editGrouping')
315
+      path: "/editgroup",
316
+      name: "editgroup",
317
+      component: () => import("@/pages/configureCenter/editGrouping")
320 318
     },
321 319
     // 新增分组
322 320
     {
@@ -332,16 +330,14 @@ export default new Router({
332 330
     },
333 331
     // 编辑床位号
334 332
     {
335
-      path: '/editbed',
336
-      name: 'editbed',
337
-      component: () => import('@/pages/configureCenter/editBed')
338
-
333
+      path: "/editbed",
334
+      name: "editbed",
335
+      component: () => import("@/pages/configureCenter/editBed")
339 336
     },
340 337
     {
341
-      path: '/allinspection',
342
-      name: '/allinspection',
343
-      component: () => import('@/pages/patientCenter/allCheck/index')
344
-
338
+      path: "/allinspection",
339
+      name: "/allinspection",
340
+      component: () => import("@/pages/patientCenter/allCheck/index")
345 341
     },
346 342
     // 我的页面管理
347 343
     {

+ 2 - 2
src/styles/newStyle.scss Zobrazit soubor

@@ -5,11 +5,11 @@
5 5
 //   color: #000 !important;
6 6
 // }
7 7
 
8
-@media only screen and (max-width: 414px) {
8
+@media only screen and (max-width: 415px) {
9 9
   html,
10 10
   body {
11 11
     height: 100%;
12
-    font-size: 30px;
12
+    font-size: 30px !important;
13 13
     background: #fff !important;
14 14
     color: #000 !important;
15 15
   }