test_user 2 years ago
parent
commit
773a078772

+ 6 - 7
src/xt_pages/hospitalStation/components/chargeDialog.vue View File

225
         },
225
         },
226
         payWays: [
226
         payWays: [
227
           { value: 1, label: '现金' },
227
           { value: 1, label: '现金' },
228
-          // {value: 2, label: '银行卡'},
229
-          // {value: 3, label: '微信'},
230
-          // {value: 4, label: '支付宝'},
228
+          { value: 2, label: '银行卡'},
229
+          { value: 3, label: '微信'},
230
+          { value: 5, label: '支付宝'},
231
+          { value: 7, label: '积分'},
231
           { value: 4, label: '医保卡' },
232
           { value: 4, label: '医保卡' },
232
-          { value: 6, label: '电子凭证' },
233
-
234
-
233
+          { value: 6, label: '电子凭证'},
235
         ],
234
         ],
236
         total: "",
235
         total: "",
237
 
236
 
288
             'admin_user_id': this.$store.getters.xt_user.user.id,
287
             'admin_user_id': this.$store.getters.xt_user.user.id,
289
             'certificates':1,
288
             'certificates':1,
290
           }
289
           }
291
-          
290
+
292
           axios.get('http://127.0.0.1:9532/zh/api/readcard', {
291
           axios.get('http://127.0.0.1:9532/zh/api/readcard', {
293
             params: params
292
             params: params
294
           })
293
           })

+ 4 - 3
src/xt_pages/outpatientCharges/components/chargeDialog.vue View File

161
         },
161
         },
162
         payWays: [
162
         payWays: [
163
           {value: 1, label: '现金'},
163
           {value: 1, label: '现金'},
164
-          // {value: 2, label: '银行卡'},
165
-          // {value: 3, label: '微信'},
166
-          // {value: 4, label: '支付宝'},
164
+          {value: 2, label: '银行卡'},
165
+          {value: 3, label: '微信'},
166
+          {value: 5, label: '支付宝'},
167
+          {value: 7, label: '积分'},
167
           {value: 4, label: '医保卡'},
168
           {value: 4, label: '医保卡'},
168
 
169
 
169
         ],
170
         ],

+ 9 - 1
src/xt_pages/outpatientCharges/statementPrint.vue View File

277
             this.$store.getters.xt_user.org_id == 10191
277
             this.$store.getters.xt_user.org_id == 10191
278
         ) {
278
         ) {
279
           const style =
279
           const style =
280
-              "@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;}}";
280
+            "@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%;}}}";
281
           printJS({
281
           printJS({
282
             printable: "statement-print",
282
             printable: "statement-print",
283
             type: "html",
283
             type: "html",
284
             style: style,
284
             style: style,
285
             scanStyles: false,
285
             scanStyles: false,
286
           });
286
           });
287
+          // const style =
288
+          //     "@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;}}";
289
+          // printJS({
290
+          //   printable: "statement-print",
291
+          //   type: "html",
292
+          //   style: style,
293
+          //   scanStyles: false,
294
+          // });
287
         } else {
295
         } else {
288
           const style =
296
           const style =
289
               "@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%;}}}";
297
               "@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%;}}}";

+ 4 - 0
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

2242
               this.$message.error('疾病类型不能为空')
2242
               this.$message.error('疾病类型不能为空')
2243
               return
2243
               return
2244
             }
2244
             }
