Browse Source

修复自提部分bug

dev
qb 1 year ago
parent
commit
29127d327f
  1. 4
      config/host.js
  2. 4
      pages/user/user.vue
  3. 2
      pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
  4. 80
      unpackage/dist/dev/app-plus/app-service.js

4
config/host.js

@ -8,11 +8,11 @@
// lmy
// const devhost = 'http://192.168.10.123:8889/'
// zhy
// const devhost = 'http://192.168.3.12:13000/'
const devhost = 'http://192.168.3.12:13000/'
// xiaohei
// const devhost = 'http://192.168.3.18:13000/'
// tjj
const devhost = 'http://192.168.3.14:13000/'
// const devhost = 'http://192.168.3.14:13000/'
// cyz
// const devhost = 'http://192.168.6.169:9777/'
// const devhost = 'http://192.168.6.141:8777/'

4
pages/user/user.vue

@ -71,6 +71,9 @@
onPullDownRefresh
} from '@dcloudio/uni-app'
import utils from '@/utils/utils.js'
import useStorageStore from '@/store/useStorageStore';
const storageStore = useStorageStore()
const { HANDLE_GETSTORAGEINFO } = storageStore
let users = ref<any>(null)
const tiplists = ref(null)
const tip = ref(null)
@ -137,6 +140,7 @@
let resdata = await preserveCurrentWarehouse(details.checkitems)
uni.setStorageSync('checkname', details.checkitems)
HANDLE_GETSTORAGEINFO()
details.showck = false
uni.showToast({
title: '切换成功',

2
pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue

@ -372,8 +372,8 @@
//
if (details.isscan && details.signedNum) {
utils.ttsspke(details.signedNum + '件')
details.isscan = false
}
uni.hideLoading()
}
}

80
unpackage/dist/dev/app-plus/app-service.js vendored

