|
|
@@ -1001,6 +1001,12 @@
|
|
|
async returnItem(item) {
|
|
|
const data = await factoryworkstation(item.id);
|
|
|
console.log(data);
|
|
|
+ if (data.workshopId) {
|
|
|
+ await this.returnItem1({ id: data.workshopId });
|
|
|
+ }
|
|
|
+ if (data.productionLineId) {
|
|
|
+ await this.getCxList(data.productionLineId);
|
|
|
+ }
|
|
|
this.zcInfo.factoryRoomId1 = data.factoryId;
|
|
|
this.zcInfo.factoryRoomName1 = data.factoryName;
|
|
|
this.zcInfo.factoryRoomId2 = data.workshopPlanId;
|
|
|
@@ -1198,18 +1204,18 @@
|
|
|
if (!this.basicInfo && this.pageType == 'add') {
|
|
|
return this.$message.error('请选择物品编码');
|
|
|
}
|
|
|
- if (!this.zcInfo.factoryRoomId1) {
|
|
|
- return this.$message.error('请选择工厂');
|
|
|
- }
|
|
|
- if (!this.zcInfo.factoryRoomId2) {
|
|
|
- return this.$message.error('请选择厂房');
|
|
|
- }
|
|
|
- if (!this.zcInfo.factoryRoomId3) {
|
|
|
- return this.$message.error('请选择车间');
|
|
|
- }
|
|
|
- if (!this.zcInfo.factoryRoomId4) {
|
|
|
- return this.$message.error('请选择产线');
|
|
|
- }
|
|
|
+ // if (!this.zcInfo.factoryRoomId1) {
|
|
|
+ // return this.$message.error('请选择工厂');
|
|
|
+ // }
|
|
|
+ // if (!this.zcInfo.factoryRoomId2) {
|
|
|
+ // return this.$message.error('请选择厂房');
|
|
|
+ // }
|
|
|
+ // if (!this.zcInfo.factoryRoomId3) {
|
|
|
+ // return this.$message.error('请选择车间');
|
|
|
+ // }
|
|
|
+ // if (!this.zcInfo.factoryRoomId4) {
|
|
|
+ // return this.$message.error('请选择产线');
|
|
|
+ // }
|
|
|
// if (!this.zcInfo.factoryRoomId5) {
|
|
|
// return this.$message.error('请选择工位');
|
|
|
// }
|