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 | 104 ++++++++++++++++++++++++++-------------------------
1 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 2e9b8d3..5d2295e 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -117,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">
@@ -199,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"
@@ -324,18 +324,18 @@
</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="1" :step="0.1"
- :min="0" :max="20" @change="debounceNumberChange" :debounce="3000"></el-input-number>
+ :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
@@ -345,7 +345,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="410">
<template slot-scope="scope">
@@ -355,10 +355,10 @@
<el-table-column label="鍘熶环" align="center" prop="proPrice" width="85"></el-table-column>
<el-table-column label="鎶樻墸" width="151">
<template slot-scope="scope">
- <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
- <el-input-number v-model.number="scope.row.limits" @input="validateDiscount(scope.row)"
- @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="small" type="number" :min="0"
- :step="0.1" :precision="1" :max="20">
+ <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 @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>
@@ -373,7 +373,7 @@
<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%" class="btntoleft">
<el-button type="primary" size="medium"
style="writing-mode: vertical-rl; text-align: center; letter-spacing: 5px;" @click="resetright">
@@ -382,7 +382,7 @@
<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>
@@ -444,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">
@@ -462,13 +462,13 @@
<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>
</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>
@@ -753,8 +753,8 @@
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();
@@ -763,8 +763,8 @@
updateProPrice1(row) {
const proPrice = new Big(row.proPrice);
const limits = new Big(row.limits);
- const result = proPrice.times(limits.div(10));
- row.ysPrice = result.toNumber();
+ 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));
@@ -780,10 +780,11 @@
}
// 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 = 0;
+ this.youhui = 10;
}
},
debounceNumberChange(currentValue, oldValue) {
@@ -794,12 +795,9 @@
},
changeXianjia() {
// 鍘熷鎶樻墸鐜囪绠�
-
-
if (this.queryParams.price !== 0) {
this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
}
-
},
getList() {
@@ -831,6 +829,7 @@
cancell() {
this.openss = false;
this.openOne = false;
+ this.youhui = 10
// this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -974,7 +973,7 @@
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();
})
// ----------------------------------------------------------
@@ -1044,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) => {
@@ -1058,7 +1055,6 @@
});
} else {
deptTreeSelect().then((response) => {
- console.log('222', response.rows);
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -1082,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 =
@@ -1093,7 +1088,6 @@
});
} else {
deptTreeSelect().then((response) => {
- console.log('44', response.rows);
this.newpacName = response.rows;
response.rows.forEach((item, index) => {
item.newID =
@@ -1127,6 +1121,7 @@
handleChangesingle(selection) {
if (selection) {
this.dataList = selection;
+ this.resetright()
}
},
resetright() {
@@ -1170,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) {
@@ -1188,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;
}
},
@@ -1312,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;
@@ -1328,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 ||
@@ -1336,7 +1340,6 @@
return; // Stop execution if any required field is empty
}
this.openOne = true;
-
this.title = "鍒嗙粍椤圭洰缁存姢";
this.OnenewpacName = [];
this.queryParams.price = 0;
@@ -1345,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);
@@ -1367,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 =
@@ -1381,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 =
@@ -1393,7 +1400,6 @@
}
getProjectList().then((response) => {
this.Treedata = response.data;
- // console.log(this.Treedata,999888);
});
},
@@ -1407,9 +1413,6 @@
proPrice: item.proPrice,
});
});
-
-
-
let data = {
groupingName: this.forms.groupingName,
@@ -1442,7 +1445,6 @@
},
// 淇敼鍒嗙粍
GroupUpdate() {
- console.log(this.$refs.elTable)
this.$refs.tbs.clearSelection();
this.forms = {
groupingName: "",
@@ -1617,7 +1619,7 @@
}
::v-deep .el-dialog {
- height: 750px;
+ // height: 750px;
overflow-y: auto;
}
--
Gitblit v1.8.0