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/report/index.vue | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/pages/production/twist/report/index.vue b/src/pages/production/twist/report/index.vue
index 9c6b5c0..a0383eb 100644
--- a/src/pages/production/twist/report/index.vue
+++ b/src/pages/production/twist/report/index.vue
@@ -1,6 +1,6 @@
<template>
- <view class="page pt-2">
- <z-paging ref="pagingRef" v-model="twistReportList" class="list" @query="getTwistReportList">
+ <view class="list">
+ <z-paging ref="pagingRef" v-model="twistReportList" :fixed="false" @query="getTwistReportList">
<template #top>
<CardTitle title="鎶ュ伐淇℃伅" :hideAction="true" :full="false" @action="addReport" />
</template>
@@ -10,14 +10,14 @@
<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" :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>
</z-paging>
@@ -27,7 +27,7 @@
<wd-button type="text" @click="cancel">鍙栨秷</wd-button>
<wd-button type="text" @click="submit">纭畾</wd-button>
</view>
- <TwistForm />
+ <TwistForm ref="twistFormRef" />
</wd-popup>
<wd-toast />
</view>
@@ -42,6 +42,7 @@
const pagingRef = ref();
const paramsId = ref();
+const twistFormRef = ref();
const toast = useToast();
const dialog = reactive({
visible: false,
@@ -61,8 +62,8 @@
prop: "monofilamentNumber",
},
{
- label: "瑙勬牸鍨嬪彿",
- prop: "model",
+ label: "瀹為檯閲嶉噺(kg)",
+ prop: "actuallyWeight",
},
{
label: "鐩橀暱(m)",
@@ -73,8 +74,8 @@
prop: "theoryWeight",
},
{
- label: "瀹為檯閲嶉噺(kg)",
- prop: "actuallyWeight",
+ label: "瑙勬牸鍨嬪彿",
+ prop: "model",
},
]);
@@ -91,8 +92,7 @@
};
const submit = () => {
- toast.show("鎻愪氦");
- dialog.visible = false;
+ dialog.visible = twistFormRef.value.submit();
};
const cancel = () => {
@@ -100,9 +100,9 @@
dialog.visible = false;
};
-const toCheck = () => {
+const toCheck = (id: number) => {
uni.navigateTo({
- url: "/pages/production/twist/selfInspect/index",
+ url: `/pages/production/twist/selfInspect/index?id=${id}`,
});
};
@@ -121,16 +121,14 @@
</script>
<style lang="scss" scoped>
-.page {
+.list {
+ height: calc(100vh - 120px);
+ padding: 12px;
background: #f3f9f8;
- .list {
- margin: 12px;
-
- :deep() {
- .round {
- border-radius: 4px;
- }
+ :deep() {
+ .round {
+ border-radius: 4px;
}
}
}
--
Gitblit v1.9.3