java_project
/
logpm
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复自提

dev
qb 1 year ago
parent
5dedd771dc
commit
bfb54817b8
7 changed files with 72 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      config/host.js
  2. 3
      pagesHome/pages/SelfPScanList/SelfPScanList.vue
  3. 6
      pagesTask/pages/checkTaskList/checkTaskList.vue
  4. 49
      pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
  5. 2
      unpackage/dist/dev/app-plus/app-config-service.js
  6. 86
      unpackage/dist/dev/app-plus/app-service.js
  7. 2
      unpackage/dist/dev/app-plus/manifest.json

8
config/host.js
Unescape View File

@ -4,7 +4,7 @@
* 测试域名
* */
//测试域名s
// const devhost = 'http://test.api.huo5you.com/'
const devhost = 'http://test.api.huo5you.com/'
// lmy
// const devhost = 'http://192.168.10.123:8889/'
// zhy
@ -12,7 +12,7 @@
// 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/'
@ -25,9 +25,9 @@ const devhost = 'http://192.168.3.14:13000/'
/**
* 正式域名
* */
const prohost = 'http://h5uapi.huitongys.com/'
// const prohost = 'http://h5uapi.huitongys.com/'
// const prohost = 'https://h5uapi.huitongys.com/' // 小程序
// const prohost = 'http://test.api.huo5you.com/'
const prohost = 'http://test.api.huo5you.com/'
/**
* 图片域名
* */

3
pagesHome/pages/SelfPScanList/SelfPScanList.vue
Unescape View File

