|
@@ -134,7 +134,6 @@
|
|
|
<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
|
|
@@ -177,7 +176,6 @@
|
|
|
</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>
|
|
@@ -192,7 +190,6 @@
|
|
|
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';
|
|
@@ -214,7 +211,6 @@
|
|
|
BaseShipArchiveAccessoriesModal,
|
|
|
SelectPurchaseOrderModal,
|
|
|
ApiSelect,
|
|
|
- SelectPrpductModal
|
|
|
},
|
|
|
props:{
|
|
|
formDisabled:{
|
|
@@ -233,7 +229,6 @@
|
|
|
const SelectProjectModalRef = ref()
|
|
|
const BaseShipArchiveAccessoriesModalRef = ref();
|
|
|
const SelectPurchaseOrderModalRef = ref();
|
|
|
- const SelectPrpductModalRef =ref()
|
|
|
const ArriveGoodsFormShipFormShipTable = reactive<Record<string, any>>({
|
|
|
loading: false,
|
|
|
columns: ArriveGoodsFormShipColumns,
|
|
@@ -386,9 +381,6 @@
|
|
|
function selectPurchaseOrderList(){
|
|
|
SelectPurchaseOrderModalRef.value.getTable(formData)
|
|
|
}
|
|
|
- function selectVirtualProducts(){
|
|
|
- SelectPrpductModalRef.value.getTableVirtual()
|
|
|
- }
|
|
|
function getShipList(id){
|
|
|
let params = {id:id}
|
|
|
let url = '/purCode/purOrder/queryPurOrderShipByMainId'
|
|
@@ -460,15 +452,6 @@
|
|
|
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
|
|
|
- }
|
|
|
|
|
|
/**
|
|
|
* 值改变事件触发-树控件回调
|
|
@@ -510,9 +493,6 @@
|
|
|
changeSupplier,
|
|
|
supplierOption,
|
|
|
ClassList,
|
|
|
- selectVirtualProducts,
|
|
|
- SelectPrpductModalRef,
|
|
|
- addProduct
|
|
|
}
|
|
|
}
|
|
|
});
|