2025/6/27

src/views/modules/project/projectInfo/projectInfo.vue

@@ -1424,6 +1424,7 @@
       search () {
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
+        this.searchData.userId = this.$store.state.user.id
         projectInfoSearch(this.searchData).then(({data}) => {
           if (data.code == 0) {
             this.dataList1 = data.page.list

src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue

@@ -126,78 +126,78 @@ export default {
           fixed: '',
           columnWidth: 100
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 102001,
-          serialNumber: '102001Table2Qty',
-          tableId: '102001Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'unitPrice',
-          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: 102001,
-          serialNumber: '102001Table2Qty',
-          tableId: '102001Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'taxRate',
-          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: 102001,
-          serialNumber: '102001Table2Qty',
-          tableId: '102001Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'exchangeRate1',
-          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: 102001,
-          serialNumber: '102001Table2Qty',
-          tableId: '102001Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'taxUnitPrice',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '含税单价(CNY)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100
-        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 102001,
+        //   serialNumber: '102001Table2Qty',
+        //   tableId: '102001Table2',
+        //   tableName: '报价详情信息表',
+        //   columnProp: 'unitPrice',
+        //   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: 102001,
+        //   serialNumber: '102001Table2Qty',
+        //   tableId: '102001Table2',
+        //   tableName: '报价详情信息表',
+        //   columnProp: 'taxRate',
+        //   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: 102001,
+        //   serialNumber: '102001Table2Qty',
+        //   tableId: '102001Table2',
+        //   tableName: '报价详情信息表',
+        //   columnProp: 'exchangeRate1',
+        //   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: 102001,
+        //   serialNumber: '102001Table2Qty',
+        //   tableId: '102001Table2',
+        //   tableName: '报价详情信息表',
+        //   columnProp: 'taxUnitPrice',
+        //   headerAlign: 'center',
+        //   align: 'right',
+        //   columnLabel: '含税单价(CNY)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100
+        // },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
@@ -216,24 +216,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 102001,
-          serialNumber: '102001Table2Qty',
-          tableId: '102001Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'exchangeRate2',
-          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: 102001,
+        //   serialNumber: '102001Table2Qty',
+        //   tableId: '102001Table2',
+        //   tableName: '报价详情信息表',
+        //   columnProp: 'exchangeRate2',
+        //   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: 102001,
@@ -252,24 +252,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5011,
-          serialNumber: '102001Table2Qty',
-          tableId: '102001Table2',
-          tableName: '报价详情信息表',
-          columnProp: 'unitPrice',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '未税单价(CNY)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100
-        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 5011,
+        //   serialNumber: '102001Table2Qty',
+        //   tableId: '102001Table2',
+        //   tableName: '报价详情信息表',
+        //   columnProp: 'unitPrice',
+        //   headerAlign: 'center',
+        //   align: 'right',
+        //   columnLabel: '未税单价(CNY)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100
+        // },
         {
           userId: this.$store.state.user.name,
           functionId: 5011,

src/views/modules/quote/detail/primary/quoteDetailCost.vue

@@ -149,9 +149,7 @@ export default {
       this.quoteDetail.totalCost =
         this.quoteDetail.adjustPartCost +
         this.quoteDetail.adjustMachineCost +
-        this.quoteDetail.adjustFabricateCost +
-        this.quoteDetail.adjustLabourCost +
-        this.quoteDetail.manageCost;
+        this.quoteDetail.adjustLabourCost;
       if (this.selectionChecked.includes('其他')){
         this.quoteDetail.totalCost += this.quoteDetail.adjustElseCost;
       }
@@ -297,6 +295,7 @@ export default {
       let value = 0;
       // 公式包含Tool +测试+其他+包装+运输
       let otherCost = this.quoteDetail.toolCost + this.quoteDetail.testCost + this.quoteDetail.elseCost + this.quoteDetail.packCost + this.quoteDetail.shippingCost
+      let partCost = this.quoteDetail.toolCost + this.quoteDetail.adjustPartCost + this.quoteDetail.packCost + this.quoteDetail.shippingCost
       // 其他成本 + 材料成本 + 机器成本 + 人工成本
       let ttlCost = otherCost + this.quoteDetail.adjustPartCost + this.quoteDetail.adjustMachineCost + this.quoteDetail.adjustLabourCost;
       switch (type){
@@ -306,39 +305,52 @@ export default {
             return;
           }
           //price = (物料成本+工具成本+运输成本+包装成本)/(1-value)+其他额外成本
-          this.quoteDetail.quoteTaxTotalPrice = (this.quoteDetail.adjustPartCost + otherCost)/(1-value)+this.totalElseCost
+          // this.quoteDetail.quoteTaxTotalPrice = (this.quoteDetail.adjustPartCost + otherCost)/(1-value)+this.totalElseCost
+          this.quoteDetail.quoteTaxTotalPrice = (partCost)/(1-value)+this.totalElseCost
           // contribution = 1-(物料成本+人工成本+工具成本+运输成本+包装成本)/(price-额外其他成本)
-          this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          // this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustLabourCost + partCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
           // margin = (price-额外其他成本-总成本)/(price-额外其他成本)
-          this.quoteDetail.quoteTaxRate = ((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
+          // this.quoteDetail.quoteTaxRate = ((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
+          this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - this.quoteDetail.totalCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
           break;
         case 'contribution':
           value = this.quoteDetail.quoteProfitAmount/100
           //price = (物料成本+工具成本+运输成本+包装成本+人工成本)/(1-value)+其他额外成本
-          this.quoteDetail.quoteTaxTotalPrice = (this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(1-value)+this.totalElseCost
-          console.log(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)
+          // this.quoteDetail.quoteTaxTotalPzorice = (this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(1-value)+this.totalElseCost
+          // this.quoteDetail.quoteTaxTotalPrice = (partCost + this.quoteDetail.adjustLabourCost)/(1-this.quoteDetail.quoteProfitAmount)+this.totalElseCost
+          this.quoteDetail.quoteTaxTotalPrice = (partCost + this.quoteDetail.adjustLabourCost)/(1-value)+this.totalElseCost
           // va = 1-(物料成本+工具成本+运输成本+包装成本)/(price-额外其他成本)
-          this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          // this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          this.quoteDetail.quoteProfitRate = (1-(partCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
           // margin = (price-额外其他成本-总成本)/(price-额外其他成本)
-          this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
+          // this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
+          this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - this.quoteDetail.totalCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
           break;
         case 'margin':
           value = this.quoteDetail.quoteTaxRate/100
           // price = 总成本/(1-value)+其他额外成本
-          this.quoteDetail.quoteTaxTotalPrice = ttlCost/(1-value)+this.totalElseCost
+          // this.quoteDetail.quoteTaxTotalPrice = ttlCost/(1-value)+this.totalElseCost
+          // this.quoteDetail.quoteTaxTotalPrice = ttlCost1/(1-this.quoteDetail.quoteTaxRate)+this.totalElseCost
+          this.quoteDetail.quoteTaxTotalPrice = ttlCost1/(1-value)+this.totalElseCost
           // va = 1-(物料成本+工具成本+运输成本+包装成本)/(price-额外其他成本)
-          this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          // this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          this.quoteDetail.quoteProfitRate = (1-(partCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
           // contribution = 1-(物料成本+人工成本+工具成本+运输成本+包装成本)/(price-额外其他成本)
-          this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          // this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustLabourCost + partCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
           break;
         case 'price':
           value = this.quoteDetail.quoteTaxTotalPrice
           // va = 1-(物料成本+工具成本+运输成本+包装成本)/(value-额外其他成本)
-          this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          // this.quoteDetail.quoteProfitRate = (1-(this.quoteDetail.adjustPartCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          this.quoteDetail.quoteProfitRate = (1-(partCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
           // contribution = 1-(物料成本+人工成本+工具成本+运输成本+包装成本)/(value-额外其他成本)
-          this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          // this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustPartCost + this.quoteDetail.adjustLabourCost + otherCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
+          this.quoteDetail.quoteProfitAmount = (1-(this.quoteDetail.adjustLabourCost + partCost)/(this.quoteDetail.quoteTaxTotalPrice-this.totalElseCost))*100
           // margin = (value-额外其他成本-总成本)/(value-额外其他成本)
-          this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
+          // this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - ttlCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
+          this.quoteDetail.quoteTaxRate=((this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost - this.quoteDetail.totalCost)/(this.quoteDetail.quoteTaxTotalPrice - this.totalElseCost))*100
           break;
       }
     }