From 55f081042fb8770cc94a0e0a1ddeafdbff956539 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 9 Jan 2026 10:56:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybill/centerWaybillList.vue | 4 ++-- src/views/emis/emisWaybill/dispatchWaybillList.vue | 4 ++-- src/views/emis/emisWaybill/sendWaybillList.vue | 4 ++-- src/views/emis/emisWaybill/sendWaybillListNew.vue | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index fc3716f3..efee7ff7 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -1225,10 +1225,10 @@ export default { if (j === 'paymentType') { return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); } - if(j === 'waybillOther.salesSupport'){ + if(j === 'waybillOther?.salesSupport'){ return v['waybillOther']['salesSupport']; } - if(j === 'waybillOther.moneyCompany'){ + if(j === 'waybillOther?.moneyCompany'){ return v['waybillOther']['moneyCompany']; } if(j=== 'blIsQuestion'){ diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index 26387da1..03ab2c59 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -1189,10 +1189,10 @@ export default { if (j === 'paymentType') { return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); } - if(j === 'waybillOther.salesSupport'){ + if(j === 'waybillOther?.salesSupport'){ return v['waybillOther']['salesSupport']; } - if(j === 'waybillOther.moneyCompany'){ + if(j === 'waybillOther?.moneyCompany'){ return v['waybillOther']['moneyCompany']; } if(j=== 'blIsQuestion'){ diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 4ed56b05..e7648b84 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -1268,10 +1268,10 @@ export default { if (j === 'paymentType') { return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); } - if(j === 'waybillOther.salesSupport'){ + if(j === 'waybillOther?.salesSupport'){ return v['waybillOther']['salesSupport']; } - if(j === 'waybillOther.moneyCompany'){ + if(j === 'waybillOther?.moneyCompany'){ return v['waybillOther']['moneyCompany']; } if(j=== 'blIsQuestion'){ diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index 8e569b22..f0c7d2bd 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -1218,10 +1218,10 @@ export default { if (j === 'paymentType') { return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); } - if(j === 'waybillOther.salesSupport'){ + if(j === 'waybillOther?.salesSupport'){ return v['waybillOther']['salesSupport']; } - if(j === 'waybillOther.moneyCompany'){ + if(j === 'waybillOther?.moneyCompany'){ return v['waybillOther']['moneyCompany']; } if(j=== 'blIsQuestion'){ From 87e54adf0cc3209adf485071627045eaa277d02e Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 9 Jan 2026 13:57:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=BB=E5=8F=96excel=20=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/custom.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/utils/custom.js b/src/utils/custom.js index 3dad090a..c0507fa2 100644 --- a/src/utils/custom.js +++ b/src/utils/custom.js @@ -15,7 +15,7 @@ export function parseExcelTime(dateString, isDateTime){ const formatDateTime = date => { return dayjs(date).format("YYYY-MM-DD HH:mm:ss"); }; - + // 帮助函数：将 Date 对象格式化为 yyyy-MM-dd const formatDate = date => { return dayjs(date).format("YYYY-MM-DD"); @@ -27,7 +27,8 @@ export function parseExcelTime(dateString, isDateTime){ } // 处理包含 "23:59:17" 的日期字符串 - if (dateString.includes("23:59:17")) { + // if (dateString.includes("23:59:17")) { + if (dateString.includes("23:59")) { dateString = dayjs(dateString) .add(isDateTime ? 43 : 1, isDateTime ? "second" : "day") .format(isDateTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD"); @@ -88,7 +89,7 @@ export function parseExcelTime(dateString, isDateTime){ return isDateTime ? formatDateTime(date) : formatDate(date); } - + // 日期格式化 export function parseTime(time, pattern) { if (arguments.length === 0 || !time) { @@ -769,5 +770,4 @@ export function addExportAuditRecord(data) { method: 'post', data: data }) -} - +} \ No newline at end of file From 77dee9877a2187f7fc19b2036b8cf9e28310d6f2 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 9 Jan 2026 16:34:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=A4=8D=E5=88=B6=E4=B8=8D=E5=90=AB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E7=BD=91=E7=82=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisTransProduct/emisTransProductForm.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/emis/emisTransProduct/emisTransProductForm.vue b/src/views/emis/emisTransProduct/emisTransProductForm.vue index 0e3cc28f..ecb7ca2b 100644 --- a/src/views/emis/emisTransProduct/emisTransProductForm.vue +++ b/src/views/emis/emisTransProduct/emisTransProductForm.vue @@ -330,6 +330,11 @@ export default { } else { if(this.isCopy){ this.form.id = null; + this.form.updateBy = null; + this.form.updateByName = null; + this.form.updateSite = null; + this.form.updateSiteName = null; + this.form.updateTime = null; } addEmisTransProduct(this.form).then(response => { this.$modal.msgSuccess("新增成功");