From 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 29 三月 2024 16:35:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index e90c293..978cf7d 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -107,6 +107,7 @@
if(res.code==200){
titleSelectJson.value=deepClone(res.data)
+ console.log(titleSelectJson.value)
const today = new Date
today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -554,7 +555,7 @@
<el-col :span="5"><el-input v-model="titleUploadData.project" :readonly="true"></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>{{$t('order.project')}}锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('delivery.paymentTerms')}}锛�</el-text></el-col>
<el-col :span="3">
<el-select v-model="titleUploadData.paymentTerms" clearable placeholder="" >
<el-option
@@ -572,6 +573,8 @@
<el-date-picker
v-model="titleUploadData.payDate"
type="date"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
:placeholder="$t('delivery.selectDate')"/>
</el-col>
@@ -604,6 +607,8 @@
<el-date-picker
v-model="titleUploadData.deliveryDate"
type="date"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
:placeholder="$t('delivery.selectDate')"/>
</el-col>
</el-row>
--
Gitblit v1.8.0