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

jiangping

2023-10-24 349bcef9a96391d22522a3409adf5a89e7e70a95

 minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue

@@ -1,4 +1,5 @@
<template>

<template>
   <page-meta :page-style="ban ?'overflow: hidden;': ''"/>

   <view>

      <InOutInfo :info="info" />

      <uni-collapse @change="change" @close="close" @open="open">

@@ -23,14 +24,11 @@
                        <span>待出<span>{{ item.outPlannum }}</span> {{ item.unitName }}</span>

                     </div>

                     <div class="page_content_title_bottom">

                        <span class="green" v-if="item.qualityType === 0">合格&nbsp;<span

                              class="black">/</span>&nbsp;</span>

                        <span class="warning" v-else-if="item.qualityType === 1">不良&nbsp;<span

                              class="black">/</span>&nbsp;</span>

                        <span class="error" v-else-if="item.qualityType === 2">报废&nbsp;<span

                              class="black">/</span>&nbsp;</span>

                        <span v-else>-&nbsp;/&nbsp;</span>

                        <span>{{item.procedureName ? item.procedureName : '-'}}&nbsp;/&nbsp;</span>

                        <span class="green" v-if="item.qualityType === 0">合格<text class="c6" decode>{{ split}}</text></span>

                        <span class="warning" v-else-if="item.qualityType === 1">不良<text class="c6" decode>{{ split}}</text></span>

                        <span class="error" v-else-if="item.qualityType === 2">报废<text class="c6" decode>{{ split}}</text></span>

                        <span v-else>-<text class="c6" decode>{{ split}}</text></span>

                        <span>{{item.procedureName || '-'}}<text class="c6" decode>{{ split}}</text></span>

                        <span>{{item.batch ? item.batch : '-'}}</span>

                     </div>

                  </div>

@@ -80,7 +78,7 @@
                  </div>

                  <div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" :key="ind">

                     <div class="page_content_list_item">

                        <div class="page_content_list_item_label">批次号1：</div>

                        <div class="page_content_list_item_label">批次号：</div>

                        <div class="page_content_list_item_nr">{{ items.batch ? items.batch : '-' }}</div>

                     </div>

                     <div class="page_content_list_items">

@@ -118,7 +116,7 @@


               </div>

               <div class="page_yxwl_list_item_sx">

                  <span class="green" v-if="item.qualityType == 0">合格t<text class="c6" decode>{{ split}}</text></span>

                  <span class="green" v-if="item.qualityType == 0">合格<text class="c6" decode>{{ split}}</text></span>

                  <span class="yellow" v-else-if="item.qualityType == 1">不良<text class="c6" decode>{{ split}}</text></span>

                  <span class="red" v-else-if="item.qualityType == 2">报废<text class="c6" decode>{{ split}}</text></span>

                  <span v-else>-<text class="c6" decode>{{ split}}</text></span>

@@ -156,7 +154,7 @@
            <span>确认出库</span>

         </div>

      </div>

      <SelectTraMultipleMaterial ref="selectTraMultipleMaterial" @selectes="selectMaterail" />

      <SelectTraMultipleMaterial ref="selectTraMultipleMaterial" @close="ban = false" @selectes="selectMaterail" />

   </view>

</template>



@@ -182,8 +180,10 @@
         InOutInfo,

         SelectTraMultipleMaterial

      },

      data() {

         return {

      data() {
			
         return {
            ban: false,

            type: '',

            id: '',

            dbid: '',

@@ -261,13 +261,15 @@
         change() {},

         close() {},

         open() {},

         openxz() {

         openxz() {
            this.ban = true

            this.$refs.selectTraMultipleMaterial.open({

               transferId: this.id,

               warehouseId: this.warehouseId

            })

         },

         selectMaterail(v) {

         selectMaterail(v) {
            this.ban = false

            let tempList = this.warehouseList[0].wtransferDetailList
            let materials = JSON.parse(JSON.stringify(v.materials))
            tempList.forEach(item => {
@@ -279,29 +281,44 @@
                  }
               })
               if (!isOutList) {
                  materials.forEach((materail, index) => {
                     if (item.batch) {
                        // 精确匹配
                        if (materail.materialId == item.materialId &&
                              materail.procedureId == item.procedureId &&
                              materail.qualityType == item.qualityType &&
                              materail.batch == item.batch
                  item.wstockExtListVOList.forEach(hw => {
                     materials.forEach((materail, index) => {
                        if (hw.materialId == materail.materialId &&
                              hw.procedureId == materail.procedureId &&
                              hw.qualityType == materail.qualityType &&
                              hw.locationId == materail.locationId &&
                              hw.batch == materail.batch
                           ) {
                              this.addToOutList(materail, item)
                              materials.splice(index, 1)
                              return
                        }
                     } else {
                        if (materail.materialId == item.materialId &&
                              materail.procedureId == item.procedureId &&
                              materail.qualityType == item.qualityType
                           ) {
                           this.addToOutList(materail, item)
                           materials.splice(index, 1)
                           return
                        }
                     }
                     })
                  })
						
							
                     // if (item.batch) {
                     //    // 精确匹配
                     //    if (materail.materialId == item.materialId &&
                     //          materail.procedureId == item.procedureId &&
                     //          materail.qualityType == item.qualityType &&
                     //          materail.batch == item.batch
                     //       ) {
                     //          this.addToOutList(materail, item)
                     //          materials.splice(index, 1)
                     //          return
                     //    }
                     // } else {
                     //    if (materail.materialId == item.materialId &&
                     //          materail.procedureId == item.procedureId &&
                     //          materail.qualityType == item.qualityType
                     //       ) {
                     //       this.addToOutList(materail, item)
                     //       materials.splice(index, 1)
                     //       return
                     //    }
                     // }
						
               } 
            })
         },