Browse Source

提交代码

陈少旭 1 year ago
parent
commit
e27385e9b7

+ 1 - 1
src/xt_pages/outpatientCharges/summary.vue View File

@@ -214,7 +214,7 @@
214 214
         </el-table-column>
215 215
         <el-table-column align="center" width="90" prop="name" label="实收金额">
216 216
           <template slot-scope="scope">{{
217
-              scope.row.reality_price.toFixed(2)
217
+              scope.row.medfee_sumamt.toFixed(2)
218 218
             }}
219 219
           </template>
220 220
         </el-table-column>

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

@@ -15,7 +15,7 @@
15 15
           <el-input v-model="form.name" placeholder="用户姓名"></el-input>
16 16
         </el-form-item>
17 17
       </el-col>
18
-    </el-row> 
18
+    </el-row>
19 19
     <el-row :gutter="24">
20 20
       <el-col :span="24">
21 21
       <el-form-item label="角色 : " prop="role_ids">
@@ -68,19 +68,27 @@
68 68
       </el-form-item>
69 69
     </el-col>
70 70
    </el-row>
71
-   <el-row :span="24">
71
+   <el-row :span="24" v-if="this.$store.getters.xt_user.org_id != 10206">
72 72
       <el-col :span="8">
73 73
        <el-form-item label="医保医师编码:">
74 74
         <el-input v-model="form.doctor_number"></el-input>
75 75
        </el-form-item>
76 76
     </el-col>
77
+
78
+
79
+     <el-row :span="24" v-if="this.$store.getters.xt_user.org_id == 10206">
80
+       <el-col :span="8">
81
+         <el-form-item label="员工ID:">
82
+           <el-input v-model="form.doctor_number"></el-input>
83
+         </el-form-item>
84
+       </el-col>
77 85
     <el-col :span="8">
78 86
        <el-form-item label="身份证(工号):">
79 87
            <el-input v-model="form.job_number" style="width:180px;"></el-input>
80 88
        </el-form-item>
81 89
     </el-col>
82 90
    </el-row>
83
-  
91
+
84 92
   <div v-show="show">
85 93
    <el-row :span="24">
86 94
     <el-col :span="8">
@@ -151,7 +159,7 @@
151 159
                 :key="item.id"
152 160
               ></el-option>
153 161
           </el-select>
154
-        
162
+
155 163
        </el-form-item>
156 164
     </el-col>
157 165
      <el-col :span="8">
@@ -178,7 +186,7 @@
178 186
                 :key="item.id"
179 187
               ></el-option>
180 188
           </el-select>
181
-        
189
+
182 190
        </el-form-item>
183 191
     </el-col>
184 192
      <el-col :span="8">
@@ -205,10 +213,10 @@
205 213
                 :key="item.id"
206 214
               ></el-option>
207 215
           </el-select>
208
-        
216
+
209 217
        </el-form-item>
210 218
     </el-col>
211
-   
219
+
212 220
     <el-col :span="8">
213 221
        <el-form-item label="处方资格标志:">
214 222
            <el-select v-model="form.prescription_qualification_identification" placeholder="处方资格标志" style="width:180px;">
@@ -235,7 +243,7 @@
235 243
                 :key="item.id"
236 244
               ></el-option>
237 245
           </el-select>
238
-        
246
+
239 247
        </el-form-item>
240 248
     </el-col>
241 249
      <el-col :span="8">
@@ -280,12 +288,12 @@
280 288
                 :key="item.id"
281 289
               ></el-option>
282 290
           </el-select>
283
-        
291
+
284 292
        </el-form-item>
285 293
     </el-col>
286 294
      <el-col :span="8">
287 295
        <el-form-item label="药师执业类别:" label-width="130px" v-show="showOne">
288
-          
296
+
289 297
              <el-select v-model="form.medical_type_job" placeholder="药师执业类别" style="width:180px;">
290 298
               <el-option
291 299
                 v-for="item in doctorLevelList"
