Parcourir la source

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

28169 il y a 1 an
Parent
révision
30156dd83e

+ 8 - 8
src/xt_pages/outpatientCharges/components/chargeDialog.vue Voir le fichier

@@ -71,37 +71,37 @@
71 71
       </el-form-item>
72 72
 
73 73
 
74
-      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id != 10138 && this.$store.getters.xt_user.org.id != 10278 && this.$store.getters.xt_user.org.id != 0 ">
74
+      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id != 10138 && this.$store.getters.xt_user.org.id != 10278 && this.$store.getters.xt_user.org.id != 0 && this.$store.getters.xt_user.org.id != 10610">
75 75
 
76 76
         <el-radio-group v-model="form.pay_way">
77 77
           <el-radio :label="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
78 78
         </el-radio-group>
79 79
       </el-form-item>
80 80
 
81
-      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510">
81
+      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610">
82 82
 
83 83
         <el-checkbox-group v-model="form.pay_wayss">
84 84
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
85 85
         </el-checkbox-group>
86 86
       </el-form-item>
87 87
 
88
-      <el-form-item label="现金支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  ">
88
+      <el-form-item label="现金支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ">
89 89
         <el-input class="number_style" v-model="form.cash_pay" ></el-input>
90 90
       </el-form-item>
91 91
 
92
-      <el-form-item label="微信支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  ">
92
+      <el-form-item label="微信支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ">
93 93
         <el-input class="number_style" v-model="form.wechat_pay" ></el-input>
94 94
       </el-form-item>
95
-      <el-form-item label="银行卡支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  ">
95
+      <el-form-item label="银行卡支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ">
96 96
         <el-input class="number_style" v-model="form.band_card_pay" ></el-input>
97 97
       </el-form-item>
98
-      <el-form-item label="支付宝支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  ">
98
+      <el-form-item label="支付宝支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610  ">
99 99
         <el-input class="number_style" v-model="form.ali_pay" ></el-input>
100 100
       </el-form-item>
101
-      <el-form-item label="积分支付:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  ">
101
+      <el-form-item label="积分支付:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610  ">
102 102
         <el-input class="number_style" v-model="form.jifen_pay" ></el-input>
103 103
       </el-form-item>
104
-      <el-form-item label="其他说明:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  ">
104
+      <el-form-item label="其他说明:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610  ">
105 105
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
106 106
       </el-form-item>
107 107
 

+ 6 - 6
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Voir le fichier

@@ -3207,12 +3207,12 @@ export default {
3207 3207
     },
3208 3208
     addTab(targetName) {
3209 3209
 
3210
-      for (let i = 0; i < this.prescriptions.length; i++) {
3211
-        if (this.prescriptions[i].is_medicine_status) {
3212
-          this.$message.error('处方中包含已发药处方,无法新增')
3213
-          return
3214
-        }
3215
-      }
3210
+      // for (let i = 0; i < this.prescriptions.length; i++) {
3211
+      //   if (this.prescriptions[i].is_medicine_status) {
3212
+      //     this.$message.error('处方中包含已发药处方,无法新增')
3213
+      //     return
3214
+      //   }
3215
+      // }
3216 3216
 
3217 3217
       // for(let i = 0; i < this.prescriptions.length; i++){
3218 3218
       //   if (this.prescriptions[i].order_status == 2 || this.prescriptions[i].order_status == 4) {