From c247686f83047948c58da0bbe3b763b95b14a757 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 22 一月 2025 18:50:52 +0800
Subject: [PATCH] 1
---
src/views/system/package/index.vue | 157 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 98 insertions(+), 59 deletions(-)
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 666f2ff..83d3587 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -24,19 +24,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="濂楅鍒嗙被" prop="categoryId">
+ <el-form-item label="浣撴绫诲埆" prop="tjCategory">
<el-select
- v-model="queryParams.categoryId"
+ v-model="queryParams.tjCategory"
placeholder="璇烽�夋嫨鐘舵��"
style="width: 200px"
filterable
clearable
>
<el-option
- v-for="dict in categoryList"
+ v-for="dict in dict.type.dict_tjtype"
:key="dict.id"
- :label="dict.name"
- :value="dict.id"
+ :label="dict.label"
+ :value="dict.value"
></el-option>
</el-select>
</el-form-item>
@@ -131,12 +131,19 @@
/>
<!-- <el-table-column label="缂栧彿" align="center" prop="pacId" /> -->
<el-table-column
- label="濂楅鍒嗙被"
+ label="浣撴绫诲埆"
width="100px"
align="center"
prop="categoryNames"
fixed
- ></el-table-column>
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.dict_tjtype"
+ :value="scope.row.tjCategory"
+ />
+ </template>
+ </el-table-column>
<el-table-column
label="濂楅鍚嶇О"
align="center"
@@ -240,12 +247,12 @@
align="center"
prop="retailPrice"
></el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="鍘熶环"
width="90px"
align="center"
prop="counterPrice"
- ></el-table-column>
+ ></el-table-column> -->
<el-table-column
label="宸插敭鏁伴噺"
width="90px"
@@ -363,12 +370,7 @@
</el-select>
</el-form-item>
- <el-form-item label="濂楅绫荤洰" prop="categoryId">
- <!-- <el-input
- v-model="form.createId"
- placeholder="璇疯緭鍏ュ晢鍝佺被鐩�"
- style="width: 200px"
- /> -->
+ <!-- <el-form-item label="濂楅绫荤洰" prop="categoryId">
<el-select
v-model="form.categoryId"
placeholder="璇烽�夋嫨濂楅绫荤洰"
@@ -384,7 +386,7 @@
:value="item.id"
></el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鍏抽敭瀛�" prop="keywords">
<el-select
@@ -560,7 +562,7 @@
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
@input="handleFilterInput"
- v-model="queryParams.nr"
+ v-model="queryParams1.nr"
clearable
/>
<div class="tab3" style="height: 365px">
@@ -580,11 +582,11 @@
</el-tree>
<pagination
small
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="handlePageChange"
+ v-show="total1 > 0"
+ :total="total1"
+ :page.sync="queryParams1.page"
+ :limit.sync="queryParams1.pageSize"
+ @pagination="getDataList"
/>
</div>
</el-col>
@@ -823,16 +825,21 @@
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
Seachopen: false,
+ checkedNodes: [],
pacId: "",
// 鎬绘潯鏁�
total: 0,
+ total1: 0,
// 鏌ヨ鍙傛暟
queryParams: {
- page: 1,
pageNum: 1,
pageSize: 10,
pacName: null,
pacRemark: null,
+ },
+ queryParams1: {
+ page: 1,
+ pageSize: 30,
nr: "",
},
// 琛ㄥ崟鍙傛暟
@@ -941,6 +948,7 @@
this.loading = true;
listCategory(this.queryParams).then((response) => {
this.categoryList = response.rows;
+ console.log(this.categoryList, 9988);
});
},
shangpin(vals) {},
@@ -1063,6 +1071,8 @@
// });
getPacInFo(this.forms.pacId).then((response) => {
this.form = response.data;
+ console.log(this.form, 2233);
+
this.form.keywords = this.form.keywords.slice(0, -1);
this.form.keywords = this.form.keywords.split(",");
// this.DataList = [];
@@ -1088,6 +1098,8 @@
this.open = true;
getPacInFo(row.pacId).then((response) => {
this.form = response.data;
+ console.log(this.form, 445);
+
this.form.keywords = this.form.keywords.slice(0, -1);
this.form.keywords = this.form.keywords.split(",");
this.DataList = [];
@@ -1149,13 +1161,18 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete1(row) {
this.DataList = this.DataList.filter((item) => item.proId !== row.proId);
- const tree = this.$refs.tree;
- const node = tree.getNode(row.proId); // 鏍规嵁鑺傜偣鐨勫敮涓�鏍囪瘑鑾峰彇鑺傜偣瀵硅薄
- if (node) {
- node.setChecked(false); // 鍙栨秷閫変腑鐘舵��
+ // 浠� checkedNodes 涓Щ闄�
+ const index = this.checkedNodes.indexOf(row.proId);
+ if (index > -1) {
+ this.checkedNodes.splice(index, 1);
}
+ const tree = this.$refs.tree;
+ const node = tree.getNode(row.proId);
+ if (node) {
+ node.setChecked(false);
+ }
+ this.updateTotalPrice();
},
-
getSelectValue(val) {
this.form.tjProjectList.forEach((formitem) => {
if (formitem.proName == val) {
@@ -1267,13 +1284,18 @@
},
getDataList() {
this.loading = true;
- search(this.queryParams).then((response) => {
+ search(this.queryParams1).then((response) => {
this.Treedata = response.data.list; // 鏇存柊鏍戝舰鏁版嵁
- this.total = response.data.total; // 鏇存柊鎬绘潯鏁�
+ this.total1 = response.data.total; // 鏇存柊鎬绘潯鏁�
this.pics = this.DataList.reduce(
(total, item) => total + item.priceOrd,
0
);
+
+ // 纭繚鍦ㄦ暟鎹姞杞藉悗淇濇寔閫変腑鐘舵��
+ this.$nextTick(() => {
+ this.$refs.tree.setCheckedKeys(this.checkedNodes);
+ });
});
this.loading = false;
},
@@ -1284,12 +1306,12 @@
// this.Treedata = response.data.list;
// /* if (this.form.tjProjectList) {
// this.form.tjProjectList.forEach((item) => {
- // this.Treedata.forEach((item1) => {
+ // this.Treedata.forEach((item1) => {
// if (item.proId == item1.proId) {
// this.checkedkey.push(item1.proId);
-
+
// this.DataList.push(item1);
-
+
// this.DataList.forEach((item1) => {
// item1.limits = 10;
// if (item1.limits > 10) {
@@ -1299,7 +1321,7 @@
// }
// this.updateProPrice(item1); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
// });
-
+
// }
// });
// });
@@ -1340,8 +1362,12 @@
// });
// },
handleFilterInput() {
- this.queryParams.page = 1; // 鎼滅储鏃堕噸缃负绗竴椤�
+ this.queryParams1.page = 1; // 鎼滅储鏃堕噸缃负绗竴椤�
this.getDataList(); // 璋冪敤鎺ュ彛鑾峰彇鏁版嵁
+ // 鍦ㄨ繃婊ゅ悗锛岄噸鏂拌缃�変腑鐘舵��
+ this.$nextTick(() => {
+ this.$refs.tree.setCheckedKeys(this.checkedNodes);
+ });
},
// 鍒嗛〉浜嬩欢
@@ -1351,36 +1377,49 @@
this.getDataList(); // 璋冪敤鎺ュ彛鑾峰彇鏁版嵁
},
- handleCurrentChecked(data, checked, checkedNodes) {
- this.dataObj = data;
- this.checkedObj = checked;
-
+ handleCurrentChecked(data, checked, indeterminate) {
if (checked) {
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪浜� DataL
- this.DataList.push({
- proId: data.proId,
- proName: data.proName,
- priceOrd: data.proPrice, // 鍘熶环锛岀‘淇濊祴鍊兼纭�
- limits: 10,
- priceNow: data.proPrice,
- });
+ // 濡傛灉宸查�夊垪琛ㄤ腑涓嶅瓨鍦ㄦ椤圭洰锛屽垯娣诲姞
+ if (!this.DataList.some((item) => item.proId === data.proId)) {
+ this.DataList.push({
+ proId: data.proId,
+ proName: data.proName,
+ priceOrd: data.proPrice,
+ limits: 10,
+ priceNow: data.proPrice,
+ });
+ }
+ // 娣诲姞鍒� checkedNodes 鏁扮粍
+ if (!this.checkedNodes.includes(data.proId)) {
+ this.checkedNodes.push(data.proId);
+ }
} else {
- let index = this.DataList.findIndex(
- (item) => item.proId === data.proId
+ // 鍙栨秷閫変腑鏃讹紝浠嶥ataList涓Щ闄�
+ this.DataList = this.DataList.filter(
+ (item) => item.proId !== data.proId
);
- if (index !== -1) {
- this.DataList.splice(index, 1);
+ // 浠� checkedNodes 涓Щ闄�
+ const index = this.checkedNodes.indexOf(data.proId);
+ if (index > -1) {
+ this.checkedNodes.splice(index, 1);
}
}
- this.pics = 0;
- this.TotalPrice1 = 0;
- this.DataList.forEach((item) => {
- this.pics += item.priceOrd;
- this.form.counterPrice += item.priceOrd;
- this.TotalPrice1 += item.priceOrd; // 鍙互鏍规嵁闇�瑕佹敼鎴愪紭鎯犱环 `priceNow`
- });
- },
+ // 鏇存柊浼樻儬浠峰拰鎬讳环
+ this.updateTotalPrice();
+ },
+ updateTotalPrice() {
+ // 璁＄畻鎵�鏈夐」鐩殑鎬讳紭鎯犱环
+ this.form.xianprice = this.DataList.reduce((sum, item) => {
+ return sum.plus(new Big(item.priceNow || "0"));
+ }, new Big(0)).toNumber();
+
+ // 璁＄畻鍘熶环鎬诲拰
+ this.pics = this.DataList.reduce(
+ (total, item) => total + item.priceOrd,
+ 0
+ );
+ },
spliceData() {
for (var i = 0; i < this.DataList.length; i++) {
for (var j = i + 1; j < this.DataList.length; j++) {
--
Gitblit v1.8.0