update: 细节优化
This commit is contained in:
parent
e86e17b7c9
commit
509476fbce
|
@ -4,11 +4,13 @@
|
||||||
"appid" : "__UNI__898003A",
|
"appid" : "__UNI__898003A",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.0",
|
"versionName" : "1.0.0",
|
||||||
"versionCode" : "100",
|
"versionCode" : 100,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"ignoreVersion": false,
|
"compatible" : {
|
||||||
|
"ignoreVersion" : true
|
||||||
|
},
|
||||||
"usingComponents" : true,
|
"usingComponents" : true,
|
||||||
"nvueStyleCompiler" : "uni-app",
|
"nvueStyleCompiler" : "uni-app",
|
||||||
"compilerVersion" : 3,
|
"compilerVersion" : 3,
|
||||||
|
|
|
@ -40,7 +40,8 @@
|
||||||
<view class="type">{{ item.productName }}</view>
|
<view class="type">{{ item.productName }}</view>
|
||||||
<view class="flex-box">
|
<view class="flex-box">
|
||||||
<text>定价人:{{ item.pricingUserName }}</text>
|
<text>定价人:{{ item.pricingUserName }}</text>
|
||||||
<text>过磅时间:{{ item.tareTime }}</text>
|
<!-- 过毛时间 -->
|
||||||
|
<text>过磅时间:{{ item.grossTime }}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="more">
|
<view class="more">
|
||||||
|
|
|
@ -25,15 +25,19 @@
|
||||||
:isLoading="pageList.isLoading"
|
:isLoading="pageList.isLoading"
|
||||||
>
|
>
|
||||||
<view class="box">
|
<view class="box">
|
||||||
<view v-for="(item, index) in pageList.list" :key="index">
|
<block v-for="(item, index) in pageList.list" :key="index">
|
||||||
<view>
|
<view v-if="item.roleName !== '超级管理员'">
|
||||||
<view>{{ item.roleName }}</view>
|
<view>
|
||||||
|
<view>{{ item.roleName }}</view>
|
||||||
|
</view>
|
||||||
|
<view class="op-box">
|
||||||
|
<view class="btn" @click="edit(item)"> 编辑 </view>
|
||||||
|
<view class="btn" @click="handleModal(true, item.id)">
|
||||||
|
删除
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="op-box">
|
</block>
|
||||||
<view class="btn" @click="edit(item)"> 编辑 </view>
|
|
||||||
<view class="btn" @click="handleModal(true, item.id)"> 删除 </view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
</page-view>
|
</page-view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -60,7 +64,7 @@ const handleModal = (v: boolean, id: number) => {
|
||||||
deleteId.value = id;
|
deleteId.value = id;
|
||||||
};
|
};
|
||||||
const handleOk = () => {
|
const handleOk = () => {
|
||||||
deleteRole({id: deleteId.value})
|
deleteRole({ id: deleteId.value });
|
||||||
};
|
};
|
||||||
|
|
||||||
const state = reactive<any>({
|
const state = reactive<any>({
|
||||||
|
@ -68,7 +72,7 @@ const state = reactive<any>({
|
||||||
});
|
});
|
||||||
const pageList: PageResult<{
|
const pageList: PageResult<{
|
||||||
roleName: string;
|
roleName: string;
|
||||||
id: number
|
id: number;
|
||||||
}> = reactive({
|
}> = reactive({
|
||||||
noMoreData: false,
|
noMoreData: false,
|
||||||
total: 0,
|
total: 0,
|
||||||
|
@ -98,13 +102,13 @@ const edit = (item: any) => {
|
||||||
const deleteRole = (item: any) => {
|
const deleteRole = (item: any) => {
|
||||||
ProfileApi.updateRole({ isDeleted: true, id: item.id }).then((res) => {
|
ProfileApi.updateRole({ isDeleted: true, id: item.id }).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
resetPageList()
|
resetPageList();
|
||||||
getList();
|
getList();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const handleSearch = () => {
|
const handleSearch = () => {
|
||||||
resetPageList()
|
resetPageList();
|
||||||
getList();
|
getList();
|
||||||
};
|
};
|
||||||
const getList = (v?: boolean) => {
|
const getList = (v?: boolean) => {
|
||||||
|
@ -131,7 +135,7 @@ const getList = (v?: boolean) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
onShow(() => {
|
onShow(() => {
|
||||||
resetPageList()
|
resetPageList();
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -393,7 +393,7 @@ const appList = reactive([
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: "09.png",
|
icon: "11.png",
|
||||||
title: "收货产品",
|
title: "收货产品",
|
||||||
fn: () => {
|
fn: () => {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
@ -411,7 +411,7 @@ const appList = reactive([
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
icon: "11.png",
|
icon: "09.png",
|
||||||
title: "出货产品",
|
title: "出货产品",
|
||||||
fn: () => {
|
fn: () => {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
|
|
|
@ -151,6 +151,7 @@ const getList = (v?: boolean) => {
|
||||||
const handleOk = () => {
|
const handleOk = () => {
|
||||||
ReceiveApi.deleteOrder({ ids: [deleteId.value] }).then((res) => {
|
ReceiveApi.deleteOrder({ ids: [deleteId.value] }).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
|
resetPageList();
|
||||||
getList();
|
getList();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -299,7 +299,9 @@ const handleScenePhoto = (id: any) => {
|
||||||
};
|
};
|
||||||
// 审核暂不支付 // 更新状态为3
|
// 审核暂不支付 // 更新状态为3
|
||||||
const handleReviewNoPay = () => {
|
const handleReviewNoPay = () => {
|
||||||
ReceiveApi.updateOne({ ...state.order, scaleStatus: 3 }).then((res) => {
|
ReceiveApi.updateOrderIn({
|
||||||
|
orderInPos: [{ ...state.order, scaleStatus: 3 }],
|
||||||
|
}).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
uni.redirectTo({
|
uni.redirectTo({
|
||||||
url: "/pagesReceive/payReview?scaleStatus=3", // 要跳转到的页面路径
|
url: "/pagesReceive/payReview?scaleStatus=3", // 要跳转到的页面路径
|
||||||
|
@ -395,12 +397,12 @@ const handlePrint = () => {
|
||||||
DeviceApi.print({
|
DeviceApi.print({
|
||||||
id: state.order.id,
|
id: state.order.id,
|
||||||
orderType: OrderType.Receive,
|
orderType: OrderType.Receive,
|
||||||
userId: state.order.deviceId
|
userId: state.order.deviceId,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: "打印成功",
|
title: "打印成功",
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -120,9 +120,9 @@ const getList = (v?: boolean) => {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
const handleOk = () => {
|
const handleOk = () => {
|
||||||
console.log(deleteId.value);
|
|
||||||
ShipmentApi.deleteOrder({ ids: [deleteId.value] }).then((res) => {
|
ShipmentApi.deleteOrder({ ids: [deleteId.value] }).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
|
resetPageList();
|
||||||
getList();
|
getList();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -145,6 +145,7 @@ const handleOk = () => {
|
||||||
console.log(deleteId.value);
|
console.log(deleteId.value);
|
||||||
ShipmentApi.deleteOrder({ ids: [deleteId.value] }).then((res) => {
|
ShipmentApi.deleteOrder({ ids: [deleteId.value] }).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
|
resetPageList();
|
||||||
getList();
|
getList();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue