From 492a91ada4f0f98d9d800b55f9dddda7b53f7dd8 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期六, 04 一月 2025 18:11:59 +0800
Subject: [PATCH] 1
---
src/views/system/comp/index.vue | 149 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 102 insertions(+), 47 deletions(-)
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 3163714..07b3d74 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -31,7 +31,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="mainDepartment"
- v-hasPermi="['system:comp:edit']">缁存姢閮ㄩ棬</el-button>
+ v-hasPermi="['system:comp:edit']">缁存姢濂楅</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -333,8 +333,8 @@
<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" :max="10" :min="1"></el-input-number>
+ <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="2" :step="0.1"
+ :max="10" :min="1" @change="numberChange"></el-input-number>
</el-form-item>
<el-form-item label="鐜颁环">
<el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable
@@ -372,8 +372,8 @@
<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 :span="11" :xs="24">
@@ -801,7 +801,7 @@
this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
},
updateProPrice(row) {
-
+
const proPrice = new Big(row.proPrice);
const limits = new Big(row.limits);
@@ -810,7 +810,7 @@
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
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
},
getList() {
this.$nextTick(() => {
@@ -971,16 +971,34 @@
}
});
},
- // 鎶樻墸
- numberChange(currentValue) {
- this.forms.limits = currentValue;
- /* if (this.forms.limits > this.getInfodis) {
- this.forms.limits = this.getInfodis;
- this.forms.ysPrice = (
- this.forms.price *
- (this.forms.limits / 10)
- ).toFixed(2);
- } */
+ numberChange(currentValue, oldValue) {
+ this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .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);
+ const limits = new Big(item.limits);
+ const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10)
+ item.ysPrice = result.toNumber();
+ this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || '0'));
+ }, new Big(0));
+ })
+ // ----------------------------------------------------------
+
+ })
+ .catch(() => {
+ this.youhui = oldValue;
+ });
},
@@ -1074,37 +1092,74 @@
this.dataList = selection;
}
},
- // 鍗曢」閫夊畾鎸夐挳
resetright() {
- this.queryParams.price = 0;
- this.dataList.forEach((item) => {
- this.$refs.tre.toggleRowSelection(item, false);
- this.OnenewpacName.push(item);
- });
+ this.queryParams.price = 0;
+ this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
+ this.youhui = 0; // 鍒濆鍖栦紭鎯�
- for (var i = 0; i < this.OnenewpacName.length - 1; i++) {
- for (var j = i + 1; j < this.OnenewpacName.length; j++) {
- if (this.OnenewpacName[i].proId == this.OnenewpacName[j].proId) {
- this.OnenewpacName.splice(j, 1);
- j--;
- }
- }
+ const newItemsToAdd = [];
+
+ this.dataList.forEach((item) => {
+ this.$refs.tre.toggleRowSelection(item, false);
+ // 浣跨敤 $set 纭繚鍝嶅簲鎬�
+ this.$set(item, 'limits', 10);
+ this.$set(item, 'ysPrice', item.proPrice);
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑椤圭洰
+ const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
+ if (!existingItem) {
+ newItemsToAdd.push(item);
+ this.updateProPrice(item); // 鏇存柊鍗曚釜椤圭洰鐨勪环鏍�
+ }
+ });
+
+ // 娣诲姞鏂伴」鐩埌 OnenewpacName
+ this.OnenewpacName.push(...newItemsToAdd);
+
+ // 鍒犻櫎閲嶅椤圭洰锛岃繖閲屾垜浠彧闇�澶勭悊鏂版坊鍔犵殑椤圭洰鍜屽師鏈夐」鐩箣闂寸殑閲嶅
+ for (let i = this.OnenewpacName.length - newItemsToAdd.length; i < this.OnenewpacName.length - 1; i++) {
+ for (let j = i + 1; j < this.OnenewpacName.length; j++) {
+ if (this.OnenewpacName[i].proId === this.OnenewpacName[j].proId) {
+ this.OnenewpacName.splice(j, 1);
+ j--;
}
- return this.OnenewpacName.forEach((item) => {
- this.queryParams.price += item.proPrice;
- });
- },
- handledbelete(row) {
- this.queryParams.price = 0;
- this.OnenewpacName.forEach((item, index) => {
- if (item.proId == row.proId) {
- this.OnenewpacName.splice(index, 1);
- }
- });
- return this.OnenewpacName.forEach((item) => {
- this.queryParams.price += item.proPrice;
- });
- },
+ }
+ }
+
+ // 璁＄畻鎬讳环鍜岀幇浠�
+ this.OnenewpacName.forEach((item) => {
+ this.queryParams.price += item.proPrice;
+ this.queryParams.xianprice += item.ysPrice || 0; // 纭繚ysPrice瀛樺湪
+ });
+
+ // 璁＄畻浼樻儬
+ if (this.queryParams.price > 0) {
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ } else {
+ this.youhui = 0;
+ }
+},
+handledbelete(row) {
+ this.queryParams.price = 0;
+ this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
+ this.youhui = 0; // 鍒濆鍖栦紭鎯�
+
+ // 鍏堟壘鍒板苟鍒犻櫎椤圭洰
+ this.OnenewpacName = this.OnenewpacName.filter(item => item.proId !== row.proId);
+
+ // 鐒跺悗鏇存柊鎬讳环鍜岀幇浠�
+ this.OnenewpacName.forEach((item) => {
+ this.queryParams.price += item.proPrice;
+ this.queryParams.xianprice += item.ysPrice || 0; // 纭繚ysPrice瀛樺湪
+ });
+
+ // 璁＄畻浼樻儬
+ if (this.queryParams.price > 0) {
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ } else {
+ this.youhui = 0;
+ }
+},
submitrighr() {
this.openOne = false;
@@ -1258,7 +1313,7 @@
this.OnenewpacName.forEach((item, index) => {
this.queryParams.price += item.proPrice;
});
- this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price)*100)/100)*10
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
});
}
// console.log(this.groupList[0].id, 9966);
@@ -1311,7 +1366,7 @@
});
-
+
let data = {
groupingName: this.forms.groupingName,
--
Gitblit v1.8.0