|
@@ -75,9 +75,22 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
- <template v-slot:batchNo="scope">
|
|
|
|
|
- <el-form-item :prop="'datasource.' + scope.$index + '.batchNo'">
|
|
|
|
|
- <el-input v-model="scope.row.batchNo" v-no-chinese></el-input>
|
|
|
|
|
|
|
+ <template v-slot:batchStockId="scope">
|
|
|
|
|
+ <el-form-item :prop="'datasource.' + scope.$index + '.batchStockId'">
|
|
|
|
|
+ <!-- <el-input v-model="scope.row.batchNo" v-no-chinese></el-input> -->
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="scope.row.batchStockId"
|
|
|
|
|
+ placeholder="请选择"
|
|
|
|
|
+ @change="batchNoChange(scope.$index, scope.row)"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in (scope.row.batchNoList || [])"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.batchNo"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ >
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
<!-- 生产编号 可编辑 -->
|
|
<!-- 生产编号 可编辑 -->
|
|
@@ -375,6 +388,7 @@
|
|
|
import { changeCount } from '@/BIZComponents/setProduct.js';
|
|
import { changeCount } from '@/BIZComponents/setProduct.js';
|
|
|
import { parameterGetByCode } from '@/api/main/index.js';
|
|
import { parameterGetByCode } from '@/api/main/index.js';
|
|
|
import { getSummaries } from '@/utils/util.js';
|
|
import { getSummaries } from '@/utils/util.js';
|
|
|
|
|
+ import { getBatchList } from '@/api/wms';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
mixins: [dictMixins, getDynamicsColumns, tabMixins],
|
|
mixins: [dictMixins, getDynamicsColumns, tabMixins],
|
|
@@ -537,9 +551,9 @@
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
width: 160,
|
|
width: 160,
|
|
|
- prop: 'batchNo',
|
|
|
|
|
|
|
+ prop: 'batchStockId',
|
|
|
label: '批次号',
|
|
label: '批次号',
|
|
|
- slot: 'batchNo',
|
|
|
|
|
|
|
+ slot: 'batchStockId',
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
@@ -987,6 +1001,7 @@
|
|
|
const data = row.warehouseList.find(
|
|
const data = row.warehouseList.find(
|
|
|
(item) => item.warehouseId == row.warehouseId
|
|
(item) => item.warehouseId == row.warehouseId
|
|
|
);
|
|
);
|
|
|
|
|
+
|
|
|
|
|
|
|
|
this.$set(
|
|
this.$set(
|
|
|
this.form.datasource[index],
|
|
this.form.datasource[index],
|
|
@@ -1007,6 +1022,37 @@
|
|
|
'warehouseNum',
|
|
'warehouseNum',
|
|
|
warehouseOutStock || 0
|
|
warehouseOutStock || 0
|
|
|
);
|
|
);
|
|
|
|
|
+
|
|
|
|
|
+ this.$set(
|
|
|
|
|
+ this.form.datasource[index],
|
|
|
|
|
+ 'batchStockId',
|
|
|
|
|
+ ''
|
|
|
|
|
+ );
|
|
|
|
|
+
|
|
|
|
|
+ this.$set(
|
|
|
|
|
+ this.form.datasource[index],
|
|
|
|
|
+ 'batchNo',
|
|
|
|
|
+ ''
|
|
|
|
|
+ );
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
|
|
+ //批次号选择
|
|
|
|
|
+ async batchNoChange(index, row) {
|
|
|
|
|
+ const data = row.batchNoList.find(
|
|
|
|
|
+ (item) => item.id == row.batchStockId
|
|
|
|
|
+ );
|
|
|
|
|
+ this.$set(
|
|
|
|
|
+ this.form.datasource[index],
|
|
|
|
|
+ 'batchNo',
|
|
|
|
|
+ data.batchNo
|
|
|
|
|
+ );
|
|
|
|
|
+
|
|
|
|
|
+ this.$set(
|
|
|
|
|
+ this.form.datasource[index],
|
|
|
|
|
+ 'warehouseNum',
|
|
|
|
|
+ data.measureQuantity || 0
|
|
|
|
|
+ );
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
//改变数量
|
|
//改变数量
|
|
|
changeCount(row, index, isBlockCount = true) {
|
|
changeCount(row, index, isBlockCount = true) {
|
|
@@ -1214,6 +1260,13 @@
|
|
|
categoryId: item.id
|
|
categoryId: item.id
|
|
|
})
|
|
})
|
|
|
);
|
|
);
|
|
|
|
|
+
|
|
|
|
|
+ this.$set(parasm, 'batchNoList', await getBatchList({
|
|
|
|
|
+ categoryCode: item.productCode,
|
|
|
|
|
+ warehouseId: item.warehouseId,
|
|
|
|
|
+ size: -1
|
|
|
|
|
+ }));
|
|
|
|
|
+
|
|
|
this.$set(
|
|
this.$set(
|
|
|
parasm,
|
|
parasm,
|
|
|
'packingSpecification',
|
|
'packingSpecification',
|
|
@@ -1286,6 +1339,7 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
setValue(data) {
|
|
setValue(data) {
|
|
|
|
|
+ console.log('setValue~~~~~~', data);
|
|
|
let indexS = [];
|
|
let indexS = [];
|
|
|
data.forEach((item, index) => {
|
|
data.forEach((item, index) => {
|
|
|
if (item.modelKey) {
|
|
if (item.modelKey) {
|
|
@@ -1351,6 +1405,36 @@
|
|
|
);
|
|
);
|
|
|
await this.warehouseChange(index, this.form.datasource[index]);
|
|
await this.warehouseChange(index, this.form.datasource[index]);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ const templist = await getBatchList({
|
|
|
|
|
+ categoryCode: item.productCode,
|
|
|
|
|
+ warehouseId: item.warehouseId,
|
|
|
|
|
+ size: -1
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ console.log('templist~~~~', templist.list);
|
|
|
|
|
+
|
|
|
|
|
+ // 批次号
|
|
|
|
|
+ this.$set(
|
|
|
|
|
+ this.form.datasource[index],
|
|
|
|
|
+ 'batchNoList',
|
|
|
|
|
+ templist?.list || []
|
|
|
|
|
+ );
|
|
|
|
|
+ console.log(this.form.datasource[index]);
|
|
|
|
|
+ if (item.batchStockId) {
|
|
|
|
|
+ // this.$set(
|
|
|
|
|
+ // this.form.datasource[index],
|
|
|
|
|
+ // 'warehouseNum',
|
|
|
|
|
+ // await getWarehouseOutStock({
|
|
|
|
|
+ // warehouseId: item.warehouseId,
|
|
|
|
|
+ // code: item.productCode
|
|
|
|
|
+ // })
|
|
|
|
|
+ // );
|
|
|
|
|
+
|
|
|
|
|
+ await this.batchNoChange(index, this.form.datasource[index]);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|