Commit 7673dd60 authored by jingnan's avatar jingnan 👀

Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

parents f3a0fb49 6a445c12
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -16,7 +16,7 @@
>
<section>
<el-button :disabled="disabled" type="primary" size="medium" @click="save">确定</el-button>
<el-button :disabled="disabled" size="medium" @click="handleClose">取消</el-button>
<el-button :disabled="disabled" size="medium" @click="close">取消</el-button>
</section>
</dee-form>
</div>
......@@ -517,7 +517,6 @@ export default {
this.defaultAirModel()
},
mounted() {
console.log('12231231312', this.basicData)
this.form.supplier = this.basicData.rows.extDxSipplier.supplierFullName || ''
this.form.isSupplierY = this.basicData.rows.extDxSipplier.isValid ? this.basicData.rows.extDxSipplier.isValid === 'Y' : ''
this.form.arrivalDate = this.basicData.rows.arrivalDate || ''
......@@ -715,7 +714,6 @@ export default {
// 带出物料相关默认值
const SELECT_MATERIAL = this.material.find((item) => item.resCode === v)
if (SELECT_MATERIAL) {
console.log('SELECT_MATERIAL', SELECT_MATERIAL)
this.form.modelNo = SELECT_MATERIAL.modelNo || ''
this.form.techSpec = SELECT_MATERIAL.techSpec || ''
this.form.spec = SELECT_MATERIAL.spec || ''
......@@ -802,17 +800,19 @@ export default {
'storageZoneIdType': 'ExtDxProductWorkCenter',
'inventoryReqId': this.basicData.rows.id,
'inventoryReqIdType': 'InventoryRequest',
'contractNo': this.form.contractNo
'contractNo': this.form.contractNo,
'isRoot': true
}
).then((res) => {
console.log('123123', res)
this.$utils.showMessageSuccess('保存成功')
this.close()
})
.catch((err) => {
console.log(err)
})
},
handleClose() {
close() {
this.$emit('completeEven')
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment