diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index 657cfb8..1142861 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -158,15 +158,15 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' loading: false, dataSource: [], columns: [ - // { - // title: '物料组', - // key: 'materialGroup', - // type: FormTypes.sel_search, - // dictCode:"", - // width:"200px", - // placeholder: '请输入${title}', - // defaultValue:'', - // }, + { + title: '', + key: 'materialGroup', + type: FormTypes.input, + dictCode:"", + width:"0px", + placeholder: '请输入${title}', + defaultValue:'', + }, { title: '物料号', key: 'materialNumber', @@ -207,7 +207,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' defaultValue:'', }, { - title: '单价', + title: '单价(元)', key: 'materialPrice', type: FormTypes.inputNumber, width:"200px", @@ -223,7 +223,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' defaultValue:'', }, { - title: '金额', + title: '金额(元)', key: 'materialAmount', type: FormTypes.inputNumber, disabled: true, diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue index fa1614f..7f34026 100644 --- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue +++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue @@ -221,7 +221,7 @@ options: [] }, { - title: '单价', + title: '单价(元)', key: 'materialPrice', type: FormTypes.inputNumber, width: '200px', @@ -229,7 +229,7 @@ defaultValue: '' }, { - title: '金额', + title: '金额(元)', key: 'materialAmount', type: FormTypes.inputNumber, width: '200px', diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index e4fa25b..5dba608 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -242,7 +242,7 @@ defaultValue:'', }, { - title: '单价', + title: '单价(元)', key: 'materialPrice', type: FormTypes.inputNumber, width:"200px", @@ -250,7 +250,7 @@ defaultValue:'', }, { - title: '金额', + title: '金额(元)', key: 'materialAmount', type: FormTypes.inputNumber, width:"200px", diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue index e1d12d7..693890b 100644 --- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue +++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue @@ -185,7 +185,7 @@ defaultValue: '' }, { - title: '单价', + title: '单价(元)', key: 'materialPrice', type: FormTypes.inputNumber, disabled: false, @@ -194,7 +194,7 @@ defaultValue: '' }, { - title: '金额', + title: '金额(元)', key: 'materialAmount', type: FormTypes.inputNumber, disabled: true, diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index 8f831df..fa36c57 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -284,7 +284,7 @@ defaultValue: '' }, { - title: '单价', + title: '单价(元)', key: 'materialPrice', type: FormTypes.inputNumber, width: '200px', @@ -295,7 +295,7 @@ title: '对比单价', key: 'action', type: FormTypes.slot, - //width: '200px', + width: '70px', // placeholder: '请输入${title}', // defaultValue: '', slotName: 'action' @@ -310,7 +310,7 @@ defaultValue: '' }, { - title: '金额', + title: '金额(元)', key: 'materialAmount', type: FormTypes.inputNumber, width: '200px', @@ -325,6 +325,14 @@ placeholder: '请输入${title}', defaultValue: '' }, + { + title: '交货时间', + key: 'deliveryTime', + type: FormTypes.date, + width: '200px', + placeholder: '请输入${title}', + defaultValue: '' + }, { title: '备注', key: 'remarks',