|
|
|
@ -43,8 +43,8 @@
|
|
|
|
|
<a-col :span="8"> |
|
|
|
|
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
|
|
|
|
<j-dict-select-tag type="list" @change="materialType" |
|
|
|
|
v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true" |
|
|
|
|
dictCode="material_type" placeholder="请选择物资类型" :disabled="issh"/> |
|
|
|
|
v-decorator="['materialType']" :trigger-change="true" |
|
|
|
|
dictCode="material_type" placeholder="请选择物资类型" :disabled="issh" disabled/> |
|
|
|
|
</a-form-item> |
|
|
|
|
</a-col> |
|
|
|
|
<a-col :span="8"> |
|
|
|
@ -547,7 +547,7 @@
|
|
|
|
|
if (res.success) { |
|
|
|
|
console.log(res.result) |
|
|
|
|
let newList = res.result |
|
|
|
|
// console.log("12312312:"+numberList.length); |
|
|
|
|
|
|
|
|
|
if (numberList.length > 0) { |
|
|
|
|
newList.forEach(item => { |
|
|
|
|
qc.push({ |
|
|
|
@ -613,7 +613,7 @@
|
|
|
|
|
res.result.forEach(item => { |
|
|
|
|
this.processMaterialsAllotListTable.columns[6].options.push({ |
|
|
|
|
title: item.departName, |
|
|
|
|
value: item.libraryAssociationIdInvisible |
|
|
|
|
value: item.unit |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
@ -661,7 +661,7 @@
|
|
|
|
|
res.result.forEach(item => { |
|
|
|
|
this.processMaterialsAllotListTable.columns[6].options.push({ |
|
|
|
|
title: item.departName, |
|
|
|
|
value: item.libraryAssociationIdInvisible |
|
|
|
|
value: item.unit |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
@ -931,18 +931,16 @@
|
|
|
|
|
let params = {} |
|
|
|
|
params.unit = value |
|
|
|
|
this.libraryInvisible = value; |
|
|
|
|
console.log('value>>>>>>>>>>>>>>>>>>>>>>>>>>>>', value); |
|
|
|
|
getAction(this.url.puwwlistByuntil, params).then((rest) => { |
|
|
|
|
// console.log('rest>>>>>>>>>>>>>>>>>>>>>>>>>>>>', rest) |
|
|
|
|
if (rest.success && rest.result.total > 0) { |
|
|
|
|
this.libraryAssociationIdInvisible = value |
|
|
|
|
} else { |
|
|
|
|
this.libraryAssociationIdInvisible = 'ZK' |
|
|
|
|
this.heid = false |
|
|
|
|
this.descriptionFetchData(this.materialTypeRecord,value); |
|
|
|
|
}else { |
|
|
|
|
this.$message.error("请选择正确的部门!") |
|
|
|
|
this.heid = true; |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
if(!!this.materialTypeRecord){ |
|
|
|
|
this.heid = false |
|
|
|
|
this.descriptionFetchData(this.materialTypeRecord,value); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -956,8 +954,9 @@
|
|
|
|
|
param.company = company |
|
|
|
|
param.departId = res.departIds |
|
|
|
|
param.createTime = getCurrentTime() |
|
|
|
|
param.materialType=1; |
|
|
|
|
this.data = param |
|
|
|
|
let fieldval = pick(this.data, 'createBy', 'company', 'departId', 'createTime') |
|
|
|
|
let fieldval = pick(this.data, 'createBy', 'company', 'departId', 'createTime',"materialType") |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.form.setFieldsValue(fieldval) |
|
|
|
|
}) |
|
|
|
|