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

Merge pull request 'master-dev' (#150) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/150
This commit is contained in:
wuteng 2025-11-26 09:53:32 +08:00
commit fa33340575
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/emis/EmisBaseTools/SalesSupportPicker.vue
View File

@ -19,6 +19,7 @@
<script> <script>
import emitter from 'element-ui/src/mixins/emitter'; import emitter from 'element-ui/src/mixins/emitter';
import { getSalesmanSupportList} from "@/api/emis/emisSalesCommissionRatio"; import { getSalesmanSupportList} from "@/api/emis/emisSalesCommissionRatio";
import { parseTime } from "@/utils/custom";
export default { export default {
name: "SalesSupportPicker", name: "SalesSupportPicker",
@ -103,7 +104,7 @@
} }
if (!this.sendDate) { if (!this.sendDate) {
//获取系统当前时间 格式为yyyy-MM-dd HH:mm:ss //获取系统当前时间 格式为yyyy-MM-dd HH:mm:ss
this.queryParams.params.sendDate = new Date().toLocaleString().replace(/\//g, "-"); this.queryParams.params.sendDate = parseTime(new Date());
}else { }else {
this.queryParams.params.sendDate = this.sendDate; this.queryParams.params.sendDate = this.sendDate;
} }

2
src/views/emis/emisWaybill/batchWaybillRecord.vue
View File

@ -535,7 +535,7 @@ export default {
salesSupport: orderData.salesSupport, salesSupport: orderData.salesSupport,
params: { params: {
userStatus: 1, userStatus: 1,
sendDate: new Date().toLocaleString().replace(/\//g, "-"), sendDate: parseTime(new Date()),
}, },
} }
getSalesmanSupportList(queryParams).then(response => { getSalesmanSupportList(queryParams).then(response => {

2
src/views/emis/emisWaybill/waybillGot.vue
View File

@ -2414,7 +2414,7 @@ methods: {
customsClear:this.form.customsClear, customsClear:this.form.customsClear,
customsEclaration:this.form.customsEclaration, customsEclaration:this.form.customsEclaration,
startSiteCode:this.form.startSiteCode, startSiteCode:this.form.startSiteCode,
sendDate:new Date().toLocaleString().replace(/\//g, "-") sendDate:parseTime(new Date())
} }

2
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -2390,7 +2390,7 @@ methods: {
customsClear:this.form.customsClear, customsClear:this.form.customsClear,
customsEclaration:this.form.customsEclaration, customsEclaration:this.form.customsEclaration,
startSiteCode:this.form.startSiteCode, startSiteCode:this.form.startSiteCode,
sendDate:new Date().toLocaleString().replace(/\//g, "-") sendDate:parseTime(new Date()),
} }