| src/views/hosp/order/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/system/tijian/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/hosp/order/index.vue
@@ -544,10 +544,12 @@ </el-dialog> <!-- 添加补录项目 --> <el-dialog :title="title" :visible.sync="Projectopen1" width="1100px" style="height: 860px" append-to-body <el-dialog :title="title" :visible.sync="Projectopen1" width="1100px" style="height: 880px" append-to-body :close-on-click-modal="false"> <div class="box"> <div class="box1"> <el-row :gutter="20"> <el-col :span="8"> <div class="grid-content bg-purple"> <div style="text-align: center; margin-bottom: 10px; margin-top: 10px"> 项目选择 </div> @@ -561,8 +563,9 @@ </el-input> <div class="tab3"> <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp" show-checkbox node-key="id" @check-change="handlepackage" :default-checked-keys="checkedkeys" :filter-node-method="filterpackage" ref="treas" :render-content="renderContents"> show-checkbox node-key="id" @check-change="handlepackage" :default-checked-keys="checkedkeys" :filter-node-method="filterpackage" ref="treas" :render-content="renderContents"> </el-tree> </div> </el-col> @@ -588,8 +591,8 @@ </el-tab-pane> </el-tabs> </div> </el-col> <el-col :span="16"> <div class="grid-content bg-purple"> <div style="text-align: center; margin-bottom: 10px; margin-top: 9px"> 已选项目列表 @@ -625,9 +628,10 @@ </template> </el-table-column> </el-table> <!-- <h3 style="font-weight: 600">合计：{{ marryalls }}元</h3> --> </div> </el-col> </el-row> </div> <el-form :model="form" inline style="display: flex; justify-content: space-between; margin-top: 20px"> @@ -650,7 +654,7 @@ <el-form-item label="折扣"> <!-- {{ discount }} --> <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1" <el-input-number ref="inputNumber" style="width: 140px" v-model="discount" :precision="1" :step="0.1" :max="10" :min="0" @change="debounceNumberChange"></el-input-number> </el-form-item> @@ -659,7 +663,7 @@ <el-input placeholder="应付金额" :value="TotalPrice1 * (discount / 10)" style="width: 90px"></el-input> </el-form-item> --> <el-form-item label="应付"> <el-input placeholder="应付金额" v-model="TotalPrice" style="width: 206px" @input="changeXianjia" <el-input placeholder="应付金额" v-model="TotalPrice" style="width: 90px" @input="changeXianjia" @blur="numberChangeXianPrice(discount, discount)" /> </el-form-item> @@ -673,7 +677,7 @@ <!-- 结算方式 --> <el-form-item label="结算方式" prop="jsType" style="display: flex"> <el-select v-model="jsType" placeholder="请选择结算方式" style="width: 130px" clearable> <el-select v-model="jsType" placeholder="请选择结算方式" style="width: 120px" clearable> <el-option v-for="dict in dict.type.reservation_pay_type" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> @@ -934,6 +938,7 @@ import { getwater } from "@/api/hosp/customer"; import { getInfo } from "@/api/login"; import ViewPdf from "@/components/ViewPdf"; import Big from "big.js"; import { shijianzhou, getaddtTransition, @@ -2062,6 +2067,8 @@ this.Datalists = []; this.filterText = "", this.filterage = "", this.TotalPrice = 0; this.discount = 10; this.TotalPrice1 = 0; this.orderId = this.ids; this.cusId = this.cusIds; @@ -2173,6 +2180,9 @@ this.TotalPrice1 = 0; this.DataList3.forEach((item) => { this.TotalPrice1 += item.proPrice * item.sl; let TotalPrice = this.TotalPrice1 * (this.discount / 10) this.TotalPrice = TotalPrice.toFixed(2); this.lastXianPrice = this.TotalPrice; }); }); } else if (checked === false) { @@ -2201,6 +2211,9 @@ this.TotalPrice1 = 0; this.DataList3.forEach((item) => { this.TotalPrice1 += item.proPrice * item.sl; let TotalPrice = this.TotalPrice1 * (this.discount / 10) this.TotalPrice = TotalPrice.toFixed(2); this.lastXianPrice = this.TotalPrice; }); }); } @@ -2244,9 +2257,6 @@ this.spliceData(); this.TotalPrice1 = 0; this.DataList.forEach((item1) => { console.log(item1.proPrice, 3322); console.log(this.TotalPrice1, 1122); this.TotalPrice1 = item1.proPrice + this.TotalPrice1; }); if (this.marryalls != 0) { @@ -2267,9 +2277,10 @@ const discount = new Big(row.discount); const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10) row.nowPrice = result.toNumber(); this.TotalPrice = this.DataList3.reduce((sum, item) => { let TotalPrice= this.DataList3.reduce((sum, item) => { return sum.plus(new Big(item.nowPrice || "0")); }, new Big(0)); }, new Big(0)) this.TotalPrice = TotalPrice.toFixed(2); this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10; } @@ -2299,7 +2310,8 @@ // this.TotalPrice = this.DataList3.reduce((sum, item) => { // return sum.plus(new Big(item.nowPrice || "0")); // }, new Big(0)); this.TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10)).toFixed(2) let TotalPrice = new Big(this.TotalPrice1 * (this.discount / 10)) this.TotalPrice = TotalPrice.toFixed(2); }); }) .catch(() => { @@ -2317,7 +2329,6 @@ numberChangeXianPrice(currentValue, oldValue) { // 如果现价没有变化，直接返回 if (this.TotalPrice === this.lastXianPrice || !this.TotalPrice) { console.log(2222333) return; } this.$confirm("确定修改所有子项的折扣吗？", "提示", { @@ -2331,7 +2342,6 @@ // this.discount = this.getInfodis; // } let totalYsprice = new Big(0); console.log(this.DataList3, 11111) this.DataList3.forEach((item) => { item.discount = this.discount; const ordPrice = new Big(item.proPrice); @@ -2839,7 +2849,7 @@ } .box1 { width: 50%; width: 35%; display: flex; flex-direction: column; } src/views/system/tijian/index.vue
@@ -554,7 +554,7 @@ v-model="activeNames" @tab-click="handleClick" > <el-tab-pane label="套餐" name="first"> <el-tab-pane label="套餐" name="first" :disabled ="form.sftj == 'Y'|| form.sftj == 'y'"> <el-form :model="queryParam" ref="queryForm" @@ -625,7 +625,7 @@ </div> </div> </el-tab-pane> <el-tab-pane label="组合" name="third"> <el-tab-pane label="组合" name="third" :disabled ="form.sftj == 'Y'|| form.sftj == 'y'"> <el-row :gutter="20" style="width: 100%"> <el-col :span="6" style="min-width: 200px"> <div @@ -737,7 +737,7 @@ </el-col> </el-row> </el-tab-pane> <el-tab-pane label="单项" name="second"> <el-tab-pane label="单项" name="second" :disabled ="form.sftj == 'Y'|| form.sftj == 'y'"> <el-row :gutter="20" style="width: 100%"> <el-col :span="6" style="min-width: 200px"> <div @@ -850,6 +850,31 @@ </div> </el-col> </el-row> </el-tab-pane> <el-tab-pane label="亲属套餐" name="four" :disabled ="form.sftj == 'N'|| form.sftj == 'n'"> <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto" @submit.native.prevent="handle"> <el-form-item label="姓名" prop="pacName"> <el-input v-model="queryParam.pacName" placeholder="请输入姓名" clearable @keyup.enter.native="handle" /> </el-form-item> <el-form-item label="身份证" prop="pacName"> <el-input v-model="queryParam.pacName" placeholder="请输入身份证" clearable @keyup.enter.native="handle" /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">查询</el-button> </el-form-item> </el-form> <div class="tab4"> <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%"> <el-table v-loading="loading" element-loading-text="正在加载中..." element-loading-spinner="el-icon-loading" border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb"> <el-table-column type="selection" width="40px" align="center" label="选择" /> <el-table-column label="套餐名称" align="center" prop="pacName" width="120px" /> <el-table-column label="套餐价格" align="center" prop="price" width="120px" /> <el-table-column label="套餐明细" align="center" prop="allProName" :show-overflow-tooltip="true" /> </el-table> </div> </div> </el-tab-pane> </el-tabs> <span slot="footer" class="dialog-footer"> @@ -997,6 +1022,13 @@ @input="changeXianjia" @blur="numberChangeXianPrice(discount, discount)" /> </el-form-item> <el-form-item label="是否替检" v-if="tjtype"> <!-- <el-input placeholder="是否替检" v-model="sftj" style="width: 150px"></el-input> --> <el-select v-model="form.sftj" placeholder="是否替检" style="width: 150px"> <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> </el-select> </el-form-item> <br /> @@ -1525,6 +1557,7 @@ }, data() { return { tjtype: false, isSubmitting: false, contentLoading: false, isLoading: false, @@ -1545,6 +1578,7 @@ cardreaderradio: 3, lishi: false, table: false, dqdlr:null, HistoryList: {}, index: [], names: "", @@ -1982,6 +2016,7 @@ this.title = "添加体检单位信息维护"; }, idFn1() { this.tjtype = true if (this.form.firmName) { const originalCompId = this.form.firmId; this.CompanyList.forEach((item) => { @@ -2083,6 +2118,7 @@ getList1() { getInfo().then((response) => { this.hospName = response.hospName; this.dqdlr = res.user.userId; }); getIsRequired().then((response) => { this.showHidden = response.data; @@ -3144,6 +3180,11 @@ }); } else if (!this.form.firmId && this.form.firmName) { this.taocan = true; if(this.form.sftj == "Y" || this.form.sftj == "y"){ this.activeNames = "four" }else{ this.activeNames = "first" } this.loading = true; deptTreeSelect(cusSex).then((response) => { this.newpacName = response.rows; @@ -3167,6 +3208,11 @@ }); } else { this.taocan = true; if(this.form.sftj == "Y" || this.form.sftj == "y"){ this.activeNames = "four" }else{ this.activeNames = "first" } this.loading = true; tuantiSelect(param).then((res) => { this.newpacName = res.data; @@ -4047,7 +4093,8 @@ //调接口显示导检单 const tjNumber = res.msg; const viewNum = "792931586196398080"; const params = { viewNum, tjNumber }; const dqdlr = this.dqdlr const params = { viewNum, tjNumber,dqdlr}; this.$tab.openPage("导诊单", "/report/breDailyReport", params); this.confirm = true; }); vue.config.js
@@ -54,8 +54,8 @@ [process.env.VUE_APP_BASE_API]: { // target: `https://ltpeis.xaltjdkj.cn:5801/`, // target: `http://192.168.1.99:5012`, target: `http://192.168.1.244:5011`, // target: `http://192.168.1.244:5011`, target: `http://192.168.1.113:5011`, // // target: `http://192.168.0.99:8080/ltkj-admin`, // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`, // target: `http://10.168.0.9:5011`,
