From 134a6c521a6adcf5402091ac97a418cf5dbe4d43 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 25 六月 2025 11:09:06 +0800
Subject: [PATCH] 取消报工页面功能迁移至报工页面
---
pages/product/WorkshopOrderIssued/comp.vue | 226 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 132 insertions(+), 94 deletions(-)
diff --git a/pages/product/WorkshopOrderIssued/comp.vue b/pages/product/WorkshopOrderIssued/comp.vue
index f006d68..02a23b7 100644
--- a/pages/product/WorkshopOrderIssued/comp.vue
+++ b/pages/product/WorkshopOrderIssued/comp.vue
@@ -1,26 +1,51 @@
<template>
<view class="page">
<view class="finishProductIn-locno-bg" />
- <u-navbar title="杞﹂棿璁㈠崟鐗╂枡" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
- back-icon-color="#000" />
+ <u-navbar
+ title="杞﹂棿璁㈠崟鐗╂枡"
+ :background="background"
+ :border-bottom="false"
+ :title-bold="true"
+ title-color="#000"
+ back-icon-color="#000"
+ />
<view class="finishProductIn-locno-search">
- <u-search v-model="keywords" shape="square" bg-color="rgba(250,252,255,0.36)" :show-action="false"
- placeholder="璇疯緭鍏ラ浂浠跺彿" @clear="search" @custom="search" @search="search">
+ <u-search
+ v-model="keywords"
+ shape="square"
+ bg-color="rgba(250,252,255,0.36)"
+ :show-action="false"
+ placeholder="璇疯緭鍏ラ浂浠跺彿"
+ @clear="search"
+ @custom="search"
+ @search="search"
+ >
</u-search>
</view>
<view class="wrap">
- <scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true" @scrolltolower="loadMore">
- <u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
- <view class="content" v-for="(item, index) in list" :key="item.locNo" :index="index"
- @click="selectNo(item.index)">
+ <scroll-view
+ class="finishProductIn-locno-scroll-list"
+ scroll-y="true"
+ @scrolltolower="getmoreList()"
+ >
+ <u-cell-group
+ class="finishProductIn-locno-scroll-list-group"
+ :border="false"
+ >
+ <view
+ class="content"
+ v-for="(item, index) in list"
+ :key="item.locNo"
+ :index="index"
+ @click="selectNo(item)"
+ >
<view class="content-header">
<view class="content-header-title">{{ item.index }}</view>
</view>
<view class="content-body">
<view class="row-list">
<view class="_label">
- <view class="_label-icon-1">
- </view>
+ <view class="_label-icon-1"> </view>
<view class="_label-name">琛屽彿锛�</view>
</view>
<view class="_content">
@@ -29,48 +54,43 @@
</view>
<view class="row-list">
<view class="_label">
- <view class="_label-icon-2">
- </view>
+ <view class="_label-icon-2"> </view>
<view class="_label-name">涓嬪彂鑷冲簱浣嶏細</view>
</view>
<view class="_content">
{{ item.value1 }}
</view>
</view>
- <view class="row-list">
+ <view class="row-list">
<view class="_label">
- <view class="_label-icon-1">
- </view>
+ <view class="_label-icon-1"> </view>
<view class="_label-name">闆朵欢鍙凤細</view>
</view>
<view class="_content">
- {{ item.value3 }}
+ {{ item.partNo }}
</view>
</view>
<view class="row-list">
<view class="_label">
- <view class="_label-icon-3">
- </view>
+ <view class="_label-icon-3"> </view>
<view class="_label-name">闆朵欢鎻忚堪锛�</view>
</view>
<view class="_content">
- {{ item.value2 }}
+ {{ item.partName }}
</view>
</view>
<view class="row-list">
<view class="_label">
- <view class="_label-icon-2">
- </view>
+ <view class="_label-icon-2"> </view>
<view class="_label-name">闆朵欢涓嬪彂鏁伴噺锛�</view>
</view>
<view class="_content">
- {{ item.value4 }}
+ {{ item.qpa }}
</view>
</view>
<view class="row-list">
<view class="_label">
- <view class="_label-icon-3">
- </view>
+ <view class="_label-icon-3"> </view>
<view class="_label-name">鐗╂枡琛岀姸鎬侊細</view>
</view>
<view class="_content">
@@ -80,110 +100,128 @@
</view>
</view>
</u-cell-group>
- <view class="loadmore" @click="loadMore">
- <u-loadmore :status="loadStatus"></u-loadmore>
+ <view class="loadmore" @click="getmoreList()">
+ <u-loadmore
+ :status="status"
+ :load-text="loadText"
+ @loadmore="getmoreList()"
+ />
</view>
</scroll-view>
</view>
</view>
</template>
<script>
-import content_bg from '@/static/custom/finishProductIn/locNoBg.png'
+import content_bg from "@/static/custom/finishProductIn/locNoBg.png";
export default {
data() {
return {
background: {
backgroundImage: `url(${content_bg})`,
- backgroundAttachment: 'fixed',
- backgroundSize: '100% auto',
- backgroundRepeat: 'no-repeat',
+ backgroundAttachment: "fixed",
+ backgroundSize: "100% auto",
+ backgroundRepeat: "no-repeat",
},
- keywords: '',
- alllist: [],
- originList: [],
- query: {
- current: 1,
- size: 10
- },
- list: [
- {
- index: 1,
- value0: '123456789',
- value1: '123456789',
- value2: '123456789',
- value3: '123456789',
- value4: '123456789',
- value5: '123456789'
- }
- ],
- count: 0,
- loadStatus: 'loading'
+ keywords: "",
+ list: [],
+ total: 0,
+ pageNum: 1,
+ pageSize: 10,
+ status: "loading",
+ loadText: {
+ loadmore: "鍔犺浇鏇村...",
+ loading: "鍔姏鍔犺浇涓�...",
+ nomore: "娌℃湁鏇村浜�",
+ },
+ id:''
};
},
- onLoad() {
- this.$u.api.finishProductIn.fetchList().then(res => {
- this.alllist = res.data
- this.originList = res.data
- this.loadList()
- })
- },
+ onLoad(options) {
+ console.log('22@@', options);
+this.id = JSON.parse(decodeURIComponent(options.id))
+ this.getlist();
+ },
methods: {
- loadMore() {
- if (this.loadStatus == "nomore" || this.loadStatus == "loading") {
- return
+ getmoreList() {
+ if (this.pageSize >= this.total) {
+ this.status = "nomore";
+ return;
}
- this.loadStatus = "loading";
+ this.status = "loading";
setTimeout(() => {
- this.query.current += 1;
- this.loadList();
- }, 100);
+ this.pageSize += this.pageSize;
+ this.getlist();
+ }, 1000);
},
- loadList() {
- const data = this.originList.slice((this.query.current - 1) * this.query.size, this.query.current * this.query.size)
- this.list = this.list.concat(data);
- this.loadStatus = "loadmore";
- if (!data || data.length < this.query.size) {
- this.loadStatus = "nomore";
- }
+ getlist() {
+ this.$u.api.WorkshopOrderIssued.manufacturingOrder({
+ current: this.pageNum,
+ size: this.pageSize,
+ id:this.id
+ }).then((res) => {
+ console.log("res", res);
+ this.list = res.data.bomRoot.children;
+ this.total = res.data.bomRoot.children.length + 1;
+ if (this.pageSize >= this.total) {
+ this.status = "nomore";
+ } else {
+ this.status = "loadmore";
+ }
+ });
},
search(value) {
- this.list = [];
- this.query.current = 1;
+ console.log("111", value);
if (value) {
- this.originList = this.alllist.filter(item => item.locNo.includes(value))
+ this.list = [];
+ this.pageSize = 10;
+ this.$u.api.workReporting
+ ._({
+ current: this.pageNum,
+ size: this.pageSize,
+ moNo: value,
+ })
+ .then((res) => {
+ console.log("res", res);
+ this.list = res.data.records;
+ this.total = res.data.total;
+ if (this.pageSize >= this.total) {
+ this.status = "nomore";
+ } else {
+ this.status = "loadmore";
+ }
+ });
} else {
- this.originList = this.alllist
+ this.getlist();
}
- this.loadList()
},
selectNo(no) {
- this.refreshLastPage(no)
+ this.refreshLastPage(no);
},
//鍒锋柊涓婁竴涓〉闈�
refreshLastPage(no) {
// 鍛婄煡 A.vue 鏇存柊鏁版嵁
// 鑾峰彇椤甸潰鏍�
- let pages = getCurrentPages()
+ let pages = getCurrentPages();
// 鑾峰彇涓婁竴椤垫爤
- let prevPage = pages[pages.length - 2]
+ let prevPage = pages[pages.length - 2];
// 瑙﹀彂涓婁竴椤� upData 鍑芥暟(骞舵惡甯﹀弬鏁�)
- prevPage.$vm.setNo(no)
+ prevPage.$vm.compNo(no);
// 杩斿洖涓婁竴椤�
uni.navigateBack({
- delta: 1
- })
+ delta: 1,
+ });
},
- }
+ },
};
</script>
<style lang="scss" scoped>
.finishProductIn-locno-bg {
- background-color: #F6F9FF;
- background-image: url('~@/static/custom/finishProductIn/locNoBg.png');
+ background-color: #f6f9ff;
+ background-image: url("~@/static/custom/finishProductIn/locNoBg.png");
// background: linear-gradient(180deg,rgba(206,227,254,1),rgba(206,227,254,1) 20%,rgba(206,227,254,0.5) 40%,rgba(206,227,254,0.25) 60%,rgba(206,227,254,0.08) 80%,rgba(206,227,254,0));
padding: 0 20rpx;
background-attachment: fixed;
@@ -213,7 +251,7 @@
.content {
font-size: 12px;
- background-color: #FFFFFF;
+ background-color: #ffffff;
box-sizing: border-box;
border-radius: 10rpx;
margin: 0rpx 0rpx 16rpx;
@@ -229,7 +267,7 @@
align-items: center;
.content-header-icon {
- background-image: url('~@/static/custom/moveWareHouse/header_icon.png');
+ background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
background-size: 100% auto;
background-repeat: no-repeat;
height: 28rpx;
@@ -246,7 +284,7 @@
.content-body {
flex: 1;
- background: #F5F9FF;
+ background: #f5f9ff;
border-radius: 10rpx;
padding: 0rpx 23rpx;
@@ -265,7 +303,7 @@
align-items: center;
._label-icon-1 {
- background-image: url('~@/static/custom/moveWareHouse/label-icon-1.png');
+ background-image: url("~@/static/custom/moveWareHouse/label-icon-1.png");
background-size: 100% auto;
background-repeat: no-repeat;
height: 26rpx;
@@ -273,7 +311,7 @@
}
._label-icon-2 {
- background-image: url('~@/static/custom/moveWareHouse/label-icon-2.png');
+ background-image: url("~@/static/custom/moveWareHouse/label-icon-2.png");
background-size: 100% auto;
background-repeat: no-repeat;
height: 26rpx;
@@ -281,7 +319,7 @@
}
._label-icon-3 {
- background-image: url('~@/static/custom/moveWareHouse/label-icon-3.png');
+ background-image: url("~@/static/custom/moveWareHouse/label-icon-3.png");
background-size: 100% auto;
background-repeat: no-repeat;
height: 26rpx;
@@ -289,7 +327,7 @@
}
._label-name {
- width:70px;
+ width: 80px;
margin-left: 11rpx;
font-size: 26rpx;
font-weight: 500;
@@ -305,9 +343,9 @@
}
.row-list .s1 {
- color: #D35651;
+ color: #d35651;
}
}
}
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3