|
@@ -128,7 +128,7 @@
|
|
|
}
|
|
|
"
|
|
|
>
|
|
|
- <div class="flex justify-center items-center" v-if="createChargeBillPositionNum == 2" style="margin: 20px 0">
|
|
|
+ <div class="flex justify-center items-center" v-if="commonCarPosition.includes(String(createChargeBillPositionNum))" style="margin: 20px 0">
|
|
|
<div>选择铸机:</div>
|
|
|
<JSearchSelect type="list" style="width: 277px" v-model:value="createChargeBillCcmNo" dict="lg_zj" placeholder="请选择" allowClear />
|
|
|
</div>
|
|
@@ -151,6 +151,7 @@
|
|
|
import { render } from '/@/utils/common/renderUtils';
|
|
|
import { getStackInfoByCcmNo, quickCreateStorageBill } from '../operator.api';
|
|
|
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
|
|
|
+ import { useAppStore } from '/@/store/modules/app';
|
|
|
|
|
|
// 注册打印modal
|
|
|
const [registerPrintModal, { openModal: openPrintModal }] = useModal();
|
|
@@ -168,9 +169,10 @@
|
|
|
|
|
|
const activeKey = ref(1);
|
|
|
const carPosition = {
|
|
|
- '5': [1, 2],
|
|
|
+ '5': [1, 2, 4],
|
|
|
'6': [2, 3, 4],
|
|
|
};
|
|
|
+ const commonCarPosition = ['2', '4'];
|
|
|
// 车辆信息
|
|
|
const infoRef1 = ref();
|
|
|
const infoRef2 = ref();
|
|
@@ -265,7 +267,7 @@
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- const { start, stop } = useTimeoutFn(getInfo, 10000);
|
|
|
+ const { start, stop } = useTimeoutFn(getInfo, 10000, useAppStore().closeTimingTask);
|
|
|
|
|
|
// 获取堆垛机堆垛信息
|
|
|
// 获取当前堆垛信息
|
|
@@ -486,7 +488,7 @@
|
|
|
// 创建装车单
|
|
|
const openCreateChargeBill = ref(false);
|
|
|
const createChargeBillCcmNo = ref(props.ccmNo);
|
|
|
- const createChargeBillPositionNum = ref(1);
|
|
|
+ const createChargeBillPositionNum = ref<string | number>(1);
|
|
|
const createChargeBillCar = ref(undefined);
|
|
|
const okLoading = ref(false);
|
|
|
const createChargeBill = async (pn) => {
|
|
@@ -497,7 +499,7 @@
|
|
|
};
|
|
|
const confirmCreateChargeBill = async () => {
|
|
|
try {
|
|
|
- if (createChargeBillPositionNum.value == 2 && !createChargeBillCcmNo.value) {
|
|
|
+ if (commonCarPosition.includes(String(createChargeBillPositionNum.value)) && !createChargeBillCcmNo.value) {
|
|
|
createMessage.error('请选择铸机号!');
|
|
|
return;
|
|
|
}
|