|
|
@ -473,7 +473,7 @@
|
|
|
|
@change="batchNoMethod" :rowIndex="scope.$index" :formData="dataForm"
|
|
|
|
@change="batchNoMethod" :rowIndex="scope.$index" :formData="dataForm"
|
|
|
|
:templateJson="interfaceRes.deliveryproductrelationcargoId" placeholder="请选择"
|
|
|
|
:templateJson="interfaceRes.deliveryproductrelationcargoId" placeholder="请选择"
|
|
|
|
:disabled="judgeWrite('warehousingproductList-storageAreaId') ||judgeWrite('warehousingproductList-storageAreaId')"
|
|
|
|
:disabled="judgeWrite('warehousingproductList-storageAreaId') ||judgeWrite('warehousingproductList-storageAreaId')"
|
|
|
|
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
|
|
|
|
propsValue="cargoId" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
|
|
|
|
relationField="cargoName" :field="'cargoId' + scope.$index"
|
|
|
|
relationField="cargoName" :field="'cargoId' + scope.$index"
|
|
|
|
interfaceId="549927783325776837" :pageSize="20"
|
|
|
|
interfaceId="549927783325776837" :pageSize="20"
|
|
|
|
:columnOptions="deliveryproductrelationcargoIdcolumnOptions" clearable
|
|
|
|
:columnOptions="deliveryproductrelationcargoIdcolumnOptions" clearable
|
|
|
@ -602,7 +602,8 @@
|
|
|
|
</JnpfInput>
|
|
|
|
</JnpfInput>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="操作" width="50" v-if="!judgeWrite('warehousingproductList')">
|
|
|
|
<el-table-column label="操作" width="100"
|
|
|
|
|
|
|
|
v-if="!judgeWrite('warehousingproductList')">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-button size="mini" type="text" class="JNPF-table-delBtn"
|
|
|
|
<el-button size="mini" type="text" class="JNPF-table-delBtn"
|
|
|
|
@click="createwarehousingproductList(scope.row)">添加</el-button>
|
|
|
|
@click="createwarehousingproductList(scope.row)">添加</el-button>
|
|
|
@ -894,13 +895,13 @@ export default {
|
|
|
|
batchNoMethod(val, val2, index) {
|
|
|
|
batchNoMethod(val, val2, index) {
|
|
|
|
// this.dataForm.warehousingProductList[idx].batchNo = val2.batch_number
|
|
|
|
// this.dataForm.warehousingProductList[idx].batchNo = val2.batch_number
|
|
|
|
// this.dataForm.warehousingProductList[idx].produceDate = val2.produce_date
|
|
|
|
// this.dataForm.warehousingProductList[idx].produceDate = val2.produce_date
|
|
|
|
|
|
|
|
debugger
|
|
|
|
let idx = index
|
|
|
|
let idx = index
|
|
|
|
for (let i = 0; i < val2.length; i++) {
|
|
|
|
for (let i = 0; i < val2.length; i++) {
|
|
|
|
if (i == 0) {
|
|
|
|
if (i == 0) {
|
|
|
|
this.dataForm.warehousingProductList[idx].storageAreaId = undefined
|
|
|
|
// this.dataForm.warehousingProductList[idx].storageAreaId = undefined
|
|
|
|
this.dataForm.warehousingProductList[idx].batchNo = undefined
|
|
|
|
// this.dataForm.warehousingProductList[idx].batchNo = undefined
|
|
|
|
this.dataForm.warehousingProductList[idx].produceDate = undefined
|
|
|
|
// this.dataForm.warehousingProductList[idx].produceDate = undefined
|
|
|
|
// this.dataForm.warehousingProductList[idx].inventoryNo = undefined
|
|
|
|
// this.dataForm.warehousingProductList[idx].inventoryNo = undefined
|
|
|
|
this.dataForm.warehousingProductList[idx].storageAreaId = val2[0].cargoId
|
|
|
|
this.dataForm.warehousingProductList[idx].storageAreaId = val2[0].cargoId
|
|
|
|
this.dataForm.warehousingProductList[idx].batchNo = val2[0].batch_number
|
|
|
|
this.dataForm.warehousingProductList[idx].batchNo = val2[0].batch_number
|
|
|
@ -1110,7 +1111,7 @@ export default {
|
|
|
|
this.isEdit = false;
|
|
|
|
this.isEdit = false;
|
|
|
|
this.childIndex = -1;
|
|
|
|
this.childIndex = -1;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
createwarehousingproductList(value) {
|
|
|
|
createwarehousingproductList(val) {
|
|
|
|
let item = JSON.parse(JSON.stringify(val));
|
|
|
|
let item = JSON.parse(JSON.stringify(val));
|
|
|
|
item.purchaseNum = 0;
|
|
|
|
item.purchaseNum = 0;
|
|
|
|
item.storageAreaId = undefined;
|
|
|
|
item.storageAreaId = undefined;
|
|
|
|