|  | @@ -167,6 +167,7 @@
 | 
	
		
			
				|  |  |      <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
 | 
	
		
			
				|  |  |        <a-tab-pane tab="采购订单 - 产品明细(product details)" key="purOrderFormShipFormProduct" :forceRender="true">
 | 
	
		
			
				|  |  |          <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;" @click="selectSaleOrderList"> 选择销售订单(select saleorder)</a-button>
 | 
	
		
			
				|  |  | +        <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectVirtualProducts"> 选择虚拟产品(select virtual products)</a-button>
 | 
	
		
			
				|  |  |          <!-- <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;" @click="SelectSupplierQuotationList">选择供应商报价选定(select supplier quotation selection)</a-button> -->
 | 
	
		
			
				|  |  |          <!-- <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectProductList"> 选择产品(select product)</a-button> -->
 | 
	
		
			
				|  |  |          <j-vxe-table
 | 
	
	
		
			
				|  | @@ -181,6 +182,7 @@
 | 
	
		
			
				|  |  |            :rowNumber="true"
 | 
	
		
			
				|  |  |            :rowSelection="true"
 | 
	
		
			
				|  |  |            asyncRemove
 | 
	
		
			
				|  |  | +          @valueChange="changeValues"
 | 
	
		
			
				|  |  |            >
 | 
	
		
			
				|  |  |              <template #action="props">
 | 
	
		
			
				|  |  |                <a-popconfirm title="确定删除吗?" @confirm="handleDelete(props)">
 | 
	
	
		
			
				|  | @@ -485,9 +487,6 @@
 | 
	
		
			
				|  |  |            });
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      function selectProductList(){
 | 
	
		
			
				|  |  | -        SelectPrpductModalRef.value.getTable()
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  |        function onSearchProject(){
 | 
	
		
			
				|  |  |          SelectProjectModalRef.value.getTable()
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -497,7 +496,8 @@
 | 
	
		
			
				|  |  |            item.productCode = item.code
 | 
	
		
			
				|  |  |            item.productId = item.id
 | 
	
		
			
				|  |  |          })
 | 
	
		
			
				|  |  | -        var arrProduct = data.concat(purOrderFormShipFormProductTable.dataSource)
 | 
	
		
			
				|  |  | +        var xTable = purOrderFormShipFormProductTableRef.value!.getXTable()
 | 
	
		
			
				|  |  | +        var arrProduct = xTable.data.concat(data)
 | 
	
		
			
				|  |  |          purOrderFormShipFormProductTable.dataSource=arrProduct  
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        function getShipList(id,status){
 | 
	
	
		
			
				|  | @@ -545,7 +545,8 @@
 | 
	
		
			
				|  |  |            item.taxAmount = item.taxPrice*item.quantity
 | 
	
		
			
				|  |  |            // item.productClass =data[0].productClass
 | 
	
		
			
				|  |  |          })
 | 
	
		
			
				|  |  | -        var arrProduct = data.concat(purOrderFormShipFormProductTable.dataSource)
 | 
	
		
			
				|  |  | +        var xTable = purOrderFormShipFormProductTableRef.value!.getXTable()
 | 
	
		
			
				|  |  | +        var arrProduct = xTable.data.concat(data)
 | 
	
		
			
				|  |  |          purOrderFormShipFormProductTable.dataSource=arrProduct  
 | 
	
		
			
				|  |  |          notAllowEdit.value=true
 | 
	
		
			
				|  |  |          formData.sourceCode2 =data[0].billCode
 | 
	
	
		
			
				|  | @@ -624,6 +625,23 @@
 | 
	
		
			
				|  |  |        function selectSaleOrderList(){
 | 
	
		
			
				|  |  |          SelectSaleOrderModalRef.value.getTable(formData)
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | +      function selectVirtualProducts(){
 | 
	
		
			
				|  |  | +        SelectPrpductModalRef.value.getTableVirtual()
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +      function changeValues(prop){
 | 
	
		
			
				|  |  | +        if(prop.col.key=='quantity'){
 | 
	
		
			
				|  |  | +          if(prop.row.quantity){
 | 
	
		
			
				|  |  | +            var num= prop.row.quantity*Number(prop.row.taxPrice)
 | 
	
		
			
				|  |  | +            prop.row.taxAmount =isNaN(num)?'': num.toFixed(2)
 | 
	
		
			
				|  |  | +          }
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +        if(prop.col.key=='taxPrice'){
 | 
	
		
			
				|  |  | +          if(prop.row.taxPrice){
 | 
	
		
			
				|  |  | +            var num= prop.row.quantity*Number(prop.row.taxPrice)
 | 
	
		
			
				|  |  | +            prop.row.taxAmount =isNaN(num)?'': num.toFixed(2)
 | 
	
		
			
				|  |  | +          }
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  |        /**
 | 
	
		
			
				|  |  |         * 值改变事件触发-树控件回调
 | 
	
		
			
				|  |  |         * @param key
 | 
	
	
		
			
				|  | @@ -654,7 +672,6 @@
 | 
	
		
			
				|  |  |          edit,
 | 
	
		
			
				|  |  |          copy,
 | 
	
		
			
				|  |  |          formRef,
 | 
	
		
			
				|  |  | -        selectProductList,
 | 
	
		
			
				|  |  |          SelectPrpductModalRef,
 | 
	
		
			
				|  |  |          addProduct,
 | 
	
		
			
				|  |  |          onSearchProject,
 | 
	
	
		
			
				|  | @@ -670,7 +687,9 @@
 | 
	
		
			
				|  |  |          selectSaleOrderList,
 | 
	
		
			
				|  |  |          addFormSaleOrder,
 | 
	
		
			
				|  |  |          ClassList,
 | 
	
		
			
				|  |  | -        supplierOption
 | 
	
		
			
				|  |  | +        supplierOption,
 | 
	
		
			
				|  |  | +        selectVirtualProducts,
 | 
	
		
			
				|  |  | +        changeValues
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    });
 |