From 0d38c8877f9fa733646488dfbf5a82a8eaf945fb Mon Sep 17 00:00:00 2001 From: yangzifeng <2547435354@qq.com> Date: Tue, 10 Feb 2026 09:31:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/printBill/bill.vue | 33 ++++++++++++------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/components/printBill/bill.vue b/src/components/printBill/bill.vue index 7034a1c..1532306 100644 --- a/src/components/printBill/bill.vue +++ b/src/components/printBill/bill.vue @@ -25,11 +25,11 @@ 项目编号： - {{ billAllObj[0]?.xmNo }} + {{ billAllObj[0]?.xmNo }} 项目描述： - {{ billAllObj[0]?.xmMs }} + {{ billAllObj[0]?.bizType == 1 ? xmMs : billAllObj[0]?.xmMs }} @@ -127,29 +127,22 @@ const props = defineProps({ }, }); -function isChukuFun(isChuku){ - // scope.row.isChuku==0?"已入库":(scope.row.isChuku==1?"已出库":"审批中") - if(isChuku == 0){ - return "已入库" - } else if(isChuku == 1){ - return "已出库" - }else if(isChuku == 3){ - return "借料出库" - }else if(isChuku == 2){ - return "审批中" - }else if(isChuku == 4){ - return "入库撤销" - }else if(isChuku == 5){ - return "出库撤销" - } -} const isRuKu = computed(() => { return props.billAllObj[0]?.bizType == 0; }); -// 获取第一条数据作为头部基础信息来源 -const header = computed(() => (props.billAllObj && props.billAllObj.length > 0 ? props.billAllObj[0] : {})); +// 获取不同的项目描述 +const xmMs = computed(() => { + const validXmMsValues = props.billAllObj + .map(item => item.xmMs) // 提取所有 xmMs 属性值 + .filter(value => !!value); // 过滤掉 null/undefined/空字符串等假值 + // 3. 去重：得到所有不同的 xmMs 值 + const uniqueXmMs = [...new Set(validXmMsValues)]; + // 4. 核心逻辑：多个值用 + 拼接，单个值直接返回，无值返回空字符串 + return uniqueXmMs.length > 1 ? uniqueXmMs.join('、') : uniqueXmMs[0] || ''; +}); + // 汇总逻辑 const summaryList = computed(() => { From 3bfb9d0f4db073f8dd40fb17daad7cf24228533e Mon Sep 17 00:00:00 2001 From: zx Date: Tue, 10 Feb 2026 11:01:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E5=90=8C=E6=AD=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=80=BB=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/jh/index.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/views/plan/jh/index.vue b/src/views/plan/jh/index.vue index cb44427..13c9808 100644 --- a/src/views/plan/jh/index.vue +++ b/src/views/plan/jh/index.vue @@ -294,7 +294,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -804,6 +804,18 @@ function handlePrint(){ // Print.print('printMe'); // showContent.value = false; } +// 合同金额改变 +function htDjChange(e) { + console.log(e,form.value,'e===>'); + if(e){ + const htDj = form.value?.htDj + const jhQty = form.value?.jhQty + const jhAmt = (Number(htDj) * Number(jhQty)* 100*10000) / ( 100*10000) + console.log(jhAmt,'jhAmt==>'); + form.value.jhAmt=jhAmt + } + +} getList(); From d8c071952c44bca0c0ca5524fc6b93906ceaed08 Mon Sep 17 00:00:00 2001 From: zx Date: Tue, 10 Feb 2026 11:18:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E5=90=8C=E6=AD=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=80=BB=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/jh/index.vue | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/views/plan/jh/index.vue b/src/views/plan/jh/index.vue index 13c9808..7dd35cf 100644 --- a/src/views/plan/jh/index.vue +++ b/src/views/plan/jh/index.vue @@ -294,7 +294,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -805,14 +805,26 @@ function handlePrint(){ // showContent.value = false; } // 合同金额改变 -function htDjChange(e) { - console.log(e,form.value,'e===>'); +function htDjChange(e,name) { + console.log(e,form.value,name,'e===>'); if(e){ const htDj = form.value?.htDj const jhQty = form.value?.jhQty const jhAmt = (Number(htDj) * Number(jhQty)* 100*10000) / ( 100*10000) console.log(jhAmt,'jhAmt==>'); - form.value.jhAmt=jhAmt + if(!(/^-?\d+(\.\d+)?$/.test(e))){ + if(name == 'htDj'){ + proxy.$modal.msgError("合同单价请输入数字"); + return; + } + if(name == 'jhQty'){ + proxy.$modal.msgError("计划交货数量请输入数字"); + return; + } + form.value.jhAmt='' + }else{ + form.value.jhAmt=jhAmt + } } } From 2252b561de5b7c988645c7b643be13c7778cbdb3 Mon Sep 17 00:00:00 2001 From: zx Date: Wed, 11 Feb 2026 09:34:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=80=BB=E8=AE=A1=E6=B1=82=E5=92=8C=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/printBill/bill.vue | 3 ++- src/components/storageBill/bill.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/printBill/bill.vue b/src/components/printBill/bill.vue index 1532306..65ae0f4 100644 --- a/src/components/printBill/bill.vue +++ b/src/components/printBill/bill.vue @@ -151,7 +151,8 @@ const summaryList = computed(() => { props.billAllObj.forEach(item => { if (map.has(item.wlNo)) { const existing = map.get(item.wlNo); - existing.totalQty = (parseFloat(existing.totalQty) + parseFloat(item.realQty)); + const total = (parseFloat(existing.totalQty) + parseFloat(item.realQty)) * 100*10000 + existing.totalQty = total / ( 100 * 10000); } else { map.set(item.wlNo, { ...item, diff --git a/src/components/storageBill/bill.vue b/src/components/storageBill/bill.vue index 2b45b68..059c2e7 100644 --- a/src/components/storageBill/bill.vue +++ b/src/components/storageBill/bill.vue @@ -145,7 +145,8 @@ const summaryList = computed(() => { props.billAllObj.forEach(item => { if (map.has(item.wlNo)) { const existing = map.get(item.wlNo); - existing.totalQty = (parseFloat(existing.totalQty) + parseFloat(item.realQty)); + const total = (parseFloat(existing.totalQty) + parseFloat(item.realQty)) * 100*10000 + existing.totalQty = total / ( 100 * 10000); } else { map.set(item.wlNo, { ...item,