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/wire/report/wire.vue | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/src/pages/production/wire/report/wire.vue b/src/pages/production/wire/report/wire.vue
index 496ae82..3a129dc 100644
--- a/src/pages/production/wire/report/wire.vue
+++ b/src/pages/production/wire/report/wire.vue
@@ -1,6 +1,6 @@
<template>
- <view class="page pt-2">
- <z-paging ref="pagingRef" v-model="wireReportList" class="list" @query="getWireReportList">
+ <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>
@@ -26,7 +26,6 @@
</template>
</wd-card>
</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>
@@ -45,7 +44,6 @@
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();
@@ -74,7 +72,7 @@
},
{
label: "鐩橀暱(m)",
- prop: "ontLength",
+ prop: "oneLength",
},
{
label: "鐞嗚閲嶉噺(kg)",
@@ -98,13 +96,8 @@
dialog.visible = true;
};
-const submit = async () => {
- toast.show("鎻愪氦");
- await WireApi.addWireOutput({
- wireId: paramsId.value,
- type: "鎷変笣",
- ...wireFormRef.value.model,
- });
+const submit = () => {
+ dialog.visible = wireFormRef.value.submit();
};
const cancel = () => {
@@ -133,17 +126,14 @@
</script>
<style lang="scss" scoped>
-.page {
+.list {
+ height: calc(100vh - 120px);
+ padding: 12px;
background: #f3f9f8;
- .list {
- margin: 12px;
- background: #f3f9f8;
-
- :deep() {
- .round {
- border-radius: 4px;
- }
+ :deep() {
+ .round {
+ border-radius: 4px;
}
}
}
--
Gitblit v1.9.3