Browse Source

comMessage ref修改 文件迁移Vue2升级Vue3 8/2-10/25

hella_vue3
王志国 2 weeks ago
parent
commit
e3618f70a9
  1. 6
      src/mycomponents/query/balanceQuery.vue
  2. 2
      src/mycomponents/scan/winComScan.vue
  3. 6
      src/mycomponents/scan/winComScanBalance.vue
  4. 7
      src/mycomponents/scan/winScanPackAndCont.vue
  5. 7
      src/mycomponents/scan/winScanPackJob.vue
  6. 8
      src/mycomponents/scan/winScanParentPackage.vue
  7. 12
      src/pages/container/record/containerUnBindRecord.vue
  8. 20
      src/pages/count/job/fuzzyCountDetail.vue
  9. 6
      src/pages/customerReturn/record/recordList.vue
  10. 16
      src/pages/customerReturn/record/recordListDetail.vue
  11. 25
      src/pages/deliver/coms/comScanDeliverPackss.vue
  12. 20
      src/pages/deliver/job/deliverDetailBatch.vue
  13. 7
      src/pages/fg/coms/comNoReceiptPopup.vue
  14. 15
      src/pages/fg/coms/comReceiptPopup.vue
  15. 16
      src/pages/fg/fgChange.vue
  16. 25
      src/pages/fg/receiptNoPlan.vue
  17. 8
      src/pages/itemHold/coms/comMoveRecordCard.vue
  18. 26
      src/pages/itemHold/record/recordList.vue
  19. 14
      src/pages/itemHold/record/recordListDetail.vue
  20. 8
      src/pages/pointPutawayJob/index.vue
  21. 24
      src/pages/productReceipt/record/recordList.vue
  22. 18
      src/pages/productReceipt/record/recordListDetail.vue
  23. 30
      src/pages/productionReturn/job/holdToReturnDetail.vue
  24. 20
      src/pages/productionReturn/job/holdToReturnJob.vue
  25. 30
      src/pages/productionReturn/job/okToReturnDetail.vue
  26. 21
      src/pages/productionReturn/job/okToReturnJob.vue
  27. 24
      src/pages/productionReturn/record/returnToHoldRecordList.vue
  28. 20
      src/pages/productionReturn/record/returnToHoldRecordListDetail.vue
  29. 26
      src/pages/purchaseReturn/coms/comScanReturnPack.vue
  30. 24
      src/pages/purchaseReturn/coms/comScanReturnPackBatch.vue
  31. 12
      src/pages/putaway/record/putawayRecord_bat.vue
  32. 16
      src/pages/repleinsh/coms/comScanReplishPackBatch.vue
  33. 12
      src/pages/repleinsh/record/directRepleinshRecord1.vue
  34. 6
      src/pages/setter/passwordpage.vue

6
src/mycomponents/query/balanceQuery.vue

@ -80,7 +80,7 @@
</view>
</u-popup>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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) {
}
});

2
src/mycomponents/scan/winComScan.vue

@ -235,7 +235,7 @@ defineExpose({
clear,
clickScanMsg,
losefocus,
setItemCodeSimulate
setItemCodeSimulate,
})
</script>
<script module="textarea" lang="renderjs">

6
src/mycomponents/scan/winComScanBalance.vue

