From 2fa9c764993b4a7ad51754d0e8587990f96f1529 Mon Sep 17 00:00:00 2001 From: 曹睿 <360930172@qq.com> Date: 星期二, 22 四月 2025 16:33:27 +0800 Subject: [PATCH] feat: 完成至扫码 --- src/pages/production/wire/report/wire.vue | 83 +++++++++++++++++++++++++++-------------- 1 files changed, 54 insertions(+), 29 deletions(-) diff --git a/src/pages/production/wire/report/wire.vue b/src/pages/production/wire/report/wire.vue index 2416d38..496ae82 100644 --- a/src/pages/production/wire/report/wire.vue +++ b/src/pages/production/wire/report/wire.vue @@ -1,26 +1,30 @@ <template> <view class="page pt-2"> - <z-paging ref="paging" refresher-only class="list"> + <z-paging ref="pagingRef" v-model="wireReportList" class="list" @query="getWireReportList"> <template #top> <CardTitle title="鎶ュ伐淇℃伅" :hideAction="true" :full="false" @action="addReport" /> </template> - <wd-card v-for="(item, index) in 6" type="rectangle" custom-class="round"> + <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> </template> - <ProductionCard :data="cardAttr" /> + <ProductionCard :data="cardAttr" :value="item" /> <template #footer> - <wd-button size="small" plain @click="toCheck">鑷</wd-button> + <wd-button size="small" plain @click="toCheck(item.id)">鑷</wd-button> </template> </wd-card> - <wd-loadmore custom-class="loadmore" state="loading" /> </z-paging> <wd-popup v-model="dialog.visible" position="bottom" custom-class="yl-popup"> @@ -28,7 +32,7 @@ <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> @@ -39,7 +43,13 @@ import { useToast } from "wot-design-uni"; 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"; +import WireApi from "@/api/product/wire"; +const pagingRef = ref(); +const wireFormRef = ref(); +const paramsId = ref(); const toast = useToast(); const dialog = reactive({ visible: false, @@ -47,38 +57,36 @@ const cardAttr = ref<any[]>([ { - label: "鍚堝悓鍙�", - value: "ht2921246", + label: "棰嗙敤鏉嗗彿", + prop: "poleNumber", }, { - label: "鐘舵��", - value: "-----", + label: "鏉嗛噸(kg)", + prop: "poleWeight", }, { - label: "瀹㈡埛鍚嶇О", - value: "澶忓織璞�", - }, - { - label: "鏈哄彴", - value: "-----", + label: "鍗曚笣鐩樺彿", + prop: "monofilamentNumber", }, { label: "瑙勬牸鍨嬪彿", - value: "2921246", - }, - { - label: "宸茬敓浜ф暟閲�", - value: "0", + prop: "model", }, { label: "鐩橀暱(m)", - value: "292", + prop: "ontLength", }, { - label: "璁″垝鏁伴噺", - value: "100", + label: "鐞嗚閲嶉噺(kg)", + prop: "theoryWeight", + }, + { + label: "瀹為檯閲嶉噺(kg)", + prop: "actuallyWeight", }, ]); + +const wireReportList = ref<any[]>([]); const toEdit = () => { uni.navigateTo({ @@ -90,9 +98,13 @@ dialog.visible = true; }; -const submit = () => { +const submit = async () => { toast.show("鎻愪氦"); - dialog.visible = false; + await WireApi.addWireOutput({ + wireId: paramsId.value, + type: "鎷変笣", + ...wireFormRef.value.model, + }); }; const cancel = () => { @@ -100,11 +112,24 @@ dialog.visible = false; }; -const toCheck = () => { +const toCheck = (id: number) => { uni.navigateTo({ - url: "/pages/production/wire/selfInspect/index", + 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> -- Gitblit v1.9.3