From aca7aa9ce32acc4c8795342f945b027d3bc9f62a Mon Sep 17 00:00:00 2001 From: 曹睿 <360930172@qq.com> Date: 星期二, 10 六月 2025 17:37:34 +0800 Subject: [PATCH] feat: 添加时效报工,修复扫码内存泄漏 --- src/pages/production/wire/report/wire.vue | 127 ++++++++++++++++++++++++++++-------------- 1 files changed, 84 insertions(+), 43 deletions(-) diff --git a/src/pages/production/wire/report/wire.vue b/src/pages/production/wire/report/wire.vue index 95125ed..76db8fb 100644 --- a/src/pages/production/wire/report/wire.vue +++ b/src/pages/production/wire/report/wire.vue @@ -1,29 +1,37 @@ <template> - <view class="page pt-2"> - <CardTitle title="鎶ュ伐淇℃伅" :hideAction="true" @action="addReport" /> - <view class="list"> - <wd-card v-for="(item, index) in 6" type="rectangle" custom-class="round"> + <view class="list"> + <z-paging ref="pagingRef" v-model="wireReportList" :fixed="false" @query="getWireReportList"> + <template #top> + <CardTitle title="鎶ュ伐淇℃伅" :hideAction="true" :full="false" @action="addReport" /> + </template> + <wd-card + v-for="(item, index) in wireReportList" + :key="index" + type="rectangle" + custom-class="round" + > <template #title> <view class="flex justify-between"> <view> <wd-icon name="user" color="#0D867F"></wd-icon> <text class="text-[#0D867F] ml-2 font-medium">鐢熶骇浜�</text> - <text class="text-[#333333] ml-2">鏂瑰厗鐜�</text> + <text class="text-[#333333] ml-2">{{ item.productUser }}</text> </view> - <view class="text-[#A8A8A8]" @click="toEdit">缂栬緫</view> + <!-- <view class="text-[#A8A8A8]" @click="toEdit">缂栬緫</view> --> </view> </template> - <ProductionCard :data="cardAttr" /> + <ProductionCard :data="cardAttr" :value="item" /> + <template #footer> + <wd-button size="small" plain @click="toCheck(item.id)">鑷</wd-button> + </template> </wd-card> - <wd-loadmore custom-class="loadmore" state="loading" /> - </view> - + </z-paging> <wd-popup v-model="dialog.visible" position="bottom" custom-class="yl-popup"> <view class="action px-3"> <wd-button type="text" @click="cancel">鍙栨秷</wd-button> <wd-button type="text" @click="submit">纭畾</wd-button> </view> - <WireForm /> + <WireForm ref="wireFormRef" /> </wd-popup> <wd-toast /> </view> @@ -32,8 +40,14 @@ import CardTitle from "@/components/card-title/index.vue"; import WireForm from "./wireForm.vue"; import { useToast } from "wot-design-uni"; -import ProductionCard from "../components/ProductionCard.vue"; +import ProductionCard from "../../components/ProductionCard.vue"; +import zPaging from "@/components/z-paging/z-paging.vue"; +import { onLoad } from "@dcloudio/uni-app"; +import ManageApi from "@/api/product/manage"; +const pagingRef = ref(); +const wireFormRef = ref(); +const paramsId = ref(); const toast = useToast(); const dialog = reactive({ visible: false, @@ -41,73 +55,100 @@ const cardAttr = ref<any[]>([ { - label: "鍚堝悓鍙�", - value: "ht2921246", + label: "棰嗙敤鏉嗗彿", + prop: "poleNumber", + span: 24, }, { - label: "鐘舵��", - value: "-----", + label: "鍗曚笣鐩樺彿", + prop: "monofilamentNumber", + span: 24, }, { - label: "瀹㈡埛鍚嶇О", - value: "澶忓織璞�", + label: "鏉嗗瀷鍙�", + prop: "poleModel", }, { - label: "鏈哄彴", - value: "-----", + label: "鏉嗗寘鍙�", + prop: "polePackageNumber", + }, + { + label: "鏉嗛噸(kg)", + prop: "poleWeight", }, { label: "瑙勬牸鍨嬪彿", - value: "2921246", + prop: "model", }, { - label: "宸茬敓浜ф暟閲�", - value: "0", + label: "鐩樺瀷鍙�", + prop: "dishModel", }, { label: "鐩橀暱(m)", - value: "292", + prop: "oneLength", }, { - label: "璁″垝鏁伴噺", - value: "100", + label: "瀹為檯闀垮害", + prop: "actuallyLength", + }, + { + label: "瀹為檯閲嶉噺(kg)", + prop: "actuallyWeight", }, ]); -const toEdit = () => { - uni.navigateTo({ - url: "/pages/production/report/wireEdit", - }); -}; +const wireReportList = ref<any[]>([]); + +// const toEdit = () => { +// uni.navigateTo({ +// url: "/pages/production/wire/report/wireEdit", +// }); +// }; const addReport = () => { dialog.visible = true; }; const submit = () => { - toast.show("鎻愪氦"); - dialog.visible = false; + dialog.visible = !wireFormRef.value.submit(); + pagingRef.value.reload(); }; const cancel = () => { toast.show("鍙栨秷"); dialog.visible = false; }; + +const toCheck = (id: number) => { + uni.navigateTo({ + url: `/pages/production/wire/selfInspect/index?id=${id}`, + }); +}; + +// 鑾峰彇鎷変笣鎶ュ伐鍒楄〃 +const getWireReportList = async () => { + const { data } = await ManageApi.getReportList({ + wireId: paramsId.value, + type: "鎷変笣", + }); + pagingRef.value.complete(data); +}; + +onLoad((options: any) => { + paramsId.value = options.id; +}); </script> <style lang="scss" scoped> -.page { +.list { + height: calc(100vh - 30px); + padding: 12px; background: #f3f9f8; - .list { - height: calc(100vh - 120px); - margin: 12px; - overflow: scroll; - - :deep() { - .round { - border-radius: 4px; - } + :deep() { + .round { + border-radius: 4px; } } } -- Gitblit v1.9.3