@ -22,7 +22,7 @@
</u-popup>
<balance-select ref="balanceSelectRef" @onSelectItem='selectBalanceItem'></balance-select>
</view>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</template>
<script setup lang="ts">
@ -98,7 +98,7 @@ const itemTypesList = ref([])
const resultData = ref({})
const popup = ref(null)
const comMessage = ref(null)
const comMessageRef = ref(null)
const comscan = ref(null)
const balanceSelectRef = ref(null)
@ -269,7 +269,7 @@ const getItemCodeType = (itemCode, callBack) => {
const showErrorMessage = (message) => {
losefocus()
comMessage.value.showErrorMessage(message, res => {
comMessageRef.value.showErrorMessage(message, res => {
if (res) {
if (comscan.value) {
comscan.value.getfocus()

7
src/mycomponents/scan/winScanPackAndCont.vue

@ -12,19 +12,19 @@
</view>
<view class="">
<view class="">
<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :headerType="headerType"
<win-com-scan ref="comscanRef" :placeholder="title" @getResult="getScanResult" :headerType="headerType"
:isShowHistory="isShowHistory" :clearResult="true"></win-com-scan>
</view>
</view>
</view>
</u-popup>
<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
<comMessage ref="comMessageRef" @afterClose="getfocus"></comMessage>
</view>
</template>
<script setup>
import winComScan from '@/mycomponents/scan/winComScan.vue'
import WinComScan from '@/mycomponents/scan/winComScan.vue'
import {getContainerByNumber} from '@/api/request2.js'
import {ref, onMounted, watch} from 'vue';
@ -46,7 +46,6 @@ const props = defineProps({
const show = ref(false);
const popupRef = ref(null);
const comscanRef = ref(null);
const comMessageRef = ref(null);

7
src/mycomponents/scan/winScanPackJob.vue

@ -42,6 +42,7 @@ const props = defineProps({
}
})
const comscan = ref()
const comMessageRef = ref(null)
const show = ref(false)
//
const openScanPopup = () => {
@ -90,11 +91,13 @@ const change = (e) => {
show.value = e.show
}
const selectItem = (item, index) => {}
//
const emit = defineEmits(['getResult', 'close', 'getCountScanResult'])
defineExpose({
openScanPopup,
closeScanPopup
closeScanPopup,
packLoseFocus,
packGetFocus
})
</script>

8
src/mycomponents/scan/winScanParentPackage.vue

@ -23,7 +23,7 @@
<!-- 模拟扫描功能 -->
<win-com-scan v-show="false" ref="comscansimulate" @getResult="getScanResult" :headerType="headerType"
:isShowHistory="false" :clearResult="true"></win-com-scan>
<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
<comMessage ref="comMessageRef" @afterClose="getfocus"></comMessage>
</view>
</template>
@ -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();
}

12
src/pages/container/record/containerUnBindRecord.vue

@ -31,7 +31,7 @@
<win-scan-button @goScan="openScanPopup"></win-scan-button>
</view>
<win-scan-pack ref="scanPopup" @getResult="getScanResult"></win-scan-pack>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
<winScanContainer ref="scanContainer" title="托盘" @getContainer="getContainer"></winScanContainer>
</view>
</template>
@ -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 = '';
});
};

20
src/pages/count/job/fuzzyCountDetail.vue

@ -60,7 +60,7 @@
<win-scan-pack ref="scanPopup" @getResult="getScanResult"></win-scan-pack>
<win-scan-location ref="scanLocationCode" title="盘点库位" @getLocation="getLocation"></win-scan-location>
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :isShowDesc="false" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount == 'TRUE'"> </count-qty-edit>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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)
})
}

6
src/pages/customerReturn/record/recordList.vue

@ -17,7 +17,7 @@
<win-scan-button @goScan='openScanPopup' v-if="recordList.length>0"></win-scan-button>
<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob>
<jobList ref="recordList" @selectItem="selectItem"></jobList>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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();
}

16
src/pages/customerReturn/record/recordListDetail.vue

@ -53,7 +53,7 @@
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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 {

25
src/pages/deliver/coms/comScanDeliverPackss.vue

@ -91,9 +91,9 @@
</view>
</view>
</u-popup>
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
<comMessage ref="comMessage"></comMessage>
<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
<balance-select ref="balanceSelectRef" @onSelectItem='selectBalanceItem'></balance-select>
<comMessage ref="comMessageRef"></comMessage>
<balance-qty-edit ref="balanceQtyEditRef" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
</view>
</template>
@ -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);
});
};

20
src/pages/deliver/job/deliverDetailBatch.vue

@ -49,7 +49,7 @@
<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
<comScanDeliverPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
</comScanDeliverPackBatch>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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 = () => {

7
src/pages/fg/coms/comNoReceiptPopup.vue

@ -128,7 +128,7 @@
</view>
</view>
</u-popup>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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) => {});
});
};

15
src/pages/fg/coms/comReceiptPopup.vue

@ -108,7 +108,7 @@
</view>
</view>
</u-popup>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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, () => {});
});
};

16
src/pages/fg/fgChange.vue

@ -66,7 +66,7 @@
<win-scan-fg-label ref="scanFgPopup" @getResult="getFgScanResult" title="灯码"></win-scan-fg-label>
<!-- <win-scan-pack ref="scanPopup" @getResult='getScanResult' title="制品标签" headerType="HMQ"></win-scan-pack> -->
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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();
});

25
src/pages/fg/receiptNoPlan.vue

