From 43861b0939a0ebeb7dcfc75927f9a58b75d7d7d5 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 6 Dec 2019 15:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orderauthor/order/addGoods.vue | 4 ++--
 src/views/orderauthor/order/draft.vue    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/orderauthor/order/addGoods.vue b/src/views/orderauthor/order/addGoods.vue
index 8c004ddf1..536496141 100644
--- a/src/views/orderauthor/order/addGoods.vue
+++ b/src/views/orderauthor/order/addGoods.vue
@@ -88,9 +88,9 @@ export default {
                     },
                     {
                         title: this.$t('orderAuthor.belongsToMap'),
-                        prop: 'mapId',
+                        prop: 'mapName',
                         type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['value', 'label']); },
+                        columnValue: (row) => { return row.mapName },
                         tagType: (row) => { return ''; }
                     },
                     {
diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue
index a134c8710..669fd009c 100644
--- a/src/views/orderauthor/order/draft.vue
+++ b/src/views/orderauthor/order/draft.vue
@@ -157,7 +157,7 @@ export default {
                     { prop: 'contractNo', label: this.$t('orderAuthor.contractNumber'), type: 'text', required: false, show: this.isShowContractNo },
                     { prop: 'amount', label: this.totalTitle, type: 'number', required: false, show: true, min: 0 },
                     { prop: 'forever', label: this.$t('orderAuthor.permanenceOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled },
-                    { prop: 'startTime', label: this.$t('orderAuthor.startDate'), type: 'date', required: false, show: this.isShowStartDate, viewFormat: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd', picker: this.DatePicker },
+                    { prop: 'startTime', label: this.$t('orderAuthor.startDate'), type: 'datetime', required: false, show: this.isShowStartDate, viewFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss', picker: this.DatePicker },
                     { prop: 'monthAmount', label: this.monthsTitle, type: 'number', required: false, show: this.isShowMonths, min: 0, message: this.$t('orderAuthor.month') },
                     { prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: this.$t('orderAuthor.yuan') },
                     { prop: 'bizType', label: this.$t('orderAuthor.businessType'), type: 'select', required: false, disabled: true, options: this.BizTypeList },