@@ -319,12 +327,12 @@
319 327
                 :key="item.id"
320 328
               ></el-option>
321 329
           </el-select>
322
-        
330
+
323 331
        </el-form-item>
324 332
     </el-col>
325 333
      <el-col :span="8">
326 334
        <el-form-item label="医生级别:" label-width="130px" v-show="showTwo">
327
-          
335
+
328 336
              <el-select v-model="form.doctor_level" placeholder="医生级别">
329 337
               <el-option
330 338
                 v-for="item in doctorLevelList"
@@ -351,7 +359,7 @@
351 359
 
352 360
 
353 361
   <el-row :gutter="24">
354
-   
362
+
355 363
      <el-col :span="8">
356 364
        <el-form-item label="门诊大病类别:" label-width="130px">
357 365
             <el-select v-model="form.outpatient_illnessCategory" placeholder="门诊大病类别">
@@ -400,7 +408,7 @@
400 408
       </el-col>
401 409
    </el-row>
402 410
    </el-form>
403
-  
411
+
404 412
     <div slot="footer" class="dialog-footer">
405 413
       <el-button @click="dialogFormVisible = false">取 消</el-button>
406 414
       <el-button type="primary" @click="submitAction">保 存</el-button>
@@ -497,7 +505,7 @@
497 505
           identification_outpatients:"",//门诊大病资格标志
498 506
           start_time:"",//开始时间
499 507
           medical_range_code:"",//药师执业范围编码
500
-         
508
+
501 509
           medical_level:"",//药师级别
502 510
           medical_type_job:"",//药师执业类别
503 511
           pharmacist_registration_number:"",//执业药师注册证编号
