|
@@ -621,6 +621,7 @@ export default {
|
|
|
sonDisable: this.disable,
|
|
|
basicForm: {
|
|
|
deliveryInventoryOrg: '',
|
|
|
+ deliveryInventoryOrgCode: '',
|
|
|
deliveryInventoryOrgName: '',
|
|
|
billType: '',
|
|
|
code: '',
|
|
@@ -644,6 +645,7 @@ export default {
|
|
|
customer: '',
|
|
|
customerName: '',
|
|
|
deliveryWarehouse: '',
|
|
|
+ deliveryWarehouseCode: '',
|
|
|
deliveryWarehouseName: '',
|
|
|
storageWarehouse: '',
|
|
|
storageWarehouseName: '',
|
|
@@ -808,6 +810,9 @@ export default {
|
|
|
if (type == 'WAREHOUSE_PARAM' && title == '调出仓库') {
|
|
|
this.chuHouseOptions = res.rows
|
|
|
}
|
|
|
+ if (type == 'UNIT_PARAM') {
|
|
|
+ this.materialInfo[this.tableIndex].unitCode = res.rows[0].code
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
addLine() {
|
|
@@ -823,6 +828,7 @@ export default {
|
|
|
originPlaceName: null,
|
|
|
model: null,
|
|
|
unit: null,
|
|
|
+ unitCode: null,
|
|
|
unitName: null,
|
|
|
deliveryWarehouseName: null,
|
|
|
qty: null,
|
|
@@ -875,6 +881,7 @@ export default {
|
|
|
if (this.referCondition.title == '调出库存组织') {
|
|
|
this.chuOrgOptions = selection
|
|
|
this.basicForm.deliveryInventoryOrg = selection[0].id
|
|
|
+ this.basicForm.deliveryInventoryOrgCode = selection[0].code
|
|
|
this.basicForm.deliveryInventoryOrgName = selection[0].name
|
|
|
}
|
|
|
if (this.referCondition.title == '调入库存组织') {
|
|
@@ -913,6 +920,7 @@ export default {
|
|
|
if (this.referCondition.title == '调出仓库') {
|
|
|
this.chuHouseOptions = selection
|
|
|
this.basicForm.deliveryWarehouse = selection[0].id
|
|
|
+ this.basicForm.deliveryWarehouseCode = selection[0].code
|
|
|
this.basicForm.deliveryWarehouseName = selection[0].name
|
|
|
}
|
|
|
if (this.referCondition.title == '调出货位') {
|
|
@@ -960,14 +968,16 @@ export default {
|
|
|
this.materialInfo[this.tableIndex].manufacturer = selection[0].manufacturerIdName
|
|
|
this.materialInfo[this.tableIndex].marketingApprovalPersonal = selection[0].registrant
|
|
|
this.materialInfo[this.tableIndex].production = selection[0].productionPermit
|
|
|
+ // 根据物料单位id查询单位code
|
|
|
+ this.reBackRefer('UNIT_PARAM', selection[0].unitId)
|
|
|
},
|
|
|
// 明细行选择批次号
|
|
|
chooseBatch(index) {
|
|
|
this.tableIndex = index
|
|
|
- this.referConditionMx.orgCode = this.basicForm.deliveryInventoryOrg
|
|
|
+ this.referConditionMx.orgCode = this.basicForm.deliveryInventoryOrgCode
|
|
|
this.referConditionMx.materialCode = this.materialInfo[this.tableIndex].material
|
|
|
- this.referConditionMx.unitCode = this.materialInfo[this.tableIndex].unit
|
|
|
- this.referConditionMx.warehouseCode = this.basicForm.deliveryWarehouse
|
|
|
+ this.referConditionMx.unitCode = this.materialInfo[this.tableIndex].unitCode
|
|
|
+ this.referConditionMx.warehouseCode = this.basicForm.deliveryWarehouseCode
|
|
|
this.$refs.batchRefer.init(this.referConditionMx)
|
|
|
},
|
|
|
selectBatch(selection) {
|