@ -342,7 +342,8 @@
try {
console.log('item :>> ', item);
let subdata = {
billLadingId: details.billLadingId
billLadingId: details.billLadingId,
stockArtieleld: item.id
}
// 获取订单内零担包件信息
const response = await billLadingzeroBillData(subdata)

6
pagesTask/pages/checkTaskList/checkTaskList.vue
Unescape View File

@ -462,10 +462,10 @@
// })
if (code === 200 && data) {
const info = {
trayCode: data[0].trayCode,
trayCode: data.trayCode,
questId: details.id,
trayId: data[0].trayId,
type: data[0].goodsType,
trayId: data.trayId,
type: data.goodsType,
marketName: details.marketName,
questNum: details.questNum,
pageType: details.pageType,

49
pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue
Unescape View File

@ -154,7 +154,7 @@
物品名称: {{item.materialName || '暂无数据'}}
</view>
<view>
数量: {{item.quantity || '暂无数据'}}
数量: {{item.stockNum || '暂无数据'}}
</view>
</template>
@ -236,7 +236,7 @@
</view>
<!-- 输入框 -->
<template v-if="tabBarCode === 2 && item.code !== 10">
<input class="input" type="number" @blur="inputNum(item)" :disabled="item.disabled"
<input class="input" type="number" @blur="() => inputNum(item)" :disabled="item.disabled"
v-model="item.value" />
</template>
@ -396,7 +396,7 @@
</view>
<view class="popUp_Add_row">
<view>在库数量:</view>
<input class="popUpInput" v-model="details.addInfo.quantity" type="number" placeholder="请输入在库数量" />
<input class="popUpInput" v-model="details.addInfo.stockNum" type="number" placeholder="请输入在库数量" />
</view>
</PopUp>
@ -416,7 +416,7 @@
</view>
<view class="popUp_Add_row">
<view>数量:</view>
<input class="popUpInput" v-model="details.addInfo.quantity" type="number" placeholder="请输入数量" />
<input class="popUpInput" v-model="details.addInfo.stockNum" type="number" placeholder="请输入数量" />
</view>
</PopUp>
@ -504,7 +504,7 @@
onLoad,
onHide
} from '@dcloudio/uni-app'
import { reactive, toRefs, ref, onMounted } from "vue";
import { reactive, toRefs, ref, onMounted, nextTick } from "vue";
import utils from '@/utils/utils.js';
import {
getWarehouseTaskgetTaskConInfo,
@ -704,7 +704,7 @@
})
onShow(() => {
onShow(async () => {
// #ifdef APP
// 开启监听扫描
uni.$off('scancodedate')
@ -726,11 +726,8 @@
// #endif
// 初始化请求页面数据
// initPage()
const timer = setTimeout(() => {
basicContainer.value.startPullDownRefresh()
// 清除定时器
clearTimeout(timer)
}, 200)
await nextTick()
basicContainer.value.startPullDownRefresh()
})
/** 请求页面数据 */
@ -939,7 +936,7 @@
else if (code === 5001) {
return
}
else if (code !== 4000) {
else if (code === 5000) {
details.addInfo.orderCode = ''
details.stopScan = true
// 手动录入新增
@ -1065,7 +1062,7 @@
// 回显数据
details.addInfo.waybillNumber = item.waybillNumber
details.addInfo.orderCode = item.orderCode
details.addInfo.quantity = item.quantity
details.addInfo.stockNum = item.stockNum
details.addInfo.materialName = item.materialName
popUp_AddZero.value.setDetails({
title: '修改零担信息',
@ -1079,7 +1076,7 @@
title: '请输入物料名称',
icon: 'none'
})
const _number = Number(details.addInfo.quantity)
const _number = Number(details.addInfo.stockNum)
if (_number !== _number || _number <= 0) return uni.showToast({
title: '数量为大于0的数字',
icon: 'none'
@ -1087,7 +1084,7 @@
item.orderCode = details.addInfo.orderCode
item.waybillNumber = details.addInfo.waybillNumber
item.quantity = _number
item.stockNum = _number
item.materialName = details.addInfo.materialName
item.stockNum = _number
details.addInfo.orderCode = ''
@ -1674,7 +1671,7 @@
title: '请输入物料名称',
icon: 'none'
})
const _number = Number(details.addInfo.quantity)
const _number = Number(details.addInfo.stockNum)
if (_number !== _number || _number <= 0) return uni.showToast({
title: '数量为大于0的数字',
icon: 'none'
@ -1742,7 +1739,7 @@
title: '请输入物料名称',
icon: 'none'
})
const _number = Number(details.addInfo.quantity)
const _number = Number(details.addInfo.stockNum)
if (_number !== _number || _number <= 0) return uni.showToast({
title: '数量为大于0的数字',
icon: 'none'
@ -1902,10 +1899,10 @@
_item.allocationId = details.pageInfos.allocationId
_item.positionCode = details.pageInfos.allocation
// 当修改前和修改后的Id一样时, 删除修改后的
if (_item.groundingAllocationId === _item.allocationId) {
delete _item.groundingAllocationId
delete _item.groundingPositionCode
}
// if (_item.groundingAllocationId === _item.allocationId) {
// delete _item.groundingAllocationId
// delete _item.groundingPositionCode
// }
}
else if (details.pageType === 4) {
_item.trayCode = val.trayCode
@ -1960,7 +1957,7 @@
id: val.questDetailId,
questId: details.pageInfos.questId,
waybillNumber: val.waybillNumber,
quantity: val.quantity,
quantity: val.stockNum,
materialName: val.materialName,
materialCode: val.materialCode,
orderCode: val.orderCode,
@ -1978,10 +1975,10 @@
_item.allocationId = details.pageInfos.allocationId
_item.positionCode = details.pageInfos.allocation
// 当修改前和修改后的Id一样时, 删除修改后的
if (_item.groundingAllocationId === _item.allocationId) {
delete _item.groundingAllocationId
delete _item.groundingPositionCode
}
// if (_item.groundingAllocationId === _item.allocationId) {
// delete _item.groundingAllocationId
// delete _item.groundingPositionCode
// }
}
else if (details.pageType === 4) {
_item.trayCode = val.trayCode

2
unpackage/dist/dev/app-plus/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

86
unpackage/dist/dev/app-plus/app-service.js vendored
Unescape View File

@ -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";
@ -66558,10 +66558,10 @@ ${i3}
const { code: code2, data } = res;
if (code2 === 200 && data) {
const info = {
trayCode: data[0].trayCode,
trayCode: data.trayCode,
questId: details.id,
trayId: data[0].trayId,
type: data[0].goodsType,
trayId: data.trayId,
type: data.goodsType,
marketName: details.marketName,
questNum: details.questNum,
pageType: details.pageType,
@ -67160,7 +67160,7 @@ ${i3}
details.pageType = infos.pageType;
details.pageInfos = infos;
});
onShow(() => {
onShow(async () => {
uni.$off("scancodedate");
uni.$on("scancodedate", function(code2) {
if (code2) {
@ -67173,17 +67173,15 @@ ${i3}
scandata();
}
});
const timer = setTimeout(() => {
basicContainer.value.startPullDownRefresh();
clearTimeout(timer);
}, 200);
await vue.nextTick();
basicContainer.value.startPullDownRefresh();
});
async function initPage() {
try {
const orderRes = initOrder();
const stockRes = initStock();
const _promiseAll = Promise.all([orderRes, stockRes]);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:742", "_promiseAll :>> ", _promiseAll);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:739", "_promiseAll :>> ", _promiseAll);
return _promiseAll;
} catch (e2) {
}
@ -67294,9 +67292,9 @@ ${i3}
questNum: details.pageInfos.questNum
};
const res = await postWarehouseTaskSelectPackageInfo(queryData);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:870", "res :>> ", res);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:867", "res :>> ", res);
const { code: code2, data } = res;
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:872", "code :>> ", code2);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:869", "code :>> ", code2);
if (code2 === 200 && data && data.length !== 0) {
data.forEach((val) => {
if (details.pageType === 4 && val.trayCode) {
@ -67314,7 +67312,7 @@ ${i3}
val.trayId = details.pageInfos.trayId;
val.isChange = true;
details.orderList.push(val);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:894", "val :>> ", val);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:891", "val :>> ", val);
popUp_RemoveTary.value.details.showPopUp = false;
utils.ttsspke(details.scanNum + "件");
}
@ -67349,7 +67347,7 @@ ${i3}
return;
} else if (code2 === 5001) {
return;
} else if (code2 !== 4e3) {
} else if (code2 === 5e3) {
details.addInfo.orderCode = "";
details.stopScan = true;
popUp_Add.value.setDetails({
@ -67397,7 +67395,7 @@ ${i3}
});
}
} catch (err) {
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:993", "err :>> ", err);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:990", "err :>> ", err);
} finally {
}
}
@ -67462,7 +67460,7 @@ ${i3}
return;
details.addInfo.waybillNumber = item.waybillNumber;
details.addInfo.orderCode = item.orderCode;
details.addInfo.quantity = item.quantity;
details.addInfo.stockNum = item.stockNum;
details.addInfo.materialName = item.materialName;
popUp_AddZero.value.setDetails({
title: "修改零担信息",
@ -67478,7 +67476,7 @@ ${i3}
title: "请输入物料名称",
icon: "none"
});
const _number = Number(details.addInfo.quantity);
const _number = Number(details.addInfo.stockNum);
if (_number !== _number || _number <= 0)
return uni.showToast({
title: "数量为大于0的数字",
@ -67486,7 +67484,7 @@ ${i3}
});
item.orderCode = details.addInfo.orderCode;
item.waybillNumber = details.addInfo.waybillNumber;
item.quantity = _number;
item.stockNum = _number;
item.materialName = details.addInfo.materialName;
item.stockNum = _number;
details.addInfo.orderCode = "";
@ -67500,7 +67498,7 @@ ${i3}
});
};
const handleShowDetails = (item) => {
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1106", "item :>> ", item);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1103", "item :>> ", item);
details.detailsInfo = item;
popUp_Details.value.setDetails({
title: "详情",
@ -67572,7 +67570,7 @@ ${i3}
}
};
const initState = (cargoName) => {
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1201", "cargoName :>> ", cargoName);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1198", "cargoName :>> ", cargoName);
if (details.tabBarCode === 1) {
if (cargoName) {
details.stateArr.forEach((val) => {
@ -67599,8 +67597,8 @@ ${i3}
if (cargoName.stockNum || cargoName.wornNum || cargoName.lossNum || cargoName.noRepairNum || cargoName.deliveNum || cargoName.noReceivedNum) {
details.stateArr.forEach((val) => {
const _value = cargoName[val.name];
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1236", "val.name :>> ", val.name);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1237", "_value :>> ", _value);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1233", "val.name :>> ", val.name);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1234", "_value :>> ", _value);
if (_value > 0 && _value)
val.value = _value;
else
@ -67619,7 +67617,7 @@ ${i3}
utils.ttsspke("取消当前操作");
};
const batchEditState = () => {
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1262", "修改");
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1259", "修改");
initState();
popUp_EditState.value.setDetails({
title: "状态修改",
@ -67643,7 +67641,7 @@ ${i3}
utils.ttsspke("成功修改" + _number + "件");
popUp_EditState.value.details.showPopUp = false;
details.showControl = false;
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1297", "111 :>> ", 111);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1294", "111 :>> ", 111);
}
});
};
@ -67715,7 +67713,7 @@ ${i3}
}
};
const handleShowSelect = (index2) => {
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1381", "222 :>> ", 222);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1378", "222 :>> ", 222);
details.materialChooseIndex = index2 === details.materialChooseIndex ? 0 : index2;
};
const handleChooseMaterial = (item) => {
@ -67857,7 +67855,7 @@ ${i3}
if (_item.title === "破损" || _item.title === "不可修复")
details.stateArr[0].value = 1;
} else {
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1573", "details.stateArr[0].value :>> ", details.stateArr[0].value);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1570", "details.stateArr[0].value :>> ", details.stateArr[0].value);
if (_item.title === "在库")
return;
if (details.stateArr[0].value === 0 && _item.title === "破损" || details.stateArr[0].value === 0 && _item.title === "不可修复")
@ -67887,7 +67885,7 @@ ${i3}
_item[val.name] = Number(val.value);
});
}
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1605", "_item :>> ", _item);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1602", "_item :>> ", _item);
if (_item.questStatus !== 1)
details.scanNum++;
_item.questStatus = 1;
@ -67947,7 +67945,7 @@ ${i3}
title: "请输入物料名称",
icon: "none"
});
const _number = Number(details.addInfo.quantity);
const _number = Number(details.addInfo.stockNum);
if (_number !== _number || _number <= 0)
return uni.showToast({
title: "数量为大于0的数字",
@ -68009,7 +68007,7 @@ ${i3}
title: "请输入物料名称",
icon: "none"
});
const _number = Number(details.addInfo.quantity);
const _number = Number(details.addInfo.stockNum);
if (_number !== _number || _number <= 0)
return uni.showToast({
title: "数量为大于0的数字",
@ -68106,7 +68104,7 @@ ${i3}
if (Number(val.questStatus) !== 1)
return;
if (!val.isManuallyAdd && Number(val.cargoName) === 10) {
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1867", "1 :>> ", 1);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1864", "1 :>> ", 1);
submitData.questDetailIds.push(val.questDetailId);
if (!val.isChange)
return;
@ -68141,10 +68139,6 @@ ${i3}
if (details.pageType === 2) {
_item.allocationId = details.pageInfos.allocationId;
_item.positionCode = details.pageInfos.allocation;
if (_item.groundingAllocationId === _item.allocationId) {
delete _item.groundingAllocationId;
delete _item.groundingPositionCode;
}
} else if (details.pageType === 4) {
_item.trayCode = val.trayCode;
_item.trayId = val.trayId;
@ -68186,7 +68180,7 @@ ${i3}
id: val.questDetailId,
questId: details.pageInfos.questId,
waybillNumber: val.waybillNumber,
quantity: val.quantity,
quantity: val.stockNum,
materialName: val.materialName,
materialCode: val.materialCode,
orderCode: val.orderCode,
@ -68201,10 +68195,6 @@ ${i3}
if (details.pageType === 2) {
_item.allocationId = details.pageInfos.allocationId;
_item.positionCode = details.pageInfos.allocation;
if (_item.groundingAllocationId === _item.allocationId) {
delete _item.groundingAllocationId;
delete _item.groundingPositionCode;
}
} else if (details.pageType === 4) {
_item.trayCode = val.trayCode;
_item.trayId = val.trayId;
@ -68212,9 +68202,9 @@ ${i3}
}
submitData.questDetailList.push(_item);
});
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1996", "submitData :>> ", submitData);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1993", "submitData :>> ", submitData);
const res = await postWarehouseTaskAddDataInfo(submitData);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1998", "res :>> ", res);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:1995", "res :>> ", res);
const { code: code2 } = res;
if (code2 === 200) {
utils.ttsspke("盘点成功");
@ -68224,7 +68214,7 @@ ${i3}
}, 1e3);
}
} catch (err) {
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2009", "err :>> ", err);
formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:2006", "err :>> ", err);
} finally {
uni.hideLoading();
}
@ -68633,7 +68623,7 @@ ${i3}
vue.createElementVNode(
"view",
null,
" 数量: " + vue.toDisplayString(item.quantity || "暂无数据"),
" 数量: " + vue.toDisplayString(item.stockNum || "暂无数据"),
1
/* TEXT */
)
@ -68804,7 +68794,7 @@ ${i3}
key: 0,
class: "input",
type: "number",
onBlur: ($event) => inputNum(item),
onBlur: () => inputNum(item),
disabled: item.disabled,
"onUpdate:modelValue": ($event) => item.value = $event
}, null, 40, ["onBlur", "disabled", "onUpdate:modelValue"])), [
@ -69210,7 +69200,7 @@ ${i3}
"input",
{
class: "popUpInput",
"onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => details.addInfo.quantity = $event),
"onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => details.addInfo.stockNum = $event),
type: "number",
placeholder: "请输入在库数量"
},
@ -69218,7 +69208,7 @@ ${i3}
512
/* NEED_PATCH */
), [
[vue.vModelText, details.addInfo.quantity]
[vue.vModelText, details.addInfo.stockNum]
])
])
]),
@ -69294,7 +69284,7 @@ ${i3}
"input",
{
class: "popUpInput",
"onUpdate:modelValue": _cache[22] || (_cache[22] = ($event) => details.addInfo.quantity = $event),
"onUpdate:modelValue": _cache[22] || (_cache[22] = ($event) => details.addInfo.stockNum = $event),
type: "number",
placeholder: "请输入数量"
},
@ -69302,7 +69292,7 @@ ${i3}
512
/* NEED_PATCH */
), [
[vue.vModelText, details.addInfo.quantity]
[vue.vModelText, details.addInfo.stockNum]
])
])
]),

2
unpackage/dist/dev/app-plus/manifest.json vendored
Unescape View File

@ -185,7 +185,7 @@
"uni-app": {
"control": "uni-v3",
"vueVersion": "3",
"compilerVersion": "4.07",
"compilerVersion": "4.08",
"nvueCompiler": "uni-app",
"renderer": "auto",
"nvue": {

Write Preview
Loading…
Cancel
Save