jiangping
2023-10-26 ea87c908fb6cdfc3e227a584a53e6730efb8262a
minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
@@ -84,6 +84,7 @@
      <u-toast ref="uToast"></u-toast>
      <!-- 仓库 -->
      <Warehouse :show="warehouseShow" @close="close" @value="getValue" />
<<<<<<< HEAD
      <!-- 物料 -->
      <Material :show="materialsShow" @close="close1" @value="getValue1" />
      <!-- 货位 -->
@@ -94,11 +95,14 @@
      <u-picker :show="typeShow" keyName="name" :columns="typeList" @confirm="confirm" @cancel="typeClose"></u-picker>
      <!-- 质量属性 -->
      <u-picker :show="qualityShow" :columns="columns" @cancel="qualityShow = false" keyName="name" @confirm="onConfirm1"></u-picker>
=======
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
   </view>
</template>
<script>
   import Warehouse from '../../components/Warehouse.vue'
<<<<<<< HEAD
   import location from '../../components/location.vue'
   import Material from '../../components/Material.vue'
   import ProductionProcess from '../../components/ProductionProcess.vue'
@@ -106,6 +110,10 @@
   import { getListByMaterialId } from '@/util/api/ExWarehouse'
   export default {
      components: { Warehouse, location, Material, ProductionProcess },
=======
   export default {
      components: { Warehouse },
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
      data() {
         return {
            i: 0,
@@ -115,6 +123,7 @@
               type: '',
               typeName: ''
            },
<<<<<<< HEAD
            locationList: [],
            productionList: [],
            columns: [
@@ -179,7 +188,6 @@
               if (!this.list[i].locationId) return uni.showToast({ title: `第${i+1}项入库货位不能为空`, icon: 'none', duration: 2000 });
               if (!this.list[i].materialId) return uni.showToast({ title: `第${i+1}项入库物料不能为空`, icon: 'none', duration: 2000 });
               if (!this.list[i].qualityType) return uni.showToast({ title: `第${i+1}项质量属性不能为空`, icon: 'none', duration: 2000 });
               if (!this.list[i].batch) return uni.showToast({ title: `第${i+1}项批次号不能为空`, icon: 'none', duration: 2000 });
               if (this.list[i].num <= 0) {
                  return uni.showToast({ title: `第${i + 1}项入库数量必须大于0`, icon: 'none', duration: 2000 });
               }
@@ -335,6 +343,16 @@
         typeClose() {
            this.typeShow = false
         },
=======
            list: [],
            warehouseShow: false
         };
      },
      methods: {
         getValue(val) {
            this.warehouseShow = false
         },
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
         close() {
            this.warehouseShow = false
         },