From 1112158bb2f50257f55e5a1963b601e1e0c4be83 Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期三, 23 四月 2025 10:12:53 +0800
Subject: [PATCH] test: 暂存
---
src/api/product/twist.ts | 2
src/pages/production/components/ProductionCard.vue | 6 +
src/pages/production/twist/receive/plate/index.vue | 75 ++++++++++++++++--------
src/pages/production/twist/receive/steelCore/index.vue | 69 +++++++++++++++-------
4 files changed, 103 insertions(+), 49 deletions(-)
diff --git a/src/api/product/twist.ts b/src/api/product/twist.ts
index 8a39f77..54d1fe1 100644
--- a/src/api/product/twist.ts
+++ b/src/api/product/twist.ts
@@ -23,7 +23,7 @@
// 鍗曚笣棰嗙敤鎵爜
getScarn(params: any) {
return request<BaseResult<any>>({
- url: "/app/getScarn",
+ url: "/app/scarn",
method: "GET",
data: params,
});
diff --git a/src/pages/production/components/ProductionCard.vue b/src/pages/production/components/ProductionCard.vue
index cf16aae..1649729 100644
--- a/src/pages/production/components/ProductionCard.vue
+++ b/src/pages/production/components/ProductionCard.vue
@@ -4,7 +4,7 @@
<view class="flex justify-between w-full h-[20px]">
<view class="text-[#646874] pl-1">{{ item.label }}</view>
<view class="font-medium pr-1" :style="{ color: item.color ?? color }">
- {{ value[item.prop] }}
+ {{ value[item.prop] }} {{ item.unit }}
</view>
</view>
</wd-col>
@@ -29,5 +29,9 @@
type: String,
default: "#333333",
},
+ unit: {
+ type: String,
+ default: "",
+ },
});
</script>
diff --git a/src/pages/production/twist/receive/plate/index.vue b/src/pages/production/twist/receive/plate/index.vue
index 26dc6e2..144f557 100644
--- a/src/pages/production/twist/receive/plate/index.vue
+++ b/src/pages/production/twist/receive/plate/index.vue
@@ -1,8 +1,16 @@
<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" @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>
@@ -12,18 +20,18 @@
<view class="text-[#A8A8A8]" @click="toEdit">缂栬緫</view>
</view>
</template>
- <ProductionCard :data="cardAttr" color="#0D867F" />
+ <ProductionCard :data="cardAttr" :value="item" color="#0D867F" />
</wd-card>
- </view>
- <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 />
- </wd-popup>
- <wd-toast />
+ </z-paging>
</view>
+ <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 />
+ </wd-popup>
+ <wd-toast />
</template>
<script setup lang="ts">
@@ -31,20 +39,27 @@
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 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",
},
]);
@@ -67,20 +82,30 @@
toast.show("鍙栨秷");
dialog.visible = false;
};
+
+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;
}
}
}
diff --git a/src/pages/production/twist/receive/steelCore/index.vue b/src/pages/production/twist/receive/steelCore/index.vue
index aab57ad..0423e2e 100644
--- a/src/pages/production/twist/receive/steelCore/index.vue
+++ b/src/pages/production/twist/receive/steelCore/index.vue
@@ -1,8 +1,16 @@
<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" @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>
@@ -14,16 +22,16 @@
</template>
<ProductionCard :data="cardAttr" color="#0D867F" />
</wd-card>
- </view>
- <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 />
- </wd-popup>
- <wd-toast />
+ </z-paging>
</view>
+ <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 />
+ </wd-popup>
+ <wd-toast />
</template>
<script setup lang="ts">
@@ -31,11 +39,17 @@
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 toast = useToast();
const dialog = reactive({
visible: false,
});
+const cardList = ref<any[]>([]);
const cardAttr = ref<any[]>([
{
@@ -80,20 +94,31 @@
toast.show("鍙栨秷");
dialog.visible = false;
};
+
+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