From 47f3611b20b8ee9379e93c82b7b2f46edae56eb1 Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期二, 21 一月 2025 14:13:56 +0800 Subject: [PATCH] taocan --- src/views/system/package/index.vue | 524 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 386 insertions(+), 138 deletions(-) diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue index 77d8860..06436ff 100644 --- a/src/views/system/package/index.vue +++ b/src/views/system/package/index.vue @@ -145,10 +145,24 @@ fixed /> <el-table-column - label="浠锋牸" + label="鍘熶环" width="80px" align="center" prop="price" + fixed + ></el-table-column> + <el-table-column + label="鎶樻墸" + width="80px" + align="center" + prop="limits" + fixed + ></el-table-column> + <el-table-column + label="浼樻儬浠�" + width="80px" + align="center" + prop="newPrice" fixed > </el-table-column> @@ -301,7 +315,7 @@ <el-dialog :title="title" :visible.sync="open" - width="1500px" + width="1400px" append-to-body :close-on-click-modal="false" > @@ -425,17 +439,38 @@ style="width: 150px" /> </el-form-item> - <el-form-item label="鍘熶环" prop="counterPrice"> + <el-form-item label="鍘熶环" prop="pics"> <el-input - v-model="form.counterPrice" + v-model="pics" placeholder="璇疯緭鍏ュ師浠�" style="width: 150px" /> </el-form-item> - <el-form-item label="浣撴绫诲埆" prop="tjCategory"> - <el-select + <el-form-item label="鎶樻墸"> + <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="form.xianprice" + placeholder="浼樻儬浠�" + clearable + style="width: 140px" + /> + </el-form-item> + <el-form-item label="浣撴绫诲埆" prop="tjCategory"> + <el-select v-model="form.tjCategory" - placeholder="璇烽�夋嫨鏄惁涓婃灦" + placeholder="璇烽�夋嫨浣撴绫诲埆" style="width: 150px" filterable clearable @@ -448,7 +483,6 @@ ></el-option> </el-select> </el-form-item> - <div v-if="!isCollapsed" style="display: flex"> <div> @@ -516,16 +550,20 @@ </el-table-column> </el-table> --> - <el-row :gutter="20"> - <el-col :span="7"> + <el-row style="display: flex; width: 1300px"> + <el-col> <div style="text-align: center; margin-bottom: 10px; margin-top: 10px" > 椤圭洰鍒楄〃 </div> - <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText"> - </el-input> - <div class="tab3"> + <el-input + placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" + @input="handleFilterInput" + v-model="queryParams1.nr" + clearable + /> + <div class="tab3" style="height: 365px"> <el-tree class="filter-tree" v-loading="loading" @@ -540,9 +578,17 @@ :render-content="renderContent" > </el-tree> + <pagination + small + v-show="total1 > 0" + :total="total1" + :page.sync="queryParams1.page" + :limit.sync="queryParams1.pageSize" + @pagination="getDataList" + /> </div> </el-col> - <el-col :span="6"> + <!-- <el-col :span="6"> <div style="text-align: center; margin-bottom: 10px; margin-top: 10px" > @@ -564,27 +610,73 @@ > </el-tree> </div> - </el-col> - <el-col :span="11"> + </el-col> --> + <el-col> <div class="grid-content bg-purple"> <div - style="text-align: center; margin-bottom: 10px; margin-top: 10px" + style=" + text-align: center; + margin-bottom: 10px; + margin-top: 10px; + margin-left: 8%; + " > 宸查�夐」鐩垪琛� </div> <el-table :data="DataList" border - style="width: 100%" + style="width: 90%; margin-left: 20px" height="400" :span-method="objectSpanMethod" > - <el-table-column prop="propinName" label="妫�鏌ラ」鐩�"> + <el-table-column prop="proName" label="妫�鏌ラ」鐩�"> </el-table-column> - <el-table-column prop="proPrice" label="鍘熶环" width="56px"> + + <el-table-column + prop="priceOrd" + label="鍘熶环" + align="center" + width="80px" + > </el-table-column> - <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px"> + <el-table-column label="鎶樻墸" width="100px"> + <template slot-scope="scope"> + <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 --> + <el-input + v-model.number="scope.row.limits" + @input="calculateDiscount(scope.row)" + placeholder="杈撳叆鎶樻墸" + size="small" + type="number" + min="0" + step="0.1" + max="10" + > + </el-input> + </template> </el-table-column> + <el-table-column + prop="priceNow" + label="浼樻儬浠�" + width="80px" + align="center" + > + </el-table-column> + <el-table-column label="鎿嶄綔" align="center" width="80px"> + <template slot-scope="scope"> + <el-button + size="mini" + type="text" + icon="el-icon-delete" + @click="handleDelete1(scope.row)" + title="鍒犻櫎" + > + </el-button> + </template> + </el-table-column> + <!-- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px"> + </el-table-column> --> <!-- <el-table-column label="鎿嶄綔" @@ -604,7 +696,7 @@ </template> </el-table-column>--> </el-table> - <h3 style="font-weight: 600;">鍚堣锛歿{ pics }}鍏�</h3> + <!-- <h3 style="font-weight: 600">鍚堣锛歿{ pics }}鍏�</h3> --> </div> </el-col> </el-row> @@ -639,7 +731,12 @@ import Packages from "@/components/Packages"; import { listCategory } from "@/api/mall/category"; import { listKeyword } from "@/api/mall/keyword"; -import { getProParentIdDxList, getProSonDxList } from "@/api/system/tijian"; +// import { getProParentIdDxList, getProSonDxList } from "@/api/system/tijian"; +import { + getProParentIdDxList, + search, + getProSonDxList, +} from "@/api/system/package"; import { getPacList, getPacInFo, @@ -653,11 +750,13 @@ getAllList, updateProject, getPacTjProjectList, + saveOreditTjPacNew, } from "@/api/system/package"; import { Message } from "element-ui"; +import Big from "big.js"; export default { name: "Package", - dicts: ["sys_normal_disable", "sys_yes_no","dict_tjtype"], + dicts: ["sys_normal_disable", "sys_yes_no", "dict_tjtype"], components: { Packages }, data() { let checkPhoneNum = (rule, value, callback) => { @@ -676,6 +775,7 @@ DataList: [], list1: true, activeName: "1", + num: 1, checkedObj: {}, dataObj: {}, Treedata: [], @@ -707,8 +807,6 @@ multiple: true, // 鏄剧ず鎼滅储鏉′欢 showSearch: true, - // 鎬绘潯鏁� - total: 0, // 浣撴濂楅琛ㄦ牸鏁版嵁 packageList: [], // 濂楅閫変腑鐨勭埗椤� @@ -726,6 +824,9 @@ open: false, Seachopen: false, pacId: "", + // 鎬绘潯鏁� + total: 0, + total1: 0, // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, @@ -733,9 +834,19 @@ pacName: null, pacRemark: null, }, + queryParams1: { + page: 1, + pageSize: 30, + nr: "", + }, // 琛ㄥ崟鍙傛暟 - form: {}, + form: { + xianprice: null, // 浼樻儬浠� + counterPrice: null, //鍘熶环 + limits: 10, + }, forms: {}, + youhui: 10, // 琛ㄥ崟鏍¢獙 rules: { deleted: [ @@ -766,11 +877,12 @@ }, }; }, - watch: { - filterText(val) { - this.$refs.tree.filter(val); - }, - }, + // watch: { + // filterText(val) { + // this.$refs.tree.filter(val); + // }, + // }, + created() { this.getList(); this.getKeyword(); @@ -782,7 +894,12 @@ }, filterNode(value, data) { if (!value) return true; - return data.proName.indexOf(value) !== -1; + // return data.proName.indexOf(value) !== -1; + if (data.proName.indexOf(value) !== -1) { + return data.proName.indexOf(value) !== -1; + } else { + return data.proEngName.indexOf(value) !== -1; + } }, /** 鏌ヨ浣撴濂楅鍒楄〃 */ getList() { @@ -808,6 +925,7 @@ this.loading = false; }); }, + /** 鏌ヨ鍏抽敭瀛楀垪琛� */ getKeyword() { this.loading = true; @@ -951,13 +1069,23 @@ this.form = response.data; this.form.keywords = this.form.keywords.slice(0, -1); this.form.keywords = this.form.keywords.split(","); - this.DataList = []; + // this.DataList = []; + // this.pics = 0; + this.DataList = []; this.checkedkey = []; this.checkedListkey = []; + this.DataList = response.data.packageProjects; + this.DataList.forEach((item) => { + this.checkedkey.push(item.proId); + this.checkedListkey.push(item.proId); + }); + + // 鑾峰彇鏂扮殑鏁版嵁鍒楄〃锛堝鏋滈渶瑕侊級 this.getDataList(); }); }, + /** 淇敼鎸夐挳鎿嶄綔 */ handleUpdate(row) { this.title = "浣撴濂楅淇℃伅缁存姢"; @@ -969,6 +1097,13 @@ this.DataList = []; this.checkedkey = []; this.checkedListkey = []; + this.DataList = response.data.packageProjects; + this.DataList.forEach((item) => { + this.checkedkey.push(item.proId); + this.checkedListkey.push(item.proId); + }); + + // 鑾峰彇鏂扮殑鏁版嵁鍒楄〃锛堝鏋滈渶瑕侊級 this.getDataList(); }); }, @@ -1015,6 +1150,16 @@ } }, + /** 鍒犻櫎鎸夐挳鎿嶄綔 */ + 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); // 鍙栨秷閫変腑鐘舵�� + } + }, + getSelectValue(val) { this.form.tjProjectList.forEach((formitem) => { if (formitem.proName == val) { @@ -1051,7 +1196,52 @@ return this.form.tjProjectList; }, - // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 } + + numberChange(currentValue, oldValue) { + this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", + }) + .then(() => { + this.youhui = currentValue; + this.DataList.forEach((item) => { + item.limits = this.youhui; + const proPrice = new Big(item.priceOrd); + const limits = new Big(item.limits); + const result = proPrice.times(limits.div(10)); + item.priceNow = result.toNumber(); + this.form.xianprice = this.DataList.reduce((sum, item) => { + return sum.plus(new Big(item.priceNow || "0")); + }, new Big(0)); + }); + }) + .catch(() => { + this.youhui = oldValue; + }); + }, + + updateProPrice(row) { + const proPrice = new Big(row.priceOrd); + const limits = new Big(row.limits); + const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10) + row.priceNow = result.toNumber(); + this.form.xianprice = this.DataList.reduce((sum, item) => { + return sum.plus(new Big(item.priceNow || "0")); + }, new Big(0)).toNumber(); + this.youhui = + (Math.floor((this.form.xianprice / this.pics) * 100) / 100) * 10; + // console.log(this.youhui, 1212); + }, + calculateDiscount(row) { + if (row.limits > 10) { + row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у�� + } else if (row.limits < 0) { + row.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓�� + } + this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫 + }, + // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 } objectSpanMethod({ row, column, rowIndex, columnIndex }) { let fields = ["propinName"]; let cellValue = row[column.property]; @@ -1081,111 +1271,125 @@ }, getDataList() { this.loading = true; - getProParentIdDxList().then((response) => { - this.Treedata = response.data.list; - if (this.form.tjProjectList) { - this.form.tjProjectList.forEach((item) => { - this.Treedata.forEach((item1) => { - if (item.proId == item1.proId) { - this.checkedkey.push(item1.proId); - let proId = item1.proId; - getProSonDxList(proId).then((res) => { - this.TreedataList = res.data.list; - this.TreedataList.forEach((item2) => { - item2.disabled = true; - this.checkedListkey.push(item2.proId); - this.DataList.push(item2); - if (this.DataList.length != 0) { - this.DataList.forEach((item) => { - if (item.proParentId == item1.proId) { - item.propinName = item1.proName; - item.propinPrice = item1.proPrice; - } - }); - this.pics = 0; - this.DataList.forEach((item) => { - this.pics += item.proPrice; - }); - } - }); - }); - } - }); - }); - } else { - this.checkedkey.push(this.Treedata[0].proId); - let proId = this.Treedata[0].proId; - getProSonDxList(proId).then((res) => { - this.TreedataList = res.data.list; - this.TreedataList.forEach((item) => { - item.disabled = true; - this.checkedListkey.push(item.proId); - this.DataList.push(item); - this.DataList.forEach((item) => { - item.propinName = this.Treedata[0].proName; - item.propinPrice = this.Treedata[0].proPrice; - }); - this.pics = 0; - this.DataList.forEach((item) => { - this.pics += item.proPrice; - }); - }); - }); - } - this.loading = false; + search(this.queryParams1).then((response) => { + this.Treedata = response.data.list; // 鏇存柊鏍戝舰鏁版嵁 + this.total1 = response.data.total; // 鏇存柊鎬绘潯鏁� + + const selectedIds = this.DataList.map((item) => item.proId); + // 鏇存柊 checkedkey 浣垮緱閫変腑鐨勯」鐩繚鎸侀�変腑鐘舵�� + this.checkedkey = selectedIds.filter((id) => + this.Treedata.some((item) => item.proId === id) + ); + + this.pics = this.DataList.reduce( + (total, item) => total + item.priceOrd, + 0 + ); }); + this.loading = false; }, + // getDataList() { + // this.loading = true; + + // getProParentIdDxList(this.queryParams).then((response) => { + // this.Treedata = response.data.list; + // /* if (this.form.tjProjectList) { + // this.form.tjProjectList.forEach((item) => { + // 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) { + // item1.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у�� + // } else if (item1.limits < 0) { + // item1.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓�� + // } + // this.updateProPrice(item1); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫 + // }); + + // } + // }); + // }); + // } */ /* else { + // this.checkedkey.push(this.Treedata[0].proId); + // let proId = this.Treedata[0].proId; + // this.TreedataList = this.Treedata.filter( + // (item) => item.proId == proId + // ); */ + + // // 灏嗙涓�涓」鐩坊鍔犲埌 DataList + // // this.TreedataList.forEach((item) => { + // // this.checkedListkey.push(item.proId); + // // this.DataList.push(item); + // // }); + // /* getProSonDxList(proId).then((res) => { + // this.TreedataList = res.data.list; + // this.TreedataList.forEach((item) => { + // item.disabled = true; + // this.checkedListkey.push(item.proId); + // this.DataList.push(item); + // this.DataList.forEach((item) => { + // item.propinName = this.Treedata[0].proName; + // item.propinPrice = this.Treedata[0].proPrice; + // }); + // this.pics = 0; + // this.DataList.forEach((item) => { + // this.pics += item.proPrice; + // }); + // }); + // }); */ + // // } + // this.pics = this.DataList.reduce( + // (total, item) => total + item.priceOrd, + // 0 + // ); + // this.loading = false; + // }); + // }, + handleFilterInput() { + this.queryParams.page = 1; // 鎼滅储鏃堕噸缃负绗竴椤� + this.getDataList(); // 璋冪敤鎺ュ彛鑾峰彇鏁版嵁 + }, + + // 鍒嗛〉浜嬩欢 + handlePageChange({ page, pageSize }) { + this.queryParams.page = page; // 鏇存柊褰撳墠椤� + this.queryParams.pageSize = pageSize; // 鏇存柊姣忛〉鏉℃暟 + this.getDataList(); // 璋冪敤鎺ュ彛鑾峰彇鏁版嵁 + }, + handleCurrentChecked(data, checked, checkedNodes) { this.dataObj = data; this.checkedObj = checked; - if (checked == true) { - // this.$refs.tree.setCheckedKeys([data.proId]); - let proId = data.proId; - getProSonDxList(proId).then((res) => { - this.TreedataList = res.data.list; - this.TreedataList.forEach((item) => { - item.disabled = true; - this.checkedListkey.push(item.proId); - this.DataList.push(item); - this.spliceData(); - this.pics = 0; - this.DataList.forEach((item1) => { - this.pics += item1.proPrice; - if (item1.proParentId == data.proId) { - item1.propinName = data.proName; - item1.propinPrice = this.dataObj.proPrice; - } - }); - }); - this.TotalPrice1 = 0; - this.pics = 0; - if (this.DataList.length != 0) { - this.list1 = false; - this.DataList.forEach((item) => { - this.TotalPrice1 = item.proPrice + this.TotalPrice1; - this.pics += item.proPrice; - }); - } + + if (checked) { + // 妫�鏌ユ槸鍚﹀凡瀛樺湪浜� DataL + this.DataList.push({ + proId: data.proId, + proName: data.proName, + priceOrd: data.proPrice, // 鍘熶环锛岀‘淇濊祴鍊兼纭� + limits: 10, + priceNow: data.proPrice, }); - } else if (checked == false) { - let proId = data.proId; - getProSonDxList(proId).then((res) => { - this.TreedataList = res.data.list; - this.TreedataList.forEach((item) => { - item.disabled = true; - }); - this.checkedListkey = []; - this.DataList.forEach((item, index) => { - if (item.proParentId == this.dataObj.proId) { - this.DataList.splice(index, this.TreedataList.length); - } - }); - this.pics = 0; - this.DataList.forEach((item, index) => { - this.pics += item.proPrice; - }); - }); + } else { + let index = this.DataList.findIndex( + (item) => item.proId === data.proId + ); + if (index !== -1) { + this.DataList.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` + }); }, spliceData() { @@ -1210,7 +1414,7 @@ this.TotalPrice1 = 0; this.pics = 0; this.DataList.forEach((item1) => { - this.pics += item1.proPrice; + this.pics += item1.priceOrd; // this.TotalPrice1 = item1.proPrice + this.TotalPrice1; }); } @@ -1219,7 +1423,7 @@ this.DataList.push(data); this.pics = 0; this.DataList.forEach((item1) => { - this.pics += item1.proPrice; + this.pics += item1.priceOrd; if (item1.proParentId == this.dataObj.proId) { item1.propinName = this.dataObj.proName; item1.propinPrice = this.dataObj.proPrice; @@ -1230,7 +1434,7 @@ this.pics = 0; this.DataList.forEach((item1) => { // this.TotalPrice1 = item1.proPrice + this.TotalPrice1; - this.pics += item1.proPrice; + this.pics += item1.priceOrd; }); } }, @@ -1252,6 +1456,51 @@ /** 鎻愪氦鎸夐挳 */ submitForm() { + this.form.limits = this.youhui; + this.form.price = this.pics; + this.form.priceNow = this.queryParams.xianprice; + + if (this.keys) { + this.form.keywords = this.keys; // 濡傛灉鏈� this.keys锛屽垯鐩存帴璧嬪�� + } else { + this.form.keywords = this.form.keywords.toString(); // 濡傛灉娌℃湁锛屽垯灏� this.form.keywords 杞垚瀛楃涓� + } + + let packageProjects = []; // 瀹氫箟涓�涓┖鏁扮粍 + + this.DataList.forEach((item) => { + packageProjects.push({ + proName: item.proName, + proId: item.proId, + priceNow: item.priceNow, + limits: item.limits, + priceOrd: item.priceOrd, + }); + }); + let data = { + pacName: this.form.pacName, + limits: this.form.limits, + pacStatus: this.form.pacStatus, + packageProjects: packageProjects, + newPrice: this.form.xianprice, + price: this.pics, + pacId: this.form.pacId || null, + isOnSale: this.form.isOnSale, + keywords: this.form.keywords, + sort: this.form.sort, + retailPrice: this.form.retailPrice, + tjCategory: this.form.tjCategory, + pacRemark: this.form.pacRemark, + detail: this.form.detail, + }; + + saveOreditTjPacNew(data).then((res) => { + console.log(res, 555); + this.open = false; + this.getList(); + }); + }, + /* submitForm() { if (this.form.pacName) { this.form.tjProjectList = []; if (this.DataList.length != 0) { @@ -1315,7 +1564,7 @@ } else { Message.warning("璇峰厛濉啓濂楅鍚嶇О"); } - }, + }, */ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const pacIds = row.pacId || this.ids; @@ -1442,7 +1691,6 @@ max-height: 400px; overflow-y: auto; border: 1px solid #d9d9d9; - } /* .custom-tree-node { flex: 1; -- Gitblit v1.8.0