@ -1769,7 +1769,7 @@ if (uni.restoreGlobal) {
};
};
const Base64$1 = new Base64();
const devhost = "http://192.168.3.14:13000/";
const devhost = "http://192.168.3.12:13000/";
const imghost = "";
const host = devhost;
const APPKEY = "h5u:h5u_secret";
@ -9169,6 +9169,8 @@ This will fail in production if not fixed.`);
const _sfc_main$2h = /* @__PURE__ */ vue.defineComponent({
__name: "user",
setup(__props) {
const storageStore = useStorageStore();
const { HANDLE_GETSTORAGEINFO } = storageStore;
let users = vue.ref(null);
const tiplists = vue.ref(null);
const tip = vue.ref(null);
@ -9222,6 +9224,7 @@ This will fail in production if not fixed.`);
}
await preserveCurrentWarehouse(details.checkitems);
uni.setStorageSync("checkname", details.checkitems);
HANDLE_GETSTORAGEINFO();
details.showck = false;
uni.showToast({
title: "切换成功",
@ -9236,7 +9239,7 @@ This will fail in production if not fixed.`);
}
async function showwhselist() {
let res = await getMyWarehouseList({});
formatAppLog("log", "at pages/user/user.vue:154", res.data);
formatAppLog("log", "at pages/user/user.vue:158", res.data);
details.warehouseList = res.data;
details.showck = true;
}
@ -9270,24 +9273,24 @@ This will fail in production if not fixed.`);
uni.reLaunch({
url: "/pages/login/login"
});
formatAppLog("log", "at pages/user/user.vue:196", res.currentSize);
formatAppLog("log", "at pages/user/user.vue:197", String(res.limitSize));
formatAppLog("log", "at pages/user/user.vue:200", res.currentSize);
formatAppLog("log", "at pages/user/user.vue:201", String(res.limitSize));
}
async function updateApp() {
let version2 = await utils.getversion();
formatAppLog("log", "at pages/user/user.vue:206", "version 版本>>>>", version2);
formatAppLog("log", "at pages/user/user.vue:210", "version 版本>>>>", version2);
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/user/user.vue:212", "data>>>>", data);
formatAppLog("log", "at pages/user/user.vue:216", "data>>>>", data);
let response = await AppPdaversiondetail(data);
formatAppLog("log", "at pages/user/user.vue:214", "123 :>> ", 123);
formatAppLog("log", "at pages/user/user.vue:215", "response :>> ", response);
formatAppLog("log", "at pages/user/user.vue:218", "123 :>> ", 123);
formatAppLog("log", "at pages/user/user.vue:219", "response :>> ", response);
if (response.code == 200 && response.data && Object.keys(response.data).length !== 0) {
formatAppLog("log", "at pages/user/user.vue:217", "res.data", response.data);
formatAppLog("log", "at pages/user/user.vue:218", "有可更新包");
formatAppLog("log", "at pages/user/user.vue:221", "res.data", response.data);
formatAppLog("log", "at pages/user/user.vue:222", "有可更新包");
if (response.data.noSensation == "2" && response.data.link.indexOf("wgt") != -1) {
utils.updatefile1(response.data.link);
} else {
@ -23533,9 +23536,11 @@ This will fail in production if not fixed.`);
return {
id: val.id,
title: val.categoryName,
value: val.realityQuantity,
// value: val.realityQuantity,
// minNum: val.realityQuantity || 0,
value: 0,
minNum: 0,
maxNum: val.quantity,
minNum: val.realityQuantity || 0,
type: "Number",
disabled: item.completeStact,
allocationId: item.allocationId,
@ -23572,7 +23577,7 @@ This will fail in production if not fixed.`);
confirmTxt: "确认选择",
isonecheck: true,
success: async (deta) => {
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:565", "deta :>> ", deta);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:567", "deta :>> ", deta);
if (deta.inpList.length === 0 || item.completeStact)
return tiplists.value.setdetails({ isshow: false });
let data2 = {
@ -23586,7 +23591,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:577", "val :>> ", val);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:579", "val :>> ", val);
if (val.value < val.minNum) {
uni.showToast({
title: "不能小于当前数量"
@ -23594,7 +23599,7 @@ This will fail in production if not fixed.`);
return false;
}
if (val.value > val.minNum) {
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:585", "1 :>> ", 1);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:587", "1 :>> ", 1);
data2.list.push({
firsts: val.title,
id: val.id,
@ -23613,7 +23618,7 @@ This will fail in production if not fixed.`);
});
}
const res2 = await postZeroStockUp(data2);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:606", "res :>> ", res2);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:608", "res :>> ", res2);
const { code: code22 } = res2;
if (code22 === 200) {
tiplists.value.setdetails({ isshow: false });
@ -23636,7 +23641,7 @@ This will fail in production if not fixed.`);
for (let i2 = 0; i2 < _inputValue; i2++) {
if (_isReturn)
return;
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:633", "i :>> ", i2);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:635", "i :>> ", i2);
let text = "! 0 200 200 333 1\r\n";
text += "SETBOLD 2\r\n";
text += `T 56 0 0 0 ${item.orderCode}\r
@ -23677,7 +23682,7 @@ This will fail in production if not fixed.`);
return;
};
function printOrderCode(item) {
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:669", "item :>> ", item);
formatAppLog("log", "at pagesHome/pages/StockUplist/StockUplist.vue:671", "item :>> ", item);
tiplists.value.setdetails({
title: "生成订单编号二维码数量",
isshow: true,
@ -28135,6 +28140,7 @@ This will fail in production if not fixed.`);
} finally {
if (details.isscan && details.signedNum) {
utils2.ttsspke(details.signedNum + "件");
details.isscan = false;
}
uni.hideLoading();
}
@ -49141,6 +49147,14 @@ This will fail in production if not fixed.`);
}
});
}
const handleGoTrayDetails = (item) => {
formatAppLog("log", "at pagesHome/pages/orderInquiry/orderInquiry.vue:501", "item :>> ", item);
if (!item.trayCode)
return;
uni.navigateTo({
url: "/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode=" + item.trayCode + "&trayType=" + item.trayType
});
};
return (_ctx, _cache) => {
const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0$5);
const _component_uni_th = resolveEasycom(vue.resolveDynamicComponent("uni-th"), __easycom_2$2);
@ -49460,23 +49474,19 @@ This will fail in production if not fixed.`);
/* DYNAMIC_SLOTS */
),
vue.createCommentVNode(" 托盘信息 "),
vue.createVNode(
_component_uni_td,
null,
{
default: vue.withCtx(() => [
vue.createTextVNode(
vue.toDisplayString(item.pallet),
1
/* TEXT */
)
]),
_: 2
/* DYNAMIC */
},
1024
/* DYNAMIC_SLOTS */
),
vue.createVNode(_component_uni_td, {
onClick: ($event) => handleGoTrayDetails(item)
}, {
default: vue.withCtx(() => [
vue.createTextVNode(
vue.toDisplayString(item.pallet),
1
/* TEXT */
)
]),
_: 2
/* DYNAMIC */
}, 1032, ["onClick"]),
vue.createCommentVNode(" 三级品 "),
vue.createVNode(
_component_uni_td,

Loading…
Cancel
Save