From f2f9b784f50405877ca1a313413733f4cf9005d3 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Fri, 30 Aug 2024 15:57:37 +0800 Subject: [PATCH] 2024-07-23 --- src/api/quotation/quote.js | 5 +- src/views/modules/quotation/index.vue | 578 --- .../quotation/inquiry/inquiryQuoteDetail.vue | 565 +++ .../modules/quotation/requestForQuote.vue | 5 +- .../modules/quotation/sellForQuotation.vue | 80 +- .../sellForQuotation/quotationDetail.vue | 3892 ----------------- .../quotationDetail/quoteBomInfo.vue | 52 - .../quotationDetail/quoteCostPrice.vue | 23 - .../sellForQuotation/quoteDetail.vue | 10 +- .../sellForQuotation/quoteDetailInfo.vue | 684 --- 10 files changed, 631 insertions(+), 5263 deletions(-) delete mode 100644 src/views/modules/quotation/index.vue create mode 100644 src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue delete mode 100644 src/views/modules/quotation/sellForQuotation/quotationDetail.vue delete mode 100644 src/views/modules/quotation/sellForQuotation/quotationDetail/quoteBomInfo.vue delete mode 100644 src/views/modules/quotation/sellForQuotation/quotationDetail/quoteCostPrice.vue delete mode 100644 src/views/modules/quotation/sellForQuotation/quoteDetailInfo.vue diff --git a/src/api/quotation/quote.js b/src/api/quotation/quote.js index 95e2b41..c6dc948 100644 --- a/src/api/quotation/quote.js +++ b/src/api/quotation/quote.js @@ -2,4 +2,7 @@ import {createAPI} from "../../utils/httpRequest"; export const getQuoteList = (data)=>createAPI(`/quote/list`,'post',data) -export const getQuotePage = (data,no,size)=>createAPI(`/quote/page/${no}/${size}`,'post',data) +export const getQuotePage = (data)=>createAPI(`/quote/page/${data.no}/${data.size}`,'post',data) + + +export const queryQuoteByInquiryNo = (data) => createAPI(`/quote/detail`,'post',data) diff --git a/src/views/modules/quotation/index.vue b/src/views/modules/quotation/index.vue deleted file mode 100644 index 5a8c105..0000000 --- a/src/views/modules/quotation/index.vue +++ /dev/null @@ -1,578 +0,0 @@ - - - - - diff --git a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue new file mode 100644 index 0000000..3aa2385 --- /dev/null +++ b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue @@ -0,0 +1,565 @@ + + + + + diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 2678dec..1e5eeaf 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -986,9 +986,8 @@ - - + @@ -1037,6 +1036,7 @@ import priceCheckProperties from "./priceCheckProperties.vue"; import {getPriceCheckPropertiesList} from "../../../api/quotation/priceCheckProperties"; import PriceCheckDetail from "./sellForQuotation/priceCheckDetail/priceCheckDetail.vue"; import {getPriceCheckDetailList} from "../../../api/quotation/priceCheckDetail"; +import InquiryQuoteDetail from "./inquiry/inquiryQuoteDetail.vue"; export default { computed: { @@ -1057,6 +1057,7 @@ export default { }, }, components: { + InquiryQuoteDetail, PriceCheckDetail, TestProperties, PriceCheckProperties, diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue index 451f253..e430fb7 100644 --- a/src/views/modules/quotation/sellForQuotation.vue +++ b/src/views/modules/quotation/sellForQuotation.vue @@ -149,9 +149,6 @@ - - - @@ -384,7 +381,6 @@ diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail.vue deleted file mode 100644 index a7206a8..0000000 --- a/src/views/modules/quotation/sellForQuotation/quotationDetail.vue +++ /dev/null @@ -1,3892 +0,0 @@ - - - - diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteBomInfo.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteBomInfo.vue deleted file mode 100644 index 762f8fc..0000000 --- a/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteBomInfo.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteCostPrice.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteCostPrice.vue deleted file mode 100644 index bdd6778..0000000 --- a/src/views/modules/quotation/sellForQuotation/quotationDetail/quoteCostPrice.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue index aee23e7..b388c1f 100644 --- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue +++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue @@ -1015,6 +1015,12 @@ export default { clickProjectHandle(){ this.projectPartData.testPartNo = this.quotationDetail.productNo this.projectPartDialogFlag = true + }, + handleToBom(row){ + + }, + handleToRouting(row){ + } }, } @@ -1031,11 +1037,13 @@ export default { + width="140" align="center"> - -import PropertyTemplates from "./quotationDetail/propertyTemplates.vue"; -import CostPrice from "./quotationDetail/costPrice.vue"; -import BillOfMateriel from "./quotationDetail/billOfMateriel.vue"; -import ToolQuotation from "./quotationDetail/toolQuotation.vue"; -import QuoteRouting from "./quotationDetail/quoteRouting.vue"; -import QuoteOtherCost from "./quotationDetail/quoteOtherCost.vue"; -import {getQuotePropertiesBaseList, getQuotePropertiesList} from "../../../../api/quotation/quoteProperties"; -import QuoteBomInfo from "./quotationDetail/quoteBomInfo.vue"; - -const quoteDetail = { - quotationDetailId:undefined, - quotationHeaderId:undefined, - productNo:undefined, - productDesc:undefined, - internalInquiryNo:undefined, - quotationDetailQuantity:undefined, - quotationDetailCount:undefined, - quotationDetailStatus:undefined, - computePartCost:undefined, - computeLabourCost:undefined, - computeMachineCost:undefined, - computeFabricateCost:undefined, - computeToolCost:undefined, - adjustPartCost:undefined, - adjustLabourCost:undefined, - adjustFabricateCost:undefined, - adjustToolCost:undefined, - adjustMachineCost:undefined, - detailOtherCost:undefined, - detailManageCost:undefined, - detailTotalCost:undefined, - detailProfitRate:undefined, - detailProfitAmount:undefined, - systemComputeAmount:undefined, - systemComputePrice:undefined, - finalUntaxedPrice:undefined, - finalTaxedPrice:undefined, - taxRate:13, - remark:undefined, - active:undefined, -} -export default { - name: "quoteDetailInfo", - components: {QuoteBomInfo, QuoteOtherCost, QuoteRouting, ToolQuotation, BillOfMateriel, CostPrice, PropertyTemplates}, - props:{ - quote:{ - type:Object, - default:()=>{}, - }, - height:{ - type:Number, - default:300, - }, - dataList:{ - type:Array, - default:()=>[], - } - }, - data(){ - return{ - - - saveQuoteDetail:{ - ...quoteDetail, - }, - index:'', - saveVisible:false, - columnList: [ - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2ProductNo', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'productNo', - headerAlign: 'center', - align: 'left', - columnLabel: '产品编码', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 200 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2ProductDesc', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'productDesc', - headerAlign: 'center', - align: 'left', - columnLabel: '产品名称', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 200 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2QuotationDetailQuantity', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'quotationDetailQuantity', - headerAlign: 'center', - align: 'right', - columnLabel: '报价数量', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2ComputePartCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'computePartCost', - headerAlign: 'center', - align: 'right', - columnLabel: '计算后材料成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2ComputeMachineCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'computeMachineCost', - headerAlign: 'center', - align: 'right', - columnLabel: '计算后机器成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2ComputeLabourCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'computeLabourCost', - headerAlign: 'center', - align: 'right', - columnLabel: '计算后人工成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2ComputeFabricateCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'computeFabricateCost', - headerAlign: 'center', - align: 'right', - columnLabel: '计算后制造费用', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2ComputeToolCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'computeToolCost', - headerAlign: 'center', - align: 'right', - columnLabel: '计算后工具成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2AdjustPartCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'adjustPartCost', - headerAlign: 'center', - align: 'right', - columnLabel: '调整后材料成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2AdjustMachineCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'adjustMachineCost', - headerAlign: 'center', - align: 'right', - columnLabel: '调整后机器成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2AdjustLabourCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'adjustLabourCost', - headerAlign: 'center', - align: 'right', - columnLabel: '调整后人工成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2AdjustFabricateCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'adjustFabricateCost', - headerAlign: 'center', - align: 'right', - columnLabel: '调整后制造费用', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2AdjustToolCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'adjustToolCost', - headerAlign: 'center', - align: 'right', - columnLabel: '调整后工具成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2DetailOtherCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'detailOtherCost', - headerAlign: 'center', - align: 'right', - columnLabel: '其他成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2DetailManageCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'detailManageCost', - headerAlign: 'center', - align: 'right', - columnLabel: '管理成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2DetailTotalCost', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'detailTotalCost', - headerAlign: 'center', - align: 'right', - columnLabel: '总成本', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2DetailProfitRate', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'detailProfitRate', - headerAlign: 'center', - align: 'right', - columnLabel: '利润率%', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2DetailProfitAmount', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'detailProfitAmount', - headerAlign: 'center', - align: 'right', - columnLabel: '利润额', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2FinalUntaxedPrice', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'finalUntaxedPrice', - headerAlign: 'center', - align: 'right', - columnLabel: '未税单价', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2TaxRate', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'taxRate', - headerAlign: 'center', - align: 'right', - columnLabel: '税率%', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2FinalTaxedPrice', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'finalTaxedPrice', - headerAlign: 'center', - align: 'right', - columnLabel: '含税单价', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2SystemComputePrice', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'systemComputePrice', - headerAlign: 'center', - align: 'right', - columnLabel: '含税总价', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2QuotationDetailStatus', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'quotationDetailStatus', - headerAlign: 'center', - align: 'center', - columnLabel: '状态', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2Remark', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'remark', - headerAlign: 'center', - align: 'left', - columnLabel: '备注', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 102005, - serialNumber: '102005Table2InternalInquiryNo', - tableId: '102005Table2', - tableName: '报价详情信息表', - columnProp: 'internalInquiryNo', - headerAlign: 'center', - align: 'left', - columnLabel: '询价单号', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - ], - fullscreen: false, - activeName:"bom", - - bomTreeList:[], - - quoteOtherCostList:[], - quotePropertyList:[], - } - }, - methods:{ - handleUpdate(row,index){ - index = index+1 - this.saveQuoteDetail = {...row} - if (index < 10){ - this.index = "00"+index; - }else if (index%10 <= 10){ - this.index = "0"+index; - }else if (index%100 <= 10){ - this.index = index - } - this.saveVisible = true - }, - closeSaveDialog(){ - this.activeName = "bom"; - }, - handleQuoteOtherCostRefresh(val){ - let params = { - itemNo:val.itemNo, - itemDesc:val.itemDesc, - site:this.saveQuoteDetail.site, - quotationDetailId: this.saveQuoteDetail.quotationDetailId, - } - getQuotePropertiesBaseList(params).then(({data})=>{ - if (data && data.code === 0){ - this.quoteOtherCostList = data.rows1; - this.quotePropertyList = data.rows2; - }else { - this.$message.warning(data.msg) - } - }).catch((error)=>{ - this.$message.error(error) - }) - }, - getQuotePropertiesList(){ - let params = { - site:this.saveQuoteDetail.site, - quotationDetailId: this.saveQuoteDetail.quotationDetailId, - } - getQuotePropertiesList(params).then(({data})=>{ - if (data && data.code === 0){ - this.quoteOtherCostList = data.rows; - }else { - this.$message.warning(data.msg) - } - }).catch((error)=>{ - this.$message.error(error) - }) - } - }, - watch:{ - saveVisible(newVal,oldVal){ - if (newVal === true){ - this.getQuotePropertiesList(); - }else { - this.quoteOtherCostList = []; - this.quotePropertyList = []; - this.bomTreeList = []; - } - } - }, -} - - - - -