From 79210c2f29c65499e5ff8e4abc0c802b7b1c4065 Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期四, 24 四月 2025 16:43:07 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/yuanwang-mes-uniapp
---
src/pages/production/twist/receive/plate/index.vue | 88 ++++++++++++++++++++++++++++++++------------
1 files changed, 64 insertions(+), 24 deletions(-)
diff --git a/src/pages/production/twist/receive/plate/index.vue b/src/pages/production/twist/receive/plate/index.vue
index 26dc6e2..128db14 100644
--- a/src/pages/production/twist/receive/plate/index.vue
+++ b/src/pages/production/twist/receive/plate/index.vue
@@ -1,26 +1,34 @@
<template>
- <view class="page pt-2">
- <CardTitle title="鐩樺叿棰嗙敤" :hideAction="true" @action="addReport" />
- <view class="list">
- <wd-card v-for="(item, index) in 2" :key="index" type="rectangle" custom-class="round">
+ <view class="list">
+ <z-paging
+ ref="pagingRef"
+ v-model="cardList"
+ :fixed="false"
+ :auto-show-back-to-top="true"
+ @query="getList"
+ >
+ <template #top>
+ <CardTitle title="鐩樺叿棰嗙敤" :hideAction="true" :full="false" @action="addReport" />
+ </template>
+ <wd-card v-for="(item, index) in cardList" :key="index" type="rectangle" custom-class="round">
<template #title>
<view class="flex justify-between">
<view>
<wd-icon name="a-rootlist" color="#0D867F"></wd-icon>
- <text class="text-[#252525] ml-2 font-medium">閾佹湪鐩�</text>
+ <text class="text-[#252525] ml-2 font-medium">{{ item.diskMaterial }}</text>
</view>
- <view class="text-[#A8A8A8]" @click="toEdit">缂栬緫</view>
+ <view class="text-[#A8A8A8]" @click="toEdit(item.id)">缂栬緫</view>
</view>
</template>
- <ProductionCard :data="cardAttr" color="#0D867F" />
+ <ProductionCard :data="cardAttr" :value="item" color="#0D867F" />
</wd-card>
- </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>
- <PlateForm />
+ <PlateForm ref="plateFormRef" @refresh="reloadList" />
</wd-popup>
<wd-toast />
</view>
@@ -31,26 +39,44 @@
import ProductionCard from "../../../components/ProductionCard.vue";
import { useToast } from "wot-design-uni";
import PlateForm from "./form.vue";
+import { onLoad } from "@dcloudio/uni-app";
+import ManageApi from "@/api/product/manage";
+import zPaging from "@/components/z-paging/z-paging.vue";
+const paramsId = ref();
+const pagingRef = ref();
+const plateFormRef = ref();
const toast = useToast();
const dialog = reactive({
visible: false,
});
+const cardList = ref<any[]>([]);
const cardAttr = ref<any[]>([
{
label: "灏哄",
- value: "10m",
+ prop: "model",
},
{
label: "閲嶉噺",
- value: "46kg",
+ prop: "weight",
+ unit: "kg",
+ },
+ {
+ label: "鏁伴噺",
+ prop: "amount",
+ },
+ {},
+ {
+ label: "鍘傚",
+ prop: "supplier",
+ span: 14,
},
]);
-const toEdit = () => {
+const toEdit = (id: number) => {
uni.navigateTo({
- url: "/pages/production/twist/receive/plate/edit",
+ url: `/pages/production/twist/receive/plate/edit?id=${id}`,
});
};
@@ -58,29 +84,43 @@
dialog.visible = true;
};
-const submit = () => {
+const submit = async () => {
toast.show("鎻愪氦");
- dialog.visible = false;
+ dialog.visible = !(await plateFormRef.value.submit());
};
const cancel = () => {
toast.show("鍙栨秷");
dialog.visible = false;
};
+
+const reloadList = () => {
+ pagingRef.value.refresh();
+};
+
+const getList = async () => {
+ const { code, data } = await ManageApi.getStrandedWireDish({
+ wireId: paramsId.value,
+ type: "鐩樺叿",
+ });
+ if (code == 200) {
+ pagingRef.value.complete(data);
+ }
+};
+onLoad((options: any) => {
+ paramsId.value = options.id;
+});
</script>
<style lang="scss" scoped>
-.page {
+.list {
+ height: calc(100vh - 120px);
+ 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