productDev/dmMes.git

			@@ -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 () {