See999 4 years ago
parent
commit
3f7e7c175c

+ 1 - 1
config/dev.env.js View File

6
 module.exports = {
6
 module.exports = {
7
   NODE_ENV: '"development"',
7
   NODE_ENV: '"development"',
8
   ENV_CONFIG: '"dev"',
8
   ENV_CONFIG: '"dev"',
9
-  BASE_API: '"http://api.xt.test.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
9
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
   // BASE_API:'"http://localhost:9531"',
10
   // BASE_API:'"http://localhost:9531"',
11
   SSO_HOST: '"http://testsso.sgjyun.com"',
11
   SSO_HOST: '"http://testsso.sgjyun.com"',
12
   SRCM_HOST: '"http://test1.sgjyun.com"',
12
   SRCM_HOST: '"http://test1.sgjyun.com"',

+ 2 - 2
src/xt_pages/data/druguseTemplate.vue View File

1211
         day_count: '',
1211
         day_count: '',
1212
 
1212
 
1213
         crumbs: [
1213
         crumbs: [
1214
-          { path: false, name: '数据字典' },
1214
+          { path: false, name: '管理中心' },
1215
           { path: 'data/druguse', name: '医嘱模版' }
1215
           { path: 'data/druguse', name: '医嘱模版' }
1216
         ],
1216
         ],
1217
         rowIndex: -1,
1217
         rowIndex: -1,
1928
                   this.$message.error(response.data.msg)
1928
                   this.$message.error(response.data.msg)
1929
                   return false
1929
                   return false
1930
                 } else {
1930
                 } else {
1931
-                  this.$message.error('添加成功')
1931
+                  this.$message.success('添加成功')
1932
 
1932
 
1933
                   this.efFormVisible = false
1933
                   this.efFormVisible = false
1934
                   this.resetForm(formName)
1934
                   this.resetForm(formName)

+ 2 - 2
src/xt_pages/data/index.vue View File

31
   data() {
31
   data() {
32
     return {
32
     return {
33
       crumbs: [
33
       crumbs: [
34
-        { path: false, name: '数据字典' },
35
-        { path: 'data/dictionary', name: '字段配置' }
34
+        { path: false, name: '管理中心' },
35
+        { path: 'data/dictionary', name: '数据字典' }
36
       ],
36
       ],
37
       tabMapOptions: [
37
       tabMapOptions: [
38
         { label: this.$t('data_config.patient'), key: 'patient' },
38
         { label: this.$t('data_config.patient'), key: 'patient' },

+ 1 - 1
src/xt_pages/data/printTemplate.vue View File

181
   data() {
181
   data() {
182
     return {
182
     return {
183
       crumbs: [
183
       crumbs: [
184
-        { path: false, name: "系统管理" },
184
+        { path: false, name: "管理中心" },
185
         { path: "data/print", name: "打印模版" }
185
         { path: "data/print", name: "打印模版" }
186
       ],
186
       ],
187
       imgUrl_One: require("@/assets/home/1.jpg"),
187
       imgUrl_One: require("@/assets/home/1.jpg"),

+ 1 - 1
src/xt_pages/data/showConfig.vue View File

52
     data() {
52
     data() {
53
       return {
53
       return {
54
         crumbs: [
54
         crumbs: [
55
-          { path: false, name: '数据字典' },
55
+          { path: false, name: '管理中心' },
56
           { path: '/data/showconfig', name: '显示配置' }
56
           { path: '/data/showconfig', name: '显示配置' }
57
         ],
57
         ],
58
         activeName: 'first',
58
         activeName: 'first',

+ 1 - 1
src/xt_pages/data/template.vue View File

27
   data() {
27
   data() {
28
     return {
28
     return {
29
       crumbs: [
29
       crumbs: [
30
-        { path: false, name: '数据字典' },
30
+        { path: false, name: '管理中心' },
31
         { path: 'data/template', name: '模版配置' },
31
         { path: 'data/template', name: '模版配置' },
32
       ],
32
       ],
33
       tabMapOptions: [
33
       tabMapOptions: [

+ 44 - 8
src/xt_pages/dialysis/bloodPresssWatch.vue View File

265
           align="center"
265
           align="center"
266
           width="120"
266
           width="120"
267
         ></el-table-column>
267
         ></el-table-column>
268
-        <el-table-column label="透中血压(Hgmm)" align="center">
268
+        <el-table-column label="透中血压(mmHg)" align="center">
269
           <el-table-column
269
           <el-table-column
270
             v-for="(item, index) in labelArr"
270
             v-for="(item, index) in labelArr"
271
             :key="index"
271
             :key="index"
336
           {
336
           {
337
             text: "今天",
337
             text: "今天",
338
             onClick(picker) {
338
             onClick(picker) {
339
-              picker.$emit("pick", new Date());
339
+              var date = new Date();
340
+              var year = date.getFullYear();
341
+              var month = date.getMonth() + 1;
342
+              var day = date.getDate();
343
+              if (month < 10) {
344
+                month = "0" + month;
345
+              }
346
+              if (day < 10) {
347
+                day = "0" + day;
348
+              }
349
+              var nowDate = year + "-" + month + "-" + day;
350
+              var date1 = new Date(nowDate + " 00:00:00");
351
+              picker.$emit("pick", date1.getTime());
340
             }
352
             }
341
           },
353
           },
342
           {
354
           {
343
             text: "昨天",
355
             text: "昨天",
344
             onClick(picker) {
356
             onClick(picker) {
345
-              const date = new Date();
346
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
347
-              picker.$emit("pick", date);
357
+              var d = new Date();
358
+              d.setTime(d.getTime() - 3600 * 1000 * 24);
359
+              var date = d;
360
+              var year = date.getFullYear();
361
+              var month = date.getMonth() + 1;
362
+              var day = date.getDate();
363
+              if (month < 10) {
364
+                month = "0" + month;
365
+              }
366
+              if (day < 10) {
367
+                day = "0" + day;
368
+              }
369
+              var nowDate = year + "-" + month + "-" + day;
370
+              var date1 = new Date(nowDate + " 00:00:00");
371
+              picker.$emit("pick", date1.getTime());
348
             }
372
             }
349
           },
373
           },
350
           {
374
           {
351
             text: "一周前",
375
             text: "一周前",
352
             onClick(picker) {
376
             onClick(picker) {
353
-              const date = new Date();
354
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
355
-              picker.$emit("pick", date);
377
+              var d = new Date();
378
+              d.setTime(d.getTime() - 3600 * 1000 * 24 * 7);
379
+              var date = d;
380
+              var year = date.getFullYear();
381
+              var month = date.getMonth() + 1;
382
+              var day = date.getDate();
383
+              if (month < 10) {
384
+                month = "0" + month;
385
+              }
386
+              if (day < 10) {
387
+                day = "0" + day;
388
+              }
389
+              var nowDate = year + "-" + month + "-" + day;
390
+              var date1 = new Date(nowDate + " 00:00:00");
391
+              picker.$emit("pick", date1.getTime());
356
             }
392
             }
357
           },
393
           },
358
           {
394
           {

+ 1 - 1
src/xt_pages/role/admin.vue View File

163
   data() {
163
   data() {
164
     return {
164
     return {
165
       crumbs: [
165
       crumbs: [
166
-        { path: false, name: "权限管理" },
166
+        { path: false, name: "管理中心" },
167
         { path: false, name: "员工管理" }
167
         { path: false, name: "员工管理" }
168
       ],
168
       ],
169
       is_loading_admins: true,
169
       is_loading_admins: true,

+ 15 - 2
src/xt_pages/role/components/AdminRoleInfoForm.vue View File

10
         <el-input v-model="form.name" placeholder="用户姓名"></el-input>
10
         <el-input v-model="form.name" placeholder="用户姓名"></el-input>
11
       </el-form-item>
11
       </el-form-item>
12
 
12
 
13
+      <el-form-item label="角色 : " prop="role" label-width="60px">
14
+
15
+           <el-checkbox-group v-model="form.role">
16
+            <el-checkbox label="子管理员" name="type"></el-checkbox>
17
+            <el-checkbox label="医生" name="type"></el-checkbox>
18
+            <el-checkbox label="护士" name="type"></el-checkbox>
19
+            <el-checkbox label="技师" name="type"></el-checkbox>
20
+            <el-checkbox label="运营" name="type"></el-checkbox>
21
+            <el-checkbox label="库存" name="type"></el-checkbox>
22
+            <el-checkbox label="院长" name="type"></el-checkbox>
23
+          </el-checkbox-group>
24
+        </el-form-item>
25
+
13
       <el-form-item label="职称 : ">
26
       <el-form-item label="职称 : ">
14
         <el-select v-model="form.user_type" placeholder="用户类型">
27
         <el-select v-model="form.user_type" placeholder="用户类型">
15
           <el-option
28
           <el-option
114
         },
127
         },
115
         rules: {
128
         rules: {
116
           mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
129
           mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
117
-          name: [{ required: true, validator: checkName, trigger: 'blur' }]
118
-
130
+          name: [{ required: true, validator: checkName, trigger: 'blur' }],
131
+          role: [{ required: true, message: '请选择角色', trigger: 'blur' }]
119
         }
132
         }
120
       }
133
       }
121
     },
134
     },

+ 18 - 5
src/xt_pages/role/components/EditRole.vue View File

1
 <template>
1
 <template>
2
   <el-dialog
2
   <el-dialog
3
-    title="新增用户"
4
-    width="660px"
3
+    title="新增员工"
4
+    width="750px"
5
     :visible.sync="visible"
5
     :visible.sync="visible"
6
     :before-close="_close"
6
     :before-close="_close"
7
   >
7
   >
14
             </el-form-item>
14
             </el-form-item>
15
     </el-form>-->
15
     </el-form>-->
16
     <div class="chooseuser">
16
     <div class="chooseuser">
17
-      <span style="color:#303133">选择用户:</span>
17
+      <span style="color:#303133">选择员工:</span>
18
       <el-radio v-model="checked" label="1">从已有员工中选择</el-radio>
18
       <el-radio v-model="checked" label="1">从已有员工中选择</el-radio>
19
       <el-radio v-model="checked" label="2">新增员工</el-radio>
19
       <el-radio v-model="checked" label="2">新增员工</el-radio>
20
     </div>
20
     </div>
78
 
78
 
79
           <el-input  v-model="ruleForm.phone"  maxlength="11"></el-input>
79
           <el-input  v-model="ruleForm.phone"  maxlength="11"></el-input>
80
         </el-form-item>
80
         </el-form-item>
81
+        <el-form-item label="角色" prop="role" label-width="70px">
82
+
83
+           <el-checkbox-group v-model="ruleForm.role">
84
+            <el-checkbox label="子管理员" name="type"></el-checkbox>
85
+            <el-checkbox label="医生" name="type"></el-checkbox>
86
+            <el-checkbox label="护士" name="type"></el-checkbox>
87
+            <el-checkbox label="技师" name="type"></el-checkbox>
88
+            <el-checkbox label="运营" name="type"></el-checkbox>
89
+            <el-checkbox label="库存" name="type"></el-checkbox>
90
+            <el-checkbox label="院长" name="type"></el-checkbox>
91
+          </el-checkbox-group>
92
+        </el-form-item>
81
 
93
 
82
         <el-form-item label="职称 : " label-width="50px">
94
         <el-form-item label="职称 : " label-width="50px">
83
           <el-select v-model="ruleForm.user_type" placeholder="用户类型">
95
           <el-select v-model="ruleForm.user_type" placeholder="用户类型">
160
         rules: {
172
         rules: {
161
           phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
173
           phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
162
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
174
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
163
-          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
175
+          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }],
164
         },
176
         },
165
         admin_user: [],
177
         admin_user: [],
166
         is_check_admin_user: [],
178
         is_check_admin_user: [],
202
           name: [
214
           name: [
203
             { required: true, message: '请输入用户名字', trigger: 'blur' },
215
             { required: true, message: '请输入用户名字', trigger: 'blur' },
204
             { max: 10, message: '10个字以内', trigger: 'blur' }
216
             { max: 10, message: '10个字以内', trigger: 'blur' }
205
-          ]
217
+          ],
218
+          role: [{ required: true, message: '请选择角色', trigger: 'blur' }]
206
         }
219
         }
207
       }
220
       }
208
     },
221
     },

+ 1 - 1
src/xt_pages/role/role.vue View File

161
   data: function() {
161
   data: function() {
162
     return {
162
     return {
163
       crumbs: [
163
       crumbs: [
164
-        { path: false, name: "权限管理" },
164
+        { path: false, name: "管理中心" },
165
         { path: false, name: "角色管理" }
165
         { path: false, name: "角色管理" }
166
       ],
166
       ],
167
       loading_roles: true,
167
       loading_roles: true,

+ 1 - 0
src/xt_pages/workforce/remind_print.vue View File

125
 
125
 
126
       getScheduleWeekDay({week_type: this.week_type}).then(rs => {
126
       getScheduleWeekDay({week_type: this.week_type}).then(rs => {
127
         var resp = rs.data
127
         var resp = rs.data
128
+        console.log(resp)
128
         if (resp.state == 1) {
129
         if (resp.state == 1) {
129
           this.scheduleData = resp.data.schdules
130
           this.scheduleData = resp.data.schdules
130
         } else {
131
         } else {