diff --git a/src/views/AssetManagement/Asset Account/edit.vue b/src/views/AssetManagement/Asset Account/edit.vue index fc0fd47..1097c18 100644 --- a/src/views/AssetManagement/Asset Account/edit.vue +++ b/src/views/AssetManagement/Asset Account/edit.vue @@ -153,8 +153,9 @@ diff --git a/src/views/AssetManagement/Asset acquisition/edit.vue b/src/views/AssetManagement/Asset acquisition/edit.vue index 39c766c..94fd369 100644 --- a/src/views/AssetManagement/Asset acquisition/edit.vue +++ b/src/views/AssetManagement/Asset acquisition/edit.vue @@ -81,8 +81,9 @@ diff --git a/src/views/AssetManagement/Asset depreciation/edit.vue b/src/views/AssetManagement/Asset depreciation/edit.vue index c8fac66..1c4493f 100644 --- a/src/views/AssetManagement/Asset depreciation/edit.vue +++ b/src/views/AssetManagement/Asset depreciation/edit.vue @@ -70,8 +70,9 @@ diff --git a/src/views/AssetManagement/AssetPurchasing/edit.vue b/src/views/AssetManagement/AssetPurchasing/edit.vue index 2b87336..605a947 100644 --- a/src/views/AssetManagement/AssetPurchasing/edit.vue +++ b/src/views/AssetManagement/AssetPurchasing/edit.vue @@ -77,8 +77,9 @@ diff --git a/src/views/AssetManagement/Assetreturn/edit.vue b/src/views/AssetManagement/Assetreturn/edit.vue index a4c2d3b..917df59 100644 --- a/src/views/AssetManagement/Assetreturn/edit.vue +++ b/src/views/AssetManagement/Assetreturn/edit.vue @@ -65,8 +65,9 @@ diff --git a/src/views/Materialmanagement/Inquiry/edit.vue b/src/views/Materialmanagement/Inquiry/edit.vue index 1c2b405..18dd545 100644 --- a/src/views/Materialmanagement/Inquiry/edit.vue +++ b/src/views/Materialmanagement/Inquiry/edit.vue @@ -70,8 +70,9 @@ diff --git a/src/views/Materialmanagement/Monthlyinventory/edit.vue b/src/views/Materialmanagement/Monthlyinventory/edit.vue index 31b348a..728df1e 100644 --- a/src/views/Materialmanagement/Monthlyinventory/edit.vue +++ b/src/views/Materialmanagement/Monthlyinventory/edit.vue @@ -73,8 +73,9 @@ diff --git a/src/views/Materialmanagement/Selfpurchasereceipt/edit.vue b/src/views/Materialmanagement/Selfpurchasereceipt/edit.vue index 9cecda8..2f32acd 100644 --- a/src/views/Materialmanagement/Selfpurchasereceipt/edit.vue +++ b/src/views/Materialmanagement/Selfpurchasereceipt/edit.vue @@ -78,8 +78,9 @@ diff --git a/src/views/Materialmanagement/TransferOrder/edit.vue b/src/views/Materialmanagement/TransferOrder/edit.vue index 69492b3..930c35f 100644 --- a/src/views/Materialmanagement/TransferOrder/edit.vue +++ b/src/views/Materialmanagement/TransferOrder/edit.vue @@ -84,8 +84,9 @@ diff --git a/src/views/Materialmanagement/TransferOrder_detail/edit.vue b/src/views/Materialmanagement/TransferOrder_detail/edit.vue index 69492b3..930c35f 100644 --- a/src/views/Materialmanagement/TransferOrder_detail/edit.vue +++ b/src/views/Materialmanagement/TransferOrder_detail/edit.vue @@ -84,8 +84,9 @@ diff --git a/src/views/Materialmanagement/materialHandlingForm/edit.vue b/src/views/Materialmanagement/materialHandlingForm/edit.vue index 01ead7f..c8df627 100644 --- a/src/views/Materialmanagement/materialHandlingForm/edit.vue +++ b/src/views/Materialmanagement/materialHandlingForm/edit.vue @@ -66,8 +66,9 @@ diff --git a/src/views/Materialmanagement/material_list/edit.vue b/src/views/Materialmanagement/material_list/edit.vue index 333749d..ace7450 100644 --- a/src/views/Materialmanagement/material_list/edit.vue +++ b/src/views/Materialmanagement/material_list/edit.vue @@ -112,8 +112,9 @@ diff --git a/src/views/Materialmanagement/outboundorder/edit.vue b/src/views/Materialmanagement/outboundorder/edit.vue index e365794..e1a43a5 100644 --- a/src/views/Materialmanagement/outboundorder/edit.vue +++ b/src/views/Materialmanagement/outboundorder/edit.vue @@ -77,8 +77,9 @@ diff --git a/src/views/Materialmanagement/returnorder/edit.vue b/src/views/Materialmanagement/returnorder/edit.vue index b06c97e..a64df25 100644 --- a/src/views/Materialmanagement/returnorder/edit.vue +++ b/src/views/Materialmanagement/returnorder/edit.vue @@ -100,8 +100,9 @@ diff --git a/src/views/bid_document_examination/edit.vue b/src/views/bid_document_examination/edit.vue index 60e38d1..ed965c0 100644 --- a/src/views/bid_document_examination/edit.vue +++ b/src/views/bid_document_examination/edit.vue @@ -209,8 +209,9 @@ diff --git a/src/views/expense_reimbursement/edit.vue b/src/views/expense_reimbursement/edit.vue index 8201c7a..ebef5dd 100644 --- a/src/views/expense_reimbursement/edit.vue +++ b/src/views/expense_reimbursement/edit.vue @@ -110,8 +110,9 @@ @@ -149,8 +150,9 @@ diff --git a/src/views/financialManagement/expense_reimbursement/edit.vue b/src/views/financialManagement/expense_reimbursement/edit.vue index b705df3..dce38cd 100644 --- a/src/views/financialManagement/expense_reimbursement/edit.vue +++ b/src/views/financialManagement/expense_reimbursement/edit.vue @@ -110,8 +110,9 @@ @@ -149,8 +150,9 @@ diff --git a/src/views/ordermanagement/saleorder/edit.vue b/src/views/ordermanagement/saleorder/edit.vue index 4b3941f..b31846c 100644 --- a/src/views/ordermanagement/saleorder/edit.vue +++ b/src/views/ordermanagement/saleorder/edit.vue @@ -229,8 +229,9 @@ @@ -300,8 +301,9 @@ diff --git a/src/views/procurement_contract_change/edit.vue b/src/views/procurement_contract_change/edit.vue index 9f29d2c..50f4f1d 100644 --- a/src/views/procurement_contract_change/edit.vue +++ b/src/views/procurement_contract_change/edit.vue @@ -120,8 +120,9 @@ @@ -186,8 +187,9 @@ diff --git a/src/views/project_alarm/outputvalue/details/edit.vue b/src/views/project_alarm/outputvalue/details/edit.vue index aecc74b..ffae63f 100644 --- a/src/views/project_alarm/outputvalue/details/edit.vue +++ b/src/views/project_alarm/outputvalue/details/edit.vue @@ -76,8 +76,9 @@ diff --git a/src/views/project_alarm/outputvalue/report/edit.vue b/src/views/project_alarm/outputvalue/report/edit.vue index aecc74b..ffae63f 100644 --- a/src/views/project_alarm/outputvalue/report/edit.vue +++ b/src/views/project_alarm/outputvalue/report/edit.vue @@ -76,8 +76,9 @@ diff --git a/src/views/project_alarm/warningrecords/edit.vue b/src/views/project_alarm/warningrecords/edit.vue index aecc74b..ffae63f 100644 --- a/src/views/project_alarm/warningrecords/edit.vue +++ b/src/views/project_alarm/warningrecords/edit.vue @@ -76,8 +76,9 @@ diff --git a/src/views/project_finance/expense_reimbursement/edit.vue b/src/views/project_finance/expense_reimbursement/edit.vue index 82ed21a..6643349 100644 --- a/src/views/project_finance/expense_reimbursement/edit.vue +++ b/src/views/project_finance/expense_reimbursement/edit.vue @@ -106,8 +106,9 @@ @@ -156,8 +157,9 @@ diff --git a/src/views/project_finance/travel_reimbursement/edit.vue b/src/views/project_finance/travel_reimbursement/edit.vue index f336c24..b460905 100644 --- a/src/views/project_finance/travel_reimbursement/edit.vue +++ b/src/views/project_finance/travel_reimbursement/edit.vue @@ -106,8 +106,9 @@ @@ -156,8 +157,9 @@ diff --git a/src/views/project_salary_payment/edit.vue b/src/views/project_salary_payment/edit.vue index 7069c2f..7b6f786 100644 --- a/src/views/project_salary_payment/edit.vue +++ b/src/views/project_salary_payment/edit.vue @@ -68,8 +68,9 @@ diff --git a/src/views/quotation/edit.vue b/src/views/quotation/edit.vue index 9df3c69..8c6315d 100644 --- a/src/views/quotation/edit.vue +++ b/src/views/quotation/edit.vue @@ -102,8 +102,9 @@ @@ -314,7 +315,7 @@ const customEvent = (e: any) => { }; const customEvent1 = (e: any) => { tableData.value.push({ - product_id: e.id, + product_id: e.id: any, name: e.name, code: e.code, unit: e.unit, @@ -326,7 +327,7 @@ const customEvent1 = (e: any) => { price: 0, remark: '', amount: 0, - amount_including: 0, + amount_including: 0 }) // formData.customer_id = e.id; // customer_name.value = e.name; diff --git a/src/views/subcontracting_contract/edit.vue b/src/views/subcontracting_contract/edit.vue index db671c4..c4fbe18 100644 --- a/src/views/subcontracting_contract/edit.vue +++ b/src/views/subcontracting_contract/edit.vue @@ -136,8 +136,10 @@ @@ -192,8 +194,9 @@ diff --git a/src/views/subcontracting_contract_negotiation/edit.vue b/src/views/subcontracting_contract_negotiation/edit.vue index 5e1913a..df09929 100644 --- a/src/views/subcontracting_contract_negotiation/edit.vue +++ b/src/views/subcontracting_contract_negotiation/edit.vue @@ -12,40 +12,37 @@ - - + + - - + + - - + + - - + + - - + + - + - + - - - @@ -53,7 +50,7 @@ - + @@ -153,6 +150,9 @@ const project_name = ref('') const project_code = ref('') const formDataannex = reactive([]) const formDataannex1 = reactive([]) +const supplier_name = ref('') +const supplier_code = ref('') +const contract_no = ref('') const tableData = reactive([]) const tableData1 = reactive([]) import feedback from '@/utils/feedback' @@ -250,9 +250,11 @@ const formData = reactive({ }) const customEvent = (e: any) => { - + contract_no.value = e.contract_no; + supplier_name.value = e.supplier_name; + formData.signing_date = e.signing_date; project_name.value = e.project_name; - formData.project_id = e.id + formData.subcontracting_contract_id = e.id; project_code.value = e.project_code showDialog.value = false;