diff --git a/src/manifest.json b/src/manifest.json index ac5e67f..d3bc3e7 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -4,11 +4,13 @@ "appid" : "__UNI__898003A", "description" : "", "versionName" : "1.0.0", - "versionCode" : "100", + "versionCode" : 100, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { - "ignoreVersion": false, + "compatible" : { + "ignoreVersion" : true + }, "usingComponents" : true, "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, diff --git a/src/pagesApp/receiveCl.vue b/src/pagesApp/receiveCl.vue index f03e04a..62fa78e 100644 --- a/src/pagesApp/receiveCl.vue +++ b/src/pagesApp/receiveCl.vue @@ -40,7 +40,8 @@ {{ item.productName }} 定价人:{{ item.pricingUserName }} - 过磅时间:{{ item.tareTime }} + + 过磅时间:{{ item.grossTime }} diff --git a/src/pagesApp/role.vue b/src/pagesApp/role.vue index e24c367..501ae46 100644 --- a/src/pagesApp/role.vue +++ b/src/pagesApp/role.vue @@ -25,15 +25,19 @@ :isLoading="pageList.isLoading" > - - - {{ item.roleName }} + + + + {{ item.roleName }} + + + 编辑 + + 删除 + + - - 编辑 - 删除 - - + @@ -60,7 +64,7 @@ const handleModal = (v: boolean, id: number) => { deleteId.value = id; }; const handleOk = () => { - deleteRole({id: deleteId.value}) + deleteRole({ id: deleteId.value }); }; const state = reactive({ @@ -68,7 +72,7 @@ const state = reactive({ }); const pageList: PageResult<{ roleName: string; - id: number + id: number; }> = reactive({ noMoreData: false, total: 0, @@ -98,13 +102,13 @@ const edit = (item: any) => { const deleteRole = (item: any) => { ProfileApi.updateRole({ isDeleted: true, id: item.id }).then((res) => { if (res.code === 200) { - resetPageList() + resetPageList(); getList(); } }); }; const handleSearch = () => { - resetPageList() + resetPageList(); getList(); }; const getList = (v?: boolean) => { @@ -131,7 +135,7 @@ const getList = (v?: boolean) => { }; onShow(() => { - resetPageList() + resetPageList(); getList(); }); diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue index 6967f67..e26bb8d 100644 --- a/src/pagesHome/index.vue +++ b/src/pagesHome/index.vue @@ -393,7 +393,7 @@ const appList = reactive([ }, }, { - icon: "09.png", + icon: "11.png", title: "收货产品", fn: () => { uni.navigateTo({ @@ -411,7 +411,7 @@ const appList = reactive([ }, }, { - icon: "11.png", + icon: "09.png", title: "出货产品", fn: () => { uni.navigateTo({ diff --git a/src/pagesReceive/pricing.vue b/src/pagesReceive/pricing.vue index 80b9438..cfebe89 100644 --- a/src/pagesReceive/pricing.vue +++ b/src/pagesReceive/pricing.vue @@ -151,6 +151,7 @@ const getList = (v?: boolean) => { const handleOk = () => { ReceiveApi.deleteOrder({ ids: [deleteId.value] }).then((res) => { if (res.code === 200) { + resetPageList(); getList(); } }); diff --git a/src/pagesReceive/review/index.vue b/src/pagesReceive/review/index.vue index 4f129d4..c60c15d 100644 --- a/src/pagesReceive/review/index.vue +++ b/src/pagesReceive/review/index.vue @@ -299,7 +299,9 @@ const handleScenePhoto = (id: any) => { }; // 审核暂不支付 // 更新状态为3 const handleReviewNoPay = () => { - ReceiveApi.updateOne({ ...state.order, scaleStatus: 3 }).then((res) => { + ReceiveApi.updateOrderIn({ + orderInPos: [{ ...state.order, scaleStatus: 3 }], + }).then((res) => { if (res.code === 200) { uni.redirectTo({ url: "/pagesReceive/payReview?scaleStatus=3", // 要跳转到的页面路径 @@ -395,12 +397,12 @@ const handlePrint = () => { DeviceApi.print({ id: state.order.id, orderType: OrderType.Receive, - userId: state.order.deviceId + userId: state.order.deviceId, }).then((res) => { if (res.code === 200) { uni.showToast({ title: "打印成功", - }) + }); } }); }; diff --git a/src/pagesShipment/grossWeight.vue b/src/pagesShipment/grossWeight.vue index 9156273..420fecd 100644 --- a/src/pagesShipment/grossWeight.vue +++ b/src/pagesShipment/grossWeight.vue @@ -120,9 +120,9 @@ const getList = (v?: boolean) => { }); }; const handleOk = () => { - console.log(deleteId.value); ShipmentApi.deleteOrder({ ids: [deleteId.value] }).then((res) => { if (res.code === 200) { + resetPageList(); getList(); } }); diff --git a/src/pagesShipment/shipmenting.vue b/src/pagesShipment/shipmenting.vue index 6b57806..cec9edd 100644 --- a/src/pagesShipment/shipmenting.vue +++ b/src/pagesShipment/shipmenting.vue @@ -145,6 +145,7 @@ const handleOk = () => { console.log(deleteId.value); ShipmentApi.deleteOrder({ ids: [deleteId.value] }).then((res) => { if (res.code === 200) { + resetPageList(); getList(); } });