From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111

---
 minipro_standard/pages_adjust/components/multipleMaterial.vue |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
index ea3d29a..2336949 100644
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ b/minipro_standard/pages_adjust/components/multipleMaterial.vue
@@ -1,21 +1,19 @@
 <template>
 	<u-popup :show="show" :round="10" closeable @close="show = false">
 		<view class="material-content bbox p30 rp">
-			<view class="tc b f24 c2 mb20">閫夋嫨鐗╂枡</view>
+			<view class="tc b f32 c2 mb20">閫夋嫨鐗╂枡</view>
 			<v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜" />
 			<div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
 			<view class="scroll-content">
-				<!-- refresher-enabled="true"
-				:refresher-triggered="refreshing"
-				@refresherrefresh="onRefresh" -->
 				<scroll-view
 				scroll-y="true"
 				@scrolltolower="loadMore">
 					<view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="jump(index)">
-						<view class="img36 mr20 pt10">
-							<u-checkbox-group style="display: block;" name="">
+						<view class="img36 mr20 pt10" style="position: relative;">
+							<u-checkbox-group style="display: block;" name="" @change="jump(index)">
 								<u-checkbox :checked="item1.isActive"></u-checkbox>
 							</u-checkbox-group>
+							<view style="width: 18px; height: 18px; position: absolute; top: 0; left: 0; z-index: 99;"></view>
 						</view>
 						<view class="fx1">
 							<div class="page_content_title_top">
@@ -63,8 +61,8 @@
 			</view> -->
 			<view class="fixedBottom bottom cY">
 				<view class="fx1 bbox plr30">
-					<u-checkbox-group style="display: block;" name="" @change="selectAll()">
-						<u-checkbox :checked="isAll" label="鍏ㄩ��"></u-checkbox>
+					<u-checkbox-group v-model="isAll" style="display: block;" @change="selectAll()">
+						<u-checkbox label="鍏ㄩ��" name="all"></u-checkbox>
 					</u-checkbox-group>
 				</view>
 				<view class="submit sbtn_green bbox tc" @click="submitAction">{{ `鎻愪氦(${totalNum})`}}</view>
@@ -97,6 +95,7 @@
 				loading: false,
 				finished: false,
 				refreshing: false,
+				isAll: false,
 				total: 0
 			};
 		},
@@ -135,6 +134,7 @@
 		},
 		methods: {
 			open() {
+				this.isAll = false
 				this.show = true
 				this.refreshing = false
 				this.finished = false
@@ -149,13 +149,20 @@
 						item.isActive = !item.isActive
 					}
 				})
+				for (let i = 0; i < this.list.length; i++) {
+					if (!this.list[i].isActive) {
+						this.isAll = []
+						return
+					}
+				}
+				this.isAll = ['all']
 			},
 			// 鎼滅储鎻愪氦
 			submit() {
 				this.form.page = 0
 				this.finished = false
 				this.list = []
-				this.onLoad()
+				this.loadData()
 			},
 			// 鎼滅储妗�
 			searchInput(data) {
@@ -163,7 +170,7 @@
 				this.finished = false
 				this.list = []
 				this.form.smodelLabel = data
-				this.onLoad()
+				this.loadData()
 			},
 			loadData() {
 				if (!this.finished) {
@@ -175,7 +182,8 @@
 						model: {
 							warehouseId: this.warehouseId,
 							warehouseQualityType: this.warehouseQualityType,
-							ids: this.selected.length > 0 ? this.selected.join(',') : ''
+							ids: this.selected.length > 0 ? this.selected.join(',') : '',
+							materialName: this.form.smodelLabel
 						}
 					}).then(res => {
 						if (this.refreshing) {
@@ -212,9 +220,9 @@
 				this.pages.page = 1
 				this.loadData()
 			},
-			selectAll() {
+			selectAll(e) {
 				this.list.forEach(element => {
-					element.isActive = this.all
+					element.isActive = e.length > 0 ? true : false
 				})
 			},
 			submitAction () {

--
Gitblit v1.9.3