|
@@ -290,13 +290,13 @@
|
|
|
{{ scope.row.rowno = scope.$index + 1 + "0" }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
show-overflow-tooltip
|
|
|
label="采购需求单单号"
|
|
|
align="center"
|
|
|
prop="demandCode"
|
|
|
width="150px"
|
|
|
- />
|
|
|
+ /> -->
|
|
|
<el-table-column
|
|
|
show-overflow-tooltip
|
|
|
label="物料编码"
|
|
@@ -597,12 +597,12 @@
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
show-overflow-tooltip
|
|
|
label="批次号"
|
|
|
align="center"
|
|
|
prop="patchNo"
|
|
|
- />
|
|
|
+ /> -->
|
|
|
<el-table-column
|
|
|
show-overflow-tooltip
|
|
|
label="产品批号"
|
|
@@ -622,7 +622,7 @@
|
|
|
:disabled="sonDisable"
|
|
|
slot="append"
|
|
|
icon="el-icon-more"
|
|
|
- @click="chooseBatch(scope.$index)"
|
|
|
+ @click="chooseBatch(scope.$index,'批号')"
|
|
|
></el-button>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
@@ -2153,17 +2153,18 @@ export default {
|
|
|
this.reBackRefer("UNIT_PARAM", selection[0].unitId);
|
|
|
},
|
|
|
// 明细行选择批次号
|
|
|
- chooseBatch(index) {
|
|
|
+ chooseBatch(index,title) {
|
|
|
this.tableIndex = index;
|
|
|
- this.referCondition.orgId = this.basicForm.deliveryInventoryOrg;
|
|
|
- this.referCondition.materialCode =
|
|
|
- this.basicForm.materialInfo[this.tableIndex].materialCode;
|
|
|
- this.referCondition.unitId = this.basicForm.materialInfo[this.tableIndex].unit;
|
|
|
+ this.referCondition.title = title;
|
|
|
+ this.referCondition.billType = this.basicForm.billType;
|
|
|
this.referCondition.warehouseId = this.basicForm.deliveryWarehouse;
|
|
|
+ this.referCondition.clocationId = this.basicForm.materialInfo[this.tableIndex].deliveryAllocation;
|
|
|
+ this.referCondition.materialCode = this.basicForm.materialInfo[this.tableIndex].materialCode;
|
|
|
this.$refs.batchRefer.init(this.referCondition);
|
|
|
},
|
|
|
selectBatch(selection) {
|
|
|
- console.log("选中的批次号", selection);
|
|
|
+ console.log("选中的批号", selection);
|
|
|
+ this.basicForm.materialInfo[this.tableIndex].producBatch = selection[0].code;
|
|
|
},
|
|
|
// 明细行选择货位
|
|
|
chooseMxHW(index, type, isPage, title, stordocId) {
|