9月2日

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -77,12 +77,12 @@
         ></el-input>
       </el-form-item>
 
-    <el-form-item label="支付方式：" style="width:100%;">
-         <el-radio-group v-model="form.pay_way">
+      <el-form-item label="支付方式：" style="width:100%;">
+        <el-radio-group v-model="form.pay_way">
           <el-radio :label="item.value" :value="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
-           <el-button type="primary" v-if="form.pay_way == 5" @click="reading()">读卡</el-button>
+          <el-button type="primary" v-if="form.pay_way == 4" @click="reading()">读卡</el-button>
 
-         </el-radio-group>
+        </el-radio-group>
       </el-form-item>
 
       <el-form-item label="个人现金支付方式：" style="width: 100%">
@@ -167,7 +167,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
-<!--      <el-button @click="init">调试</el-button>-->
+      <!--      <el-button @click="init">调试</el-button>-->
     <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
@@ -216,7 +216,7 @@
           // {value: 2, label: '银行卡'},
           // {value: 3, label: '微信'},
           // {value: 4, label: '支付宝'},
-          { value: 5, label: '医保卡' },
+          { value: 4, label: '医保卡' },
 
         ],
         total: "",
@@ -259,186 +259,186 @@
         default: 1,
       },
     },
-      created() {
-      },
-      methods: {
-        reading() {
-          var that = this
-          let params = {
-            'id_card_type': 1,
-            '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
+    created() {
+    },
+    methods: {
+      reading() {
+        var that = this
+        let params = {
+          'id_card_type': 1,
+          '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
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              that.$message({ message: '读卡成功', type: 'success' })
+            }
           })
-              .then(function(response) {
-                if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
-                  return false
-                } else {
-                  that.$message({ message: '读卡成功', type: 'success' })
-                }
-              })
-              .catch(function(error) {
-
-              })
-        },
+          .catch(function(error) {
 
-        init() {
-          console.log("====this.form.dec_way===", this.form.dec_way)
-        },
-        lilili(val) {
-          console.log("val", val)
-          if (this.form.tmp_decimal == "") {
-            this.form.pay_price = this.tmp_pay
-            return
-          }
+          })
+      },
+
+      init() {
+        console.log("====this.form.dec_way===", this.form.dec_way)
+      },
+      lilili(val) {
+        console.log("val", val)
+        if (this.form.tmp_decimal == "") {
+          this.form.pay_price = this.tmp_pay
+          return
+        }
+        if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)) {
+          // alert("押金不得大于自费金额")
+          this.$message.error("押金不得大于自费金额");
+          this.form.tmp_decimal = ""
+          this.form.pay_price = this.tmp_pay
+          return
+        }
+        // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
+
+        this.form.pay_price = ((parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000).toFixed(2)
+      },
+      changedecimal() {
+        // console.log("this.isshow前",this.isshow)
+        this.$forceUpdate();
+        this.isshow = this.form.dec_way
+        // console.log("this.form.dec_way后",this.form.dec_way)
+        if (this.isshow == false) {
+          // this.form.private_price = parseFloat(this.form.pay_price)
+          this.form.tmp_decimal = 0
+          this.form.pay_price = this.tmp_pay
+        } else {
+          //储存临时付款
+          this.tmp_pay = this.form.pay_price
           if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)) {
+            this.form.tmp_decimal = 0
             // alert("押金不得大于自费金额")
             this.$message.error("押金不得大于自费金额");
-            this.form.tmp_decimal = ""
-            this.form.pay_price = this.tmp_pay
             return
           }
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
-
+          this.tmp_pay = this.form.pay_price
           this.form.pay_price = ((parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000).toFixed(2)
-        },
-        changedecimal() {
-          // console.log("this.isshow前",this.isshow)
-          this.$forceUpdate();
-          this.isshow = this.form.dec_way
-          // console.log("this.form.dec_way后",this.form.dec_way)
-          if (this.isshow == false) {
-            // this.form.private_price = parseFloat(this.form.pay_price)
-            this.form.tmp_decimal = 0
-            this.form.pay_price = this.tmp_pay
-          } else {
-            //储存临时付款
-            this.tmp_pay = this.form.pay_price
-            if (parseFloat(this.form.tmp_decimal) > parseFloat(this.form.private_price)) {
-              this.form.tmp_decimal = 0
-              // alert("押金不得大于自费金额")
-              this.$message.error("押金不得大于自费金额");
-              return
-            }
-            // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
-            this.tmp_pay = this.form.pay_price
-            this.form.pay_price = ((parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000).toFixed(2)
-          }
-        },
-        //查询用户当前的余额
-        updateconfig() {
-          var params = {
-            his_patient_id: this.id,
-          }
-          idtobalance(params).then((res) => {
-            if (res.data.state == 1) {
-              this.decimal = res.data.data.list;
-            }
-          })
-        },
-        show(total,order,id) {
-          this.record_date = moment(new Date()).add('year', 0).format("YYYY-MM-DD HH:mm")
-          //初始化
-          this.form.tmp_decimal = 0
-          this.tmp_pay = 0
-          this.id = id
-          this.updateconfig()
-          this.form.dec_way = false
-          this.form.total = total
-          this.form.private_price = total
-          this.form.pay_price = total
-          this.form.total = total + this.form.medical_insurance_price
-          this.form.discount_price = 0.0
-          this.form.preferential_price = 0.0
-
-          this.form.fapiao_code = "";
-          this.form.fapiao_number = "";
-          this.order = order;
-
-          if (this.order && this.order.id > 0) {
-            this.form.acct_pay = this.order.acct_pay
-            this.form.psn_pay = this.order.psn_cash_pay
-            this.form.total = this.order.medfee_sumamt
-            this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
-            this.form.medical_insurance_price = this.order.fund_pay_sumamt
-            this.form.private_price = this.order.psn_part_amt
+        }
+      },
+      //查询用户当前的余额
+      updateconfig() {
+        var params = {
+          his_patient_id: this.id,
+        }
+        idtobalance(params).then((res) => {
+          if (res.data.state == 1) {
+            this.decimal = res.data.data.list;
           }
+        })
+      },
+      show(total,order,id) {
+        this.record_date = moment(new Date()).add('year', 0).format("YYYY-MM-DD HH:mm")
+        //初始化
+        this.form.tmp_decimal = 0
+        this.tmp_pay = 0
+        this.id = id
+        this.updateconfig()
+        this.form.dec_way = false
+        this.form.total = total
+        this.form.private_price = total
+        this.form.pay_price = total
+        this.form.total = total + this.form.medical_insurance_price
+        this.form.discount_price = 0.0
+        this.form.preferential_price = 0.0
+
+        this.form.fapiao_code = "";
+        this.form.fapiao_number = "";
+        this.order = order;
+
+        if (this.order && this.order.id > 0) {
+          this.form.acct_pay = this.order.acct_pay
+          this.form.psn_pay = this.order.psn_cash_pay
+          this.form.total = this.order.medfee_sumamt
+          this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
+          this.form.medical_insurance_price = this.order.fund_pay_sumamt
+          this.form.private_price = this.order.psn_part_amt
+        }
 
-          this.visibility = true
+        this.visibility = true
 
-        },
-        hide: function() {
-          this.form = Object.assign({}, this.resetForm);
-          this.loadingtwo = false;
-          this.visibility = false
-        }, cancel: function(formName) {
-          this.form.tmp_decimal = 0
-          this.tmp_pay = 0
-          this.form.dec_way = false
-          this.$emit('cancel', this.getValue());
-          this.$refs['formValue'].resetFields()
-        },
-        confirm: function(formName) {
-          if (parseFloat(this.form.tmp_decimal) > parseFloat(this.decimal)){
-            this.$message.error("押金余额不足");
-            return
-          }
-          this.$refs['formValue'].validate((valid) => {
-            if (valid) {
-              let value = {};
-              value = this.getValue();
-              this.$emit('confirm', value);
-              this.loadingtwo = true
-            }
-          })
-        },
-        getValue: function() {
-          let form = {};
-          form = this.form;
-          return form
-        },
-        realityPrice(val) {
-          if (val < (this.form.total - this.form.discount_price - this.form.preferential_price)) {
-            this.$message.error('实收金额不能小于收费金额');
-            return
-          }
-          this.form.found_price = parseInt(val) - parseInt(this.form.total) + parseInt(this.form.discount_price) + parseInt(this.form.preferential_price)
-        },
-        changeDiscountPrice(val) {
-          if (val > this.form.total) {
-            this.$message.error('折扣金额不能超过费用总额');
-            return
-          }
-          this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
-        },
-        changePreferentialPrice(val) {
-          if (val > this.form.total) {
-            this.$message.error('优惠金额不能超过费用总额');
-            return
+      },
+      hide: function() {
+        this.form = Object.assign({}, this.resetForm);
+        this.loadingtwo = false;
+        this.visibility = false
+      }, cancel: function(formName) {
+        this.form.tmp_decimal = 0
+        this.tmp_pay = 0
+        this.form.dec_way = false
+        this.$emit('cancel', this.getValue());
+        this.$refs['formValue'].resetFields()
+      },
+      confirm: function(formName) {
+        if (parseFloat(this.form.tmp_decimal) > parseFloat(this.decimal)){
+          this.$message.error("押金余额不足");
+          return
+        }
+        this.$refs['formValue'].validate((valid) => {
+          if (valid) {
+            let value = {};
+            value = this.getValue();
+            this.$emit('confirm', value);
+            this.loadingtwo = true
           }
-          this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
+        })
+      },
+      getValue: function() {
+        let form = {};
+        form = this.form;
+        return form
+      },
+      realityPrice(val) {
+        if (val < (this.form.total - this.form.discount_price - this.form.preferential_price)) {
+          this.$message.error('实收金额不能小于收费金额');
+          return
         }
+        this.form.found_price = parseInt(val) - parseInt(this.form.total) + parseInt(this.form.discount_price) + parseInt(this.form.preferential_price)
       },
-      mounted() {
-        var nowDate = new Date();
-        var nowYear = nowDate.getFullYear();
-        var nowMonth = nowDate.getMonth() + 1;
-        var nowDay = nowDate.getDate();
-
-        var nowHours = nowDate.getHours();
-        var nowMin = nowDate.getMinutes();
-        var nowSecond = nowDate.getSeconds();
-
-        this.record_date =
-          nowYear +
-          '-' +
-          (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-          '-' +
-          (nowDay < 10 ? '0' + nowDay : nowDay) + " " + (nowHours < 10 ? '0' + nowHours : nowHours) + ":" + (nowMin < 10 ? '0' + nowMin : nowMin)
+      changeDiscountPrice(val) {
+        if (val > this.form.total) {
+          this.$message.error('折扣金额不能超过费用总额');
+          return
+        }
+        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
+      },
+      changePreferentialPrice(val) {
+        if (val > this.form.total) {
+          this.$message.error('优惠金额不能超过费用总额');
+          return
+        }
+        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
       }
+    },
+    mounted() {
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+
+      var nowHours = nowDate.getHours();
+      var nowMin = nowDate.getMinutes();
+      var nowSecond = nowDate.getSeconds();
+
+      this.record_date =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay) + " " + (nowHours < 10 ? '0' + nowHours : nowHours) + ":" + (nowMin < 10 ? '0' + nowMin : nowMin)
+    }
 
 
   }
@@ -446,16 +446,16 @@
 
 
 <style lang="scss" scoped>
-/deep/input::-webkit-input-placeholder {
-  color: red;
-  font-size: 15px;
-}
-
-/deep/.el-input__inner {
-  background-color: transparent !important;
-  border: 1px solid red;
-}
-.chargeDialog {
+  /deep/input::-webkit-input-placeholder {
+    color: red;
+    font-size: 15px;
+  }
+
+  /deep/.el-input__inner {
+    background-color: transparent !important;
+    border: 1px solid red;
+  }
+  .chargeDialog {
   .el-form {
     display: flex;
     flex-wrap: wrap;
@@ -463,13 +463,13 @@
   .el-form-item {
     width: 50%;
   }
-}
-.input_style {
-  border-radius: 5px;
-  border: 1px solid #dddddd;
-}
-.input_style:focus {
-outline:none;
-border: 1px solid #66b1ff;
-}
+  }
+  .input_style {
+    border-radius: 5px;
+    border: 1px solid #dddddd;
+  }
+  .input_style:focus {
+    outline:none;
+    border: 1px solid #66b1ff;
+  }
 </style>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -17,8 +17,8 @@
       <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
-      <list-print-two v-if="org_id == 10215 || org_id == 0 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
-      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
+      <print-two10265  v-if="org_id == 10265 || org_id == 0 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -189,7 +189,7 @@
                 if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
                   obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
                   obj['name'] = infos.advice.drug.drug_name
-                  obj['unit'] = infos.advice.drug.min_unit
+                  obj['unit'] = infos.advice.prescribing_number_unit
                   obj['feedetl_sn'] =  infos.feedetl_sn
                   obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
                   obj['is_total']= 0
@@ -314,7 +314,7 @@
                 obj['name'] = details[a].advice.advice_name
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
-                obj['unit'] = details[a].advice.drug.max_unit
+                obj['unit'] = details[a].advice.prescribing_number_unit
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
@@ -409,7 +409,7 @@
                 obj['name'] = details[a].advice.advice_name
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
-                obj['unit'] = details[a].advice.drug.max_unit
+                obj['unit'] = details[a].advice.prescribing_number_unit
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
@@ -570,7 +570,7 @@
         if(this.org_id != 10106){
           if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
             const style =
-                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+              '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'allList-print',
               type: 'html',
@@ -581,7 +581,7 @@
 
           }else {
             const style =
-                '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
+              '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'list-print',
               type: 'html',
@@ -591,7 +591,7 @@
           }
         }else{
           const style =
-          '@media print {#statement-print{font-size:12px;width:800px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+            '@media print {#statement-print{font-size:12px;width:800px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
           printJS({
             printable: "statement-print",
             type: "html",