|
@@ -403,19 +403,47 @@
|
|
|
style="margin-right: 10px; width: 20%"
|
|
style="margin-right: 10px; width: 20%"
|
|
|
v-model="zcInfo.factoryRoomId2"
|
|
v-model="zcInfo.factoryRoomId2"
|
|
|
:augr="2"
|
|
:augr="2"
|
|
|
|
|
+ @returnItem="returnItem1"
|
|
|
/>
|
|
/>
|
|
|
- <FactoryAreaSelect
|
|
|
|
|
|
|
+ <!-- <FactoryAreaSelect
|
|
|
placeholder="请选择车间"
|
|
placeholder="请选择车间"
|
|
|
style="margin-right: 10px; width: 20%"
|
|
style="margin-right: 10px; width: 20%"
|
|
|
v-model="zcInfo.factoryRoomId3"
|
|
v-model="zcInfo.factoryRoomId3"
|
|
|
:augr="3"
|
|
:augr="3"
|
|
|
- />
|
|
|
|
|
- <FactoryAreaSelect
|
|
|
|
|
|
|
+ /> -->
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ style="width: 19%; margin-right: 10px"
|
|
|
|
|
+ v-model="zcInfo.factoryRoomId3"
|
|
|
|
|
+ placeholder="请选择"
|
|
|
|
|
+ @change="getCxList"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in zjList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ >
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ <!-- <FactoryAreaSelect
|
|
|
style="margin-right: 10px; width: 20%"
|
|
style="margin-right: 10px; width: 20%"
|
|
|
placeholder="请选择产线"
|
|
placeholder="请选择产线"
|
|
|
v-model="zcInfo.factoryRoomId4"
|
|
v-model="zcInfo.factoryRoomId4"
|
|
|
:augr="4"
|
|
:augr="4"
|
|
|
- />
|
|
|
|
|
|
|
+ /> -->
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ style="width: 19%; margin-right: 10px"
|
|
|
|
|
+ v-model="zcInfo.factoryRoomId4"
|
|
|
|
|
+ placeholder="请选择"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in cxList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ >
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
<FactoryAreaSelect
|
|
<FactoryAreaSelect
|
|
|
style="margin-right: 10px; width: 15%"
|
|
style="margin-right: 10px; width: 15%"
|
|
|
placeholder="请输入工位"
|
|
placeholder="请输入工位"
|
|
@@ -760,6 +788,7 @@
|
|
|
} from '@/api/ledgerAssets';
|
|
} from '@/api/ledgerAssets';
|
|
|
import { getUserPage } from '@/api/system/organization';
|
|
import { getUserPage } from '@/api/system/organization';
|
|
|
import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
|
|
import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
|
|
|
|
|
+ import { listWorkshopByParentId, listFactoryLine } from '@/api/factoryModel';
|
|
|
export default {
|
|
export default {
|
|
|
components: {
|
|
components: {
|
|
|
linkMsg,
|
|
linkMsg,
|
|
@@ -929,7 +958,9 @@
|
|
|
warehouseList: [],
|
|
warehouseList: [],
|
|
|
areaList: [],
|
|
areaList: [],
|
|
|
shelvesList: [],
|
|
shelvesList: [],
|
|
|
- suppList: []
|
|
|
|
|
|
|
+ suppList: [],
|
|
|
|
|
+ zjList: [],
|
|
|
|
|
+ cxList: []
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
watch: {},
|
|
watch: {},
|
|
@@ -958,6 +989,15 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ async getCxList(e) {
|
|
|
|
|
+ const data = await listFactoryLine([e]);
|
|
|
|
|
+ this.cxList = data;
|
|
|
|
|
+ },
|
|
|
|
|
+ async returnItem1(item) {
|
|
|
|
|
+ const data = await listWorkshopByParentId(item.id);
|
|
|
|
|
+
|
|
|
|
|
+ this.zjList = data;
|
|
|
|
|
+ },
|
|
|
async returnItem(item) {
|
|
async returnItem(item) {
|
|
|
const data = await factoryworkstation(item.id);
|
|
const data = await factoryworkstation(item.id);
|
|
|
console.log(data);
|
|
console.log(data);
|
|
@@ -1322,7 +1362,14 @@
|
|
|
this.zcInfo.factoryRoomId4 = pathIds[3];
|
|
this.zcInfo.factoryRoomId4 = pathIds[3];
|
|
|
|
|
|
|
|
this.zcInfo.factoryRoomId5 = pathIds[4];
|
|
this.zcInfo.factoryRoomId5 = pathIds[4];
|
|
|
|
|
+ if (this.zcInfo.factoryRoomId2) {
|
|
|
|
|
+ this.returnItem1({ id: pathIds[1] });
|
|
|
|
|
+ }
|
|
|
|
|
+ if (this.zcInfo.factoryRoomId3) {
|
|
|
|
|
+ this.getCxList(pathIds[2]);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
if (data.positionList?.length) {
|
|
if (data.positionList?.length) {
|
|
|
this.positionInfo.detailPosition =
|
|
this.positionInfo.detailPosition =
|
|
|
data.positionList[0].detailPosition;
|
|
data.positionList[0].detailPosition;
|