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 },