@ -77,7 +77,7 @@
</view>
</view>
</view>
<comNoReceiptPopup ref="comNoReceiptPopup" @confirm='requestConfirm'></comNoReceiptPopup>
<comNoReceiptPopup ref="comNoReceiptPopupRef" @confirm='requestConfirm'></comNoReceiptPopup>
<win-scan-button v-if="dataContent" @goScan='openScanPopup'></win-scan-button>
<win-scan-fg-label ref="scanPopup" @getResult='getScanResult' title='制品标签'></win-scan-fg-label>
<comMessage ref="comMessage"></comMessage>
@ -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();
}

8
src/pages/itemHold/coms/comMoveRecordCard.vue

@ -27,7 +27,7 @@
>
</balanceQtyEdit>
<job-detail-popup ref="winHint" :dataContent="showItem"></job-detail-popup>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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 = {};

26
src/pages/itemHold/record/recordList.vue

@ -10,15 +10,15 @@
</comReturnRecordCard>
</u-swipe-action>
<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
<job-info-popup ref='jobInfoPopup'></job-info-popup>
<job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></job-list-popup>
<job-info-popup ref='jobInfoPopupRef'></job-info-popup>
<uni-load-more :status="loadingType"/>
</view>
<win-scan-button @goScan='openScanPopup' v-if="recordList.length>0"></win-scan-button>
<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob>
<jobList ref="recordList" @selectItem="selectItem"></jobList>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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();
}

14
src/pages/itemHold/record/recordListDetail.vue

@ -54,7 +54,7 @@
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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);
});
};

8
src/pages/pointPutawayJob/index.vue

@ -93,7 +93,7 @@
</view>
<u-empty text="无打印数据" mode="list"
v-if="(tabIndex == 1 &&(!data1.inspectDTOList || data1.inspectDTOList && data1.inspectDTOList.length==0))||(tabIndex == 2&&isHaveOn && (!data.sublist || data.sublist.length==0))"></u-empty>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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) {
}
})

24
src/pages/productReceipt/record/recordList.vue

@ -1,7 +1,5 @@
<template>
<view class="uni-flex" style="flex-direction: column;;">
<view class="uni-flex" style="flex-direction: column;">
<job-filter ref="filter" otherTitle="ASN" :isShowProductionLineCode="false" :isShowItemCode="false"
:isShowQurery='true' @onQuery="getListByFilter">
</job-filter>
@ -21,8 +19,8 @@
</view>
<win-scan-button @goScan='openScanPopup' v-if="recordList.length>0"></win-scan-button>
<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob>
<jobList ref="recordList" @selectItem="selectItem"></jobList>
<comMessage ref="comMessage"></comMessage>
<jobList ref="recordListRef" @selectItem="selectItem"></jobList>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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]);
}

18
src/pages/productReceipt/record/recordListDetail.vue

@ -54,7 +54,7 @@
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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);
});
};

30
src/pages/productionReturn/job/holdToReturnDetail.vue

@ -27,7 +27,7 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"
<locationCompare ref="locationCompareRef" title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
@ -40,8 +40,8 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<!-- <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> -->
<win-scan-pack ref="scanPopup" @getResult='getScanResult' headerType="HMQ,HPQ"></win-scan-pack>
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage>
<detail-info-popup ref="detailInfoPopupRef"></detail-info-popup>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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);
});
};

20
src/pages/productionReturn/job/holdToReturnJob.vue

@ -12,13 +12,13 @@
<com-return-job-card :dataContent="item" @click='openJobDetail(item)'></com-return-job-card>
</u-swipe-action>
<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
<job-info-popup ref='jobInfoPopup'></job-info-popup>
<job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></job-list-popup>
<job-info-popup ref='jobInfoPopupRef'></job-info-popup>
<uni-load-more :status="loadingType" v-if="jobList.length>0"/>
</view>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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) {
}
});

30
src/pages/productionReturn/job/okToReturnDetail.vue

@ -27,7 +27,7 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"
<locationCompare ref="locationCompareRef" title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
@ -40,8 +40,8 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<!-- <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> -->
<win-scan-pack ref="scanPopup" @getResult='getScanResult' headerType="HMQ,HPQ"></win-scan-pack>
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage>
<detail-info-popup ref="detailInfoPopupRef"></detail-info-popup>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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);
});
};

21
src/pages/productionReturn/job/okToReturnJob.vue

@ -12,13 +12,13 @@
<com-return-job-card :dataContent="item" @click='openJobDetail(item)'></com-return-job-card>
</u-swipe-action>
<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
<job-info-popup ref='jobInfoPopup'></job-info-popup>
<job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></job-list-popup>
<job-info-popup ref='jobInfoPopupRef'></job-info-popup>
<uni-load-more :status="loadingType" v-if="jobList.length>0" />
</view>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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) {
}
});

