From 5db2eb6dd6952d0920e5148ae62a6144230d9972 Mon Sep 17 00:00:00 2001 From: wangmeng <1620161711@qq.com> Date: Thu, 12 Feb 2026 18:29:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order/orderList.js | 2 +- src/views/order/AddtoTemplate.vue | 10 +- src/views/order/category.vue | 29 ++-- src/views/order/orderAddEdit.vue | 23 ++- src/views/order/orderChangeLog.vue | 2 +- src/views/order/orderList.vue | 12 +- src/views/product/add/productCostPrice.vue | 155 +++++++++++++++++++-- 7 files changed, 193 insertions(+), 40 deletions(-) diff --git a/src/api/order/orderList.js b/src/api/order/orderList.js index ea8635f..d6a922c 100644 --- a/src/api/order/orderList.js +++ b/src/api/order/orderList.js @@ -13,7 +13,7 @@ export const fetchOrderList = (params) => { // 2. 获取客户列表（下拉选项） export const getCustomerList = (params) =>{ return request({ - url:'/api/jinchao/customer/search', + url:'/api/jinchao/customer/selectList', method:'get', params }) diff --git a/src/views/order/AddtoTemplate.vue b/src/views/order/AddtoTemplate.vue index 351e35e..7b41715 100644 --- a/src/views/order/AddtoTemplate.vue +++ b/src/views/order/AddtoTemplate.vue @@ -402,9 +402,13 @@ export default { }, // 选择产品 handleSelectProduct() { - let arr = [ {name:'工作台',url:'/wel'}] - - this.$store.commit('SET_ROUTE_DATA', [ ...arr]) + let arr = [{ name: '工作台', url: '/wel' }] + const routeDataN = this.routeData.filter(item => { + return !['/order/category', '/order/subcategory'].includes(item.url); + }); + // const routeDataN = this.routeData + // console.log("routeDataN",routeDataN) + this.$store.commit('SET_ROUTE_DATA', [ ...routeDataN]) this.$router.push({ path: "/order/category", query: { diff --git a/src/views/order/category.vue b/src/views/order/category.vue index e78b355..222c03b 100644 --- a/src/views/order/category.vue +++ b/src/views/order/category.vue @@ -76,17 +76,23 @@ export default { ...mapGetters(["routeData"]) }, mounted(){ - console.log('this.$route---------------',this.$route) - console.log('this.routeData---------------',this.routeData) - // let arr = [ - // {name:'工作台',url:'/wel'} - // ] - // this.$store.commit('SET_ROUTE_DATA',arr) + console.log('this.$route-------大',this.$route) + console.log('this.routeData------------大', this.routeData) + const routeDataN = (this.routeData || []).filter(item => { + return !['/order/category', '/order/subcategory'].includes(item.url); + }); + console.log("routeDataN",routeDataN) + let arr = [ + ...routeDataN, + + ] + this.$store.commit('SET_ROUTE_DATA', arr) + this.getCategoryList() // 点击页面空白处关闭右键菜单 document.addEventListener('click', this.closeContextMenu) }, - methods:{ + methods: { getCategoryList(){ getCategory({ parentId:0, @@ -206,8 +212,15 @@ export default { }, changePage(val){ + // const routeDataN = this.routeData + // 应该去掉 /order/category 和 /order/subcategory + const routeDataN = (this.routeData || []).filter(item => { + return !['/order/category', '/order/subcategory'].includes(item.url); + }); + console.log("routeDataN",routeDataN) + let arr = [ - ...this.routeData, + ...routeDataN, {name:val.name,url:'/order/category',categoryId:val.id} ] this.$store.commit('SET_ROUTE_DATA', arr) diff --git a/src/views/order/orderAddEdit.vue b/src/views/order/orderAddEdit.vue index 0d623ad..1a15b3c 100644 --- a/src/views/order/orderAddEdit.vue +++ b/src/views/order/orderAddEdit.vue @@ -645,9 +645,9 @@ formatDiscountAmount() { // 加载客户列表 async loadCustomerList() { try { - const res = await getCustomerList({ current: 1, size: 10000000 }); + const res = await getCustomerList(); if (res.data && res.data.code === 200) { - this.customerList = res.data.data.records || []; + this.customerList = res.data.data || []; } else { this.$message.error("加载客户列表失败：" + (res.msg || "未知错误")); } @@ -916,7 +916,16 @@ formatDiscountAmount() { orderId: this.vuexParams.orderId, }) - this.$store.commit('SET_ROUTE_DATA', [...this.routeData, ...arr]) + this.$store.commit('SET_ROUTE_DATA', [...this.routeData, ...arr]) + if (!this.vuexTemp.form.customerCode) { + this.$message.warning("请先选择客户名称"); + return; + } + // console.log("row.sort111111111111",row.sort) + this.saveTempOrderInfo({ + sort: row.sort, + customerId: this.vuexTemp.form.customerCode, + }); this.$router.push({ path: "/order/ProjectProductEdit", query: { @@ -976,7 +985,7 @@ formatDiscountAmount() { async initPageData() { const currentRouteData = this.routeData || []; - console.log("当前面包屑数据routeData：", currentRouteData) + // console.log("当前面包屑数据routeData：", currentRouteData) const targetCrumb = currentRouteData.find(item => item.url === '/order/addEdit') || {}; const crumbMode = targetCrumb.mode ; // 从精准项提取mode const crumbOrderId = targetCrumb.orderId ; // 从精准项提取orderId @@ -991,9 +1000,9 @@ formatDiscountAmount() { const initRouteOrderId = this.$route.query.id || this.$route.query.orderId || ""; const hasEchoParams = this.$route.query.queryData || this.$route.query.temData || this.$route.query.noClear; // 调试日志：查看mode值 - console.log("路由mode参数：", this.$route.query.mode); - console.log("初始化mode：", initRouteMode); - console.log("initRouteOrderId):", initRouteOrderId); + // console.log("路由mode参数：", this.$route.query.mode); + // console.log("初始化mode：", initRouteMode); + // console.log("initRouteOrderId):", initRouteOrderId); const finalMode = crumbMode || initRouteMode; const finalOrderId = crumbOrderId || initRouteOrderId; // 新增模式且无回显参数：强制清空Vuex并初始化add模式 diff --git a/src/views/order/orderChangeLog.vue b/src/views/order/orderChangeLog.vue index 6ce18c3..3767221 100644 --- a/src/views/order/orderChangeLog.vue +++ b/src/views/order/orderChangeLog.vue @@ -183,7 +183,7 @@
项目单位: - {{ system.after.unit }} + {{ system.after.unit }}
产品总指导价: diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue index 9e28fbe..2a62755 100644 --- a/src/views/order/orderList.vue +++ b/src/views/order/orderList.vue @@ -147,8 +147,8 @@ - - + + @@ -536,12 +536,10 @@ export default { return ""; }, loadCustomerList() { - getCustomerList({ - current: 1, - size: 10000000, - }).then((res) => { + getCustomerList().then((res) => { // this.tableData = res.data.data.records - this.customerList = res.data.data.records || []; + console.log("res.data.data.records",res.data.data) + this.customerList = res.data.data || []; }); }, async handleFinish(row) { diff --git a/src/views/product/add/productCostPrice.vue b/src/views/product/add/productCostPrice.vue index 00059bb..84e8ff6 100644 --- a/src/views/product/add/productCostPrice.vue +++ b/src/views/product/add/productCostPrice.vue @@ -45,8 +45,43 @@ - - + + + + + + + + + + + + + + + + 搜索 @@ -68,35 +103,39 @@ cell-style="text-align: center;" fit > - + - - + + - +