Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -225,13 +225,12 @@
         },
         payWays: [
           { value: 1, label: '现金' },
-          // {value: 2, label: '银行卡'},
-          // {value: 3, label: '微信'},
-          // {value: 4, label: '支付宝'},
+          { value: 2, label: '银行卡'},
+          { value: 3, label: '微信'},
+          { value: 5, label: '支付宝'},
+          { value: 7, label: '积分'},
           { value: 4, label: '医保卡' },
-          { value: 6, label: '电子凭证' },
-
-
+          { value: 6, label: '电子凭证'},
         ],
         total: "",
 
@@ -288,7 +287,7 @@
             'admin_user_id': this.$store.getters.xt_user.user.id,
             'certificates':1,
           }
-          
+
           axios.get('http://127.0.0.1:9532/zh/api/readcard', {
             params: params
           })

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -161,9 +161,10 @@
         },
         payWays: [
           {value: 1, label: '现金'},
-          // {value: 2, label: '银行卡'},
-          // {value: 3, label: '微信'},
-          // {value: 4, label: '支付宝'},
+          {value: 2, label: '银行卡'},
+          {value: 3, label: '微信'},
+          {value: 5, label: '支付宝'},
+          {value: 7, label: '积分'},
           {value: 4, label: '医保卡'},
 
         ],

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2242,6 +2242,10 @@
               this.$message.error('疾病类型不能为空')
               return
             }
+            if (this.diagnose.length <= 0) {
+              this.$message.error('诊断不能为空')
+              return
+            }
             for (let i = 0; i < this.prescriptions.length; i++) {
               for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
                 if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {

src/xt_pages/workforce/components/template_table.vue

@@ -1159,6 +1159,7 @@
       <span slot="footer" class="dialog-footer">
          <el-button
            type="primary"
+           :loading="changeLoadingOne"
            @click="coverSch()"
          >确定</el-button>
 
@@ -1178,6 +1179,7 @@
       <span slot="footer" class="dialog-footer">
          <el-button
            type="primary"
+           :loading="changeLoadingTwo"
            @click="changeSchTemplateTwo()"
          >确定</el-button>
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
@@ -1252,6 +1254,8 @@ export default {
   },
   data() {
     return {
+      changeLoadingOne:false,
+      changeLoadingTwo:false,
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
       tipDialogVisible:false,
@@ -2807,15 +2811,19 @@ export default {
         patient_id_two:this.cur_temp_info.patient_id,
 
       }
+      this.changeLoadingOne = true
       CoverSchTemplate(params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           this.tipDialogVisibleTwo = false
+          this.changeLoadingOne = false
 
         } else {
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
+          this.changeLoadingOne = false
+
           // this.getSchedules();
           this.all_template = response.data.data.items
           this.$emit("setTemplate",response.data.data.items)
@@ -2847,14 +2855,19 @@ export default {
 
 
       }
+      this.changeLoadingTwo = true
       ExchangeSchTemplate(params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           this.tipDialogVisibleThree = false
+          this.changeLoadingTwo = false
+
         } else {
           this.$message.success("交换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleThree = false
+          this.changeLoadingTwo = false
+
           // this.getSchedules();
           this.all_template = response.data.data.items
           this.$emit("setTemplate",response.data.data.items)