到货单-增加‘选择虚拟产品’按钮

src/views/publicComponents/SelectPrpductModal.vue

@@ -1,6 +1,6 @@
 <template>
     <a-modal
-      title="选择产品(select product)"
+      :title="modeaTitle"
       width="95%"
       :visible="visible"
       :maskClosable="false"
@@ -106,6 +106,8 @@
     const emit = defineEmits([ 'selectProduct']); //定义emit
     let classOption = ref([])
     var visible = ref(false)
+    var productType=ref('')
+    var modeaTitle =ref('选择产品(select product)')
     const columns = [
         { 
             type: 'selection',
@@ -234,6 +236,7 @@
         partno:'',
         orderno:'',
         drawingno:'',
+        virtualProduct:''
     });
     let pagination = ref({
       current: 1,
@@ -266,6 +269,11 @@
     }
     function getQueryParams(){
         let params = Object.assign(queryParams.value);
+        if(productType.value=='Virtual'){
+            params.virtualProduct=1
+        }else{
+            params.virtualProduct=''
+        }
         params.pageNo = pagination.value.current;
         params.pageSize = pagination.value.pageSize;
         return filterObj(params);
@@ -310,6 +318,7 @@
             partno:'',
             orderno:'',
             drawingno:'',
+            virtualProduct:''
         }
         pagination.value.current =1;
         pagination.value.pageSize = 10; 
@@ -376,11 +385,21 @@
     }
     function getTable(){
         visible.value = true
+        modeaTitle.value = '选择产品(select product)'
+        productType.value=''
+        loadData()
+        getOptiom()
+    }
+    function getTableVirtual(){
+        visible.value = true
+        productType.value='Virtual'
+        modeaTitle.value = '选择虚拟产品(select virtual products)'
         loadData()
         getOptiom()
     }
     defineExpose({
-      getTable
+      getTable,
+      getTableVirtual
     });
 </script>
 <style scoped lang="less">

src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -134,6 +134,7 @@
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
       <a-tab-pane tab="到货单 - 到货明细(arrive details)" key="arriveDetailsFormProduct" :forceRender="true">
         <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectPurchaseOrderList"> 选择采购单(select purchase order)</a-button>
+        <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectVirtualProducts"> 选择虚拟产品(select virtual products)</a-button>
         <j-vxe-table
           :keep-source="true"
           resizable
@@ -176,6 +177,7 @@
     </a-tabs>
     <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
     <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesModalRef"></BaseShipArchiveAccessoriesModal>
+    <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct="addProduct"></SelectPrpductModal>
     <SelectPurchaseOrderModal ref="SelectPurchaseOrderModalRef" @selectPurchaseOrder="addAddiveGoods"></SelectPurchaseOrderModal>
   </a-spin>
 </template>
@@ -190,6 +192,7 @@
   import SelectProjectModal from '../../../publicComponents/SelectProjectModal.vue';
   import BaseShipArchiveAccessoriesModal from '../../../publicComponents/BaseShipArchiveAccessoriesModal.vue';
   import SelectPurchaseOrderModal from '../../../publicComponents/SelectPurchaseOrderModal.vue';
+  import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
   import { JDictSelectTag} from '/@/components/Form';
@@ -210,7 +213,8 @@
       SelectProjectModal,
       BaseShipArchiveAccessoriesModal,
       SelectPurchaseOrderModal,
-      ApiSelect
+      ApiSelect,
+      SelectPrpductModal
     },
     props:{
       formDisabled:{
@@ -229,6 +233,7 @@
       const SelectProjectModalRef = ref()
       const BaseShipArchiveAccessoriesModalRef = ref();
       const SelectPurchaseOrderModalRef = ref();
+      const SelectPrpductModalRef =ref()
       const ArriveGoodsFormShipFormShipTable = reactive<Record<string, any>>({
         loading: false,
         columns: ArriveGoodsFormShipColumns,
@@ -381,6 +386,9 @@
       function selectPurchaseOrderList(){
         SelectPurchaseOrderModalRef.value.getTable(formData)
       }
+      function selectVirtualProducts(){
+        SelectPrpductModalRef.value.getTableVirtual()
+      }
       function getShipList(id){
         let params = {id:id}
         let url = '/purCode/purOrder/queryPurOrderShipByMainId'
@@ -452,6 +460,15 @@
           formData.supplierName = ''
         }
       }
+      function addProduct(data){
+        data.map(item=>{
+          item.productClass = item.classId_dictText
+          item.productCode = item.code
+          item.productId = item.id
+        })
+        var arrProduct = data.concat(arriveDetailsFormProductTable.dataSource)
+        arriveDetailsFormProductTable.dataSource=arrProduct  
+      }
         
       /**
        * 值改变事件触发-树控件回调
@@ -493,6 +510,9 @@
         changeSupplier,
         supplierOption,
         ClassList,
+        selectVirtualProducts,
+        SelectPrpductModalRef,
+        addProduct
       }
     }
   });