2245
+            if (this.diagnose.length <= 0) {
2246
+              this.$message.error('诊断不能为空')
2247
+              return
2248
+            }
2245
             for (let i = 0; i < this.prescriptions.length; i++) {
2249
             for (let i = 0; i < this.prescriptions.length; i++) {
2246
               for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
2250
               for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
2247
                 if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {
2251
                 if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == '') {

+ 13 - 0
src/xt_pages/workforce/components/template_table.vue View File

1174
       <span slot="footer" class="dialog-footer">
1174
       <span slot="footer" class="dialog-footer">
1175
          <el-button
1175
          <el-button
1176
            type="primary"
1176
            type="primary"
1177
+           :loading="changeLoadingOne"
1177
            @click="coverSch()"
1178
            @click="coverSch()"
1178
          >确定</el-button>
1179
          >确定</el-button>
1179
 
1180
 
1193
       <span slot="footer" class="dialog-footer">
1194
       <span slot="footer" class="dialog-footer">
1194
          <el-button
1195
          <el-button
1195
            type="primary"
1196
            type="primary"
1197
+           :loading="changeLoadingTwo"
1196
            @click="changeSchTemplateTwo()"
1198
            @click="changeSchTemplateTwo()"
1197
          >确定</el-button>
1199
          >确定</el-button>
1198
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
1200
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
1267
   },
1269
   },
1268
   data() {
1270
   data() {
1269
     return {
1271
     return {
1272
+      changeLoadingOne:false,
1273
+      changeLoadingTwo:false,
1270
       tipDialogVisibleTwo:false,
1274
       tipDialogVisibleTwo:false,
1271
       tipDialogVisibleThree:false,
1275
       tipDialogVisibleThree:false,
1272
       tipDialogVisible:false,
1276
       tipDialogVisible:false,
2817
         patient_id_two:this.cur_temp_info.patient_id,
2821
         patient_id_two:this.cur_temp_info.patient_id,
2818
 
2822
 
2819
       }
2823
       }
2824
+      this.changeLoadingOne = true
2820
       CoverSchTemplate(params).then((response) => {
2825
       CoverSchTemplate(params).then((response) => {
2821
         if (response.data.state == 0) {
2826
         if (response.data.state == 0) {
2822
           this.$message.error(response.data.msg);
2827
           this.$message.error(response.data.msg);
2823
           this.tipDialogVisibleTwo = false
2828
           this.tipDialogVisibleTwo = false
2829
+          this.changeLoadingOne = false
2824
 
2830
 
2825
         } else {
2831
         } else {
2826
           this.$message.success("替换成功");
2832
           this.$message.success("替换成功");
2827
           this.tipDialogVisible = false
2833
           this.tipDialogVisible = false
2828
           this.tipDialogVisibleTwo = false
2834
           this.tipDialogVisibleTwo = false
2835
+          this.changeLoadingOne = false
2836
+
2829
           // this.getSchedules();
2837
           // this.getSchedules();
2830
           this.all_template = response.data.data.items
2838
           this.all_template = response.data.data.items
2831
           this.$emit("setTemplate",response.data.data.items)
2839
           this.$emit("setTemplate",response.data.data.items)
2857
 
2865
 
2858
 
2866
 
2859
       }
2867
       }
2868
+      this.changeLoadingTwo = true
2860
       ExchangeSchTemplate(params).then((response) => {
2869
       ExchangeSchTemplate(params).then((response) => {
2861
         if (response.data.state == 0) {
2870
         if (response.data.state == 0) {
2862
           this.$message.error(response.data.msg);
2871
           this.$message.error(response.data.msg);
2863
           this.tipDialogVisibleThree = false
2872
           this.tipDialogVisibleThree = false
2873
+          this.changeLoadingTwo = false
2874
+
2864
         } else {
2875
         } else {
2865
           this.$message.success("交换成功");
2876
           this.$message.success("交换成功");
2866
           this.tipDialogVisible = false
2877
           this.tipDialogVisible = false
2867
           this.tipDialogVisibleThree = false
2878
           this.tipDialogVisibleThree = false
2879
+          this.changeLoadingTwo = false
2880
+
2868
           // this.getSchedules();
2881
           // this.getSchedules();
2869
           this.all_template = response.data.data.items
2882
           this.all_template = response.data.data.items
2870
           this.$emit("setTemplate",response.data.data.items)
2883
           this.$emit("setTemplate",response.data.data.items)