master
Aiden 1 week ago
parent a2a27e334f
commit 7102055fe1

@ -112,17 +112,17 @@ const loading = ref(false);
const isCode = ref(false); const isCode = ref(false);
const haveCode = ref(false); const haveCode = ref(false);
onLoad((options) => { onLoad((options) => {
console.log('options',options) if (options.id && options.pid) {
console.log("options", options);
state.id = options.id; state.id = options.id;
state.pid = options.pid; state.pid = options.pid;
console.log("222", state.id);
const token = uni.getStorageSync("token"); const token = uni.getStorageSync("token");
const userInfo = uni.getStorageSync("userInfo"); const userInfo = uni.getStorageSync("userInfo");
console.log('userInfo',token,userInfo)
// //
if (token && userInfo) { if (token && userInfo) {
paintingDetail(); paintingDetail();
} }
}
/* /*
1.先调用options的对应接口 1.先调用options的对应接口
@ -134,18 +134,17 @@ onLoad((options) => {
}); });
const paintingDetail = async () => { const paintingDetail = async () => {
loading.value = true; loading.value = true;
console.log('state',state) console.log("state", state);
const res = await pbDetail({ const res = await pbDetail({
id: state.id, id: state.id,
pid: state.pid, pid: state.pid,
}); });
console.log(1111111111111,res)
if (res.status === 0) { if (res.status === 0) {
state.boxRelBucketStatus = res.data.boxRelBucketStatus; state.boxRelBucketStatus = res.data.boxRelBucketStatus;
console.log("boxRelBucketStatus",state.boxRelBucketStatus) console.log("boxRelBucketStatus", state.boxRelBucketStatus);
if (res.data.pbStatus == 1) { if (res.data.pbStatus == 1) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/index/index?id="+state.id+'&pid='+state.pid, url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid,
success: () => { success: () => {
loading.value = false; loading.value = false;
}, },
@ -157,7 +156,7 @@ const paintingDetail = async () => {
} else { } else {
if (res.data.boxRelBucketStatus == 3) { if (res.data.boxRelBucketStatus == 3) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/painting/index?id="+state.id+'&pid='+state.pid, url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
success: () => { success: () => {
loading.value = false; loading.value = false;
}, },
@ -168,7 +167,13 @@ const paintingDetail = async () => {
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: "/pages/detail/index?id="+state.id+'&pid='+state.pid+'&boxRelBucketStatus='+state.boxRelBucketStatus, url:
"/pages/detail/index?id=" +
state.id +
"&pid=" +
state.pid +
"&boxRelBucketStatus=" +
state.boxRelBucketStatus,
success: () => { success: () => {
loading.value = false; loading.value = false;
}, },
@ -177,7 +182,6 @@ const paintingDetail = async () => {
showMessage({ type: "default", message: "跳转失败" }); showMessage({ type: "default", message: "跳转失败" });
}, },
}); });
} }
} }
} }

@ -2,35 +2,37 @@
<view class="content"> <view class="content">
<navBar> 入库 </navBar> <navBar> 入库 </navBar>
<view class="container-box"> <view class="container-box">
<span style="font-weight: bold"> <span style="font-weight: bold"> 已扫画筒号{{ state.pid }} </span>
已扫画筒号{{state.pid }} <span style="margin-top: 40rpx"> 请放入 </span>
</span>
<span style="margin-top: 40rpx;">
请放入
</span>
<view class="painting-box"> <view class="painting-box">
<span style="font-weight: bold;text-align: center;">{{ state.containerName }}货架</span> <span style="font-weight: bold; text-align: center"
<up-line style="margin-top: 20rpx;"></up-line> >{{ state.containerName }}货架</span
<span style="color: #CF3050;font-size: 24px;text-align: center;margin-top: 20rpx;"> >
<up-line style="margin-top: 20rpx"></up-line>
<span
style="
color: #cf3050;
font-size: 24px;
text-align: center;
margin-top: 20rpx;
"
>
A1 A1
</span> </span>
<span style="text-align: center;margin-top: 20rpx;"> <span style="text-align: center; margin-top: 20rpx"> A列1行 </span>
A列1行
</span>
</view> </view>
</view> </view>
</view> </view>
<view class="button-container"> <view class="button-container">
<up-button <up-button
style="width: 326rpx; margin: auto; height: 80rpx;" style="width: 326rpx; margin: auto; height: 80rpx"
color="#BCBCBC" color="#BCBCBC"
throttleTime="5" throttleTime="5"
:loading="loading" :loading="loading"
>取消</up-button >取消</up-button
> >
<up-button <up-button
style="width: 326rpx; margin: auto; height: 80rpx;" style="width: 326rpx; margin: auto; height: 80rpx"
color="#EFC54E" color="#EFC54E"
throttleTime="5" throttleTime="5"
:loading="loading" :loading="loading"
@ -39,7 +41,6 @@
</view> </view>
</template> </template>
<script setup> <script setup>
import { ref, reactive, onBeforeMount } from "vue"; import { ref, reactive, onBeforeMount } from "vue";
import useToast from "@/hooks/toast/useToast.js"; import useToast from "@/hooks/toast/useToast.js";
@ -54,12 +55,8 @@
}); });
onLoad((options) => { onLoad((options) => {
state.id = options.id; state.id = options.id;
state.pid = options.pid; state.pid = options.id;
const token = uni.getStorageSync("token");
const userInfo = uni.getStorageSync("userInfo");
if(token && userInfo){
bindShelfHole(); bindShelfHole();
}
}); });
const bindShelfHole = async () => { const bindShelfHole = async () => {
loading.value = true; loading.value = true;
@ -69,10 +66,6 @@
} }
loading.value = false; loading.value = false;
}; };
onBeforeMount(() => {
bindShelfHole();
// getPositionList();
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -98,10 +91,8 @@ onBeforeMount(() => {
margin-top: 60rpx; margin-top: 60rpx;
padding: 40rpx; padding: 40rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.painting-box { .painting-box {
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -127,4 +118,3 @@ onBeforeMount(() => {
height: 8%; height: 8%;
} }
</style> </style>

@ -27,13 +27,12 @@ const request = new Request({
if (response.data.status === 1) { if (response.data.status === 1) {
showMessage({ type: "error", message: response.data.msg }); showMessage({ type: "error", message: response.data.msg });
} }
if(response.data.status === 0){ // if(response.data.status === 0){
uni.setStorageSync("token", response.data.data.Token); // uni.setStorageSync("token", response.data.data.Token);
uni.setStorageSync("userInfo", response.data.data.AccountInfo); // uni.setStorageSync("userInfo", response.data.data.AccountInfo);
response.config.headers["Authorization"] = response.data.data.Token; // response.config.headers["Authorization"] = response.data.data.Token;
} // }
if (response.data.code === 401) { if (response.data.code === 401) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/login/index", url: "/pages/login/index",
}); });

Loading…
Cancel
Save