diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue
index 64628541..4179efa8 100644
--- a/src/mycomponents/query/balanceQuery.vue
+++ b/src/mycomponents/query/balanceQuery.vue
@@ -80,7 +80,7 @@
-
+
@@ -105,7 +105,7 @@ const props = defineProps({
}
});
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const itemCode = ref("");
const itemCodeResult = ref([]);
@@ -125,7 +125,7 @@ const change = () => {
};
const showErrorMessage = (message) => {
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
}
});
diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index 32933097..5c1de92d 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -235,7 +235,7 @@ defineExpose({
clear,
clickScanMsg,
losefocus,
- setItemCodeSimulate
+ setItemCodeSimulate,
})
diff --git a/src/mycomponents/scan/winScanParentPackage.vue b/src/mycomponents/scan/winScanParentPackage.vue
index a4c081da..838ed093 100644
--- a/src/mycomponents/scan/winScanParentPackage.vue
+++ b/src/mycomponents/scan/winScanParentPackage.vue
@@ -23,7 +23,7 @@
-
+
@@ -55,7 +55,7 @@ const businessType = ref(null);
const comscansimulate = ref(null);
const comscan = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const simulateScan = (item) => {
comscansimulate.value.setItemCodeSimulate(item.copyContent);
@@ -196,7 +196,7 @@ const losefocus = () => {
};
const showMessage = (message) => {
- comMessage.value.showMessage(message);
+ comMessageRef.value.showMessage(message);
};
const change = (e) => {
@@ -205,7 +205,7 @@ const change = (e) => {
const showErrorMessage = (message) => {
losefocus();
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
getfocus();
}
diff --git a/src/pages/container/record/containerUnBindRecord.vue b/src/pages/container/record/containerUnBindRecord.vue
index 35c309ea..eac6a722 100644
--- a/src/pages/container/record/containerUnBindRecord.vue
+++ b/src/pages/container/record/containerUnBindRecord.vue
@@ -31,7 +31,7 @@
-
+
@@ -69,7 +69,7 @@ const containerCode = ref('');
const scanPopup = ref(null);
const scanContainer = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const emit = defineEmits(['close', 'getResult']);
@@ -270,7 +270,7 @@ const getParams = () => {
const showMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showMessage(message, (res) => {
+ comMessageRef.value.showMessage(message, (res) => {
if (res) {
scanPopupGetFocus();
}
@@ -281,7 +281,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
scanPopupGetFocus();
}
@@ -290,7 +290,7 @@ const showErrorMessage = (message) => {
};
const showScanMessage = (message) => {
- comMessage.value.showScanMessage(message);
+ comMessageRef.value.showScanMessage(message);
};
const afterCloseMessage = () => {
@@ -315,7 +315,7 @@ const getContainer = (containerInfo) => {
};
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
containerCode.value = '';
});
};
diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue
index fccabad4..34b29203 100644
--- a/src/pages/count/job/fuzzyCountDetail.vue
+++ b/src/pages/count/job/fuzzyCountDetail.vue
@@ -60,7 +60,7 @@
-
+
@@ -104,7 +104,7 @@ const showItem = ref(null)
const scanLocationCode = ref(null)
const scanPopup = ref(null)
-const comMessage = ref(null)
+const comMessageRef = ref(null)
const countQtyEdit = ref(null)
const detailInfoPopup = ref(null)
@@ -304,7 +304,7 @@ const onScan = async (packInfo) => {
if (index >= 0) {
detailSource.value.unshift(detailSource.value.splice(index, 1)[0]) // 置顶
// 提交
- comMessage.value.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => {
+ comMessageRef.value.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => {
if (res) {
closeScanPopup()
edit(detail)
@@ -377,7 +377,7 @@ const editClose = () => {
const remove = (item, index) => {
scanPopupLoseFocus()
- comMessage.value.showQuestionMessage('是否要移除扫描信息?', res => {
+ comMessageRef.value.showQuestionMessage('是否要移除扫描信息?', res => {
if (res) {
detailSource.value.splice(index, 1)
}
@@ -392,7 +392,7 @@ const detail = (item) => {
const commit = () => {
if (detailSource.value.length === 0) {
- comMessage.value.showMessage('还未扫描,是否要继续提交', res => {
+ comMessageRef.value.showMessage('还未扫描,是否要继续提交', res => {
if (res) {
commitJob()
}
@@ -430,7 +430,7 @@ const setParams = () => {
const showMessage = (message) => {
scanPopupLoseFocus()
- comMessage.value.showMessage(message, res => {
+ comMessageRef.value.showMessage(message, res => {
if (res) {
afterCloseMessage()
}
@@ -439,7 +439,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
scanPopupLoseFocus()
- comMessage.value.showErrorMessage(message, res => {
+ comMessageRef.value.showErrorMessage(message, res => {
if (res) {
afterCloseMessage()
}
@@ -447,7 +447,7 @@ const showErrorMessage = (message) => {
}
const showScanMessage = (message) => {
- comMessage.value.showScanMessage(message)
+ comMessageRef.value.showScanMessage(message)
}
const afterCloseMessage = () => {
@@ -459,7 +459,7 @@ const closeScanMessage = () => {
}
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, res => {
+ comMessageRef.value.showSuccessMessage(hint, res => {
fromLocationCode.value = ''
fromLocation.value = {}
detailSource.value = []
@@ -481,7 +481,7 @@ const getCountScopeName = (value) => {
}
const showQuestionMessage = (message, callback) => {
- comMessage.value.showQuestionMessage(message, res => {
+ comMessageRef.value.showQuestionMessage(message, res => {
callback(res)
})
}
diff --git a/src/pages/customerReturn/record/recordList.vue b/src/pages/customerReturn/record/recordList.vue
index 8eaaa212..cb4d6f73 100644
--- a/src/pages/customerReturn/record/recordList.vue
+++ b/src/pages/customerReturn/record/recordList.vue
@@ -17,7 +17,7 @@
-
+
@@ -68,7 +68,7 @@ const queryParams = ref({
const filter = ref(null);
const jobListPopup = ref(null);
const jobInfoPopup = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const scanPopup = ref(null);
const recordListRef = ref(null);
@@ -230,7 +230,7 @@ const showMessage = (message) => {
if (scanPopup.value) {
scanPopup.value.packLoseFocus();
}
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res && scanPopup.value) {
scanPopup.value.packGetFocus();
}
diff --git a/src/pages/customerReturn/record/recordListDetail.vue b/src/pages/customerReturn/record/recordListDetail.vue
index 7dc64565..8b39b277 100644
--- a/src/pages/customerReturn/record/recordListDetail.vue
+++ b/src/pages/customerReturn/record/recordListDetail.vue
@@ -53,7 +53,7 @@
-
+
@@ -100,7 +100,7 @@ const scanCount = ref(0);
const detailInfoPopup = ref(null);
const scanPopup = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
onLoad((option) => {
uni.setNavigationBarTitle({
@@ -264,7 +264,7 @@ const receive = () => {
};
const showMessageHint = (hint, callback) => {
- comMessage.value.showErrorMessage(hint, (res) => {
+ comMessageRef.value.showErrorMessage(hint, (res) => {
if (res) {
callback();
}
@@ -289,7 +289,7 @@ const receiveSubmit = () => {
const showMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showMessage(message, (res) => {
+ comMessageRef.value.showMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -300,7 +300,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -311,7 +311,7 @@ const showErrorMessage = (message) => {
const showQuestionMessage = (message, callback) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showQuestionMessage(message, (res) => {
+ comMessageRef.value.showQuestionMessage(message, (res) => {
if (res) {
callback(res);
}
@@ -336,7 +336,7 @@ const afterCloseMessage = () => {
};
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
navigateBack(1);
});
};
@@ -352,7 +352,7 @@ const switchChange = (isOn) => {
});
calcHandleQty();
} else {
- comMessage.value.showQuestionMessage("是否要关闭整单收货?", (res) => {
+ comMessageRef.value.showQuestionMessage("是否要关闭整单收货?", (res) => {
if (res) {
getDetail();
} else {
diff --git a/src/pages/deliver/coms/comScanDeliverPackss.vue b/src/pages/deliver/coms/comScanDeliverPackss.vue
index 6fdb0cbc..2b8faec5 100644
--- a/src/pages/deliver/coms/comScanDeliverPackss.vue
+++ b/src/pages/deliver/coms/comScanDeliverPackss.vue
@@ -91,9 +91,9 @@
-
-
-
+
+
+
@@ -157,12 +157,11 @@ const defaultValueList = ref([]);
const label = ref({});
const fromInventoryStatuses = ref([]);
const packageInfo = ref({});
-const popup = ref(null);
-const balanceSelect = ref(null);
+const balanceSelectRef = ref(null);
const comscan = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const receiptHint = ref(null);
-const balanceQtyEdit = ref(null);
+const balanceQtyEditRef = ref(null);
const detailOptions = ref('')
const toLocationCombox = ref('')
const showItem = ref('')
@@ -206,7 +205,7 @@ const initData = () => {
const showBalanceSelect = (items, packageInfo) => {
packageInfo.value = packageInfo;
- balanceSelect.value.openPopup(items);
+ balanceSelectRef.value.openPopup(items);
};
const getFromLocationList = () => {
@@ -221,7 +220,7 @@ const getFromLocationList = () => {
fromLocationCode.value = list[0];
return list;
} else {
- comMessage.value.showErrorMessages('需求库位【' + toLocationCode.value + '】不存在', res => {
+ comMessageRef.value.showErrorMessages('需求库位【' + toLocationCode.value + '】不存在', res => {
toLocationCode.value = '';
});
}
@@ -471,7 +470,7 @@ const swipeClick = (e, item, index) => {
const edit = (item) => {
editItem.value = item;
item.balance.balanceQty = item.balance.qty;
- balanceQtyEdit.value.openEditPopup(item.balance, item.qty);
+ balanceQtyEditRef.value.openEditPopup(item.balance, item.qty);
};
const detail = (item) => {
@@ -509,21 +508,21 @@ const packLoseFocus = () => {
const showMessage = (message, callback) => {
setTimeout(() => {
packLoseFocus();
- comMessage.value.showMessage(message, callback);
+ comMessageRef.value.showMessage(message, callback);
});
};
const showErrorMessage = (message, callback) => {
setTimeout(() => {
packLoseFocus();
- comMessage.value.showErrorMessage(message, callback);
+ comMessageRef.value.showErrorMessage(message, callback);
});
};
const showQuestionMessage = (message, callback) => {
setTimeout(() => {
packLoseFocus();
- comMessage.value.showQuestionMessage(message, callback);
+ comMessageRef.value.showQuestionMessage(message, callback);
});
};
diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue
index 275be9cc..2b332443 100644
--- a/src/pages/deliver/job/deliverDetailBatch.vue
+++ b/src/pages/deliver/job/deliverDetailBatch.vue
@@ -49,7 +49,7 @@
-
+
@@ -106,7 +106,7 @@ const jobStatus = ref("");
const dataContent = ref('')
const managementList = ref([]);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const scanPopup = ref(null);
const comScanIssuePack = ref(null);
import {useCountStore} from '@/store'
@@ -252,7 +252,7 @@ const submitJob = () => {
console.log("提交参数", params);
if (params.subList.length == 0) {
uni.hideLoading();
- comMessage.value.showConfirmMessageModal('请扫描箱码');
+ comMessageRef.value.showConfirmMessageModal('请扫描箱码');
return;
}
@@ -309,7 +309,7 @@ const setParams = () => {
};
const cancel = () => {
- comMessage.value.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', (res) => {
+ comMessageRef.value.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', (res) => {
if (res) {
clearInfo();
}
@@ -345,7 +345,7 @@ const scanPopupGetFocus = () => {
};
const showMessage = (message) => {
- comMessage.value.showMessage(message, (res) => {
+ comMessageRef.value.showMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -353,7 +353,7 @@ const showMessage = (message) => {
};
const showErrorMessage = (message) => {
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -361,21 +361,21 @@ const showErrorMessage = (message) => {
};
const showScanMessage = (message) => {
- comMessage.value.showScanMessage(message);
+ comMessageRef.value.showScanMessage(message);
};
const showCommitSuccess = () => {
- comMessage.value.showCommitSuccess();
+ comMessageRef.value.showCommitSuccess();
};
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
navigateBack(1);
});
};
const showRescanMessage = (message) => {
- comMessage.value.showRescanMessage(message);
+ comMessageRef.value.showRescanMessage(message);
};
const afterCloseMessage = () => {
diff --git a/src/pages/fg/coms/comNoReceiptPopup.vue b/src/pages/fg/coms/comNoReceiptPopup.vue
index b8e752b3..2e3f9358 100644
--- a/src/pages/fg/coms/comNoReceiptPopup.vue
+++ b/src/pages/fg/coms/comNoReceiptPopup.vue
@@ -128,7 +128,7 @@
-
+
@@ -207,8 +207,7 @@ const putAwayRequestSwitch = ref(true);
const putAwayInspectSwitch = ref(true);
const EnableQms = ref(true);
const show = ref(false)
-const popup = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const itemCodeFocus = ref(false);
onMounted(() => {
@@ -328,7 +327,7 @@ const callback = () => {
const showErrorMessage = (message, type) => {
setTimeout(() => {
- comMessage.value.showErrorMessage(message, (res) => {});
+ comMessageRef.value.showErrorMessage(message, (res) => {});
});
};
diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index b9113fd0..29cfaadc 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -108,7 +108,7 @@
-
+
@@ -116,14 +116,14 @@
import { getIssueJobByProductionline, getPlaneInfoByproductLine, getPackUnitByItemCode, getProductionlineAndWorkStation } from '@/api/request2.js'
import { getPackUnitName, getUomInfo } from '@/common/directory.js'
-import { getCurrDate, getBatch8, dateFormatData, lastThreeDay, getSwitchInfoByCode } from '@/common/basic.js'
+import { getCurrDate, getBatch8, dateFormatData, lastThreeDays, getSwitchInfoByCode } from '@/common/basic.js'
import { calc } from '@/common/calc.js'
import uom from '@/mycomponents/qty/uom.vue'
-import packQty from '@/mycomponents/qty/packQty.vue'
-import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
-import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+import PackQty from '@/mycomponents/qty/packQty.vue'
+import BalanceStatus from '@/mycomponents/status/balanceStatus.vue'
+import WinScanItem from '@/mycomponents/scan/winScanItem.vue'
import { ref, onMounted } from 'vue';
import { onLoad } from '@dcloudio/uni-app';
@@ -171,8 +171,7 @@ const putAwayInspectSwitch = ref(true);
const EnableQms = ref(true);
const show = ref(false)
const itemCodeFocus = ref(false)
-const popup = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
onMounted(() => {
EnableQms.value = getSwitchInfoByCode('EnableQms');
console.log(777, EnableQms.value);
@@ -281,7 +280,7 @@ const callback = () => {
const showErrorMessage = (message) => {
setTimeout(() => {
- comMessage.value.showErrorMessage(message, () => {});
+ comMessageRef.value.showErrorMessage(message, () => {});
});
};
diff --git a/src/pages/fg/fgChange.vue b/src/pages/fg/fgChange.vue
index aa5b816b..5c309a9e 100644
--- a/src/pages/fg/fgChange.vue
+++ b/src/pages/fg/fgChange.vue
@@ -66,7 +66,7 @@
-
+
@@ -106,7 +106,7 @@ const fgList = ref([]);
const currentPackage = ref(null);
const reason = ref('');
const options = ref([]);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const scanPopup = ref(null);
const scanFgPopup = ref(null);
const store = useCountStore()
@@ -206,7 +206,7 @@ const getFgScanResult = (result) => {
if (item != undefined) {
const index = fgList.value.findIndex((r) => r.remark == result.content);
if (item.scaned == true) {
- comMessage.value.showQuestionMessage(`灯码【${result.content}】已经扫描,是否移除`, (res) => {
+ comMessageRef.value.showQuestionMessage(`灯码【${result.content}】已经扫描,是否移除`, (res) => {
if (res) {
item.scaned = false;
fgList.value.splice(index, 1);
@@ -249,13 +249,13 @@ const commit = () => {
return;
}
if (currentPackage.value.handleQty == null) {
- comMessage.value.showQuestionMessage('是否要将全部灯码进行变更?', (res) => {
+ comMessageRef.value.showQuestionMessage('是否要将全部灯码进行变更?', (res) => {
if (res) {
commitChange();
}
});
} else {
- comMessage.value.showQuestionMessage(`是否要将已扫描的【${currentPackage.value.handleQty}】个灯码进行变更?`, (res) => {
+ comMessageRef.value.showQuestionMessage(`是否要将已扫描的【${currentPackage.value.handleQty}】个灯码进行变更?`, (res) => {
if (res) {
commitChange();
}
@@ -320,7 +320,7 @@ const setParams = () => {
const showMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showMessage(message, (res) => {
+ comMessageRef.value.showMessage(message, (res) => {
if (res) {
scanPopupGetFocus();
}
@@ -331,7 +331,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
scanPopupGetFocus();
}
@@ -370,7 +370,7 @@ const closeScanMessage = () => {
};
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
clearData();
openScanPopup();
});
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index ecea0d9b..0d2cbf02 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -77,7 +77,7 @@
-
+
@@ -109,9 +109,7 @@ import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comNoReceiptPopup from '@/pages/fg/coms/comNoReceiptPopup.vue'
import item from '@/mycomponents/item/item.vue'
import batch from '@/mycomponents/balance/batch.vue'
-import pack from '@/mycomponents/balance/pack.vue'
import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue"
-import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue"
import light from '@/mycomponents/balance/light.vue'
import { ref } from 'vue';
@@ -128,9 +126,8 @@ const scanedQty = ref(0);
const settingPutAwayRequestSwitch = ref(true);
const settingPutAwayInspectSwitch = ref(true);
-// 模板引用
-const comNoReceiptPopup = ref(null);
-const comMessage = ref(null);
+const comNoReceiptPopupRef = ref(null);
+const comMessageRef = ref(null);
const scanPopup = ref(null);
onLoad(() => {
@@ -156,8 +153,8 @@ onReachBottom(() => {
const openFg = () => {
setTimeout(() => {
- if (comNoReceiptPopup.value) {
- comNoReceiptPopup.value.openRequestPopup();
+ if (comNoReceiptPopupRef.value) {
+ comNoReceiptPopupRef.value.openRequestPopup();
}
}, 600);
};
@@ -207,7 +204,7 @@ const getDataPage = (pageNo, pageSize) => {
const swipeClick = (e, dataContent, index) => {
if (e.content.text === "移除") {
- comMessage.value.showQuestionMessage("是否要移除", (res) => {
+ comMessageRef.value.showQuestionMessage("是否要移除", (res) => {
if (res) {
showList.value.splice(index, 1);
calcFgQty();
@@ -223,7 +220,7 @@ const submit = () => {
}
if (showList.value.length < dataContent.value.packQty) {
- comMessage.value.showQuestionMessage("扫描数量小于包装规格数量,是否提交?", (res) => {
+ comMessageRef.value.showQuestionMessage("扫描数量小于包装规格数量,是否提交?", (res) => {
if (res) {
commit();
}
@@ -311,7 +308,7 @@ const setParams = () => {
};
const clear = () => {
- comMessage.value.showQuestionMessage("是否要清空?", (res) => {
+ comMessageRef.value.showQuestionMessage("是否要清空?", (res) => {
if (res) {
clearData();
openFg();
@@ -343,7 +340,7 @@ const getScanResult = (result) => {
showList.value.sort(compare('countTime'));
calcFgQty();
} else {
- comMessage.value.showQuestionMessage(`唯一码【${result.content}】已经扫描,是否移除`, (res) => {
+ comMessageRef.value.showQuestionMessage(`唯一码【${result.content}】已经扫描,是否移除`, (res) => {
if (res) {
showList.value.splice(itemIndex, 1);
showList.value.sort(compare('countTime'));
@@ -430,13 +427,13 @@ const print = (pointData) => {
};
const showCommitSuccessMessage = (hint, pointData) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
print(pointData);
});
};
const showErrorMessage = (message) => {
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
scanPopupGetFocus();
}
diff --git a/src/pages/itemHold/coms/comMoveRecordCard.vue b/src/pages/itemHold/coms/comMoveRecordCard.vue
index 4439cb96..a114d429 100644
--- a/src/pages/itemHold/coms/comMoveRecordCard.vue
+++ b/src/pages/itemHold/coms/comMoveRecordCard.vue
@@ -27,7 +27,7 @@
>
-
+
@@ -93,7 +93,7 @@ const removeOptions = ref([]);
const dataList = ref([]);
const collapse1 = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const balanceQtyEdit = ref(null);
const winHint = ref(null);
@@ -120,7 +120,7 @@ onMounted(() => {
// 方法
const removeData = (e, dataContent) => {
if (e.content.text === "移除") {
- comMessage.value.showQuestionMessage("确定移除扫描信息?", res => {
+ comMessageRef.value.showQuestionMessage("确定移除扫描信息?", res => {
if (res) {
emit('removeData', dataContent);
}
@@ -156,7 +156,7 @@ const detail = (item) => {
};
const remove = (item, index) => {
- comMessage.value.showQuestionMessage("确定移除扫描信息?", res => {
+ comMessageRef.value.showQuestionMessage("确定移除扫描信息?", res => {
if (res) {
item.scaned = false;
item.balance = {};
diff --git a/src/pages/itemHold/record/recordList.vue b/src/pages/itemHold/record/recordList.vue
index e0fd4c08..8a42f9ff 100644
--- a/src/pages/itemHold/record/recordList.vue
+++ b/src/pages/itemHold/record/recordList.vue
@@ -10,15 +10,15 @@
-
-
+
+
-
+
@@ -41,14 +41,6 @@ import jobList from '@/mycomponents/jobList/jobList.vue'
import {
ref,
- onMounted,
- onBeforeMount,
- onBeforeUnmount,
- onActivated,
- onDeactivated,
- onUpdated,
- onRenderTracked,
- onRenderTriggered
} from 'vue';
import {
onLoad,
@@ -86,9 +78,9 @@ const queryParams = ref({
});
const filter = ref(null);
-const jobListPopup = ref(null);
-const jobInfoPopup = ref(null);
-const comMessage = ref(null);
+const jobListPopupRef = ref(null);
+const jobInfoPopupRef = ref(null);
+const comMessageRef = ref(null);
const scanPopup = ref(null);
const recordList = ref(null);
@@ -243,7 +235,7 @@ const openJobDetail = (item, scanMes = '') => {
};
const showItemList = (itemList) => {
- jobListPopup.value.openPopup(itemList);
+ jobListPopupRef.value.openPopup(itemList);
};
const selectedItem = (item) => {
@@ -251,14 +243,14 @@ const selectedItem = (item) => {
};
const openjobInfoPopup = (item) => {
- jobInfoPopup.value.openPopup(item);
+ jobInfoPopupRef.value.openPopup(item);
};
const showMessage = (message) => {
if (scanPopup.value) {
scanPopup.value.packLoseFocus();
}
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res && scanPopup.value) {
scanPopup.value.packGetFocus();
}
diff --git a/src/pages/itemHold/record/recordListDetail.vue b/src/pages/itemHold/record/recordListDetail.vue
index c78c05a2..7b0e69c3 100644
--- a/src/pages/itemHold/record/recordListDetail.vue
+++ b/src/pages/itemHold/record/recordListDetail.vue
@@ -54,7 +54,7 @@
-
+
@@ -106,7 +106,7 @@ const receiveDisable = ref(true);
const detailInfoPopup = ref(null);
const scanPopup = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
onLoad((option) => {
uni.setNavigationBarTitle({
@@ -274,7 +274,7 @@ const receive = () => {
};
const showMessageHint = (hint, callback) => {
- comMessage.value.showErrorMessage(hint, (res) => {
+ comMessageRef.value.showErrorMessage(hint, (res) => {
if (res) {
callback();
}
@@ -302,7 +302,7 @@ const receiveSubmit = () => {
const showMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showMessage(message, (res) => {
+ comMessageRef.value.showMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -313,7 +313,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -324,7 +324,7 @@ const showErrorMessage = (message) => {
const showQuestionMessage = (message, callback) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showQuestionMessage(message, (res) => {
+ comMessageRef.value.showQuestionMessage(message, (res) => {
if (res) {
callback(res);
}
@@ -349,7 +349,7 @@ const afterCloseMessage = () => {
};
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
navigateBack(1);
});
};
diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 528f7110..d2b9de4e 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -93,7 +93,7 @@
-
+
@@ -136,7 +136,7 @@ const currentPage1 = ref(1)
const pageSize1 = ref(20)
const number = ref('')
const isHaveOn = ref(false)
-const comMessage = ref(null)
+const comMessageRef = ref(null)
const printImage = () => {
// #ifdef APP
@@ -302,7 +302,7 @@ const getTableInspectDTOList = () => {
}
const showMessage = (message) => {
- comMessage.value.showMessage(message, res => {
+ comMessageRef.value.showMessage(message, res => {
if (res) {
}
})
@@ -339,7 +339,7 @@ onShow(async () => {
}
getTableInspectDTOList()
}).catch(error => {
- comMessage.value.showMessage(error, res => {
+ comMessageRef.value.showMessage(error, res => {
if (res) {
}
})
diff --git a/src/pages/productReceipt/record/recordList.vue b/src/pages/productReceipt/record/recordList.vue
index 4f7bb571..64ea301b 100644
--- a/src/pages/productReceipt/record/recordList.vue
+++ b/src/pages/productReceipt/record/recordList.vue
@@ -1,7 +1,5 @@
-
-
-
+
@@ -21,8 +19,8 @@
-
-
+
+
@@ -90,11 +88,11 @@ const queryParams = ref({
});
const filter = ref(null);
-const jobListPopup = ref(null);
-const jobInfoPopup = ref(null);
-const comMessage = ref(null);
+const jobListPopupRef = ref(null);
+const jobInfoPopupRef = ref(null);
+const comMessageRef = ref(null);
const scanPopup = ref(null);
-const recordList = ref(null);
+const recordListRef = ref(null);
onLoad((option) => {
@@ -247,7 +245,7 @@ const openJobDetail = (item, scanMes = '') => {
};
const showItemList = (itemList) => {
- jobListPopup.value.openPopup(itemList);
+ jobListPopupRef.value.openPopup(itemList);
};
const selectedItem = (item) => {
@@ -255,14 +253,14 @@ const selectedItem = (item) => {
};
const openjobInfoPopup = (item) => {
- jobInfoPopup.value.openPopup(item);
+ jobInfoPopupRef.value.openPopup(item);
};
const showMessage = (message) => {
if (scanPopup.value) {
scanPopup.value.packLoseFocus();
}
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res && scanPopup.value) {
scanPopup.value.packGetFocus();
}
@@ -320,7 +318,7 @@ const getScanResult = (result) => {
const list = resultList.filter((item, index, self) => self.findIndex((t) => t.title === item.title) === index);
if (list.length > 1) {
- recordList.value.openList(list);
+ recordListRef.value.openList(list);
} else {
selectItem(list[0]);
}
diff --git a/src/pages/productReceipt/record/recordListDetail.vue b/src/pages/productReceipt/record/recordListDetail.vue
index c78c05a2..df67d051 100644
--- a/src/pages/productReceipt/record/recordListDetail.vue
+++ b/src/pages/productReceipt/record/recordListDetail.vue
@@ -54,7 +54,7 @@
-
+
@@ -104,9 +104,9 @@ const toLocationCode = ref("");
const isAllReceived = ref(false);
const receiveDisable = ref(true);
-const detailInfoPopup = ref(null);
+const detailInfoPopupRef = ref(null);
const scanPopup = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
onLoad((option) => {
uni.setNavigationBarTitle({
@@ -196,7 +196,7 @@ const updateData = () => {
};
const openDetail = (item) => {
- detailInfoPopup.value.openPopup(item);
+ detailInfoPopupRef.value.openPopup(item);
};
const openScanPopup = () => {
@@ -274,7 +274,7 @@ const receive = () => {
};
const showMessageHint = (hint, callback) => {
- comMessage.value.showErrorMessage(hint, (res) => {
+ comMessageRef.value.showErrorMessage(hint, (res) => {
if (res) {
callback();
}
@@ -302,7 +302,7 @@ const receiveSubmit = () => {
const showMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showMessage(message, (res) => {
+ comMessageRef.value.showMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -313,7 +313,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -324,7 +324,7 @@ const showErrorMessage = (message) => {
const showQuestionMessage = (message, callback) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showQuestionMessage(message, (res) => {
+ comMessageRef.value.showQuestionMessage(message, (res) => {
if (res) {
callback(res);
}
@@ -349,7 +349,7 @@ const afterCloseMessage = () => {
};
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
navigateBack(1);
});
};
diff --git a/src/pages/productionReturn/job/holdToReturnDetail.vue b/src/pages/productionReturn/job/holdToReturnDetail.vue
index 6cdc8c58..76530977 100644
--- a/src/pages/productionReturn/job/holdToReturnDetail.vue
+++ b/src/pages/productionReturn/job/holdToReturnDetail.vue
@@ -27,7 +27,7 @@
-
@@ -40,8 +40,8 @@
-
-
+
+
@@ -102,10 +102,10 @@ const titleInfo = ref("");
const jobStatus = ref("");
const jobToLocationCode = ref("");
-const detailInfoPopup = ref(null);
+const detailInfoPopupRef = ref(null);
const scanPopup = ref(null);
-const comMessage = ref(null);
-const locationCompare = ref(null);
+const comMessageRef = ref(null);
+const locationCompareRef = ref(null);
// 页面加载时执行
onLoad((option) => {
@@ -225,7 +225,7 @@ const updateData = () => {
// 打开详情
const openDetail = (item) => {
- detailInfoPopup.value.openPopup(item);
+ detailInfoPopupRef.value.openPopup(item);
};
// 打开扫描弹窗
@@ -287,13 +287,13 @@ const commit = () => {
submitJob();
} else if (scanCount.value < subList.value.length) {
if (jobContent.value.allowPartialComplete === "TRUE") {
- comMessage.value.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+ comMessageRef.value.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
if (res) {
submitJob();
}
});
} else {
- comMessage.value.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+ comMessageRef.value.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
if (res) {
openScanPopup();
}
@@ -367,7 +367,7 @@ const setParams = () => {
const checkLocation = () => {
if (toLocationCode.value === "" || toLocationCode.value === null) {
showMessageHint('请扫描收货库位', () => {
- locationCompare.value.showLocation();
+ locationCompareRef.value.showLocation();
});
return false;
}
@@ -376,7 +376,7 @@ const checkLocation = () => {
// 显示提示信息
const showMessageHint = (hint, callback) => {
- comMessage.value.showErrorMessage(hint, res => {
+ comMessageRef.value.showErrorMessage(hint, res => {
if (res) {
callback();
}
@@ -387,7 +387,7 @@ const showMessageHint = (hint, callback) => {
const showMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showMessage(message, res => {
+ comMessageRef.value.showMessage(message, res => {
if (res) {
afterCloseMessage();
}
@@ -399,7 +399,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showErrorMessage(message, res => {
+ comMessageRef.value.showErrorMessage(message, res => {
if (res) {
afterCloseMessage();
}
@@ -435,7 +435,7 @@ const scanPopupLoseFocus = () => {
const showQuestionMessage = (message, callback) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showQuestionMessage(message, res => {
+ comMessageRef.value.showQuestionMessage(message, res => {
if (res) {
callback(res);
}
@@ -445,7 +445,7 @@ const showQuestionMessage = (message, callback) => {
// 显示提交成功消息
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, res => {
+ comMessageRef.value.showSuccessMessage(hint, res => {
navigateBack(1);
});
};
diff --git a/src/pages/productionReturn/job/holdToReturnJob.vue b/src/pages/productionReturn/job/holdToReturnJob.vue
index 078047e9..ee06a387 100644
--- a/src/pages/productionReturn/job/holdToReturnJob.vue
+++ b/src/pages/productionReturn/job/holdToReturnJob.vue
@@ -12,13 +12,13 @@
-
-
+
+
-
+
@@ -70,9 +70,9 @@ const detailGiveupOptions = ref([]);
const title = ref('');
const filter = ref(null);
-const jobListPopup = ref(null);
-const jobInfoPopup = ref(null);
-const comMessage = ref(null);
+const jobListPopupRef = ref(null);
+const jobInfoPopupRef = ref(null);
+const comMessageRef = ref(null);
onLoad((option) => {
title.value = option.title;
@@ -194,7 +194,7 @@ const openJobDetail = (item) => {
// 显示项目列表
const showItemList = (itemList) => {
- jobListPopup.value.openPopup(itemList);
+ jobListPopupRef.value.openPopup(itemList);
};
// 选择项目
@@ -207,7 +207,7 @@ const swipeClick = (e, dataContent) => {
if (e.content.text === "详情") {
openJobInfoPopup(dataContent);
} else if (e.content.text === "放弃") {
- comMessage.value.showQuestionMessage("确定要放弃当前任务?", (res) => {
+ comMessageRef.value.showQuestionMessage("确定要放弃当前任务?", (res) => {
if (res) {
cancleJob(dataContent.masterId);
}
@@ -217,7 +217,7 @@ const swipeClick = (e, dataContent) => {
// 打开任务信息弹窗
const openJobInfoPopup = (item) => {
- jobInfoPopup.value.openPopup(item);
+ jobInfoPopupRef.value.openPopup(item);
};
// 放弃任务
@@ -296,7 +296,7 @@ const getDataListByType = (code) => {
// 显示消息
const showMessage = (message) => {
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
}
});
diff --git a/src/pages/productionReturn/job/okToReturnDetail.vue b/src/pages/productionReturn/job/okToReturnDetail.vue
index 83a2bba1..72a48396 100644
--- a/src/pages/productionReturn/job/okToReturnDetail.vue
+++ b/src/pages/productionReturn/job/okToReturnDetail.vue
@@ -27,7 +27,7 @@
-
@@ -40,8 +40,8 @@
-
-
+
+
@@ -103,10 +103,10 @@ const jobToLocationCode = ref("");
const managementList = ref([]);
const managementType = ref('');
-const detailInfoPopup = ref(null);
+const detailInfoPopupRef = ref(null);
const scanPopup = ref(null);
-const comMessage = ref(null);
-const locationCompare = ref(null);
+const comMessageRef = ref(null);
+const locationCompareRef = ref(null);
onLoad((option) => {
uni.setNavigationBarTitle({
@@ -234,7 +234,7 @@ const updateData = () => {
};
const openDetail = (item) => {
- detailInfoPopup.value.openPopup(item);
+ detailInfoPopupRef.value.openPopup(item);
};
const openScanPopup = () => {
@@ -295,13 +295,13 @@ const commit = () => {
submitJob();
} else if (scanCount.value < subList.value.length) {
if (jobContent.value.allowPartialComplete === "TRUE") {
- comMessage.value.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', (res) => {
+ comMessageRef.value.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', (res) => {
if (res) {
submitJob();
}
});
} else {
- comMessage.value.showErrorMessage("任务明细未全部完成,不允许部分提交!", (res) => {
+ comMessageRef.value.showErrorMessage("任务明细未全部完成,不允许部分提交!", (res) => {
if (res) {
openScanPopup();
}
@@ -377,7 +377,7 @@ const setParams = () => {
const checkLocation = () => {
if (toLocationCode.value === "" || toLocationCode.value === null) {
showMessageHint('请扫描收货库位', () => {
- locationCompare.value.showLocation();
+ locationCompareRef.value.showLocation();
});
return false;
}
@@ -385,7 +385,7 @@ const checkLocation = () => {
};
const showMessageHint = (hint, callback) => {
- comMessage.value.showErrorMessage(hint, (res) => {
+ comMessageRef.value.showErrorMessage(hint, (res) => {
if (res) {
callback();
}
@@ -395,7 +395,7 @@ const showMessageHint = (hint, callback) => {
const showMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showMessage(message, (res) => {
+ comMessageRef.value.showMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -406,7 +406,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -437,7 +437,7 @@ const scanPopupLoseFocus = () => {
const showQuestionMessage = (message, callback) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showQuestionMessage(message, (res) => {
+ comMessageRef.value.showQuestionMessage(message, (res) => {
if (res) {
callback(res);
}
@@ -446,7 +446,7 @@ const showQuestionMessage = (message, callback) => {
};
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
navigateBack(1);
});
};
diff --git a/src/pages/productionReturn/job/okToReturnJob.vue b/src/pages/productionReturn/job/okToReturnJob.vue
index de4aae01..9edb0ac1 100644
--- a/src/pages/productionReturn/job/okToReturnJob.vue
+++ b/src/pages/productionReturn/job/okToReturnJob.vue
@@ -12,13 +12,13 @@
-
-
+
+
-
+
@@ -62,11 +62,10 @@ const detailOptions = ref([]);
const detailGiveupOptions = ref([]);
const title = ref('');
-// 模板引用
const filter = ref(null);
-const jobListPopup = ref(null);
-const jobInfoPopup = ref(null);
-const comMessage = ref(null);
+const jobListPopupRef = ref(null);
+const jobInfoPopupRef = ref(null);
+const comMessageRef = ref(null);
onLoad((option) => {
title.value = option.title;
@@ -185,7 +184,7 @@ const openJobDetail = (item) => {
};
const showItemList = (itemList) => {
- jobListPopup.value.openPopup(itemList);
+ jobListPopupRef.value.openPopup(itemList);
};
const selectedItem = (item) => {
@@ -196,7 +195,7 @@ const swipeClick = (e, dataContent) => {
if (e.content.text === "详情") {
openJobInfoPopup(dataContent);
} else if (e.content.text === "放弃") {
- comMessage.value.showQuestionMessage("确定要放弃当前任务?", (res) => {
+ comMessageRef.value.showQuestionMessage("确定要放弃当前任务?", (res) => {
if (res) {
cancleJob(dataContent.masterId);
}
@@ -205,7 +204,7 @@ const swipeClick = (e, dataContent) => {
};
const openJobInfoPopup = (item) => {
- jobInfoPopup.value.openPopup(item);
+ jobInfoPopupRef.value.openPopup(item);
};
const cancleJob = (id) => {
@@ -277,7 +276,7 @@ const getDataListByType = (code) => {
};
const showMessage = (message) => {
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
}
});
diff --git a/src/pages/productionReturn/record/returnToHoldRecordList.vue b/src/pages/productionReturn/record/returnToHoldRecordList.vue
index e6109196..d46c4222 100644
--- a/src/pages/productionReturn/record/returnToHoldRecordList.vue
+++ b/src/pages/productionReturn/record/returnToHoldRecordList.vue
@@ -17,8 +17,8 @@
-
-
+
+
@@ -45,8 +45,8 @@
import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
import jobFilter from '@/mycomponents/job/jobFilter.vue'
import comReturnRecordCard from '@/pages/customerReturn/coms/comReturnRecordCard.vue'
- import jobListPopup from '@/pages/productionReceipt/coms/jobListPopup.vue'
- import jobInfoPopup from '@/pages/productionReceipt/coms/jobInfoPopup.vue'
+ import JobListPopup from '@/pages/productionReceipt/coms/jobListPopup.vue'
+ import JobInfoPopup from '@/pages/productionReceipt/coms/jobInfoPopup.vue'
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
import jobList from '@/mycomponents/jobList/jobList.vue'
@@ -78,9 +78,9 @@ const queryParams = ref({
const filter = ref(null);
const jobListPopup = ref(null);
const jobInfoPopup = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
const scanPopup = ref(null);
-const recordListPopup = ref(null);
+const recordListRef = ref(null);
const store = useCountStore();
@@ -250,12 +250,12 @@ const openJobInfoPopup = (item) => {
};
const showMessage = (message) => {
- if (comMessage.value) {
- comMessage.value.packLoseFocus();
+ if (comMessageRef.value) {
+ comMessageRef.value.packLoseFocus();
}
- comMessage.value.showErrorMessage(message, (res) => {
- if (res && comMessage.value) {
- comMessage.value.packGetFocus();
+ comMessageRef.value.showErrorMessage(message, (res) => {
+ if (res && comMessageRef.value) {
+ comMessageRef.value.packGetFocus();
}
});
};
@@ -315,7 +315,7 @@ const getScanResult = (result) => {
);
if (list.length > 1) {
- recordListPopup.value.openList(list);
+ recordListRef.value.openList(list);
} else {
selectItem(list[0]);
}
diff --git a/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue b/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue
index 369f2759..6dc6c75e 100644
--- a/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue
+++ b/src/pages/productionReturn/record/returnToHoldRecordListDetail.vue
@@ -52,7 +52,7 @@
-
+
@@ -78,10 +78,10 @@
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
- import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+ import DetailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
import receiveTop from '@/mycomponents/receive/receiveTop.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
- import comMoveRecordCard from '@/pages/itemHold/coms/comMoveRecordCard.vue'
+ import ComMoveRecordCard from '@/pages/itemHold/coms/comMoveRecordCard.vue'
import { ref, onMounted } from 'vue';
import { onLoad, onNavigationBarButtonTap, onBackPress } from '@dcloudio/uni-app';
@@ -98,7 +98,7 @@ const receiveDisable = ref(true);
const detailInfoPopup = ref(null);
const scanPopup = ref(null);
-const comMessage = ref(null);
+const comMessageRef = ref(null);
onLoad((option) => {
uni.setNavigationBarTitle({
@@ -275,7 +275,7 @@ const receive = () => {
// 显示消息提示
const showMessageHint = (hint, callback) => {
- comMessage.value.showErrorMessage(hint, (res) => {
+ comMessageRef.value.showErrorMessage(hint, (res) => {
if (res) {
callback();
}
@@ -305,7 +305,7 @@ const receiveSubmit = () => {
const showMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showMessage(message, (res) => {
+ comMessageRef.value.showMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -317,7 +317,7 @@ const showMessage = (message) => {
const showErrorMessage = (message) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showErrorMessage(message, (res) => {
+ comMessageRef.value.showErrorMessage(message, (res) => {
if (res) {
afterCloseMessage();
}
@@ -329,7 +329,7 @@ const showErrorMessage = (message) => {
const showQuestionMessage = (message, callback) => {
setTimeout(() => {
scanPopupLoseFocus();
- comMessage.value.showQuestionMessage(message, (res) => {
+ comMessageRef.value.showQuestionMessage(message, (res) => {
if (res) {
callback(res);
}
@@ -358,7 +358,7 @@ const afterCloseMessage = () => {
// 显示提交成功的消息
const showCommitSuccessMessage = (hint) => {
- comMessage.value.showSuccessMessage(hint, (res) => {
+ comMessageRef.value.showSuccessMessage(hint, (res) => {
navigateBack(1);
});
};
@@ -375,7 +375,7 @@ const switchChange = (isOn) => {
});
calcHandleQty();
} else {
- comMessage.value.showQuestionMessage("是否要关闭整单收货?", (res) => {
+ comMessageRef.value.showQuestionMessage("是否要关闭整单收货?", (res) => {
if (res) {
getDetail();
} else {
diff --git a/src/pages/purchaseReturn/coms/comScanReturnPack.vue b/src/pages/purchaseReturn/coms/comScanReturnPack.vue
index c80dc504..07584898 100644
--- a/src/pages/purchaseReturn/coms/comScanReturnPack.vue
+++ b/src/pages/purchaseReturn/coms/comScanReturnPack.vue
@@ -125,16 +125,16 @@
-
+