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>

         <v-Search ref="V" @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="搜索物料名称/编码">

         </v-Search>

         <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">
@@ -71,15 +71,15 @@
</template>



<script>

   import vSearch from '@/components/Search.vue'

   // import vSearch from '@/components/Search.vue'

   import {

      choiceStockPageByTransfer

   } from '@/util/api/ExWarehouse'

   export default {

      name: "selectTraMultipleMaterial",

      components: {

         vSearch

      },

      // components: {

      //    vSearch

      // },

      data() {

         return {

            show: false,

@@ -100,7 +100,8 @@
      methods: {

         open(target) {

            this.show = true
            this.refreshing = false

            this.refreshing = false
            this.isAll = false

            this.transferId = target.transferId

            this.warehouseId = target.warehouseId

            this.list = []
@@ -119,7 +120,7 @@
               ...this.pages,

               model: {

                  transferId: this.transferId,

                  deviceId: this.deviceId

                  warehouseId: this.warehouseId

               }

            }).then(res => {
               let {data} = res
@@ -152,11 +153,20 @@
               this.selectIndex.push(index)
            } else {
               this.selectIndex.splice(i)
            }
            if (this.selectIndex.length == this.list.length) {
               this.isAll = true
            } else {
               this.isAll = false
            }

         },

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

      }

   }

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

      flex-direction: column;

      margin-bottom: 10rpx;









   }



   .bottom {

      height: 98rpx;



      .submit {

         width: 272rpx;

         height: 98rpx;