|
@@ -85,7 +85,7 @@
|
|
<el-form-item label="需求日期">
|
|
<el-form-item label="需求日期">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="basicForm.demandDate"
|
|
v-model="basicForm.demandDate"
|
|
- :disabled="sonDisable"
|
|
|
|
|
|
+ disabled
|
|
type="date"
|
|
type="date"
|
|
value-format="yyyy-MM-dd"
|
|
value-format="yyyy-MM-dd"
|
|
size="small"
|
|
size="small"
|
|
@@ -97,7 +97,7 @@
|
|
|
|
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
<el-form-item label="单据来源">
|
|
<el-form-item label="单据来源">
|
|
- <el-select v-model="basicForm.source" :disabled="sonDisable" size="small" style="width: 200px">
|
|
|
|
|
|
+ <el-select v-model="basicForm.source" disabled size="small" style="width: 200px">
|
|
<el-option v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
|
|
<el-option v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
@@ -314,9 +314,9 @@
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="scope.row.deliveryDate"
|
|
v-model="scope.row.deliveryDate"
|
|
:readonly="sonDisable"
|
|
:readonly="sonDisable"
|
|
- type="date"
|
|
|
|
|
|
+ type="datetime"
|
|
size="small"
|
|
size="small"
|
|
- value-format="yyyy-MM-dd"
|
|
|
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
placeholder="选择日期">
|
|
placeholder="选择日期">
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -574,6 +574,7 @@ export default {
|
|
basicForm: {
|
|
basicForm: {
|
|
code: '',
|
|
code: '',
|
|
org: '',
|
|
org: '',
|
|
|
|
+ orgName: '',
|
|
demandBusinessType: '1',
|
|
demandBusinessType: '1',
|
|
status: '0',
|
|
status: '0',
|
|
customer: '',
|
|
customer: '',
|
|
@@ -582,7 +583,7 @@ export default {
|
|
demandPersonal: '',
|
|
demandPersonal: '',
|
|
demandDept: '',
|
|
demandDept: '',
|
|
demandDate: '',
|
|
demandDate: '',
|
|
- source: '',
|
|
|
|
|
|
+ source: '1',
|
|
warehouse: '',
|
|
warehouse: '',
|
|
goodsAllocation: '',
|
|
goodsAllocation: '',
|
|
billType: '',
|
|
billType: '',
|
|
@@ -699,9 +700,11 @@ export default {
|
|
materialClassifyFour: null,
|
|
materialClassifyFour: null,
|
|
materialClassifyFourName: null,
|
|
materialClassifyFourName: null,
|
|
materialCode: null,
|
|
materialCode: null,
|
|
|
|
+ materialId: null,
|
|
materialName: null,
|
|
materialName: null,
|
|
specification: null,
|
|
specification: null,
|
|
unit: null,
|
|
unit: null,
|
|
|
|
+ unitName: null,
|
|
manufacturerName: null,
|
|
manufacturerName: null,
|
|
registrant: null,
|
|
registrant: null,
|
|
puPeriod: null,
|
|
puPeriod: null,
|
|
@@ -862,10 +865,12 @@ export default {
|
|
if(this.referCondition.type == 'ORG_PARAM') {
|
|
if(this.referCondition.type == 'ORG_PARAM') {
|
|
this.orgOptions = selection
|
|
this.orgOptions = selection
|
|
this.basicForm.org = selection[0].id
|
|
this.basicForm.org = selection[0].id
|
|
|
|
+ this.basicForm.orgName = selection[0].name
|
|
}
|
|
}
|
|
if(this.referCondition.type == 'CUSTOMER_PARAM') {
|
|
if(this.referCondition.type == 'CUSTOMER_PARAM') {
|
|
this.customerOptions = selection
|
|
this.customerOptions = selection
|
|
this.basicForm.customer = selection[0].id
|
|
this.basicForm.customer = selection[0].id
|
|
|
|
+ this.basicForm.customerName = selection[0].name
|
|
}
|
|
}
|
|
if(this.referCondition.type == 'CONTACTS_PARAM') {
|
|
if(this.referCondition.type == 'CONTACTS_PARAM') {
|
|
this.personOptions = selection
|
|
this.personOptions = selection
|
|
@@ -930,6 +935,7 @@ export default {
|
|
this.basicForm.puDemandItemList[this.tableIndex].businessDept = selection[0].businessDepartment
|
|
this.basicForm.puDemandItemList[this.tableIndex].businessDept = selection[0].businessDepartment
|
|
this.basicForm.puDemandItemList[this.tableIndex].businessDeptName = selection[0].businessDepartmentName
|
|
this.basicForm.puDemandItemList[this.tableIndex].businessDeptName = selection[0].businessDepartmentName
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialCode = selection[0].code
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialCode = selection[0].code
|
|
|
|
+ this.basicForm.puDemandItemList[this.tableIndex].materialId = selection[0].id
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialName = selection[0].name
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialName = selection[0].name
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialClassifyOneName = selection[0].oneClass
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialClassifyOneName = selection[0].oneClass
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialClassifyTwoName = selection[0].twoClass
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialClassifyTwoName = selection[0].twoClass
|
|
@@ -937,7 +943,8 @@ export default {
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialClassifyFourName = selection[0].fourClass
|
|
this.basicForm.puDemandItemList[this.tableIndex].materialClassifyFourName = selection[0].fourClass
|
|
this.basicForm.puDemandItemList[this.tableIndex].specification = selection[0].specification
|
|
this.basicForm.puDemandItemList[this.tableIndex].specification = selection[0].specification
|
|
this.basicForm.puDemandItemList[this.tableIndex].model = selection[0].model
|
|
this.basicForm.puDemandItemList[this.tableIndex].model = selection[0].model
|
|
- this.basicForm.puDemandItemList[this.tableIndex].unit = selection[0].unitIdName
|
|
|
|
|
|
+ this.basicForm.puDemandItemList[this.tableIndex].unit = selection[0].unitId
|
|
|
|
+ this.basicForm.puDemandItemList[this.tableIndex].unitName = selection[0].unitIdName
|
|
this.basicForm.puDemandItemList[this.tableIndex].registrant = selection[0].registrant
|
|
this.basicForm.puDemandItemList[this.tableIndex].registrant = selection[0].registrant
|
|
this.basicForm.puDemandItemList[this.tableIndex].manufacturerName = selection[0].manufacturerIdName
|
|
this.basicForm.puDemandItemList[this.tableIndex].manufacturerName = selection[0].manufacturerIdName
|
|
this.basicForm.puDemandItemList[this.tableIndex].puPeriod = selection[0].deliveryPeriod
|
|
this.basicForm.puDemandItemList[this.tableIndex].puPeriod = selection[0].deliveryPeriod
|