更新

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/outpatientCharges/statementPrint.vue

@@ -277,13 +277,21 @@ export default {
             this.$store.getters.xt_user.org_id == 10191
         ) {
           const style =
-              "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";
+            "@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}";
           printJS({
             printable: "statement-print",
             type: "html",
             style: style,
             scanStyles: false,
           });
+          // const style =
+          //     "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";
+          // printJS({
+          //   printable: "statement-print",
+          //   type: "html",
+          //   style: style,
+          //   scanStyles: false,
+          // });
         } else {
           const style =
               "@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}";

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

@@ -1174,6 +1174,7 @@
       <span slot="footer" class="dialog-footer">
          <el-button
            type="primary"
+           :loading="changeLoadingOne"
            @click="coverSch()"
          >确定</el-button>
 
@@ -1193,6 +1194,7 @@
       <span slot="footer" class="dialog-footer">
          <el-button
            type="primary"
+           :loading="changeLoadingTwo"
            @click="changeSchTemplateTwo()"
          >确定</el-button>
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
@@ -1267,6 +1269,8 @@ export default {
   },
   data() {
     return {
+      changeLoadingOne:false,
+      changeLoadingTwo:false,
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
       tipDialogVisible:false,
@@ -2817,15 +2821,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)
@@ -2857,14 +2865,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)