XMLWAN 4 years ago
parent
commit
608cf324c5

+ 6 - 32
src/api/role/admin.js View File

@@ -26,23 +26,11 @@ export function getAddAdminInitData() {
26 26
   })
27 27
 }
28 28
 
29
-export function addAdmin(mobile, name, type, title, role, intro, user_title_name,department,department_id) {
30
-  const params = {
31
-    mobile: mobile,
32
-    name: name,
33
-    type: type,
34
-    title: title,
35
-    role: role,
36
-    intro: intro,
37
-    user_title_name: user_title_name,
38
-    department:department,
39
-    department_id:department_id,
40
-  }
41
-  console.log("epa",department_id,department)
42
-
29
+export function addAdmin(params) {
30
+  
43 31
   return request({
44 32
     url: '/api/admin/add',
45
-    method: 'post',
33
+    method: 'get',
46 34
     params: params
47 35
   })
48 36
 }
@@ -58,25 +46,11 @@ export function getModifyAdminInitData(uid) {
58 46
   })
59 47
 }
60 48
 
61
-export function modifyAdmin(uid, name, type, title, role, intro, user_title_name, sort,department,department_id) {
62
-  console.log("进来",department,department_id)
63
-  const params = {
64
-    uid: uid,
65
-    name: name,
66
-    type: type,
67
-    title: title,
68
-    role: role,
69
-    intro: intro,
70
-    user_title_name: user_title_name,
71
-    sort: sort,
72
-    department:department,
73
-    department_id:department_id
74
-  }
75
-
76
-
49
+export function modifyAdmin(params) {
50
+ 
77 51
   return request({
78 52
     url: '/api/admin/edit',
79
-    method: 'post',
53
+    method: 'get',
80 54
     params: params
81 55
   })
82 56
 }

+ 4 - 0
src/xt_pages/data/components/addDrugs.vue View File

@@ -586,6 +586,10 @@
586 586
       ,
587 587
       hide() {
588 588
         // this.clear()
589
+        this.form.social_security_directory_code = ""
590
+        this.form.prescription_mark = ""
591
+        this.form.record_date = ""
592
+        this.form.drug_remark = ""
589 593
         this.visible = false
590 594
       },
591 595
       getValue: function() {

+ 4 - 3
src/xt_pages/data/components/consumables.vue View File

@@ -57,9 +57,10 @@
57 57
           </el-option>
58 58
         </el-select> -->
59 59
       </div>
60
-      <el-button type="primary" @click="openForm()">新增</el-button>
61
-      <!-- <el-button type="primary" @click="toRecord()">备案</el-button> -->
62
-       <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
60
+      <div>
61
+        <el-button type="primary" @click="openForm()">新增</el-button>
62
+        <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
63
+      </div>
63 64
     </div>
64 65
 
65 66
     <el-table

+ 5 - 4
src/xt_pages/data/components/drugs.vue View File

@@ -54,9 +54,10 @@
54 54
           </el-option>
55 55
         </el-select>
56 56
       </div>
57
-      <el-button type="primary" @click="openForm(0)">新增</el-button>
58
-       <!-- <el-button type="primary" @click="toRecord()">备案</el-button> -->
59
-      <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
57
+      <div>
58
+        <el-button type="primary" @click="openForm(0)">新增</el-button>
59
+        <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
60
+      </div>
60 61
     </div>
61 62
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
62 63
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
@@ -679,7 +680,7 @@
679 680
                return false
680 681
             } else {
681 682
               that.$message({ message: '备案成功', type: 'success' })
682
-              this.getList()
683
+              that.getList()
683 684
              }
684 685
            }).catch(function(error) {
685 686
         })

+ 2 - 5
src/xt_pages/data/components/project.vue View File

@@ -32,11 +32,8 @@
32 32
                   </el-option>
33 33
                 </el-select>
34 34
             </div>
35
-            <div style="margin-left:200px">
36
-              <el-button type="primary" @click="openForm(0)">新增</el-button>
37
-            </div>
38 35
             <div>
39
-             <!-- <el-button type="primary" @click="toRecord()">备案</el-button> -->
36
+             <el-button type="primary" @click="openForm(0)">新增</el-button>
40 37
              <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
41 38
             </div>
42 39
         </div>
@@ -317,7 +314,7 @@ export default {
317 314
                return false
318 315
             } else {
319 316
               that.$message({ message: '备案成功', type: 'success' })
320
-              this.getList()
317
+              that.getList()
321 318
              }
322 319
            }).catch(function(error) {
323 320
         })

+ 5 - 1
src/xt_pages/dialysis/batch_print/batch_print_order.vue View File

@@ -946,7 +946,11 @@
946 946
                       </div>
947 947
                       <div class="inline_block" style="float: right;">
948 948
                         医生签名:
949
-                        <div class="under_line" style="width: 100px;">
949
+                        <div class="under-line" v-if="org_id == 9987">
950
+                          <span v-if="setAdminUserES(record.prescription==null?0:(record.prescription.prescription_doctor?record.prescription.prescription_doctor:record.prescription.creater)) == ''">{{getAdminUser(record.prescription==null?0:(record.prescription.prescription_doctor?record.prescription.prescription_doctor:record.prescription.creater))}}</span>
951
+                          <img v-else style="height:30px;" :src="setAdminUserES(record.prescription==null?0:(record.prescription.prescription_doctor?record.prescription.prescription_doctor:record.prescription.creater))" alt="" srcset="">
952
+                        </div>
953
+                        <div class="under_line" v-else style="width: 100px;">
950 954
                           <span
951 955
                             v-if="
952 956
                               !record.advices ||

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

@@ -701,7 +701,6 @@
701 701
                 this.form.mobile = admin.admin.mobile
702 702
                 this.form.user_type = admin.user_type
703 703
                 if(admin.user_type == 1){
704
-
705 704
                   this.form.user_type = ""
706 705
                 }
707 706
                 this.form.user_title = admin.user_title
@@ -718,7 +717,8 @@
718 717
               
719 718
                 this.form.intro = admin.intro
720 719
                 this.form.user_title_name = admin.user_title_name
721
-                if(admin.role_ids.indexOf("1349")!=-1){
720
+
721
+                if(this.form.user_type == 2){
722 722
                    this.show = true
723 723
                 }else{
724 724
                   this.show = false