From 8315c3ff55eb53be82ac7ddbbc6cce5f447ffdfa Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 09 四月 2025 13:42:35 +0800
Subject: [PATCH] qx
---
src/views/system/comp/index.vue | 359 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 266 insertions(+), 93 deletions(-)
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index af48456..5d2295e 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -45,15 +45,43 @@
<el-table-column label="鑱旂郴浜�" align="center" prop="contactPerson" :show-overflow-tooltip="true" width="90px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="contactPhone" :show-overflow-tooltip="true" />
<el-table-column label="娉ㄥ唽鍦板潃" align="center" prop="registerAddress" :show-overflow-tooltip="true" />
-
+ <!-- <el-table-column label="浼佷笟绫诲瀷" align="center" prop="typeOfEnterprise" :show-overflow-tooltip="true">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_comp_type" :value="scope.row.typeOfEnterprise"/>
+ </template>
+</el-table-column> -->
<el-table-column label="琛屾斂鍖哄垝" align="center" prop="areaName" :show-overflow-tooltip="true" />
<el-table-column label="閫氳鍦板潃" align="center" prop="mailingAddress" :show-overflow-tooltip="true" />
<el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="寮�鎴烽摱琛�" align="center" prop="bankAccount" :show-overflow-tooltip="true" />
<el-table-column label="閾惰璐﹀彿" align="center" prop="countNum" :show-overflow-tooltip="true" />
-
+ <!-- <el-table-column label="GMP鍙戣瘉鏃ユ湡" align="center" prop="gmpissueDate" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.gmpissueDate, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column> -->
+ <!-- <el-table-column label="缁忚惀璁稿彲璇佸彿" align="center" prop="businessLicenseNumber" /> -->
+ <!-- <el-table-column label="GMP鏈夋晥鎴鏃ユ湡" align="center" prop="gmpDeadlineDate" width="110px" :show-overflow-tooltip="true">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.gmpDeadlineDate, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column> -->
+ <!-- <el-table-column label="GMP寤剁画鏃ユ湡" align="center" prop="gmpDelayDate" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.gmpDelayDate, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column> -->
+ <!-- <el-table-column label="GMP璇佷功鍥剧墖(base64缂栫爜)" align="center" prop="gmpPhoto" width="100">
+ <template slot-scope="scope">
+ <image-preview :src="scope.row.gmpPhoto" :width="50" :height="50"/>
+ </template>
+ </el-table-column> -->
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
-
+ <!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column> -->
<el-table-column label="淇敼浜�" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100px" />
<el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="100px" :show-overflow-tooltip="true">
<template slot-scope="scope">
@@ -61,7 +89,16 @@
</template>
</el-table-column>
<el-table-column label="鎺掑簭" align="center" prop="orderNum" :show-overflow-tooltip="true" width="55px" />
-
+ <!-- <el-table-column label="鏁版嵁鐘舵��(PT10.00.004)" align="center" prop="effective">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_data_status" :value="scope.row.effective"/>
+ </template>
+ </el-table-column> -->
+ <!-- <el-table-column label="鏈夋晥鏃堕棿" align="center" prop="validTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.validTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column> -->
<el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="70px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -80,7 +117,7 @@
</div>
<div>
- <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="false">
+ <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="true">
<el-row :gutter="20">
<el-col :span="7" :xs="24">
<div style="padding: 0 20px">
@@ -133,10 +170,6 @@
<el-form-item label="鍘熶环" prop="price">
<el-input v-model="forms.price" placeholder="璇疯緭鍏ュ師浠�" style="width: 130px" />
</el-form-item>
- <!-- <el-form-item label="鎶樻墸" prop="limits">
- <el-input v-model="forms.limits" placeholder="璇疯緭鍏ユ姌鎵�" style="width: 130px" @change="numberChange" />
- </el-form-item> -->
-
<el-form-item label="浼樻儬浠�" prop="ysPrice">
<el-input v-model="forms.ysPrice" placeholder="璇疯緭鍏ュ簲鏀�" style="width: 120px" />
</el-form-item>
@@ -166,7 +199,7 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGroup">淇濆瓨</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" @click="xiangmuWh">椤圭洰缁存姢</el-button>
+ <el-button type="primary" icon="el-icon-edit" size="mini" @click="xiangmuWh" >椤圭洰缁存姢</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
@@ -256,6 +289,8 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
<el-col :span="2" :xs="24">
<div style="margin: 240% 16%">
@@ -289,41 +324,42 @@
</div>
<div>
- <el-dialog :title="title" :visible.sync="openOne" width="1400px" append-to-body :close-on-click-modal="false">
+ <el-dialog :title="title" :visible.sync="openOne" width="1400px" append-to-body :close-on-click-modal="false" >
<el-row :gutter="24" v-if="!isTableVisible">
<el-col :span="15" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
- style="height: 35px" @submit.native.prevent>
+ style="height: 50px" @submit.native.prevent>
<el-form-item label="鍘熶环">
<el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
</el-form-item>
- <el-form-item label="浼樻儬">
- <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="2" :step="0.1"
- :min="0" @change="numberChange"></el-input-number>
+ <el-form-item label="鎶樻墸">
+ <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="1" :step="0.1"
+ :min="0" :max="10" @change="debounceNumberChange" :debounce="3000"></el-input-number>
</el-form-item>
<el-form-item label="鐜颁环">
<el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable
- style="width: 140px" />
+ style="width: 140px" @input="changeXianjia" @blur="numberChangeXianPrice(youhui, youhui)" />
</el-form-item>
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="486">
+ <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478" :cell-style="{ padding: '5px 0' }">
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="410">
<template slot-scope="scope">
{{ scope.row.proName }}
</template>
</el-table-column>
<el-table-column label="鍘熶环" align="center" prop="proPrice" width="85"></el-table-column>
- <el-table-column label="鎶樻墸" width="85">
+ <el-table-column label="鎶樻墸" width="151">
<template slot-scope="scope">
- <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
- <el-input v-model.number="scope.row.limits" @input="validateDiscount(scope.row)" placeholder="杈撳叆鎶樻墸"
- size="small" type="number" min="0" step="1" max="10">
- </el-input>
+ <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 @input="validateDiscount(scope.row)"-->
+ <el-input-number v-model="scope.row.limits"
+ @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="mini" type="number" :min="0"
+ :step="0.1" :precision="1" :max="10">
+ </el-input-number>
</template>
</el-table-column>
<el-table-column label="鐜颁环" align="center" prop="ysPrice" width="85"></el-table-column>
@@ -334,14 +370,19 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
- <el-col :span="2" :xs="24">
- <div style="margin: 240% 16%">
- <el-button type="primary" size="medium " icon="el-icon-back"
- style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" @click="resetright">纭�
- 璁�</el-button>
+ <!-- <el-col :span="2" :xs="24">
+ <div style="margin: 240% 16%" class="btntoleft">
+ <el-button type="primary" size="medium"
+ style="writing-mode: vertical-rl; text-align: center; letter-spacing: 5px;" @click="resetright">
+ 纭�
+ 璁�
+ <i class="el-icon-back"></i>
+ </el-button>
</div>
- </el-col>
+ </el-col> -->
<el-col :span="7" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px" @submit.native.prevent>
@@ -391,7 +432,7 @@
</el-table-column>
</el-table>
<div style="font-size: 16px;margin-top: 10px;">椤圭洰鎬绘潯鏁帮細<span style="font-weight: 700;margin-right: 5px;">{{
- newpacName.length }}</span>鏉�</div>
+ newpacName.length }}</span>鏉�</div>
</el-col>
<el-col :span="8" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
@@ -403,7 +444,7 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
+ <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478" :cell-style="{ padding: '5px 0' }">
<el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="170">
<template slot-scope="scope">
@@ -418,14 +459,16 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
- <el-col :span="2" :xs="24">
+ <!-- <el-col :span="2" :xs="24">
<div style="margin: 240% 16%">
<el-button type="primary" size="medium " icon="el-icon-back"
- style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;"
- @click="resetright">纭� 璁�</el-button>
+ style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" @click="resetright">纭�
+ 璁�</el-button>
</div>
- </el-col>
+ </el-col> -->
<el-col :span="8" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px" @submit.native.prevent>
@@ -475,6 +518,9 @@
<el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
</el-form-item>
+ <!-- <el-form-item label="缂栫爜" prop="code">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鐮�" />
+ </el-form-item> -->
<el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
<el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" style="width: 1157px" />
@@ -506,7 +552,9 @@
<el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
style="width: 830px" resize="none"></el-input>
</el-form-item>
-
+ <!-- <el-form-item label="浜旂瑪绠�鐮�" prop="wbm">
+ <el-input v-model="form.wbm" placeholder="璇疯緭鍏ヤ簲绗旂畝鐮�" />
+ </el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -560,7 +608,6 @@
// 閬僵灞�
loading: true,
Treedata: [],
- getInfodis: 0,
id: "",
// 閫変腑鏁扮粍
ids: [],
@@ -611,6 +658,7 @@
id: "",
// 琛ㄥ崟鍙傛暟
form: {},
+ lastXianPrice: 0,
forms: {
limits: 10,
ltAge: 0,
@@ -651,7 +699,31 @@
contactPhone: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
-
+ // taxNumber: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
+ // legalPerson: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
+ // registerAddress: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
+ // bankAccount: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
+ // countNum: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
+ // principal: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
+ // faxNumber: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
+ // mailingAddress: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
+ // email: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
},
};
},
@@ -665,26 +737,69 @@
this.getList();
},
methods: {
+ handleManualChange(row) {
+ console.log("杩欐槸涓诲姩鍑哄彂鐨�");
+ this.updateProPrice(row);
+ },
validateDiscount(row) {
- if (row.limits > 10) {
- row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
- } else if (row.limits < 0) {
- row.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
+ if (this.queryParams.xianprice !== undefined &&
+ !isNaN(this.queryParams.xianprice) &&
+ this.queryParams.xianprice !== this.lastXianPrice) {
+ // 鍙湁鍦ㄧ幇浠峰疄闄呯敱鐢ㄦ埛杈撳叆淇敼鏃舵墠鏇存柊
+ this.updateProPrice1(row);
+ this.lastXianPrice = this.queryParams.xianprice;
}
- this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
},
updateProPrice(row) {
-
const proPrice = new Big(row.proPrice);
-
const limits = new Big(row.limits);
- const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10)
- row.ysPrice = result.toNumber();
+ const result = proPrice.times(limits.div(10)).toNumber(); // ordPrice * (discount / 10)
+ row.ysPrice = result.toFixed(2);
this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
return sum.plus(new Big(item.ysPrice || '0'));
}, new Big(0)).toNumber();
this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
},
+ updateProPrice1(row) {
+ const proPrice = new Big(row.proPrice);
+ const limits = new Big(row.limits);
+ const result = proPrice.times(limits.div(10)).toNumber(); // ordPrice * (discount / 10)
+ row.ysPrice = result.toFixed(2);
+ const totalYsPrice = this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || '0'));
+ }, new Big(0));
+ const totalYsPriceNum = totalYsPrice.toNumber();
+ if (this.queryParams.xianprice !== undefined && !isNaN(this.queryParams.xianprice)) {
+ const xianPrice = new Big(this.queryParams.xianprice);
+ const diff = xianPrice.minus(totalYsPriceNum);
+ if (!diff.eq(0) && this.OnenewpacName.length > 0) {
+ const lastItem = this.OnenewpacName[this.OnenewpacName.length - 1];
+ const newYsPrice = new Big(lastItem.ysPrice).plus(diff).toNumber();
+ this.$set(this.OnenewpacName[this.OnenewpacName.length - 1], 'ysPrice', newYsPrice);
+ }
+ }
+
+ // Update youhui calculation
+
+ if (this.queryParams.price !== 0 && this.queryParams.xianprice !== 0) {
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ } else {
+ this.youhui = 10;
+ }
+ },
+ debounceNumberChange(currentValue, oldValue) {
+ clearTimeout(this.debounceTimer);
+ this.debounceTimer = setTimeout(() => {
+ this.numberChange(currentValue, oldValue);
+ }, 300);
+ },
+ changeXianjia() {
+ // 鍘熷鎶樻墸鐜囪绠�
+ if (this.queryParams.price !== 0) {
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ }
+ },
+
getList() {
this.$nextTick(() => {
this.$refs.inputName.focus();
@@ -703,17 +818,18 @@
this.loading = false;
});
},
- // 鍙栨秷鎸夐挳
+
cancel() {
this.open = false;
this.opens = false;
- this.$router.go(0);
+ // this.$router.go(0);
},
// 鍙栨秷濂楅
cancell() {
this.openss = false;
this.openOne = false;
+ this.youhui = 10
// this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -770,7 +886,7 @@
this.handleQuery();
},
resetQuerys() {
- this.OnenewpacName = [],
+ this.OnenewpacName = [],
this.queryParams.price = 0,
this.queryParams.xianprice = 0,
this.youhui = 0
@@ -799,7 +915,18 @@
this.GroupUpdate();
}
-
+ /* if (this.selectionList.length) {
+ // 濡傛灉绗竴涓〃鏍兼湁閫変腑椤癸紝閫変腑绗簩涓〃鏍煎搴旂殑鏁版嵁
+ const selectedDeptId = this.selectionList[0].id; // 鍋囪姣忎釜椤规湁涓�涓敮涓�鐨� id
+ const correspondingGroups = this.groupingList.filter(
+ (group) => group.deptId === selectedDeptId
+ );
+ this.groupList = correspondingGroups;
+ } else {
+ // 濡傛灉娌℃湁閫変腑浠讳綍椤癸紝娓呯┖绗簩涓〃鏍肩殑閫変腑椤�
+ this.groupList = [];
+ this.$refs.tbs.clearSelection();
+ } */
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
@@ -827,12 +954,7 @@
this.beCurrentDept();
}
this.title = "濂楅鍒嗙粍缁存姢" + "( " + this.form.cnName + ")";
- getInfo().then((response) => {
- this.getInfodis = response.user.discount;
- if (this.getInfodis == null || this.getInfodis == 10) {
- this.isfalse = true;
- }
- });
+
},
numberChange(currentValue, oldValue) {
this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
@@ -842,10 +964,7 @@
})
.then(() => {
this.youhui = currentValue;
- if (this.youhui < this.getInfodis) {
- this.youhui = this.getInfodis;
- // this.$modal.msgError(`璇ヤ汉鍛樻渶楂樹紭鎯犳潈闄愪负${this.getInfodis}鎶榒);
- }
+
this.OnenewpacName.forEach((item) => {
item.limits = this.youhui
const proPrice = new Big(item.proPrice);
@@ -854,9 +973,9 @@
item.ysPrice = result.toNumber();
this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
return sum.plus(new Big(item.ysPrice || '0'));
- }, new Big(0));
+ }, new Big(0)).toNumber();
})
-
+ // ----------------------------------------------------------
})
.catch(() => {
@@ -864,6 +983,51 @@
});
},
+ numberChangeXianPrice(currentValue, oldValue) {
+ // 濡傛灉鐜颁环娌℃湁鍙樺寲锛岀洿鎺ヨ繑鍥�
+ if (this.queryParams.xianprice === this.lastXianPrice || !this.queryParams.xianprice) {
+ return;
+ }
+
+ this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ // 纭繚淇敼鎶樻墸鐨勫��
+ this.youhui = currentValue;
+
+ let totalYsprice = new Big(0); // 鍒濆鍖栨�� ysprice
+ // 閬嶅巻姣忎釜椤圭洰锛屾洿鏂版瘡涓瓙椤圭殑浠锋牸
+ this.OnenewpacName.forEach((item) => {
+ item.limits = this.youhui;
+ const proPrice = new Big(item.proPrice);
+ const limits = new Big(item.limits);
+ const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10)
+ item.ysPrice = result.toNumber();
+ totalYsprice = totalYsprice.plus(new Big(item.ysPrice));
+ });
+ // 濡傛灉鎬荤殑 ysPrice 鍜屾煡璇㈠弬鏁颁腑鐨� xianprice 涓嶄竴鑷达紝杩涜璋冩暣
+ if (!totalYsprice.eq(this.queryParams.xianprice)) {
+ const diff = new Big(this.queryParams.xianprice).minus(totalYsprice);
+ // 濡傛灉 OnenewpacName 鏁扮粍涓嶄负绌猴紝璋冩暣鏈�鍚庝竴椤圭殑 ysPrice
+ if (this.OnenewpacName.length > 0) {
+ const lastItem = this.OnenewpacName[this.OnenewpacName.length - 1];
+ const newYsPrice = new Big(lastItem.ysPrice).plus(diff).toNumber();
+ // 浣跨敤 $set 纭繚鍝嶅簲鎬ф洿鏂�
+ this.$set(this.OnenewpacName[this.OnenewpacName.length - 1], 'ysPrice', newYsPrice);
+ }
+ }
+ // 鏇存柊 lastXianPrice 浠ヤ究涓嬫姣旇緝
+ this.lastXianPrice = this.queryParams.xianprice;
+ })
+ .catch(() => {
+ // 濡傛灉鍙栨秷淇敼锛屾仮澶嶅師鏈夌殑浼樻儬鍊�
+ this.youhui = oldValue;
+ });
+},
+
changegroupingName() {
if (this.selectionList.length <= 0) {
@@ -879,8 +1043,6 @@
this.loading = true;
if (this.forms.sex) {
deptTreeSelect(this.forms.sex).then((response) => {
- console.log('111', response.rows);
-
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -893,7 +1055,6 @@
});
} else {
deptTreeSelect().then((response) => {
- console.log('222', response.rows);
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -917,7 +1078,6 @@
handleSearch() {
if (this.queryParams.pacName) {
getPackageList(this.queryParams.pacName).then((response) => {
- console.log('333', response.data);
this.newpacName = response.data;
response.data.forEach((item, index) => {
item.newID =
@@ -928,7 +1088,6 @@
});
} else {
deptTreeSelect().then((response) => {
- console.log('44', response.rows);
this.newpacName = response.rows;
response.rows.forEach((item, index) => {
item.newID =
@@ -962,6 +1121,7 @@
handleChangesingle(selection) {
if (selection) {
this.dataList = selection;
+ this.resetright()
}
},
resetright() {
@@ -984,7 +1144,7 @@
const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
if (!existingItem) {
newItemsToAdd.push(item); // 濡傛灉涓嶅瓨鍦ㄧ浉鍚岄」鐩紝鍒欐坊鍔犲埌鏂版暟缁�
- this.updateProPrice(item); // 鏇存柊鍗曚釜椤圭洰鐨勪环鏍�
+ this.updateProPrice(item);
}
});
@@ -1005,11 +1165,12 @@
// 閲嶆柊璁＄畻鎬讳环鍜岀幇浠�
this.OnenewpacName.forEach((item) => {
this.queryParams.price += item.proPrice; // 绱姞鍘熶环
- this.queryParams.xianprice += item.ysPrice || 0; // 绱姞鐜颁环锛屽鏋測sPrice涓簎ndefined鍒欑疮鍔�0
+ //this.queryParams.xianprice += item.ysPrice || 0; 绱姞鐜颁环锛屽鏋測sPrice涓簎ndefined鍒欑疮鍔�0
});
-
- // 璁＄畻浼樻儬锛岃繖閲屽亣璁句紭鎯犳槸鐜颁环涓庡師浠风殑宸鐧惧垎姣�
- this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || '0'));
+ }, new Big(0)).toNumber();
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
}
},
handledbelete(row) {
@@ -1023,14 +1184,16 @@
// 鐒跺悗鏇存柊鎬讳环鍜岀幇浠�
this.OnenewpacName.forEach((item) => {
this.queryParams.price += item.proPrice;
- this.queryParams.xianprice += item.ysPrice || 0; // 纭繚ysPrice瀛樺湪
+ this.queryParams.xianprice =this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || "0"));
+ }, new Big(0)).toNumber();
});
// 璁＄畻浼樻儬
if (this.queryParams.price > 0) {
this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
} else {
- this.youhui = 0;
+ this.youhui = 10;
}
},
@@ -1147,6 +1310,7 @@
this.forms.groupingName = item.groupingName;
this.forms.gtAge = item.gtAge;
this.forms.limits = item.limits;
+ this.youhui =item.limits
this.forms.ltAge = item.ltAge;
this.forms.pacName = item.pacName;
this.forms.payType = item.payType;
@@ -1163,6 +1327,11 @@
this.groupIds = selection.map((item) => item.id);
this.singlegg = !selection.length;
},
+ handleBeforeClose(done) {
+ this.$confirm('纭鍏抽棴锛�')
+ .then(() => done())
+ .catch(() => { /* 鍙栨秷鍏抽棴 */ });
+ },
xiangmuWh() {
if (!this.forms.groupingName ||
!this.forms.sex ||
@@ -1171,7 +1340,6 @@
return; // Stop execution if any required field is empty
}
this.openOne = true;
-
this.title = "鍒嗙粍椤圭洰缁存姢";
this.OnenewpacName = [];
this.queryParams.price = 0;
@@ -1180,13 +1348,19 @@
let id = this.groupList[0].id || '';
getDetails(id).then((res) => {
this.OnenewpacName = res.data.groupingProList;
- this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
- return sum.plus(new Big(item.ysPrice || '0'));
- }, new Big(0));
- this.OnenewpacName.forEach((item, index) => {
- this.queryParams.price += item.proPrice;
- });
- this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+ // this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+ // return sum.plus(new Big(item.ysPrice || '0'));
+ // }, new Big(0)).toNumber();
+
+ // this.OnenewpacName.forEach((item, index) => {
+ // this.queryParams.price += item.proPrice;
+ // });
+ //
+
+ // this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+ this.queryParams.xianprice = res.data.ysPrice
+ this.queryParams.price= res.data.price
+ this.youhui= res.data.limits
});
}
// console.log(this.groupList[0].id, 9966);
@@ -1202,7 +1376,6 @@
deptTreeSelect(this.forms.sex).then((response) => {
// 濂楅鍚嶇О
this.newpacName = response.rows;
- console.log('5', response.rows);
this.loading = false;
response.rows.forEach((item, index) => {
item.newID =
@@ -1216,7 +1389,6 @@
deptTreeSelect().then((response) => {
this.newpacName = response.rows;
- console.log('6', response.rows);
this.loading = false;
response.rows.forEach((item, index) => {
item.newID =
@@ -1228,7 +1400,6 @@
}
getProjectList().then((response) => {
this.Treedata = response.data;
- // console.log(this.Treedata,999888);
});
},
@@ -1242,9 +1413,6 @@
proPrice: item.proPrice,
});
});
-
-
-
let data = {
groupingName: this.forms.groupingName,
@@ -1277,7 +1445,6 @@
},
// 淇敼鍒嗙粍
GroupUpdate() {
- console.log(this.$refs.elTable)
this.$refs.tbs.clearSelection();
this.forms = {
groupingName: "",
@@ -1348,7 +1515,7 @@
}
},
- // 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row,鏂逛究鍙屽嚮淇敼鏃犳硶鑾峰緱绱㈠紩鍒欐棤娉曞彇娑堝悗鏁版嵁杩涜杩樺師
+
tableRowClassName({ row, rowIndex }) {
row.index = rowIndex;
},
@@ -1412,7 +1579,7 @@
},
};
</script>
-<style scoped>
+<style lang="scss" scoped>
.pag {
width: 100%;
display: flex;
@@ -1452,7 +1619,13 @@
}
::v-deep .el-dialog {
- height: 750px;
+ // height: 750px;
overflow-y: auto;
}
+
+::v-deep .btntoleft .el-button--medium {
+ padding: 20px 20px 10px;
+ font-size: 14px;
+ border-radius: 4px;
+}
</style>
--
Gitblit v1.8.0