Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -153,7 +153,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
-    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
+    <el-button type="primary" :disabled="loading"  @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
 
@@ -180,6 +180,7 @@
         IsShow:false,
         tmp_pay:"",//临时付款金额
         isshow:false,
+        loading:false,
         id:0,
         decimal:0,//当前押金余额
         record_date:'',
@@ -392,6 +393,7 @@
         this.visibility = true
 
       }, hide: function () {
+        this.loading = false
         this.form = Object.assign({}, this.resetForm)
         this.loadingtwo = false
         this.visibility = false
@@ -409,9 +411,11 @@
         }
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
+            this.loading = true
             let value = {}
             value = this.getValue()
             console.log(value)
+
             this.$emit('confirm', value)
 
             this.loadingtwo = true

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1676,6 +1676,7 @@ export default {
             this.loadingtwo = false
             this.newLoading = false
             this.$refs.charge.hide()
+
             return false
           } else {
             if(response.data.data.msg == 2){
@@ -1790,9 +1791,8 @@ export default {
                 name = this.patientTableData[i].name
               }
             }
-            this.$refs.call_prescription.show(name, id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
+            this.$refs.call_prescription.show(name, id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id)
 
-            // this.$refs.call_prescription.show(this.patientInfo.name, this.patientInfo.id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
           }
         }
       })
@@ -3748,9 +3748,18 @@ export default {
               that.$message.error(response.data.msg)
               return false
             } else {
-              that.changeRadioAndPatient(1)
-              // that.$message({ message: '退号成功', type: 'success' })
-              that.$message({ message: '退明细成功', type: 'success', duration: 5000 })
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
+              }else{
+                that.changeRadioAndPatient(1)
+                that.$message({ message: '退明细成功', type: 'success', duration: 5000 })
+              }
             }
           })
           .catch(function(error) {

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -369,7 +369,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=0 && org_id!=10088 ">
+                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=0 && org_id!=10088 && org_id!=10510">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.count * item.retail_price}} </span> 
@@ -377,7 +377,7 @@
                     </span>
                     </span>
 
-                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id==0 || org_id ==10088">
+                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id==0 || org_id ==10088 || org_id ==10510">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*scope.row.min_price).toFixed(2)}}</span>  
                      <span v-if="is_sys==0"> {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>