|
@@ -56,27 +56,27 @@
|
|
|
@click="onEndBoxClick(index, item)"
|
|
|
>
|
|
|
<div class="name">{{ item.name }}</div>
|
|
|
- <div
|
|
|
- v-if="
|
|
|
- item.targetType === 'stock' && index === currentDestinationIndex
|
|
|
- "
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model="selectStore"
|
|
|
- filterable
|
|
|
- placeholder="请选择"
|
|
|
- size="large"
|
|
|
- style="width: 200px"
|
|
|
- value-key="id"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="store in storeMap.get(item.houseNo)"
|
|
|
- :key="store.id"
|
|
|
- :label="store.name"
|
|
|
- :value="store"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
+ <!-- <div-->
|
|
|
+ <!-- v-if="-->
|
|
|
+ <!-- item.targetType === 'stock' && index === currentDestinationIndex-->
|
|
|
+ <!-- "-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- <el-select-->
|
|
|
+ <!-- v-model="selectStore"-->
|
|
|
+ <!-- filterable-->
|
|
|
+ <!-- placeholder="请选择"-->
|
|
|
+ <!-- size="large"-->
|
|
|
+ <!-- style="width: 200px"-->
|
|
|
+ <!-- value-key="id"-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- <el-option-->
|
|
|
+ <!-- v-for="store in storeMap.get(item.houseNo)"-->
|
|
|
+ <!-- :key="store.id"-->
|
|
|
+ <!-- :label="store.name"-->
|
|
|
+ <!-- :value="store"-->
|
|
|
+ <!-- />-->
|
|
|
+ <!-- </el-select>-->
|
|
|
+ <!-- </div>-->
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-button class="sureBtn" type="primary" @click="createTask"
|
|
@@ -94,10 +94,9 @@ import {
|
|
|
getBoxDetailByLabel,
|
|
|
getDestinationList,
|
|
|
getMaterialInfoByLabel,
|
|
|
- getStoreListByNo,
|
|
|
} from "@/api/process/materialFlow";
|
|
|
|
|
|
-const currentBox = ref("ZJ000011");
|
|
|
+const currentBox = ref("");
|
|
|
const boxDetail = ref<any>({});
|
|
|
const enterBox = () => {
|
|
|
getBoxDetailByLabel(currentBox.value).then((res) => {
|
|
@@ -107,7 +106,7 @@ const enterBox = () => {
|
|
|
};
|
|
|
|
|
|
// 物料
|
|
|
-const scanCodeInput = ref("2010100002301#gys022#sc022#100#20220929#31");
|
|
|
+const scanCodeInput = ref("");
|
|
|
const materialList = ref<any>([]);
|
|
|
|
|
|
const handleScanCodeInput = () => {
|
|
@@ -127,13 +126,13 @@ const onEndBoxClick = (index: number, item: any) => {
|
|
|
currentDestination.value = item;
|
|
|
currentDestinationIndex.value = index;
|
|
|
// 如果是仓库,会根据仓库的no获取仓储的列表,存入map, 如果已经有数据了则不需要再次请求接口
|
|
|
- if (item.targetType === "stock") {
|
|
|
- if (!storeMap.has(item.houseNo)) {
|
|
|
- getStoreListByNo(item.houseNo).then((res) => {
|
|
|
- storeMap.set(item.houseNo, res.data || []);
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (item.targetType === "stock") {
|
|
|
+ // if (!storeMap.has(item.houseNo)) {
|
|
|
+ // getStoreListByNo(item.houseNo).then((res) => {
|
|
|
+ // storeMap.set(item.houseNo, res.data || []);
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // }
|
|
|
};
|
|
|
|
|
|
onMounted(() => {
|
|
@@ -147,9 +146,9 @@ onMounted(() => {
|
|
|
const createTask = () => {
|
|
|
const params = {
|
|
|
circulationDetail: [...materialList.value],
|
|
|
- coordinate: "",
|
|
|
+ // coordinate: "",
|
|
|
houseNo: "",
|
|
|
- locationNo: "",
|
|
|
+ // locationNo: "",
|
|
|
stationId: 0,
|
|
|
targetType: "",
|
|
|
vehicleCode: "",
|
|
@@ -159,8 +158,8 @@ const createTask = () => {
|
|
|
params.targetType = currentDestination.value.targetType;
|
|
|
if (currentDestination.value.targetType === "stock") {
|
|
|
params.houseNo = currentDestination.value.houseNo;
|
|
|
- params.locationNo = selectStore.value.locationNo;
|
|
|
- params.coordinate = selectStore.value.coordinate;
|
|
|
+ // params.locationNo = selectStore.value.locationNo;
|
|
|
+ // params.coordinate = selectStore.value.coordinate;
|
|
|
} else {
|
|
|
params.stationId = currentDestination.value.id;
|
|
|
}
|