24
src/pages/productionReturn/record/returnToHoldRecordList.vue

@ -17,8 +17,8 @@
</view>
<win-scan-button @goScan='openScanPopup' v-if="recordList.length>0"></win-scan-button>
<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob>
<jobList ref="recordList" @selectItem="selectItem"></jobList>
<comMessage ref="comMessage"></comMessage>
<jobList ref="recordListRef" @selectItem="selectItem"></jobList>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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]);
}

20
src/pages/productionReturn/record/returnToHoldRecordListDetail.vue

@ -52,7 +52,7 @@
<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -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 {

26
src/pages/purchaseReturn/coms/comScanReturnPack.vue

@ -125,16 +125,16 @@
</view>
</u-popup>
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
</view>
</template>
<script setup lang="ts">
import winComScan from '@/mycomponents/scan/winComScan.vue'
import balance from '@/mycomponents/balance/balance.vue'
import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
import Balance from '@/mycomponents/balance/balance.vue'
import BalanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import BalanceSelect from '@/mycomponents/balance/balanceSelect.vue'
import {
getDetailOption,
@ -203,7 +203,7 @@ const toLocationCombox = ref(null);
const comscan = ref(null);
const balanceQtyEdit = ref(null);
const receiptHint = ref(null);
const comMessage = ref(null);
const comMessageRef = ref(null);
onMounted(() => {
detailOptions.value = getDetailOption();
scanOptions.value = getDetailEditRemoveOption();
@ -217,7 +217,7 @@ const openScanPopup = (content, jobcontent) => {
initData();
positionInfo.value = jobContent.value.workShopCode + "-" + jobContent.value.subList[0].productionLineCode +
"-" + jobContent.value.subList[0].workStationCode;
popup.value.open('bottom');
show.value = true
setTimeout(() => {
getfocus();
}, 500);
@ -225,7 +225,7 @@ const openScanPopup = (content, jobcontent) => {
const closeScanPopup = () => {
losefocus();
popup.value.close();
show.value = false
emit("closeScan");
//
// Object.assign(this.$data, this.$options.data());
@ -546,21 +546,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);
});
};
@ -988,20 +988,20 @@ this.$refs.comscan.losefocus();
showMessage(message, callback) {
setTimeout(r => {
this.packLoseFocus();
this.$refs.comMessage.showMessage(message, callback);
this.$refs.comMessageRef.showMessage(message, callback);
})
},
showErrorMessage(message, callback) {
setTimeout(r => {
this.packLoseFocus();
this.$refs.comMessage.showErrorMessage(message, callback);
this.$refs.comMessageRef.showErrorMessage(message, callback);
})
},
showQuestionMessage(message, callback) {
setTimeout(r => {
this.packLoseFocus();
this.$refs.comMessage.showQuestionMessage(message, callback);
this.$refs.comMessageRef.showQuestionMessage(message, callback);
})
},
confirm(val) {

24
src/pages/purchaseReturn/coms/comScanReturnPackBatch.vue

@ -125,16 +125,16 @@
</view>
</u-popup>
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
</view>
</template>
<script setup lang="ts">
import winComScan from '@/mycomponents/scan/winComScan.vue'
import balance from '@/mycomponents/balance/balance.vue'
import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
import WinComScan from '@/mycomponents/scan/winComScan.vue'
import Balance from '@/mycomponents/balance/balance.vue'
import BalanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import BalanceSelect from '@/mycomponents/balance/balanceSelect.vue'
import {
getDetailOption,
@ -196,11 +196,11 @@ const label = ref({});
const fromInventoryStatuses = ref([]);
const packageInfo = ref({});
const detailOptions = ref([]);
const popup = ref(null);
const balanceSelect = ref(null);
const comscan = ref(null);
const receiptHint = ref(null);
const comMessage = ref(null);
const comMessageRef = ref(null);
const toLocationCombox = ref(null)
const balanceQtyEdit = ref(null)
const showItem = ref(null)
@ -216,7 +216,7 @@ const openScanPopup = (content, jobcontent) => {
initData();
positionInfo.value = jobContent.value.workShopCode + "-" + jobContent.value.subList[0].productionLineCode +
"-" + jobContent.value.subList[0].workStationCode;
popup.value.open('bottom');
show.value = true
setTimeout(() => {
getfocus();
}, 500);
@ -224,7 +224,7 @@ const openScanPopup = (content, jobcontent) => {
const closeScanPopup = () => {
losefocus();
popup.value.close();
show.value = false
emit("closeScan");
//
// Object.assign(dataContent, {});
@ -512,21 +512,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);
});
};

12
src/pages/putaway/record/putawayRecord_bat.vue

@ -38,7 +38,7 @@
</view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'>
</win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view>
@ -115,7 +115,7 @@ const toWarehouseCode = ref('')
const scanPopup = ref(null);
const scanLocationCode = ref(null);
const comMessage = ref(null);
const comMessageRef = ref(null);
onMounted(() => {
//
clearData();
@ -344,15 +344,15 @@ const setRecordParams = () => {
};
const showMessage = (message) => {
comMessage.value?.showMessage(message, (res) => {});
comMessageRef.value?.showMessage(message, (res) => {});
};
const showErrorMessage = (message) => {
comMessage.value?.showErrorMessage(message, (res) => {});
comMessageRef.value?.showErrorMessage(message, (res) => {});
};
const showScanMessage = (message) => {
comMessage.value?.showScanMessage(message);
comMessageRef.value?.showScanMessage(message);
};
const afterCloseMessage = () => {
@ -385,7 +385,7 @@ const getToLocationCode = (location, code) => {
};
const showCommitSuccessMessage = (hint) => {
comMessage.value?.showSuccessMessage(hint, (res) => {
comMessageRef.value?.showSuccessMessage(hint, (res) => {
clearData();
});
};

16
src/pages/repleinsh/coms/comScanReplishPackBatch.vue

@ -66,16 +66,16 @@
</view>
</u-popup>
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
</view>
</template>
<script setup lang="ts">
import winComScan from '@/mycomponents/scan/winComScan.vue'
import balance from '@/mycomponents/balance/balance.vue'
import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
import Balance from '@/mycomponents/balance/balance.vue'
import BalanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import BalanceSelect from '@/mycomponents/balance/balanceSelect.vue'
import {
getDetailOption,
@ -141,7 +141,7 @@ const showItem = ref({})
const balanceSelect = ref(null);
const comscan = ref(null);
const receiptHint = ref(null);
const comMessage = ref(null);
const comMessageRef = ref(null);
const detailOptions = ref(null)
onMounted(() => {
detailOptions.value = getDetailOption();
@ -576,21 +576,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);
});
};

12
src/pages/repleinsh/record/directRepleinshRecord1.vue

@ -44,7 +44,7 @@
</view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation='false'>
</win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
</view>
@ -130,7 +130,7 @@ const fgLocationCode = ref('')
const scanPopup = ref(null);
const scanLocationCode = ref(null);
const comMessage = ref(null);
const comMessageRef = ref(null);
//
onLoad(option => {
@ -444,17 +444,17 @@ const setRecordParams = () => {
};
const showMessage = (message) => {
comMessage.value.showMessage(message, res => {
comMessageRef.value.showMessage(message, res => {
});
};
const showErrorMessage = (message) => {
comMessage.value.showErrorMessage(message, res => {
comMessageRef.value.showErrorMessage(message, res => {
});
};
const showScanMessage = (message) => {
comMessage.value.showScanMessage(message);
comMessageRef.value.showScanMessage(message);
};
const afterCloseMessage = () => {
@ -487,7 +487,7 @@ const getToLocationCode = (location, code) => {
};
const showCommitSuccessMessage = (hint) => {
comMessage.value.showSuccessMessage(hint, res => {
comMessageRef.value.showSuccessMessage(hint, res => {
clearData();
});
};

6
src/pages/setter/passwordpage.vue

@ -14,7 +14,7 @@
<view class="new_btn_bot">
<button class="new_save_btn" @click="submit">确认修改</button>
</view>
<comMessage ref="comMessage"></comMessage>
<comMessage ref="comMessageRef"></comMessage>
</view>
</template>
@ -28,7 +28,7 @@ const formData = ref({
newpassword: '',
newpassword2: ''
})
const comMessage = ref(null)
const comMessageRef = ref(null)
const rules = ref({
oldpassword: [{ required: true, message: '请输入密码', trigger: ['change', 'blur'] }],
// name
@ -82,7 +82,7 @@ const submit = () => {
})
}
const showCommitSuccessMessage = (hint)=> {
comMessage.value.showSuccessMessage(hint, res => {
comMessageRef.value.showSuccessMessage(hint, res => {
navigateBack(1)
})
}

Loading…
Cancel
Save