@@ -661,7 +669,7 @@
661 669
             .then(rs => {
662 670
               this.loading = false
663 671
               var resp = rs.data
664
-              
672
+
665 673
               if (resp.state === 1) {
666 674
                 // this.roles.push(...resp.data.roles)
667 675
                 this.roles = resp.data.roles
@@ -710,7 +718,7 @@
710 718
                 }
711 719
                 this.form.user_title = admin.user_title
712 720
                 this.form.role = admin.role_ids
713
-               
721
+
714 722
                 this.form.department_id = admin.department_id
715 723
                 if(admin.department_id == 0){
716 724
                    this.form.department_id = ""
@@ -722,8 +730,8 @@
722 730
                   }
723 731
                 }
724 732
 
725
-               
726
-              
733
+
734
+
727 735
                 this.form.intro = admin.intro
728 736
                 this.form.user_title_name = admin.user_title_name
729 737
 
@@ -739,12 +747,12 @@
739 747
                 if(this.role_type == 2){
740 748
                   this.showOne = true
741 749
                    this.showTwo = false
742
-                   
750
+
743 751
                 }
744 752
                 this.isSubSuperAdmin = resp.data.isSubSuperAdmin
745 753
                 this.org = resp.data.org
746
-                
747
-               
754
+
755
+
748 756
                 this.form.sex = admin.sex
749 757
                 if(admin.sex == 0){
750 758
                    this.form.sex = ""
@@ -817,7 +825,7 @@
817 825
                 if(admin.active_status == 0){
818 826
                    this.form.active_status = ""
819 827
                 }
820
-              
828
+
821 829
                 var id = 0
822 830
                 for(let i=0;i<this.numberList.length;i++){
823 831
                    if(this.numberList[i].name == admin.outpatient_illness_category){
@@ -861,8 +869,8 @@
861 869
 
862 870
         this.dialogFormVisible = true
863 871
       },
864
-      submitAction: function() {   
865
-        
872
+      submitAction: function() {
873
+
866 874
         var department = ""
867 875
         for(let i=0;i<this.departMent.length;i++){
868 876
           if(this.form.department_id == this.departMent[i].id){
@@ -870,7 +878,7 @@
870 878
           }
871 879
         }
872 880
         this.form.department = department
873
-        
881
+
874 882
         if (this.admin_id < 0) {
875 883
           return
876 884
         }
@@ -882,7 +890,7 @@
882 890
             }
883 891
 
884 892
             this.loading = true
885
-            
893
+
886 894
             var name = ""
887 895
             for(let i=0;i<this.numberList.length;i++){
888 896
                if(this.form.outpatient_illnessCategory == this.numberList[i].id){
@@ -901,7 +909,7 @@
901 909
                 user_title_name:this.form.user_title_name,
902 910
                 department:this.form.department,
903 911
                 department_id:this.form.department_id,
904
-                
912
+
905 913
 
906 914
                 sex:this.form.sex, //性别
907 915
                 age:parseInt(this.form.age), //年龄
@@ -920,7 +928,7 @@
920 928
                 identification_outpatients:this.form.identification_outpatients,//门诊大病资格标志
921 929
                 start_time:this.form.start_time,//开始时间
922 930
                 medical_range_code:this.form.medical_range_code,//药师执业范围编码
923
-              
931
+
924 932
                 medical_level:this.form.medical_level,//药师级别
925 933
                 medical_type_job:this.form.medical_type_job,//药师执业类别
926 934
                 pharmacist_registration_number:this.form.pharmacist_registration_number,//执业药师注册证编号
@@ -931,10 +939,10 @@
931 939
                 outpatient_illnessCategory:name,//门诊大病类别
932 940
                 is_active:this.form.is_active,//在职状态
933 941
                 active_status:this.form.active_status,//执业状态
934
-                
942
+
935 943
               }
936 944
               console.log("params",params)
937
-             
945
+
938 946
               addAdmin(params).then(rs => {
939 947
                   this.loading = false
940 948
                   var resp = rs.data
@@ -955,7 +963,7 @@
955 963
                 })
956 964
             } else {
957 965
               this.form.role = this.form.role_ids.join(',')
958
-             
966
+
959 967
                var department = ""
960 968
                for(let i=0;i<this.departMent.length;i++){
961 969
                 if(this.form.department_id == this.departMent[i].id){
@@ -999,7 +1007,7 @@
999 1007
                 identification_outpatients:this.form.identification_outpatients,//门诊大病资格标志
1000 1008
                 start_time:this.form.start_time,//开始时间
1001 1009
                 medical_range_code:this.form.medical_range_code,//药师执业范围编码
1002
-              
1010
+
1003 1011
                 medical_level:this.form.medical_level,//药师级别
1004 1012
                 medical_type_job:this.form.medical_type_job,//药师执业类别
1005 1013
                 pharmacist_registration_number:this.form.pharmacist_registration_number,//执业药师注册证编号
@@ -1020,7 +1028,7 @@
1020 1028
                    if(resp.data.approle.active_status == 2){
1021 1029
                       let params = {
1022 1030
                        'id':resp.data.approle.id,
1023
-                       'is_mark':1, 
1031
+                       'is_mark':1,
1024 1032
                        }
1025 1033
                      var that = this
1026 1034
                       axios.get('http://127.0.0.1:9532/sz/api/medical/get',{params:params}).then(function(response) {
@@ -1061,7 +1069,7 @@
1061 1069
            var department =   response.data.data.departMent
1062 1070
            console.log("department2222",department)
1063 1071
            this.departMent = department
1064
-         
1072
+
1065 1073
          }
1066 1074
         })
1067 1075
       },
@@ -1098,7 +1106,7 @@
1098 1106
         if(val == 1){
1099 1107
           this.showTwo = true
1100 1108
           this.showOne = false
1101
-          
1109
+
1102 1110
         }
1103 1111
         if(val == 2){
1104 1112
           this.showTwo =false
@@ -1108,7 +1116,7 @@
1108 1116
     },
1109 1117
 
1110 1118
     created(){
1111
-     
1119
+
1112 1120
         //获取所有科室
1113 1121
        this.getlist()
1114 1122
     }