Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

jiangping

2023-10-24 349bcef9a96391d22522a3409adf5a89e7e70a95

 minipro_standard/components/SelectTraMultipleMaterial.vue

@@ -1,12 +1,12 @@
<template>

   <u-popup :show="show" :round="10" closeable @close="show=false">

   <u-popup :show="show" :round="10" closeable @close="close()">

      <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 ref="V" @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="搜索物料名称/编码">

         </v-Search> -->

         <div class="content_total">共{{pages.total}}条数据</div>

         <view class="scroll-content">
            <scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="refreshing" @scrolltolower="loadMore"
            <scroll-view style="height: 100%;" scroll-y="true" refresher-enabled="true" :refresher-triggered="refreshing" @scrolltolower="loadMore"
               @refresherrefresh="onRefresh">
               <view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="selectMaterialAction(index)">
                  <view class="img36 mr20 pt10">
@@ -162,7 +162,11 @@
         },

         selectAll() {
            this.selectIndex = []
            this.isAll = !this.isAll
            if (this.isAll) {
            this.selectIndex = [...new Array(this.list.length).keys()]
            }
				
         },
         submitAction () {
            this.show = false
@@ -171,6 +175,10 @@
               selectValue.push(this.list[item])
            })
            this.$emit('selectes', { materials: selectValue })
         },
         close() {
            this.show = false
            this.$emit('close')
         }

      }

   }

@@ -241,15 +249,10 @@
      display: flex;

      flex-direction: column;

      margin-bottom: 10rpx;









   }



   .bottom {

      height: 98rpx;

      // bottom: calc(env(safe-area-inset-bottom) + 20rpx);

      .submit {

         width: 272rpx;

         height: 98rpx;