diff --git a/App.vue b/App.vue index 99a91b4..9b2b0ad 100644 --- a/App.vue +++ b/App.vue @@ -20,7 +20,7 @@ // #endif console.log('onLaunch'); - // watermark.set('/static/check.png') + // watermark.set('/static/water.png') }) onShow(() => { diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue index 7c5255c..5b5976a 100644 --- a/compoment/BasicContainer/BasicContainer.vue +++ b/compoment/BasicContainer/BasicContainer.vue @@ -91,7 +91,7 @@ uni.hideLoading() // 清空定时器 antiShake = null - }, 1000) + }, 500) }) @@ -104,8 +104,16 @@ uni.stopPullDownRefresh() // 清除定时器 clearTimeout(timer) - }, 1000) + }, 500) }) + + // 触发下拉刷新 + function startPullDownRefresh() { + console.log('触发下拉') + uni.startPullDownRefresh() + } + + defineExpose({ startPullDownRefresh }) + &-splitor { + justify-content: center; + line-height: 20px; + padding: 0 0; + font-size: 12px; + box-sizing: border-box; + } + + &-number { + line-height: 20px; + justify-content: center; + height: 20px; + border-radius: 50%; + margin: 0 2.5px; + font-size: 12px; + width: 20px; + text-align: center; + box-sizing: border-box; + } + } + \ No newline at end of file diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 5855e81..76875e4 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -1794,7 +1794,7 @@ if (uni.restoreGlobal) { /* STYLE */ ); } - const __easycom_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1o, [["render", _sfc_render$i], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]); + const __easycom_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1o, [["render", _sfc_render$i], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]); const icons = { "uicon-level": "", "uicon-column-line": "", @@ -2192,7 +2192,7 @@ if (uni.restoreGlobal) { /* CLASS */ ); } - const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1n, [["render", _sfc_render$h], ["__scopeId", "data-v-ac70166d"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]); + const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1n, [["render", _sfc_render$h], ["__scopeId", "data-v-ac70166d"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]); const props$3 = { props: { // 是否开启顶部安全区适配 @@ -2409,7 +2409,7 @@ if (uni.restoreGlobal) { ) ]); } - const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$1m, [["render", _sfc_render$g], ["__scopeId", "data-v-f631659b"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]); + const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$1m, [["render", _sfc_render$g], ["__scopeId", "data-v-f631659b"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]); function getDevtoolsGlobalHook$1() { return getTarget$1().__VUE_DEVTOOLS_GLOBAL_HOOK__; } @@ -4016,7 +4016,7 @@ if (uni.restoreGlobal) { }; }; const base64 = new Base64(); - const devhost = "http://192.168.10.75:8777/"; + const devhost = "http://192.168.10.29:13000/"; const imghost = ""; const host = devhost; const APPKEY = "h5u:h5u_secret"; @@ -5536,7 +5536,6 @@ if (uni.restoreGlobal) { async function init() { let tabber = uni.getStorageSync("homerouter"); if (tabber) { - details.tablist = tabber; return; } let res = await appMenuroutes({}); @@ -5566,6 +5565,7 @@ if (uni.restoreGlobal) { uni.setStorageSync("authbuts", qxan); } onShow(() => { + updateApp(); init(); }); onLoad(() => { @@ -5577,7 +5577,7 @@ if (uni.restoreGlobal) { initbuts(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); vue.watchEffect(() => { if (details.tablist.length > 0) { @@ -5609,6 +5609,48 @@ if (uni.restoreGlobal) { details.tablist = maxarr; formatAppLog("log", "at pages/index/index.vue:401", details.tablist); } + async function updateApp() { + let version2 = await utils.getversion(); + let data = { + betenantCode: uni.getStorageSync("userinfo").tenant_id, + versionCode: version2.version.split(".").join(""), + versionType: version2.pkName.indexOf("test") != -1 ? "1" : version2.pkName.indexOf("bate") != -1 ? "2" : "3" + }; + formatAppLog("log", "at pages/index/index.vue:430", "data", data); + let response = await AppPdaversiondetail(data); + formatAppLog("log", "at pages/index/index.vue:432", "response :>> ", response); + if (response.code == 200 && response.data) { + formatAppLog("log", "at pages/index/index.vue:434", response.data); + formatAppLog("log", "at pages/index/index.vue:435", "有可更新包"); + if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) { + utils.updatefile1(response.data.link); + } else { + tip.value.setdetails({ + title: "提示", + content: "检测到有新版本，请问是否更新？", + confirmTxt: "更新", + isshow: true, + isshowcancel: true, + success: async () => { + utils.updatefile(response.data.link); + tip.value.setisshow(false); + }, + cancel: () => { + tip.value.setisshow(false); + if (response.data.isUpdates == "2") { + plus.runtime.quit(); + } + }, + close: () => { + tip.value.setisshow(false); + if (response.data.isUpdates == "2") { + plus.runtime.quit(); + } + } + }); + } + } + } const { tablist } = vue.toRefs(details); return (_ctx, _cache) => { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); @@ -5686,7 +5728,7 @@ if (uni.restoreGlobal) { }; } }); - const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$1l, [["__file", "D:/worksp/logpm/pages/index/index.vue"]]); + const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$1l, [["__file", "D:/workSpace/logpm/pages/index/index.vue"]]); var isVue2 = false; function set(target, key, val) { if (Array.isArray(target)) { @@ -7359,7 +7401,7 @@ This will fail in production if not fixed.`); details.password = ""; uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function ckeckitem(item) { details.checkitem = item; @@ -7632,7 +7674,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesLoginLogin = /* @__PURE__ */ _export_sfc(_sfc_main$1k, [["__file", "D:/worksp/logpm/pages/login/login.vue"]]); + const PagesLoginLogin = /* @__PURE__ */ _export_sfc(_sfc_main$1k, [["__file", "D:/workSpace/logpm/pages/login/login.vue"]]); const _sfc_main$1j = /* @__PURE__ */ vue.defineComponent({ __name: "user", setup(__props) { @@ -7663,7 +7705,7 @@ This will fail in production if not fixed.`); const timer = setTimeout(() => { uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function ckeckitemck(item) { details.checkitems = item; @@ -7943,7 +7985,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["__file", "D:/worksp/logpm/pages/user/user.vue"]]); + const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["__file", "D:/workSpace/logpm/pages/user/user.vue"]]); const _sfc_main$1i = /* @__PURE__ */ vue.defineComponent({ __name: "news", setup(__props) { @@ -7952,7 +7994,7 @@ This will fail in production if not fixed.`); iptis.value = "http://192.168.10.75:8777/"; uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); let iptis = vue.ref("http://192.168.10.12:1086/"); if (uni.getStorageSync("setip")) { @@ -8007,7 +8049,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$1i, [["__file", "D:/worksp/logpm/pages/news/news.vue"]]); + const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$1i, [["__file", "D:/workSpace/logpm/pages/news/news.vue"]]); const _sfc_main$1h = /* @__PURE__ */ vue.defineComponent({ __name: "taskList", setup(__props) { @@ -8040,7 +8082,7 @@ This will fail in production if not fixed.`); const timer = setTimeout(() => { uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); const { tablist } = vue.toRefs(details); return (_ctx, _cache) => { @@ -8123,7 +8165,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesTaskListTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$1h, [["__file", "D:/worksp/logpm/pages/taskList/taskList.vue"]]); + const PagesTaskListTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$1h, [["__file", "D:/workSpace/logpm/pages/taskList/taskList.vue"]]); const _sfc_main$1g = /* @__PURE__ */ vue.defineComponent({ __name: "reportForms", setup(__props) { @@ -8131,14 +8173,14 @@ This will fail in production if not fixed.`); const timer = setTimeout(() => { uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); return (_ctx, _cache) => { return vue.openBlock(), vue.createElementBlock("view"); }; } }); - const PagesReportFormsReportForms = /* @__PURE__ */ _export_sfc(_sfc_main$1g, [["__file", "D:/worksp/logpm/pages/reportForms/reportForms.vue"]]); + const PagesReportFormsReportForms = /* @__PURE__ */ _export_sfc(_sfc_main$1g, [["__file", "D:/workSpace/logpm/pages/reportForms/reportForms.vue"]]); let calendar = { /** * 农历1900-2100的润大小信息表 @@ -9712,7 +9754,7 @@ This will fail in production if not fixed.`); /* HYDRATE_EVENTS */ ); } - const __easycom_1$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1f, [["render", _sfc_render$f], ["__scopeId", "data-v-665735f1"], ["__file", "D:/worksp/logpm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]); + const __easycom_1$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1f, [["render", _sfc_render$f], ["__scopeId", "data-v-665735f1"], ["__file", "D:/workSpace/logpm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]); const _sfc_main$1e = /* @__PURE__ */ vue.defineComponent({ __name: "pickingScan", setup(__props) { @@ -9755,7 +9797,7 @@ This will fail in production if not fixed.`); const timer = setTimeout(() => { uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function init() { details.currentPage = 1; @@ -10049,7 +10091,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesPickingScanPickingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1e, [["__file", "D:/worksp/logpm/pagesHome/pages/pickingScan/pickingScan.vue"]]); + const PagesHomePagesPickingScanPickingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1e, [["__file", "D:/workSpace/logpm/pagesHome/pages/pickingScan/pickingScan.vue"]]); const _sfc_main$1d = /* @__PURE__ */ vue.defineComponent({ __name: "SelfPickupScan", setup(__props) { @@ -10320,7 +10362,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSelfPickupScanSelfPickupScan = /* @__PURE__ */ _export_sfc(_sfc_main$1d, [["__file", "D:/worksp/logpm/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue"]]); + const PagesHomePagesSelfPickupScanSelfPickupScan = /* @__PURE__ */ _export_sfc(_sfc_main$1d, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue"]]); const _sfc_main$1c = /* @__PURE__ */ vue.defineComponent({ __name: "LoadingScan", setup(__props) { @@ -10346,7 +10388,7 @@ This will fail in production if not fixed.`); await initpage(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function setstates(state) { if (details.checkstate == state) { @@ -10931,7 +10973,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesLoadingScanLoadingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1c, [["__file", "D:/worksp/logpm/pagesHome/pages/LoadingScan/LoadingScan.vue"]]); + const PagesHomePagesLoadingScanLoadingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1c, [["__file", "D:/workSpace/logpm/pagesHome/pages/LoadingScan/LoadingScan.vue"]]); const _sfc_main$1b = /* @__PURE__ */ vue.defineComponent({ __name: "StockUplist", setup(__props) { @@ -10967,7 +11009,7 @@ This will fail in production if not fixed.`); onShow(() => { uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:187", code2); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:188", code2); details.scancode = code2; details.isscan = true; if (details.isscan) @@ -10980,6 +11022,13 @@ This will fail in production if not fixed.`); uni.$off("scancodedate"); details.isscan = false; }); + onPullDownRefresh(() => { + const timer = setTimeout(async () => { + await initpage(); + uni.stopPullDownRefresh(); + clearTimeout(timer); + }, 500); + }); function goorderdetail(item) { uni.navigateTo({ url: "/pagesHome/pages/orderDetails/orderDetails?orderCode=" + item.orderCode @@ -10987,7 +11036,7 @@ This will fail in production if not fixed.`); } async function initpage() { var _a, _b, _c, _d, _e, _f, _g; - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:205", details.items); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:213", details.items); let data = { // 零担为1, 不是零担为0 isZero: 0, @@ -11002,8 +11051,8 @@ This will fail in production if not fixed.`); } details.orderList = []; let response = await distributionStockuporderList(data); - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:221", "response :>> ", response); - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:222", "details.orderStatus :>> ", details.orderStatus); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:229", "response :>> ", response); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:230", "details.orderStatus :>> ", details.orderStatus); details.user.consignee = (_a = response.data) == null ? void 0 : _a.consignee; details.user.goodsAreaName = (_b = response.data) == null ? void 0 : _b.goodsAreaName; details.user.planNum = (_c = response.data) == null ? void 0 : _c.planNum; @@ -11013,6 +11062,7 @@ This will fail in production if not fixed.`); if (details.orderStatus === 3) details.zeroOrderList = (_g = response.data) == null ? void 0 : _g.orderList; details.isscan = false; + return null; } function godetails(item) { uni.navigateTo({ @@ -11109,7 +11159,7 @@ This will fail in production if not fixed.`); let inpList = []; const { code: code2 } = res; if (code2 === 200) { - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:360", "res.data :>> ", res.data); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:369", "res.data :>> ", res.data); inpList = res.data.map((val) => { return { id: val.id, @@ -11154,7 +11204,7 @@ This will fail in production if not fixed.`); confirmTxt: "确认选择", isonecheck: true, success: async (deta) => { - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:409", "deta :>> ", deta); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:418", "deta :>> ", deta); if (deta.inpList.length === 0 || item.completeStact) return tiplists.value.setdetails({ isshow: false }); let data2 = { @@ -11168,7 +11218,7 @@ This will fail in production if not fixed.`); if (deta.inpList[0].allocationId) data2.allocationId = deta.inpList[0].allocationId; const _flag = deta.inpList.every((val) => { - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:421", "val :>> ", val); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:430", "val :>> ", val); if (val.value < val.minNum) { uni.showToast({ title: "不能小于当前数量" @@ -11176,7 +11226,7 @@ This will fail in production if not fixed.`); return false; } if (val.value > val.minNum) { - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:429", "1 :>> ", 1); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:438", "1 :>> ", 1); data2.list.push({ firsts: val.title, id: val.id, @@ -11195,7 +11245,7 @@ This will fail in production if not fixed.`); }); } const res2 = await postZeroStockUp(data2); - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:450", "res :>> ", res2); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:459", "res :>> ", res2); const { code: code22 } = res2; if (code22 === 200) { tiplists.value.setdetails({ isshow: false }); @@ -11214,7 +11264,7 @@ This will fail in production if not fixed.`); }); } function printOrderCode(item) { - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:475", "item :>> ", item); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:484", "item :>> ", item); tiplists.value.setdetails({ title: "生成订单编号二维码数量", isshow: true, @@ -11243,7 +11293,7 @@ This will fail in production if not fixed.`); if (!_flag) return tiplists.value.setdetails({ isshow: false }); for (let i = 0; i <= _inputValue; i++) { - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:508", "i :>> ", i); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:517", "i :>> ", i); let text = "! 0 200 200 330 1\r\n"; text += "SETBOLD 2\r\n"; text += `T 56 0 0 0 ${item.orderCode}\r @@ -11273,9 +11323,9 @@ This will fail in production if not fixed.`); text += "FORM\r\n"; text += "PRINT\r\n"; let sylist = utils2.initbl(); - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:530", sylist); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:539", sylist); sylist.map((item2) => { - formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:532", item2); + formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:541", item2); if (item2.uuids) { utils2.getbl(item2, text); } @@ -11646,7 +11696,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesStockUplistStockUplist = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["__file", "D:/worksp/logpm/pagesHome/pages/StockUplist/StockUplist.vue"]]); + const PagesHomePagesStockUplistStockUplist = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUplist/StockUplist.vue"]]); const _sfc_main$1a = /* @__PURE__ */ vue.defineComponent({ __name: "StockUplistScandetails", setup(__props) { @@ -11711,7 +11761,7 @@ This will fail in production if not fixed.`); initpage(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function prinbut() { let list = [], checklist = []; @@ -12027,7 +12077,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["__file", "D:/worksp/logpm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]); + const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]); const _sfc_main$19 = {}; function _sfc_render$e(_ctx, _cache) { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); @@ -12050,7 +12100,7 @@ This will fail in production if not fixed.`); /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */ ); } - const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["render", _sfc_render$e], ["__file", "D:/worksp/logpm/pagesHome/pages/DownScan/DownScan.vue"]]); + const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["render", _sfc_render$e], ["__file", "D:/workSpace/logpm/pagesHome/pages/DownScan/DownScan.vue"]]); const _sfc_main$18 = /* @__PURE__ */ vue.defineComponent({ __name: "signinScan", setup(__props) { @@ -12067,7 +12117,7 @@ This will fail in production if not fixed.`); onPullDownRefresh(() => { setTimeout(() => { uni.stopPullDownRefresh(); - }, 1e3); + }, 500); }); const date2 = vue.ref([]); function showCalendar() { @@ -12415,7 +12465,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSigninScanSigninScan = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["__file", "D:/worksp/logpm/pagesHome/pages/signinScan/signinScan.vue"]]); + const PagesHomePagesSigninScanSigninScan = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["__file", "D:/workSpace/logpm/pagesHome/pages/signinScan/signinScan.vue"]]); const _imports_0 = "/assets/cha.b7e7843e.png"; const _sfc_main$17 = { props: { @@ -12665,7 +12715,7 @@ This will fail in production if not fixed.`); /* STYLE */ ); } - const cusSelects = /* @__PURE__ */ _export_sfc(_sfc_main$17, [["render", _sfc_render$d], ["__scopeId", "data-v-7a3666ce"], ["__file", "D:/worksp/logpm/compoment/cus-selects-fan/cus-selects-fan.vue"]]); + const cusSelects = /* @__PURE__ */ _export_sfc(_sfc_main$17, [["render", _sfc_render$d], ["__scopeId", "data-v-7a3666ce"], ["__file", "D:/workSpace/logpm/compoment/cus-selects-fan/cus-selects-fan.vue"]]); const _sfc_main$16 = /* @__PURE__ */ vue.defineComponent({ __name: "SelfPScanList", setup(__props) { @@ -13246,7 +13296,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSelfPScanListSelfPScanList = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["__file", "D:/worksp/logpm/pagesHome/pages/SelfPScanList/SelfPScanList.vue"]]); + const PagesHomePagesSelfPScanListSelfPScanList = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPScanList/SelfPScanList.vue"]]); const _sfc_main$15 = { name: "uniTh", options: { @@ -13422,7 +13472,7 @@ This will fail in production if not fixed.`); /* CLASS, STYLE */ ); } - const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["render", _sfc_render$c], ["__scopeId", "data-v-bf970acd"], ["__file", "D:/worksp/logpm/uni_modules/uni-table/components/uni-th/uni-th.vue"]]); + const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["render", _sfc_render$c], ["__scopeId", "data-v-bf970acd"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-th/uni-th.vue"]]); const _sfc_main$14 = { name: "TableCheckbox", emits: ["checkboxSelected"], @@ -13512,7 +13562,7 @@ This will fail in production if not fixed.`); ])) ]); } - const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["render", _sfc_render$b], ["__scopeId", "data-v-25e435b1"], ["__file", "D:/worksp/logpm/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]); + const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["render", _sfc_render$b], ["__scopeId", "data-v-25e435b1"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]); const _sfc_main$13 = { name: "uniTr", components: { tableCheckbox }, @@ -13623,7 +13673,7 @@ This will fail in production if not fixed.`); vue.renderSlot(_ctx.$slots, "default", {}, void 0, true) ]); } - const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$a], ["__scopeId", "data-v-b48b3e32"], ["__file", "D:/worksp/logpm/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]); + const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$a], ["__scopeId", "data-v-b48b3e32"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]); const _sfc_main$12 = { name: "uniTd", options: { @@ -13696,7 +13746,7 @@ This will fail in production if not fixed.`); /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */ ); } - const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$12, [["render", _sfc_render$9], ["__scopeId", "data-v-edae4802"], ["__file", "D:/worksp/logpm/uni_modules/uni-table/components/uni-td/uni-td.vue"]]); + const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$12, [["render", _sfc_render$9], ["__scopeId", "data-v-edae4802"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-td/uni-td.vue"]]); const _sfc_main$11 = { name: "uniTable", options: { @@ -13988,7 +14038,7 @@ This will fail in production if not fixed.`); /* CLASS */ ); } - const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["render", _sfc_render$8], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "D:/worksp/logpm/uni_modules/uni-table/components/uni-table/uni-table.vue"]]); + const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["render", _sfc_render$8], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "D:/workSpace/logpm/uni_modules/uni-table/components/uni-table/uni-table.vue"]]); const _sfc_main$10 = /* @__PURE__ */ vue.defineComponent({ __name: "SelfPickupDetails", setup(__props) { @@ -14048,7 +14098,7 @@ This will fail in production if not fixed.`); const timer = setTimeout(() => { utils2.ttsspke(details.signedNum + "件"); clearTimeout(timer); - }, 1e3); + }, 500); } }); onHide(() => { @@ -14603,7 +14653,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSelfPickupDetailsSelfPickupDetails = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["__file", "D:/worksp/logpm/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue"]]); + const PagesHomePagesSelfPickupDetailsSelfPickupDetails = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["__file", "D:/workSpace/logpm/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue"]]); const _sfc_main$$ = /* @__PURE__ */ vue.defineComponent({ __name: "LoadingDetails", setup(__props) { @@ -15045,7 +15095,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesLoadingDetailsLoadingDetails = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__file", "D:/worksp/logpm/pagesHome/pages/LoadingDetails/LoadingDetails.vue"]]); + const PagesHomePagesLoadingDetailsLoadingDetails = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__file", "D:/workSpace/logpm/pagesHome/pages/LoadingDetails/LoadingDetails.vue"]]); const _sfc_main$_ = /* @__PURE__ */ vue.defineComponent({ __name: "CustomerOrdersDetails", setup(__props) { @@ -15164,7 +15214,7 @@ This will fail in production if not fixed.`); await initpage(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); const loadingNub = vue.computed(() => { let num = 0; @@ -15903,7 +15953,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesCustomerOrdersDetailsCustomerOrdersDetails = /* @__PURE__ */ _export_sfc(_sfc_main$_, [["__file", "D:/worksp/logpm/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue"]]); + const PagesHomePagesCustomerOrdersDetailsCustomerOrdersDetails = /* @__PURE__ */ _export_sfc(_sfc_main$_, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue"]]); const _sfc_main$Z = /* @__PURE__ */ vue.defineComponent({ __name: "DeliveryCustomerScan", setup(__props) { @@ -15939,7 +15989,7 @@ This will fail in production if not fixed.`); initpage(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); const ordernumber = vue.computed(() => { let num = 0; @@ -16268,7 +16318,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesDeliveryCustomerScanDeliveryCustomerScan = /* @__PURE__ */ _export_sfc(_sfc_main$Z, [["__file", "D:/worksp/logpm/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue"]]); + const PagesHomePagesDeliveryCustomerScanDeliveryCustomerScan = /* @__PURE__ */ _export_sfc(_sfc_main$Z, [["__file", "D:/workSpace/logpm/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue"]]); const _sfc_main$Y = /* @__PURE__ */ vue.defineComponent({ __name: "CustomerSign", setup(__props) { @@ -16316,7 +16366,7 @@ This will fail in production if not fixed.`); await initpage(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); async function getconfig() { let res = await dictbizdictionary({ code: "photo_type" }); @@ -16795,7 +16845,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesCustomerSignCustomerSign = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["__file", "D:/worksp/logpm/pagesHome/pages/CustomerSign/CustomerSign.vue"]]); + const PagesHomePagesCustomerSignCustomerSign = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerSign/CustomerSign.vue"]]); const _sfc_main$X = /* @__PURE__ */ vue.defineComponent({ __name: "signOrderScan", setup(__props) { @@ -16911,7 +16961,7 @@ This will fail in production if not fixed.`); initpage(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); async function scandata() { let data = { @@ -17574,7 +17624,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSignOrderScanSignOrderScan = /* @__PURE__ */ _export_sfc(_sfc_main$X, [["__scopeId", "data-v-fb393026"], ["__file", "D:/worksp/logpm/pagesHome/pages/signOrderScan/signOrderScan.vue"]]); + const PagesHomePagesSignOrderScanSignOrderScan = /* @__PURE__ */ _export_sfc(_sfc_main$X, [["__scopeId", "data-v-fb393026"], ["__file", "D:/workSpace/logpm/pagesHome/pages/signOrderScan/signOrderScan.vue"]]); const _sfc_main$W = /* @__PURE__ */ vue.defineComponent({ __name: "SignDetailScan", setup(__props) { @@ -18030,7 +18080,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSignDetailScanSignDetailScan = /* @__PURE__ */ _export_sfc(_sfc_main$W, [["__file", "D:/worksp/logpm/pagesHome/pages/SignDetailScan/SignDetailScan.vue"]]); + const PagesHomePagesSignDetailScanSignDetailScan = /* @__PURE__ */ _export_sfc(_sfc_main$W, [["__file", "D:/workSpace/logpm/pagesHome/pages/SignDetailScan/SignDetailScan.vue"]]); const _sfc_main$V = /* @__PURE__ */ vue.defineComponent({ __name: "setbarcode", setup(__props) { @@ -18390,7 +18440,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSetbarcodeSetbarcode = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__file", "D:/worksp/logpm/pagesHome/pages/setbarcode/setbarcode.vue"]]); + const PagesHomePagesSetbarcodeSetbarcode = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__file", "D:/workSpace/logpm/pagesHome/pages/setbarcode/setbarcode.vue"]]); const _sfc_main$U = /* @__PURE__ */ vue.defineComponent({ __name: "OfflineUpload", setup(__props) { @@ -18532,7 +18582,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesOfflineUploadOfflineUpload = /* @__PURE__ */ _export_sfc(_sfc_main$U, [["__file", "D:/worksp/logpm/pagesHome/pages/OfflineUpload/OfflineUpload.vue"]]); + const PagesHomePagesOfflineUploadOfflineUpload = /* @__PURE__ */ _export_sfc(_sfc_main$U, [["__file", "D:/workSpace/logpm/pagesHome/pages/OfflineUpload/OfflineUpload.vue"]]); const _sfc_main$T = /* @__PURE__ */ vue.defineComponent({ __name: "createTask", setup(__props) { @@ -18719,7 +18769,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesCreateTaskCreateTask = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__file", "D:/worksp/logpm/pagesHome/pages/createTask/createTask.vue"]]); + const PagesHomePagesCreateTaskCreateTask = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__file", "D:/workSpace/logpm/pagesHome/pages/createTask/createTask.vue"]]); const _sfc_main$S = /* @__PURE__ */ vue.defineComponent({ __name: "ordersorting", setup(__props) { @@ -18780,7 +18830,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesOrdersortingOrdersorting = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["__file", "D:/worksp/logpm/pagesHome/pages/ordersorting/ordersorting.vue"]]); + const PagesHomePagesOrdersortingOrdersorting = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["__file", "D:/workSpace/logpm/pagesHome/pages/ordersorting/ordersorting.vue"]]); const _sfc_main$R = /* @__PURE__ */ vue.defineComponent({ __name: "lnventorysorting", setup(__props) { @@ -18830,7 +18880,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesLnventorysortingLnventorysorting = /* @__PURE__ */ _export_sfc(_sfc_main$R, [["__file", "D:/worksp/logpm/pagesHome/pages/lnventorysorting/lnventorysorting.vue"]]); + const PagesHomePagesLnventorysortingLnventorysorting = /* @__PURE__ */ _export_sfc(_sfc_main$R, [["__file", "D:/workSpace/logpm/pagesHome/pages/lnventorysorting/lnventorysorting.vue"]]); const _sfc_main$Q = /* @__PURE__ */ vue.defineComponent({ __name: "scansorting", setup(__props) { @@ -18899,7 +18949,7 @@ This will fail in production if not fixed.`); return option.isEnd = true; } clearTimeout(antiShake); - }, 1e3); + }, 500); } catch (err) { formatAppLog("log", "at pagesHome/pages/scansorting/scansorting.vue:179", "err :>> ", err); } @@ -19207,7 +19257,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesScansortingScansorting = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["__file", "D:/worksp/logpm/pagesHome/pages/scansorting/scansorting.vue"]]); + const PagesHomePagesScansortingScansorting = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["__file", "D:/workSpace/logpm/pagesHome/pages/scansorting/scansorting.vue"]]); const _sfc_main$P = {}; function _sfc_render$7(_ctx, _cache) { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); @@ -19231,7 +19281,7 @@ This will fail in production if not fixed.`); /* STABLE_FRAGMENT */ ); } - const PagesHomePagesPeopleSortingPeopleSorting = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["render", _sfc_render$7], ["__file", "D:/worksp/logpm/pagesHome/pages/peopleSorting/peopleSorting.vue"]]); + const PagesHomePagesPeopleSortingPeopleSorting = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["render", _sfc_render$7], ["__file", "D:/workSpace/logpm/pagesHome/pages/peopleSorting/peopleSorting.vue"]]); const _sfc_main$O = /* @__PURE__ */ vue.defineComponent({ __name: "OrderSortingDetail", setup(__props) { @@ -19269,7 +19319,7 @@ This will fail in production if not fixed.`); details.trayType = op.trayType; if (op.pageName) utils.ttsspke("当前打托方式为" + op.pageName); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:397", "details.trayType :>> ", details.trayType); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:399", "details.trayType :>> ", details.trayType); if (!op.trayType) { uni.showToast({ title: "获取打托方式出错", @@ -19280,7 +19330,7 @@ This will fail in production if not fixed.`); onShow(async () => { uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:408", code2); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:410", code2); details.scancode = code2; scandata(); details.iscan = true; @@ -19296,7 +19346,7 @@ This will fail in production if not fixed.`); await initlist(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); async function godetaillist(item) { uni.navigateTo({ @@ -19324,7 +19374,7 @@ This will fail in production if not fixed.`); orderCode: item.dataCode }; let res = await warehouseTrayTypedeleteOrderCode(data); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:463", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:465", "res :>> ", res); initlist(); tip.value.setisshow(false); }, @@ -19372,7 +19422,7 @@ This will fail in production if not fixed.`); trayGoodsId: item.trayGoodsId }; let res = await warehouseTrayTypedeleteStockByTrayGoodsId(data); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:517", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:519", "res :>> ", res); if (res.code == 200) { initlist(); } @@ -19391,13 +19441,13 @@ This will fail in production if not fixed.`); trayCode: details.trayCode }; let res = await warehouseTrayTypeorderScanTrayCode(data); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:537", res.data, "resresresres"); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:539", res.data, "resresresres"); if (res.code == 200) { if (res.data.isHasData == 1) { details.detauser = res.data.data; details.stock.marketId = res.data.data.marketId; details.Remarktext = res.data.data.reamrk; - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:545", " details.detauser :>> ", details.detauser); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:547", " details.detauser :>> ", details.detauser); if (details.tabBarState === 1) details.datelist = details.detauser.packageList; else if (details.tabBarState === 2) @@ -19430,18 +19480,18 @@ This will fail in production if not fixed.`); orderPackageCode: details.scancode }; let response = await warehouseTrayTypeorderScanOrderPackageCode(submitData); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:580", "response", response); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:582", "response", response); const res = await initlist(); const { code: code2 } = res; - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:584", "res :>> ", res); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:586", "details.scancode :>> ", details.scancode); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:586", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:588", "details.scancode :>> ", details.scancode); if (response.code !== 200 || code2 !== 200) return; if (((_a = details == null ? void 0 : details.detauser) == null ? void 0 : _a.trayNum) && ((_b = details == null ? void 0 : details.detauser) == null ? void 0 : _b.trayNum) > 0) { utils.ttsspke(details.detauser.trayNum + "件"); const { data: { orderCode } } = response; const scanOrder2 = details.datelist.find((val) => val.dataCode === orderCode); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:597", "scanOrder :>> ", scanOrder2); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:599", "scanOrder :>> ", scanOrder2); if (scanOrder2 && scanOrder2.orderTotalNum === scanOrder2.scanNum) { utils.ttsspke(`订单${orderCode}已齐套`); } @@ -19452,7 +19502,7 @@ This will fail in production if not fixed.`); orderPackageCode: details.scancode }; const res = warehouseTrayTypeenterStockNoDataMaterialCode(data); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:615", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:617", "res :>> ", res); } async function setTabBarState(state) { details.tabBarState = state; @@ -19467,11 +19517,11 @@ This will fail in production if not fixed.`); } } async function chooseMarket() { - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:638", "111 :>> ", 111); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:640", "details.datelist :>> ", details.datelist.length); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:640", "111 :>> ", 111); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:642", "details.datelist :>> ", details.datelist.length); if (details.datelist.length === 0) { const res = await warehouseTrayTypefindAllMarket({}); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:644", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:646", "res :>> ", res); if (res.code !== 200) return; const _marketArr = res.data; @@ -19489,9 +19539,9 @@ This will fail in production if not fixed.`); icon: "none" }); } - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:663", "detail :>> ", detail); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:665", "detail :>> ", detail); details.stock.marketId = _marketArr[detail.checklist[0]].marketId; - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:665", "_marketName :>> ", _marketArr); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:667", "_marketName :>> ", _marketArr); details.stock.marketName = _marketArr[detail.checklist[0]].marketName; tiplists.value.setdetails({ isshow: false }); }, @@ -19553,7 +19603,7 @@ This will fail in production if not fixed.`); waybillCode: details.waybillCode }; let response = await warehouseTrayTypegetZeroOrderByWaybillCode(data); - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:739", response); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:741", response); details.codelist = response.data; details.codelist.map((item) => { item["number"] = 0; @@ -19563,7 +19613,7 @@ This will fail in production if not fixed.`); async function confirmlist() { let zeroList = []; let isfl = false; - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:756", "details.codelist :>> ", details.codelist); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:758", "details.codelist :>> ", details.codelist); isfl = !details.codelist.some((item) => { if (item.number === 0) { return false; @@ -19640,18 +19690,60 @@ This will fail in production if not fixed.`); } }); Promise.all(PromiseArr).then((res) => { - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:850", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:852", "res :>> ", res); setshowstate(0); initlist(); details.stock.searchStockList = []; details.stock.materialCode = ""; }); } catch (err) { - formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:857", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:859", "err :>> ", err); } finally { uni.hideLoading(); } } + const print = () => { + let list = [], checklist = []; + tiplists.value.setdetails({ + title: "是否打印", + isshow: true, + tipstate: 2, + list, + checklist, + inputtext: "", + confirmTxt: "确认打印", + isonecheck: true, + success: (deta) => { + let text1 = ` + ^XA + ^CF0,40 + ^FO0,50^FD打印时间:2023/10/10/2319:22:23^FS + ^FO0,100^FD汇通龙泉03850^FS + ^FO0,150^FD按商场: 江油欧派衣橱^FS + ^FO0,200^FD车次号: QYZX231021008^FS + ^FO0,250^FD分拣人: 陈勇^FS + ^FO0,300^FD分拣完成时间: 2023/10/2318:45:00^FS + + ^XZ + `; + let sylist = utils.initbl(); + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:933", sylist); + sylist.map((item) => { + formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:935", item); + if (item.uuids) { + utils.getbl(item, text1); + } + }); + tiplists.value.setdetails({ isshow: false }); + }, + cancel: (details2) => { + tiplists.value.setdetails({ isshow: false }); + }, + close: (details2) => { + tiplists.value.setdetails({ isshow: false }); + } + }); + }; const { datelist, detauser, showstate, waybillCode, checkinarr, Remarktext, codelist } = vue.toRefs(details); return (_ctx, _cache) => { var _a, _b, _c, _d, _e, _f, _g, _h; @@ -19780,6 +19872,12 @@ This will fail in production if not fixed.`); /* TEXT */ ), vue.createElementVNode("view", null, "备注") + ]), + vue.createElementVNode("view", null, [ + vue.createElementVNode("view", { + class: "printBtn", + onClick: print + }, "打印") ]) ]) ]), @@ -20470,7 +20568,6 @@ This will fail in production if not fixed.`); 64 /* STABLE_FRAGMENT */ )) : vue.createCommentVNode("v-if", true), - vue.createCommentVNode(' '), vue.createVNode(_component_saomiao2), vue.createVNode( _component_tips, @@ -20499,7 +20596,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesOrderSortingDetailOrderSortingDetail = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__scopeId", "data-v-ca2cce65"], ["__file", "D:/worksp/logpm/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue"]]); + const PagesHomePagesOrderSortingDetailOrderSortingDetail = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__scopeId", "data-v-ca2cce65"], ["__file", "D:/workSpace/logpm/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue"]]); const _sfc_main$N = /* @__PURE__ */ vue.defineComponent({ __name: "ScanSortingType", setup(__props) { @@ -20603,7 +20700,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesScanSortingTypeScanSortingType = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__file", "D:/worksp/logpm/pagesHome/pages/ScanSortingType/ScanSortingType.vue"]]); + const PagesHomePagesScanSortingTypeScanSortingType = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanSortingType/ScanSortingType.vue"]]); const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({ __name: "PeopleSortingDetail", setup(__props) { @@ -21190,7 +21287,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesPeopleSortingDetailPeopleSortingDetail = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-e9f42dec"], ["__file", "D:/worksp/logpm/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue"]]); + const PagesHomePagesPeopleSortingDetailPeopleSortingDetail = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-e9f42dec"], ["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue"]]); const _sfc_main$L = /* @__PURE__ */ vue.defineComponent({ __name: "inventoryType", setup(__props) { @@ -21273,7 +21370,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesInventoryTypeInventoryType = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["__file", "D:/worksp/logpm/pagesHome/pages/inventoryType/inventoryType.vue"]]); + const PagesHomePagesInventoryTypeInventoryType = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryType/inventoryType.vue"]]); const _sfc_main$K = /* @__PURE__ */ vue.defineComponent({ __name: "inventoryDetail", setup(__props) { @@ -21481,7 +21578,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesInventoryDetailInventoryDetail = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__file", "D:/worksp/logpm/pagesHome/pages/inventoryDetail/inventoryDetail.vue"]]); + const PagesHomePagesInventoryDetailInventoryDetail = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryDetail/inventoryDetail.vue"]]); const _sfc_main$J = /* @__PURE__ */ vue.defineComponent({ __name: "inventoryDetailList", setup(__props) { @@ -21658,7 +21755,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesInventoryDetailListInventoryDetailList = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__file", "D:/worksp/logpm/pagesHome/pages/inventoryDetailList/inventoryDetailList.vue"]]); + const PagesHomePagesInventoryDetailListInventoryDetailList = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryDetailList/inventoryDetailList.vue"]]); const _sfc_main$I = /* @__PURE__ */ vue.defineComponent({ __name: "inventoryenter", setup(__props) { @@ -22255,7 +22352,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesInventoryenterInventoryenter = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__file", "D:/worksp/logpm/pagesHome/pages/inventoryenter/inventoryenter.vue"]]); + const PagesHomePagesInventoryenterInventoryenter = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__file", "D:/workSpace/logpm/pagesHome/pages/inventoryenter/inventoryenter.vue"]]); const _sfc_main$H = /* @__PURE__ */ vue.defineComponent({ __name: "lnventorysortinglist", setup(__props) { @@ -22319,7 +22416,7 @@ This will fail in production if not fixed.`); return option.isEnd = true; } clearTimeout(antiShake); - }, 1e3); + }, 500); } catch (err) { formatAppLog("log", "at pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue:169", "err :>> ", err); } @@ -22625,7 +22722,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesLnventorysortinglistLnventorysortinglist = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__file", "D:/worksp/logpm/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue"]]); + const PagesHomePagesLnventorysortinglistLnventorysortinglist = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__file", "D:/workSpace/logpm/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue"]]); const _sfc_main$G = /* @__PURE__ */ vue.defineComponent({ __name: "OrderSortingDetailList", setup(__props) { @@ -22657,7 +22754,7 @@ This will fail in production if not fixed.`); await initpage(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); async function initpage() { let data = { @@ -23095,7 +23192,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesOrderSortingDetailListOrderSortingDetailList = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__file", "D:/worksp/logpm/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue"]]); + const PagesHomePagesOrderSortingDetailListOrderSortingDetailList = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__file", "D:/workSpace/logpm/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue"]]); const _sfc_main$F = /* @__PURE__ */ vue.defineComponent({ __name: "ScanUpType", setup(__props) { @@ -23117,7 +23214,7 @@ This will fail in production if not fixed.`); const timer = setTimeout(() => { uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function gotourl(item) { let url2 = "/pagesHome/pages/ScanUp/ScanUp?type=" + item.type + "&pageName=" + item.name; @@ -23172,7 +23269,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesScanUpTypeScanUpType = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__file", "D:/worksp/logpm/pagesHome/pages/ScanUpType/ScanUpType.vue"]]); + const PagesHomePagesScanUpTypeScanUpType = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanUpType/ScanUpType.vue"]]); const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({ __name: "ScanUp", setup(__props) { @@ -23208,7 +23305,7 @@ This will fail in production if not fixed.`); onShow(() => { uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:233", "code :>> ", code2); + formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:234", "code :>> ", code2); details.scancode = code2; scandata(); } @@ -23220,13 +23317,13 @@ This will fail in production if not fixed.`); onPullDownRefresh(() => { const timer = setTimeout(() => { details.allocationId = ""; - details.reqobj = []; + details.reqobj = {}; details.renderList = []; details.datalist = []; details.uplistarr = []; uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); async function scandata() { var _a; @@ -23235,7 +23332,7 @@ This will fail in production if not fixed.`); allocationId: details.scancode }; let res = await warehouseUpdownTypeupShelfScanAllocation(data); - formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:269", res); + formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:270", res); if (res.code == 200) { details.reqobj = res.data; const _positionArr = details.reqobj.allocationTitle.split("-"); @@ -23262,7 +23359,7 @@ This will fail in production if not fixed.`); code: details.scancode }; let res = await warehouseUpdownTypeupShelfScanGoods(data); - formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:303", "res>>>>>", res); + formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:304", "res>>>>>", res); if (res.code == 200) { if (Number(details.upshelfScanType) !== 3) { const _uplistarr = details.uplistarr; @@ -23486,7 +23583,7 @@ This will fail in production if not fixed.`); vue.createElementVNode("view", { class: "numbox" }, [ vue.createElementVNode("view", null, [ vue.createElementVNode("view", null, [ - vue.createElementVNode("view", null, "库位总数"), + vue.createElementVNode("view", null, "库位订单总数"), vue.createElementVNode( "view", null, @@ -23754,7 +23851,7 @@ This will fail in production if not fixed.`); ]) ])) : vue.createCommentVNode("v-if", true), vue.createElementVNode("view", { class: "tpbx" }, [ - Number(vue.unref(details).upshelfScanType) === 1 || Number(vue.unref(details).upshelfScanType) === 2 ? (vue.openBlock(), vue.createElementBlock( + Number(vue.unref(details).upshelfScanType) === 1 || Number(vue.unref(details).upshelfScanType) === 2 || vue.unref(details).checkstate === 2 ? (vue.openBlock(), vue.createElementBlock( vue.Fragment, { key: 0 }, [ @@ -23779,7 +23876,7 @@ This will fail in production if not fixed.`); 64 /* STABLE_FRAGMENT */ )) : vue.createCommentVNode("v-if", true), - vue.createCommentVNode(' ') + vue.createCommentVNode(' ') ]), Number(vue.unref(details).upshelfScanType) != 3 ? (vue.openBlock(), vue.createElementBlock("image", { key: 6, @@ -23840,7 +23937,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesScanUpScanUp = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["__file", "D:/worksp/logpm/pagesHome/pages/ScanUp/ScanUp.vue"]]); + const PagesHomePagesScanUpScanUp = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["__file", "D:/workSpace/logpm/pagesHome/pages/ScanUp/ScanUp.vue"]]); const _sfc_main$D = /* @__PURE__ */ vue.defineComponent({ __name: "RelocationType", setup(__props) { @@ -23929,7 +24026,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesRelocationTypeRelocationType = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__file", "D:/worksp/logpm/pagesHome/pages/RelocationType/RelocationType.vue"]]); + const PagesHomePagesRelocationTypeRelocationType = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__file", "D:/workSpace/logpm/pagesHome/pages/RelocationType/RelocationType.vue"]]); const _sfc_main$C = /* @__PURE__ */ vue.defineComponent({ __name: "Relocation", setup(__props) { @@ -23974,7 +24071,7 @@ This will fail in production if not fixed.`); details.scancodeList = []; uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function goorderdetail(item) { uni.navigateTo({ @@ -24662,7 +24759,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesRelocationRelocation = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["__file", "D:/worksp/logpm/pagesHome/pages/Relocation/Relocation.vue"]]); + const PagesHomePagesRelocationRelocation = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["__file", "D:/workSpace/logpm/pagesHome/pages/Relocation/Relocation.vue"]]); const _sfc_main$B = /* @__PURE__ */ vue.defineComponent({ __name: "PeopleScanUpType", setup(__props) { @@ -24733,7 +24830,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesPeopleScanUpTypePeopleScanUpType = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["__file", "D:/worksp/logpm/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.vue"]]); + const PagesHomePagesPeopleScanUpTypePeopleScanUpType = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.vue"]]); const _sfc_main$A = /* @__PURE__ */ vue.defineComponent({ __name: "PeopleScanUp", setup(__props) { @@ -24788,7 +24885,7 @@ This will fail in production if not fixed.`); details.checkinarr = []; uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); vue.watchEffect(() => { if (Number(details.upshelfScanType) == 1 || Number(details.upshelfScanType) == 2) { @@ -25855,7 +25952,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesPeopleScanUpPeopleScanUp = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__file", "D:/worksp/logpm/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue"]]); + const PagesHomePagesPeopleScanUpPeopleScanUp = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__file", "D:/workSpace/logpm/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue"]]); const _sfc_main$z = /* @__PURE__ */ vue.defineComponent({ __name: "PickingScanList", setup(__props) { @@ -25942,7 +26039,7 @@ This will fail in production if not fixed.`); const timer = setTimeout(() => { uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); async function initpage() { let data = { @@ -26156,7 +26253,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesPickingScanListPickingScanList = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__file", "D:/worksp/logpm/pagesHome/pages/PickingScanList/PickingScanList.vue"]]); + const PagesHomePagesPickingScanListPickingScanList = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__file", "D:/workSpace/logpm/pagesHome/pages/PickingScanList/PickingScanList.vue"]]); const _sfc_main$y = /* @__PURE__ */ vue.defineComponent({ __name: "Retention", setup(__props) { @@ -26312,7 +26409,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesRetentionRetention = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__file", "D:/worksp/logpm/pagesHome/pages/Retention/Retention.vue"]]); + const PagesHomePagesRetentionRetention = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__file", "D:/workSpace/logpm/pagesHome/pages/Retention/Retention.vue"]]); const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({ __name: "MergeTray", setup(__props) { @@ -26353,7 +26450,7 @@ This will fail in production if not fixed.`); details.newmergeTray = ""; uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function setstate(state) { details.scantype = state; @@ -26779,7 +26876,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesMergeTrayMergeTray = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "D:/worksp/logpm/pagesHome/pages/MergeTray/MergeTray.vue"]]); + const PagesHomePagesMergeTrayMergeTray = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "D:/workSpace/logpm/pagesHome/pages/MergeTray/MergeTray.vue"]]); const _sfc_main$w = /* @__PURE__ */ vue.defineComponent({ __name: "MergeTrayDetails", setup(__props) { @@ -27074,7 +27171,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesMergeTrayDetailsMergeTrayDetails = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__file", "D:/worksp/logpm/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue"]]); + const PagesHomePagesMergeTrayDetailsMergeTrayDetails = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__file", "D:/workSpace/logpm/pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue"]]); const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({ __name: "DownGoodsType", setup(__props) { @@ -27146,7 +27243,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesDownGoodsTypeDownGoodsType = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__file", "D:/worksp/logpm/pagesHome/pages/DownGoodsType/DownGoodsType.vue"]]); + const PagesHomePagesDownGoodsTypeDownGoodsType = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__file", "D:/workSpace/logpm/pagesHome/pages/DownGoodsType/DownGoodsType.vue"]]); const _sfc_main$u = /* @__PURE__ */ vue.defineComponent({ __name: "DownGoods", setup(__props) { @@ -27167,7 +27264,8 @@ This will fail in production if not fixed.`); typelist: [], Marketlist: [], checkmarkindex: 0, - allocaTitle: "" + allocaTitle: "", + scandataList: [] }); onLoad((op) => { details.pageType = op.type; @@ -27207,7 +27305,7 @@ This will fail in production if not fixed.`); details.allocaTitle = ""; uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); function backun() { uni.navigateBack(); @@ -27222,7 +27320,7 @@ This will fail in production if not fixed.`); warehouseCode: "LQ" }; let res = await warehouseTrayTypefindAllMarket(data); - formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:373", res.data); + formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:374", res.data); details.Marketlist = res.data; } vue.watchEffect(() => { @@ -27238,72 +27336,98 @@ This will fail in production if not fixed.`); } async function scandata() { var _a; - let res = null; - let data = null; - switch (Number(details.pageType)) { - case 1: - data = { - trayCode: details.scancode - }; - res = await warehouseUpdownTypedownScanTrayCode(data); - if (res.code == 200) { - details.datalist = []; - details.checkdatalist = []; - details.datalist = details.datalist.concat(res.data.list); - details.checkdatalist = details.checkdatalist.concat(res.data.list); - details.trayCode = details.scancode; - details.allocaTitle = res.data.warehouseName + res.data.areaTitle + res.data.allocationTitle; - } - break; - case 2: - data = { - allocationId: details.scancode - }; - res = await warehouseUpdownTypeupShelfScanAllocation(data); - if (res.code == 200) { - details.datalist = []; - details.checkdatalist = []; - details.datalist = details.datalist.concat(res.data.list); - details.checkdatalist = details.checkdatalist.concat(res.data.list); - details.resdata = res.data; - const _positionArr = details.resdata.allocationTitle.split("-"); - details.resdata.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列"; - } - break; - case 3: - data = { - orderPackageCode: details.scancode - }; - res = await warehouseUpdownTypedownScanPackage(data); - if (res.code == 200) { - details.datalist = details.datalist.concat([res.data]); - details.checkdatalist = details.checkdatalist.concat([res.data]); - } - break; - case 4: - data = { - stockType: details.checkmakindex + 1, - code: details.scancode, - marketId: (_a = details.Marketlist[details.checkmarkindex]) == null ? void 0 : _a.marketId - }; - res = await warehouseUpdownTypedownEnterStock(data); - if (res.code == 200) { - details.datalist = []; - details.checkdatalist = []; - details.codelist = res.data; - } - break; - case 5: - data = { - zeroType: details.checkmakindex + 1, - code: details.scancode - }; - res = await warehouseUpdownTypedownEnterZeroOrder(data); - if (res.code == 200) { - details.codelist = res.data; - } - break; + const _scancode = details.scancode; + let _flag = true; + if (details.scandataList.includes(_scancode)) + _flag = false; + if (Number(details.pageType) === 3 && details.checkdatalist.find((val) => val.orderPackageCode === _scancode)) + _flag = false; + if (!_flag) { + utils.ttsspke("重复扫码"); + return uni.showToast({ + title: "重复扫码", + icon: "none" + }); } + formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:412", "111 :>> ", 111); + details.scandataList.push(_scancode); + try { + let res = null; + let data = null; + switch (Number(details.pageType)) { + case 1: + data = { + trayCode: details.scancode + }; + res = await warehouseUpdownTypedownScanTrayCode(data); + if (res.code == 200) { + details.datalist = []; + details.checkdatalist = []; + details.datalist = details.datalist.concat(res.data.list); + details.checkdatalist = details.checkdatalist.concat(res.data.list); + details.trayCode = details.scancode; + details.allocaTitle = res.data.warehouseName + res.data.areaTitle + res.data.allocationTitle; + } + break; + case 2: + data = { + allocationId: details.scancode + }; + res = await warehouseUpdownTypeupShelfScanAllocation(data); + if (res.code == 200) { + details.datalist = []; + details.checkdatalist = []; + details.datalist = details.datalist.concat(res.data.list); + details.checkdatalist = details.checkdatalist.concat(res.data.list); + details.resdata = res.data; + const _positionArr = details.resdata.allocationTitle.split("-"); + details.resdata.positionInfo = _positionArr[0] + "层" + _positionArr[1] + "列"; + } + break; + case 3: + data = { + orderPackageCode: details.scancode + }; + res = await warehouseUpdownTypedownScanPackage(data); + formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:454", "res", res); + if (res.code == 200) { + details.datalist = details.datalist.concat([res.data]); + details.checkdatalist = details.checkdatalist.concat([res.data]); + } + break; + case 4: + data = { + stockType: details.checkmakindex + 1, + code: details.scancode, + marketId: (_a = details.Marketlist[details.checkmarkindex]) == null ? void 0 : _a.marketId + }; + res = await warehouseUpdownTypedownEnterStock(data); + if (res.code == 200) { + details.datalist = []; + details.checkdatalist = []; + details.codelist = res.data; + } + break; + case 5: + data = { + zeroType: details.checkmakindex + 1, + code: details.scancode + }; + res = await warehouseUpdownTypedownEnterZeroOrder(data); + if (res.code == 200) { + details.codelist = res.data; + } + break; + } + } catch (err) { + formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:487", "err :>> ", err); + } finally { + details.scandataList.splice(details.scandataList.indexOf(_scancode), 1); + } + } + function moni() { + details.scancode = "22022803211-80"; + scandata(); } async function downs() { let res = null; @@ -27370,7 +27494,7 @@ This will fail in production if not fixed.`); res = await warehouseUpdownTypedownZeroOrder(data); break; } - formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:530", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/DownGoods/DownGoods.vue:565", "res :>> ", res); uni.hideLoading(); if (res.code == 200) { uni.showToast({ @@ -28227,6 +28351,7 @@ This will fail in production if not fixed.`); ]) ])) : vue.createCommentVNode("v-if", true) ])) : vue.createCommentVNode("v-if", true), + vue.createElementVNode("button", { onClick: moni }, "模拟"), vue.createVNode(_component_saomiao2), vue.createVNode( _component_tips, @@ -28255,7 +28380,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesDownGoodsDownGoods = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__file", "D:/worksp/logpm/pagesHome/pages/DownGoods/DownGoods.vue"]]); + const PagesHomePagesDownGoodsDownGoods = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__file", "D:/workSpace/logpm/pagesHome/pages/DownGoods/DownGoods.vue"]]); const _sfc_main$t = /* @__PURE__ */ vue.defineComponent({ __name: "SetPrice", setup(__props) { @@ -28284,7 +28409,7 @@ This will fail in production if not fixed.`); init(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); const tiplists = vue.ref(null); async function init() { @@ -28554,7 +28679,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSetPriceSetPrice = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__file", "D:/worksp/logpm/pagesHome/pages/SetPrice/SetPrice.vue"]]); + const PagesHomePagesSetPriceSetPrice = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__file", "D:/workSpace/logpm/pagesHome/pages/SetPrice/SetPrice.vue"]]); const _sfc_main$s = /* @__PURE__ */ vue.defineComponent({ __name: "RemoveTray", setup(__props) { @@ -28590,7 +28715,7 @@ This will fail in production if not fixed.`); details.trayCodes = ""; uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); async function scandata() { let submitData = { @@ -29030,7 +29155,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesRemoveTrayRemoveTray = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-8dd39525"], ["__file", "D:/worksp/logpm/pagesHome/pages/RemoveTray/RemoveTray.vue"]]); + const PagesHomePagesRemoveTrayRemoveTray = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-8dd39525"], ["__file", "D:/workSpace/logpm/pagesHome/pages/RemoveTray/RemoveTray.vue"]]); const _sfc_main$r = /* @__PURE__ */ vue.defineComponent({ __name: "Check", setup(__props) { @@ -29049,7 +29174,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesCheckCheck = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__file", "D:/worksp/logpm/pagesHome/pages/Check/Check.vue"]]); + const PagesHomePagesCheckCheck = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__file", "D:/workSpace/logpm/pagesHome/pages/Check/Check.vue"]]); const _sfc_main$q = /* @__PURE__ */ vue.defineComponent({ __name: "createAddServe", setup(__props) { @@ -29645,7 +29770,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesCreateAddServeCreateAddServe = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__scopeId", "data-v-fee6bcca"], ["__file", "D:/worksp/logpm/pagesHome/pages/createAddServe/createAddServe.vue"]]); + const PagesHomePagesCreateAddServeCreateAddServe = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__scopeId", "data-v-fee6bcca"], ["__file", "D:/workSpace/logpm/pagesHome/pages/createAddServe/createAddServe.vue"]]); const _sfc_main$p = {}; function _sfc_render$6(_ctx, _cache) { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); @@ -29659,7 +29784,7 @@ This will fail in production if not fixed.`); leftIconSize: "35" }); } - const PagesHomePagesOrderDetailOrderDetail = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$6], ["__file", "D:/worksp/logpm/pagesHome/pages/orderDetail/orderDetail.vue"]]); + const PagesHomePagesOrderDetailOrderDetail = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_render$6], ["__file", "D:/workSpace/logpm/pagesHome/pages/orderDetail/orderDetail.vue"]]); const _sfc_main$o = /* @__PURE__ */ vue.defineComponent({ __name: "RelocationAllocationId", setup(__props) { @@ -30219,7 +30344,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesRelocationAllocationIdRelocationAllocationId = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__file", "D:/worksp/logpm/pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue"]]); + const PagesHomePagesRelocationAllocationIdRelocationAllocationId = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__file", "D:/workSpace/logpm/pagesHome/pages/RelocationAllocationId/RelocationAllocationId.vue"]]); const _sfc_main$n = /* @__PURE__ */ vue.defineComponent({ __name: "orderDetails", setup(__props) { @@ -30486,7 +30611,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesOrderDetailsOrderDetails = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__file", "D:/worksp/logpm/pagesHome/pages/orderDetails/orderDetails.vue"]]); + const PagesHomePagesOrderDetailsOrderDetails = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__file", "D:/workSpace/logpm/pagesHome/pages/orderDetails/orderDetails.vue"]]); const props$2 = { props: { // checkbox的名称 @@ -30767,7 +30892,7 @@ This will fail in production if not fixed.`); /* CLASS, STYLE */ ); } - const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$5], ["__scopeId", "data-v-41713600"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-checkbox/u-checkbox.vue"]]); + const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["render", _sfc_render$5], ["__scopeId", "data-v-41713600"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-checkbox/u-checkbox.vue"]]); const props$1 = { props: { // 标识符 @@ -30919,7 +31044,7 @@ This will fail in production if not fixed.`); /* CLASS */ ); } - const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$4], ["__scopeId", "data-v-ff0492f0"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-checkbox-group/u-checkbox-group.vue"]]); + const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$4], ["__scopeId", "data-v-ff0492f0"], ["__file", "D:/workSpace/logpm/uni_modules/uview-plus/components/u-checkbox-group/u-checkbox-group.vue"]]); const _sfc_main$k = /* @__PURE__ */ vue.defineComponent({ __name: "orderInquiry", setup(__props) { @@ -30976,7 +31101,7 @@ This will fail in production if not fixed.`); packageList.value = []; uni.stopPullDownRefresh(); clearTimeout(timer2); - }, 1e3); + }, 500); }); function handleSearchFormType(type) { searchForm.type = type; @@ -31508,7 +31633,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesOrderInquiryOrderInquiry = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-e1375c52"], ["__file", "D:/worksp/logpm/pagesHome/pages/orderInquiry/orderInquiry.vue"]]); + const PagesHomePagesOrderInquiryOrderInquiry = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-e1375c52"], ["__file", "D:/workSpace/logpm/pagesHome/pages/orderInquiry/orderInquiry.vue"]]); const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({ __name: "CustomerTrayDetails", setup(__props) { @@ -31885,7 +32010,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesCustomerTrayDetailsCustomerTrayDetails = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__file", "D:/worksp/logpm/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue"]]); + const PagesHomePagesCustomerTrayDetailsCustomerTrayDetails = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__file", "D:/workSpace/logpm/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.vue"]]); const _sfc_main$i = /* @__PURE__ */ vue.defineComponent({ __name: "StockUpListZero", setup(__props) { @@ -32162,7 +32287,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesStockUpListZeroStockUpListZero = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__file", "D:/worksp/logpm/pagesHome/pages/StockUpListZero/StockUpListZero.vue"]]); + const PagesHomePagesStockUpListZeroStockUpListZero = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__file", "D:/workSpace/logpm/pagesHome/pages/StockUpListZero/StockUpListZero.vue"]]); const _sfc_main$h = {}; function _sfc_render$3(_ctx, _cache) { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); @@ -32185,7 +32310,7 @@ This will fail in production if not fixed.`); /* STABLE_FRAGMENT */ ); } - const PagesUserPagesAboutAbout = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$3], ["__file", "D:/worksp/logpm/pagesUser/pages/about/about.vue"]]); + const PagesUserPagesAboutAbout = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$3], ["__file", "D:/workSpace/logpm/pagesUser/pages/about/about.vue"]]); const usePdaStore = defineStore("usePdaStore", () => { const pdaBroadcastList = vue.reactive({ "newPdaVersion": { @@ -32222,12 +32347,12 @@ This will fail in production if not fixed.`); const _sfc_main$g = /* @__PURE__ */ vue.defineComponent({ __name: "systemSettings", setup(__props) { - const { HANDLE_PDABROADCAS } = usePdaStore(); + usePdaStore(); onPullDownRefresh(() => { const timer = setTimeout(() => { uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); const details = vue.reactive({ pda: { @@ -32242,12 +32367,7 @@ This will fail in production if not fixed.`); }); vue.reactive(["中国", "美国", "巴西", "日本"]); vue.ref(0); - function bindPickerChange(e) { - formatAppLog("log", "at pagesUser/pages/systemSettings/systemSettings.vue:54", "picker发送选择改变，携带值为", e.detail.value); - pda.value.pdaChooseIndex = e.detail.value; - HANDLE_PDABROADCAS(details.pda.padVersionList[details.pda.pdaChooseIndex].value); - } - const { pda } = vue.toRefs(details); + vue.toRefs(details); return (_ctx, _cache) => { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); return vue.openBlock(), vue.createElementBlock( @@ -32264,27 +32384,7 @@ This will fail in production if not fixed.`); leftIconSize: "35" }), vue.createElementVNode("view", { class: "uni-list" }, [ - vue.createElementVNode("view", { - class: "uni-list-cell", - style: { "display": "flex" } - }, [ - vue.createElementVNode("view", { class: "uni-list-cell-left" }, " 扫描版本选择 "), - vue.createElementVNode("view", { class: "uni-list-cell-db" }, [ - vue.createElementVNode("picker", { - onChange: bindPickerChange, - value: vue.unref(pda).pdaChooseIndex, - range: vue.unref(pda).padVersionList.map((val) => val.title) - }, [ - vue.createElementVNode( - "view", - { class: "uni-input" }, - vue.toDisplayString(vue.unref(pda).padVersionList.map((val) => val.title)[vue.unref(pda).pdaChooseIndex]), - 1 - /* TEXT */ - ) - ], 40, ["value", "range"]) - ]) - ]) + vue.createCommentVNode(' \r\n \r\n 扫描版本选择\r\n \r\n \r\n \r\n {{pda.padVersionList.map(val => val.title)[pda.pdaChooseIndex]}}\r\n \r\n \r\n ') ]) ], 64 @@ -32293,7 +32393,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesUserPagesSystemSettingsSystemSettings = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__file", "D:/worksp/logpm/pagesUser/pages/systemSettings/systemSettings.vue"]]); + const PagesUserPagesSystemSettingsSystemSettings = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__file", "D:/workSpace/logpm/pagesUser/pages/systemSettings/systemSettings.vue"]]); const _sfc_main$f = /* @__PURE__ */ vue.defineComponent({ __name: "dynamicCheck", setup(__props) { @@ -32340,7 +32440,7 @@ This will fail in production if not fixed.`); const timer = setTimeout(() => { uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); const goCheckList = (pageType, item) => { const { startTime, endTime } = item; @@ -32499,7 +32599,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesTaskPagesDynamicCheckDynamicCheck = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__file", "D:/worksp/logpm/pagesTask/pages/dynamicCheck/dynamicCheck.vue"]]); + const PagesTaskPagesDynamicCheckDynamicCheck = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__file", "D:/workSpace/logpm/pagesTask/pages/dynamicCheck/dynamicCheck.vue"]]); const _sfc_main$e = /* @__PURE__ */ vue.defineComponent({ __name: "checkTaskList", setup(__props) { @@ -32619,7 +32719,7 @@ This will fail in production if not fixed.`); await initPage(); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); async function initPage() { try { @@ -32747,17 +32847,18 @@ This will fail in production if not fixed.`); formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:436", "res >>>>>>>>", res); if (res.code !== 403) { uni.navigateTo({ - url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.searchText.taryText}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}` + url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}` }); } }); }; const goStorageDetails = (val) => { + formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:447", "val :>> ", val); getWarehouseTaskAllocationDetailByStrip({ questId: details.id, allocationId: val.allocationId }).then((res) => { - formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:451", res); + formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:452", res); if (res.code != 403) { uni.navigateTo({ url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${val.allocationId}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}` @@ -32805,7 +32906,7 @@ This will fail in production if not fixed.`); type: "2", incomingBatch: details.scancode }).then((res) => { - formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:506", res, "res==="); + formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:507", res, "res==="); utils.ttsspke(res.audio); if (res.code != 3001) { details.renderList = res.data; @@ -32813,7 +32914,7 @@ This will fail in production if not fixed.`); }); }; const handleInputChange = () => { - formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:518", details.searchText.taryText); + formatAppLog("log", "at pagesTask/pages/checkTaskList/checkTaskList.vue:519", details.searchText.taryText); if (!details.scancode) { pgetContractList({ taskId: infodata.value.id, @@ -33178,7 +33279,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesTaskPagesCheckTaskListCheckTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-ab53b22c"], ["__file", "D:/worksp/logpm/pagesTask/pages/checkTaskList/checkTaskList.vue"]]); + const PagesTaskPagesCheckTaskListCheckTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["__scopeId", "data-v-ab53b22c"], ["__file", "D:/workSpace/logpm/pagesTask/pages/checkTaskList/checkTaskList.vue"]]); const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({ __name: "dynamicCheckDetails", setup(__props) { @@ -33395,7 +33496,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesTaskPagesDynamicCheckDetailsDynamicCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-5a4729ce"], ["__file", "D:/worksp/logpm/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue"]]); + const PagesTaskPagesDynamicCheckDetailsDynamicCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-5a4729ce"], ["__file", "D:/workSpace/logpm/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue"]]); const _sfc_main$c = /* @__PURE__ */ vue.defineComponent({ __name: "storageLocationCheckDetails", setup(__props) { @@ -33405,13 +33506,20 @@ This will fail in production if not fixed.`); isEnd: false, haveData: true, async pullDownRefreshInitPage() { - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:257", "下拉刷新"); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:262", "下拉刷新"); + details.showControl = false; + details.renderList = []; article.articleList = []; + zero.zeroCheckList = []; + stock.stockCheckList = []; return await initPage(); }, async reachBottomInitPage() { - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:263", "触底加载"); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:276", "触底加载"); return true; + }, + // 开启刷新 + startPullDownRefresh: () => { } }); const details = vue.reactive({ @@ -33514,10 +33622,11 @@ This will fail in production if not fixed.`); stockCheckList } = vue.toRefs(stock); const tiplists = vue.ref(null); + const basicContainer = vue.ref(null); onLoad((info) => { details.allocationId = info.allocationId; details.questId = info.questId; - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:385", "info :>> ", info.marketName); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:402", "info :>> ", info.marketName); details.marketName = JSON.parse(info.marketName); }); onShow(() => { @@ -33556,7 +33665,7 @@ This will fail in production if not fixed.`); }; try { const res = await getWarehouseTaskAllocationDetailByStrip(submitData); - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:473", "res :>>1 ", res); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:489", "res :>>1 ", res); const { code: code2, data } = res; if (code2 === 200) { article.total = data.allNum; @@ -33567,7 +33676,7 @@ This will fail in production if not fixed.`); article.articleCheckList = data.list.map(() => false); } } catch (err) { - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:485", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:501", "err :>> ", err); } } async function initZero() { @@ -33580,7 +33689,7 @@ This will fail in production if not fixed.`); }; try { const res = await getallocationDetailByZeroWaList(submitData); - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:505", "res :>>0蛋 ", res); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:521", "res :>>0蛋 ", res); const { code: code2, data } = res; if (code2 === 200) { zero.total = data.allNum; @@ -33591,7 +33700,7 @@ This will fail in production if not fixed.`); zero.zeroCheckList = data.list.map(() => false); } } catch (err) { - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:516", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:532", "err :>> ", err); } } async function initStock() { @@ -33604,7 +33713,7 @@ This will fail in production if not fixed.`); }; try { const res = await getallocationDetailByStockList(submitData); - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:535", "res :>>库存 ", res); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:551", "res :>>库存 ", res); const { code: code2, data } = res; if (code2 === 200) { stock.total = data.allNum; @@ -33615,7 +33724,7 @@ This will fail in production if not fixed.`); stock.stockCheckList = data.list.map(() => false); } } catch (err) { - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:546", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:562", "err :>> ", err); } } async function scandata() { @@ -33623,7 +33732,7 @@ This will fail in production if not fixed.`); return; details.scancode; const flag2 = article.articleList.find((val) => val.ordePackageCode === details.scancode); - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:556", "flag :>> ", flag2); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:572", "flag :>> ", flag2); if (flag2) { const questDetailList = [{ id: flag2.id, @@ -33642,9 +33751,9 @@ This will fail in production if not fixed.`); }]; const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.questId }); const { code: code2, msg } = res; - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:576", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:592", "res :>> ", res); if (code2 === 200) { - initPage(); + basicContainer.value.startPullDownRefresh(); utils.ttsspke(msg); } } else { @@ -33654,6 +33763,7 @@ This will fail in production if not fixed.`); function handleTabBarCode(code2) { showControl.value = false; tabBarCode.value = code2; + initPage(); } function submitSearch() { uni.showToast({ @@ -33876,7 +33986,7 @@ This will fail in production if not fixed.`); } function grounding() { const marketName = Array.from(details.marketName); - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:840", "marketName :>> ", marketName); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:858", "marketName :>> ", marketName); const goodsType = ["定制品", "零担", "库存品"]; tiplists.value.setdetails({ title: "新增", @@ -33910,7 +34020,7 @@ This will fail in production if not fixed.`); if (tabBarCode.value === 3) submitData = stockAdd(deta); const res = await getWarehouseSaveNewQuestDetail(submitData); - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:874", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:892", "res :>> ", res); const { code: code2 } = res; if (code2 === 200) { initPage(); @@ -33957,9 +34067,9 @@ This will fail in production if not fixed.`); function zeroAdd(deta) { } function stockAdd(deta) { - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:926", "deta :>> ", deta); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:944", "deta :>> ", deta); const { upform: { stock: { orderCode, stockNum, marketName, incomingBatch } } } = deta; - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:937", "data :>> ", deta); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:946", "data :>> ", deta); const submitData = { questDetail: { orderCode, @@ -34081,7 +34191,7 @@ This will fail in production if not fixed.`); } utils.ttsspke(res.msg); } catch (err) { - formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:1075", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue:1084", "err :>> ", err); } finally { details.showUpData = false; details.isBatch = false; @@ -34106,7 +34216,11 @@ This will fail in production if not fixed.`); vue.Fragment, null, [ - vue.createVNode(_component_BasicContainer, { option }, { + vue.createVNode(_component_BasicContainer, { + ref_key: "basicContainer", + ref: basicContainer, + option + }, { head: vue.withCtx(() => [ vue.createCommentVNode(" 主体内容 "), vue.createElementVNode("view", { class: "main" }, [ @@ -34186,18 +34300,9 @@ This will fail in production if not fixed.`); class: vue.normalizeClass({ "tabBar-item": true, "active": vue.unref(tabBarCode) === 1 }), onClick: _cache[1] || (_cache[1] = ($event) => handleTabBarCode(1)) }, - [ - vue.createTextVNode(" 定制品 "), - vue.unref(tabBarCode) == 1 ? (vue.openBlock(), vue.createElementBlock( - "text", - { key: 0 }, - "（" + vue.toDisplayString(article.total) + "）", - 1 - /* TEXT */ - )) : vue.createCommentVNode("v-if", true) - ], - 2 - /* CLASS */ + " 定制品（" + vue.toDisplayString(article.total) + "） ", + 3 + /* TEXT, CLASS */ ), vue.createElementVNode( "view", @@ -34205,18 +34310,9 @@ This will fail in production if not fixed.`); class: vue.normalizeClass({ "tabBar-item": true, "active": vue.unref(tabBarCode) === 2 }), onClick: _cache[2] || (_cache[2] = ($event) => handleTabBarCode(2)) }, - [ - vue.createTextVNode(" 零担"), - vue.unref(tabBarCode) == 2 ? (vue.openBlock(), vue.createElementBlock( - "text", - { key: 0 }, - " （" + vue.toDisplayString(zero.total) + "）", - 1 - /* TEXT */ - )) : vue.createCommentVNode("v-if", true) - ], - 2 - /* CLASS */ + " 零担（" + vue.toDisplayString(zero.total) + "） ", + 3 + /* TEXT, CLASS */ ), vue.createElementVNode( "view", @@ -34224,18 +34320,9 @@ This will fail in production if not fixed.`); class: vue.normalizeClass({ "tabBar-item": true, "active": vue.unref(tabBarCode) === 3 }), onClick: _cache[3] || (_cache[3] = ($event) => handleTabBarCode(3)) }, - [ - vue.createTextVNode(" 库存品"), - vue.unref(tabBarCode) == 3 ? (vue.openBlock(), vue.createElementBlock( - "text", - { key: 0 }, - " （" + vue.toDisplayString(stock.total) + "）", - 1 - /* TEXT */ - )) : vue.createCommentVNode("v-if", true) - ], - 2 - /* CLASS */ + " 库存品（" + vue.toDisplayString(stock.total) + "） ", + 3 + /* TEXT, CLASS */ ) ]), vue.createCommentVNode(" 控件 "), @@ -34252,21 +34339,34 @@ This will fail in production if not fixed.`); ), [ [vue.vShow, !vue.unref(showControl)] ]), - vue.withDirectives(vue.createElementVNode( + vue.unref(tabBarCode) === 2 ? vue.withDirectives((vue.openBlock(), vue.createElementBlock( "view", { + key: 0, + class: "button", + onClick: grounding + }, + "添加订单", + 512 + /* NEED_PATCH */ + )), [ + [vue.vShow, !vue.unref(showControl)] + ]) : vue.unref(tabBarCode) === 3 ? vue.withDirectives((vue.openBlock(), vue.createElementBlock( + "view", + { + key: 1, class: "button", onClick: grounding }, "添加物料", 512 /* NEED_PATCH */ - ), [ + )), [ [vue.vShow, !vue.unref(showControl)] - ]), + ]) : vue.createCommentVNode("v-if", true), vue.unref(showControl) ? (vue.openBlock(), vue.createElementBlock( vue.Fragment, - { key: 0 }, + { key: 2 }, [ vue.createElementVNode("view", { class: "button", @@ -34625,7 +34725,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesTaskPagesStorageLocationCheckDetailsStorageLocationCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-683b534e"], ["__file", "D:/worksp/logpm/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue"]]); + const PagesTaskPagesStorageLocationCheckDetailsStorageLocationCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__scopeId", "data-v-683b534e"], ["__file", "D:/workSpace/logpm/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue"]]); const _sfc_main$b = /* @__PURE__ */ vue.defineComponent({ __name: "trayCheckDetails", setup(__props) { @@ -34689,24 +34789,25 @@ This will fail in production if not fixed.`); renderList } = vue.toRefs(details); const tiplists = vue.ref(null); + const basicContainer = vue.ref(null); onLoad((data) => { details.pageInfo = JSON.parse(data.info); info.trayCode = details.pageInfo.trayCode; info.goodsType = details.pageInfo.type; details.holdBackFirstPost = details.pageInfo.holdBackFirstPost; - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:307", "pageInfo :>> ", details.pageInfo); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:309", "pageInfo :>> ", details.pageInfo); }); onShow(() => { uni.$on("scancodedate", function(code2) { if (code2) { - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:316", "code :>> ", code2); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:318", "code :>> ", code2); details.scancode = code2; scandata(); } }); if (details.holdBackFirstPost) return; - initPage(); + basicContainer.value.startPullDownRefresh(); }); onHide(() => { uni.$off("scancodedate"); @@ -34720,7 +34821,7 @@ This will fail in production if not fixed.`); trayId: details.pageInfo.trayId }; const res = await getWarehousetrayListInfo(submitForm); - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:372", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:374", "res :>> ", res); const { code: code2, data } = res; if (code2 === 200) { const dataInfo = res.data; @@ -34730,7 +34831,7 @@ This will fail in production if not fixed.`); details.checkList = dataInfo.list.map(() => false); } } catch (err) { - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:382", "err :>> ", err); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:384", "err :>> ", err); } finally { return true; } @@ -34740,7 +34841,7 @@ This will fail in production if not fixed.`); return; details.scancode; const flag2 = details.renderList.find((val) => val.ordePackageCode === details.scancode); - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:394", "flag :>> ", flag2); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:396", "flag :>> ", flag2); if (flag2) { const questDetailList = [{ id: flag2.id, @@ -34759,14 +34860,14 @@ This will fail in production if not fixed.`); }]; const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId }); const { code: code2, msg } = res; - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:414", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:416", "res :>> ", res); if (code2 === 200) { initPage(); utils.ttsspke(msg); } } else { const res = await postWarehouseTaskSelectPackageInfo({ orderPackageCode: details.scancode, questId: details.pageInfo.taskId }); - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:421", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:423", "res :>> ", res); } } function submitSearch() { @@ -34784,7 +34885,7 @@ This will fail in production if not fixed.`); icon: "none" }); const arr = details.renderList.filter((v) => v.questStatus !== 3); - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:451", "arr :>> ", arr); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:453", "arr :>> ", arr); const questDetailList = arr.map((val) => { return { id: val.id }; }); @@ -34801,7 +34902,7 @@ This will fail in production if not fixed.`); details.checkList = details.checkList.map((val) => !val); } function handleBatchDel() { - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:479", "details :>> ", details.checkList); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:482", "details :>> ", details.checkList); if (!details.checkList.some((val) => val)) { return uni.showToast({ icon: "none", @@ -34821,10 +34922,10 @@ This will fail in production if not fixed.`); confirmTxt: "确认删除", isonecheck: true, success: (deta) => { - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:498", "111 :>> ", 111); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:501", "111 :>> ", 111); try { getWarehouseDeleteQuestDetail({ questDetailList, questId: details.pageInfo.taskId }).then((res) => { - initPage(); + basicContainer.value.startPullDownRefresh(); }); } catch (e) { } finally { @@ -34876,7 +34977,7 @@ This will fail in production if not fixed.`); success: (deta) => { try { getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId }).then((res) => { - initPage(); + basicContainer.value.startPullDownRefresh(); }); } catch (e) { } finally { @@ -34968,7 +35069,7 @@ This will fail in production if not fixed.`); const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId }); const { code: code2 } = res; if (code2 === 200) - initPage(); + basicContainer.value.startPullDownRefresh(); tiplists.value.setdetails({ isshow: false }); }, cancel: () => { @@ -34984,7 +35085,7 @@ This will fail in production if not fixed.`); } function grounding() { const marketName = Array.from(details.pageInfo.marketName); - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:682", "marketName :>> ", marketName); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:680", "marketName :>> ", marketName); tiplists.value.setdetails({ title: "新增", isshow: true, @@ -35017,10 +35118,10 @@ This will fail in production if not fixed.`); if (info.goodsType === "库存品") submitData = stockAdd(deta); const res = await getWarehouseSaveNewQuestDetail(submitData); - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:715", "res :>> ", res); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:713", "res :>> ", res); const { code: code2 } = res; if (code2 === 200) { - initPage(); + basicContainer.value.startPullDownRefresh(); uni.showToast({ title: "操作成功", icon: "success" @@ -35064,9 +35165,9 @@ This will fail in production if not fixed.`); function zeroAdd(deta) { } function stockAdd(deta) { - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:768", "deta :>> ", deta); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:766", "deta :>> ", deta); const { upform: { stock: { orderCode, stockNum, marketName, incomingBatch } } } = deta; - formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:779", "data :>> ", deta); + formatAppLog("log", "at pagesTask/pages/trayCheckDetails/trayCheckDetails.vue:768", "data :>> ", deta); const submitData = { questDetail: { orderCode, @@ -35089,7 +35190,11 @@ This will fail in production if not fixed.`); vue.Fragment, null, [ - vue.createVNode(_component_BasicContainer, { option }, { + vue.createVNode(_component_BasicContainer, { + ref_key: "basicContainer", + ref: basicContainer, + option + }, { head: vue.withCtx(() => [ vue.createCommentVNode(" 主体内容 "), vue.createElementVNode("view", { class: "main" }, [ @@ -35526,7 +35631,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesTaskPagesTrayCheckDetailsTrayCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__scopeId", "data-v-99e79307"], ["__file", "D:/worksp/logpm/pagesTask/pages/trayCheckDetails/trayCheckDetails.vue"]]); + const PagesTaskPagesTrayCheckDetailsTrayCheckDetails = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__scopeId", "data-v-99e79307"], ["__file", "D:/workSpace/logpm/pagesTask/pages/trayCheckDetails/trayCheckDetails.vue"]]); const _sfc_main$a = /* @__PURE__ */ vue.defineComponent({ __name: "contracts", setup(__props) { @@ -36690,7 +36795,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesTaskPagesContractsContracts = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-4e527f5b"], ["__file", "D:/worksp/logpm/pagesTask/pages/contracts/contracts.vue"]]); + const PagesTaskPagesContractsContracts = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-4e527f5b"], ["__file", "D:/workSpace/logpm/pagesTask/pages/contracts/contracts.vue"]]); __definePage("pages/index/index", PagesIndexIndex); __definePage("pages/login/login", PagesLoginLogin); __definePage("pages/user/user", PagesUserUser); @@ -36773,7 +36878,7 @@ This will fail in production if not fixed.`); return {}; } }; - const App = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__file", "D:/worksp/logpm/App.vue"]]); + const App = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__file", "D:/workSpace/logpm/App.vue"]]); const mixin = { // 定义每个组件都可能需要用到的外部样式以及类名 props: { @@ -40101,7 +40206,7 @@ This will fail in production if not fixed.`); function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock("view", { class: "content" }); } - const saomiao = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$2], ["__file", "D:/worksp/logpm/compoment/saomiao.vue"]]); + const saomiao = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$2], ["__file", "D:/workSpace/logpm/compoment/saomiao.vue"]]); const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({ __name: "tips", emits: ["cancel", "confirm"], @@ -40199,7 +40304,7 @@ This will fail in production if not fixed.`); }; } }); - const tips = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-27fa88b6"], ["__file", "D:/worksp/logpm/compoment/tips/tips.vue"]]); + const tips = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-27fa88b6"], ["__file", "D:/workSpace/logpm/compoment/tips/tips.vue"]]); const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({ __name: "tiplist", setup(__props, { expose }) { @@ -40417,7 +40522,7 @@ This will fail in production if not fixed.`); if (code2 === 200) details.materialName = res.data; clearTimeout(_atn); - }, 1e3); + }, 500); } function checkSec(val) { details.upform.stock.materialName = val.materialName; @@ -40701,7 +40806,7 @@ This will fail in production if not fixed.`); "input", { "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => vue.unref(details).upform.article.contractNumber = $event), - placeholder: "请输入合同号" + placeholder: "请输入订单号" }, null, 512 @@ -40790,47 +40895,53 @@ This will fail in production if not fixed.`); )) : vue.createCommentVNode("v-if", true) ]) ]), - vue.createElementVNode("view", { - class: "inputbx", - onClick: handleshowMarket - }, [ - vue.withDirectives(vue.createElementVNode( - "input", - { - "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => vue.unref(details).upform.stock.marketName = $event), - placeholder: "请选择商城", - disabled: "true" - }, - null, - 512 - /* NEED_PATCH */ - ), [ - [vue.vModelText, vue.unref(details).upform.stock.marketName] - ]), - vue.unref(details).showMarketList ? (vue.openBlock(), vue.createElementBlock( - "view", - { - key: 0, - class: vue.normalizeClass({ "select_content": true, "show": vue.unref(details).showMarketList }) - }, - [ - (vue.openBlock(true), vue.createElementBlock( - vue.Fragment, - null, - vue.renderList(vue.unref(details).marketName, (val) => { - return vue.openBlock(), vue.createElementBlock("view", { - key: val, - onClick: ($event) => vue.unref(details).upform.stock.marketName = val - }, vue.toDisplayString(val), 9, ["onClick"]); - }), - 128 - /* KEYED_FRAGMENT */ - )) - ], - 2 - /* CLASS */ - )) : vue.createCommentVNode("v-if", true) - ]), + vue.createElementVNode( + "view", + { + class: "inputbx", + onTouchstart: handleshowMarket + }, + [ + vue.withDirectives(vue.createElementVNode( + "input", + { + "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => vue.unref(details).upform.stock.marketName = $event), + placeholder: "请选择商城", + disabled: "true" + }, + null, + 512 + /* NEED_PATCH */ + ), [ + [vue.vModelText, vue.unref(details).upform.stock.marketName] + ]), + vue.unref(details).showMarketList ? (vue.openBlock(), vue.createElementBlock( + "view", + { + key: 0, + class: vue.normalizeClass({ "select_content": true, "show": vue.unref(details).showMarketList }) + }, + [ + (vue.openBlock(true), vue.createElementBlock( + vue.Fragment, + null, + vue.renderList(vue.unref(details).marketName, (val) => { + return vue.openBlock(), vue.createElementBlock("view", { + key: val, + onClick: ($event) => vue.unref(details).upform.stock.marketName = val + }, vue.toDisplayString(val), 9, ["onClick"]); + }), + 128 + /* KEYED_FRAGMENT */ + )) + ], + 2 + /* CLASS */ + )) : vue.createCommentVNode("v-if", true) + ], + 32 + /* HYDRATE_EVENTS */ + ), vue.createElementVNode("view", { class: "inputbx" }, [ vue.withDirectives(vue.createElementVNode( "input", @@ -40965,7 +41076,7 @@ This will fail in production if not fixed.`); }; } }); - const tiplist = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-a3a2f036"], ["__file", "D:/worksp/logpm/compoment/tiplist/tiplist.vue"]]); + const tiplist = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-a3a2f036"], ["__file", "D:/workSpace/logpm/compoment/tiplist/tiplist.vue"]]); const _sfc_main$5 = /* @__PURE__ */ vue.defineComponent({ __name: "InputNum", props: { @@ -41023,7 +41134,7 @@ This will fail in production if not fixed.`); }; } }); - const InputNum = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-92b65ffd"], ["__file", "D:/worksp/logpm/compoment/InputNum/InputNum.vue"]]); + const InputNum = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-92b65ffd"], ["__file", "D:/workSpace/logpm/compoment/InputNum/InputNum.vue"]]); const _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({ __name: "BasicContainer", props: { @@ -41035,7 +41146,7 @@ This will fail in production if not fixed.`); type: String } }, - setup(__props) { + setup(__props, { expose }) { const props2 = __props; let { title, isEnd, haveData } = vue.toRefs(props2.option); if (!title) @@ -41071,7 +41182,7 @@ This will fail in production if not fixed.`); await reachBottomInitPage(); uni.hideLoading(); antiShake = null; - }, 1e3); + }, 500); }); onPullDownRefresh(() => { const timer = setTimeout(async () => { @@ -41079,8 +41190,13 @@ This will fail in production if not fixed.`); formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:103", "111 :>> ", 111); uni.stopPullDownRefresh(); clearTimeout(timer); - }, 1e3); + }, 500); }); + function startPullDownRefresh() { + formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:112", "触发下拉"); + uni.startPullDownRefresh(); + } + expose({ startPullDownRefresh }); return (_ctx, _cache) => { const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0); return vue.openBlock(), vue.createElementBlock( @@ -41122,7 +41238,7 @@ This will fail in production if not fixed.`); }; } }); - const BasicContainer = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-e1062c8b"], ["__file", "D:/worksp/logpm/compoment/BasicContainer/BasicContainer.vue"]]); + const BasicContainer = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-e1062c8b"], ["__file", "D:/workSpace/logpm/compoment/BasicContainer/BasicContainer.vue"]]); const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({ __name: "saomiao1", props: { @@ -41183,7 +41299,7 @@ This will fail in production if not fixed.`); }; } }); - const saomiao1 = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "D:/worksp/logpm/compoment/saomiao1.vue"]]); + const saomiao1 = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "D:/workSpace/logpm/compoment/saomiao1.vue"]]); const _sfc_main$2 = /* @__PURE__ */ vue.defineComponent({ __name: "saomiao2", props: { @@ -41241,8 +41357,8 @@ This will fail in production if not fixed.`); details.intentFilter.addAction(pdaBroadcastList[brand].broadcastAction); details.receiver = plus.android.implements("io.dcloud.feature.internal.reflect.BroadcastReceiver", { onReceive: function(context, intent) { - formatAppLog("log", "at compoment/saomiao2.vue:81", "111 :>> ", 111); - formatAppLog("log", "at compoment/saomiao2.vue:82", "intent", intent); + formatAppLog("log", "at compoment/saomiao2.vue:80", "111 :>> ", 111); + formatAppLog("log", "at compoment/saomiao2.vue:81", "intent", intent); plus.android.importClass(intent); let content = intent.getStringExtra(pdaBroadcastList[brand].broadcastTag); uni.$emit("scancodedate", content.replace(/\n/g, "")); @@ -41265,7 +41381,7 @@ This will fail in production if not fixed.`); }; } }); - const saomiao2 = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/worksp/logpm/compoment/saomiao2.vue"]]); + const saomiao2 = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/workSpace/logpm/compoment/saomiao2.vue"]]); const _sfc_main$1 = { setup() { let details = vue.reactive({ @@ -41377,7 +41493,7 @@ This will fail in production if not fixed.`); function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock("view", { class: "content" }); } - const saomiao3 = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__file", "D:/worksp/logpm/compoment/saomiao3.vue"]]); + const saomiao3 = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__file", "D:/workSpace/logpm/compoment/saomiao3.vue"]]); const _sfc_main = { setup() { let details = vue.reactive({ @@ -41441,7 +41557,7 @@ This will fail in production if not fixed.`); function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock("view", { class: "content" }); } - const saomiao4 = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/worksp/logpm/compoment/saomiao4.vue"]]); + const saomiao4 = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/workSpace/logpm/compoment/saomiao4.vue"]]); function createApp() { const app = vue.createVueApp(App); app.config.warnHandler = () => null; diff --git a/unpackage/dist/dev/app-plus/app.css b/unpackage/dist/dev/app-plus/app.css index ba4e0bb..80ecce0 100644 --- a/unpackage/dist/dev/app-plus/app.css +++ b/unpackage/dist/dev/app-plus/app.css @@ -820,8 +820,11 @@ body { .modtips .inputbx .select_content[data-v-a3a2f036] { position: absolute; z-index: 99; - top: 110%; + top: 120%; + left: 50%; + transform: translateX(-50%); background: #fff; + border: 0.03125rem solid #eee; width: 100%; overflow: hidden; } @@ -830,6 +833,9 @@ body { padding: 0.625rem 0; border-bottom: 0.03125rem solid #000; } +.modtips .inputbx .select_content uni-view[data-v-a3a2f036]:last-child { + border-bottom: 0; +} .modtips .listcheck[data-v-a3a2f036] { display: flex; flex-direction: column; diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css b/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css index 9c5dced..24130b9 100644 --- a/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css +++ b/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css @@ -272,6 +272,14 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat font-weight: 400; color: #90A0AF; } +.mabxtop .printBtn { + background: #d3832a; + color: #fff !important; + width: 3.125rem; + padding: 0.3125rem; + text-align: center; + border-radius: 0.15625rem; +} .bgimg { position: fixed; left: 0; @@ -376,7 +384,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat box-sizing: border-box; } .scvmabx .maxboxs > .items .numbxvie .zhon { - color: #D3832A; + color: #d3832a; } .scvmabx .maxboxs > .items .numbxvie .yish { color: #1197EB; @@ -496,19 +504,23 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat width: 100%; } .buts[data-v-ca2cce65] { + position: fixed; + bottom: 0.625rem; + left: 50%; + transform: translateX(-50%); width: 10rem; height: 2.75rem; - background: #D3832A; border-radius: 0.25rem 0.25rem 0.25rem 0.25rem; opacity: 1; display: flex; align-items: center; justify-content: center; font-size: 1rem; - font-weight: 400; - color: #FFFFFF; + font-weight: bold; + color: #d3832a; margin: auto; margin-top: 0.625rem; + border: 0.03125rem solid #d3832a; } .tanchuangbg[data-v-ca2cce65] { width: 100%; diff --git a/utils/watermark.js b/utils/watermark.js index 1907324..b35aeb3 100644 --- a/utils/watermark.js +++ b/utils/watermark.js @@ -9,16 +9,15 @@ watermark.set = (path) => { let div = document.createElement('div'); div.id = id; div.style.pointerEvents = 'none'; - div.style.top = '44px'; - div.style.left = '0px'; - div.style.bottom = '50px'; - div.style.right = '0px'; + div.style.top = '50%'; + div.style.left = '50%'; + div.style.fontSize = '50px'; div.style.position = 'fixed'; div.style.zIndex = '100000'; div.style.zoom = '0.6'; //设置缩放 div.style.opacity = '0.5'; //设置透明度 div.style.background = 'url(' + path + ') left top repeat'; - div.innerText = '测试' + div.innerText = '货物优测试' document.body.appendChild(div); return id; // #endif