aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#188) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/188
This commit is contained in:
wuteng 2026-01-09 16:43:16 +08:00
commit 3afc6a5767
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/custom.js
View File

@ -15,7 +15,7 @@ export function parseExcelTime(dateString, isDateTime){
const formatDateTime = date => { const formatDateTime = date => {
return dayjs(date).format("YYYY-MM-DD HH:mm:ss"); return dayjs(date).format("YYYY-MM-DD HH:mm:ss");
}; };
// 帮助函数：将 Date 对象格式化为 yyyy-MM-dd // 帮助函数：将 Date 对象格式化为 yyyy-MM-dd
const formatDate = date => { const formatDate = date => {
return dayjs(date).format("YYYY-MM-DD"); return dayjs(date).format("YYYY-MM-DD");
@ -27,7 +27,8 @@ export function parseExcelTime(dateString, isDateTime){
} }
// 处理包含 "23:59:17" 的日期字符串 // 处理包含 "23:59:17" 的日期字符串
if (dateString.includes("23:59:17")) { // if (dateString.includes("23:59:17")) {
if (dateString.includes("23:59")) {
dateString = dayjs(dateString) dateString = dayjs(dateString)
.add(isDateTime ? 43 : 1, isDateTime ? "second" : "day") .add(isDateTime ? 43 : 1, isDateTime ? "second" : "day")
.format(isDateTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD"); .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); return isDateTime ? formatDateTime(date) : formatDate(date);
} }
// 日期格式化 // 日期格式化
export function parseTime(time, pattern) { export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) { if (arguments.length === 0 || !time) {
@ -769,5 +770,4 @@ export function addExportAuditRecord(data) {
method: 'post', method: 'post',
data: data data: data
}) })
} }

5
src/views/emis/emisTransProduct/emisTransProductForm.vue
View File

@ -330,6 +330,11 @@ export default {
} else { } else {
if(this.isCopy){ if(this.isCopy){
this.form.id = null; 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 => { addEmisTransProduct(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");

4
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -1225,10 +1225,10 @@ export default {
if (j === 'paymentType') { if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
} }
if(j === 'waybillOther.salesSupport'){ if(j === 'waybillOther?.salesSupport'){
return v['waybillOther']['salesSupport']; return v['waybillOther']['salesSupport'];
} }
if(j === 'waybillOther.moneyCompany'){ if(j === 'waybillOther?.moneyCompany'){
return v['waybillOther']['moneyCompany']; return v['waybillOther']['moneyCompany'];
} }
if(j=== 'blIsQuestion'){ if(j=== 'blIsQuestion'){

4
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -1189,10 +1189,10 @@ export default {
if (j === 'paymentType') { if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
} }
if(j === 'waybillOther.salesSupport'){ if(j === 'waybillOther?.salesSupport'){
return v['waybillOther']['salesSupport']; return v['waybillOther']['salesSupport'];
} }
if(j === 'waybillOther.moneyCompany'){ if(j === 'waybillOther?.moneyCompany'){
return v['waybillOther']['moneyCompany']; return v['waybillOther']['moneyCompany'];
} }
if(j=== 'blIsQuestion'){ if(j=== 'blIsQuestion'){

4
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -1268,10 +1268,10 @@ export default {
if (j === 'paymentType') { if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
} }
if(j === 'waybillOther.salesSupport'){ if(j === 'waybillOther?.salesSupport'){
return v['waybillOther']['salesSupport']; return v['waybillOther']['salesSupport'];
} }
if(j === 'waybillOther.moneyCompany'){ if(j === 'waybillOther?.moneyCompany'){
return v['waybillOther']['moneyCompany']; return v['waybillOther']['moneyCompany'];
} }
if(j=== 'blIsQuestion'){ if(j=== 'blIsQuestion'){

4
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -1218,10 +1218,10 @@ export default {
if (j === 'paymentType') { if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
} }
if(j === 'waybillOther.salesSupport'){ if(j === 'waybillOther?.salesSupport'){
return v['waybillOther']['salesSupport']; return v['waybillOther']['salesSupport'];
} }
if(j === 'waybillOther.moneyCompany'){ if(j === 'waybillOther?.moneyCompany'){
return v['waybillOther']['moneyCompany']; return v['waybillOther']['moneyCompany'];
} }
if(j=== 'blIsQuestion'){ if(j=== 'blIsQuestion'){