From 641b1715533df67adaa824f56b0c2f3622cc650f Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 26 Mar 2025 14:28:10 +0800
Subject: [PATCH] 2025-03-26

---
 .../modules/proofing/requestForProofing.vue   |  9 +--
 .../quotation/inquiry/inquiryQuoteDetail.vue  | 56 +++++++++----------
 .../modules/quotation/requestForQuote.vue     |  5 +-
 src/views/modules/quotation/toBeQuoted.vue    |  6 +-
 .../quote/detail/primary/quoteDetailCost.vue  | 10 +++-
 src/views/modules/quote/index.vue             |  9 ++-
 .../modules/quote/primary/quoteSearch.vue     | 18 +++---
 src/views/modules/test/requestForTest.vue     |  4 ++
 8 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index b4b7986..fcb1e99 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -2638,15 +2638,10 @@ export default {
     saveProofing() {
       proofingInformationSave(this.modalData).then(({data}) => {
         if (data && data.code === 0) {
+          this.searchData.proofingNo = data.proofingNo
           this.getDataList()
           this.modalFlag = false
-          this.$message({
-            message: '操作成功',
-            type: 'success',
-            duration: 1500,
-            onClose: () => {
-            }
-          })
+          this.$message.success('操作成功')
         } else {
           this.$alert(data.msg, '错误', {
             confirmButtonText: '确定'
diff --git a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
index 181e22c..1799c92 100644
--- a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
+++ b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
@@ -111,128 +111,128 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table2AdjustPartCost',
+          serialNumber: '102001Table2Qty',
           tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustPartCost',
+          columnProp: 'unitPrice',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '材料成本',
+          columnLabel: '未税单价',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 130
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table2AdjustLabourCost',
+          serialNumber: '102001Table2Qty',
           tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustLabourCost',
+          columnProp: 'taxRate',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '人工成本',
+          columnLabel: '税率',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table2AdjustMachineCost',
+          serialNumber: '102001Table2Qty',
           tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustMachineCost',
+          columnProp: 'exchangeRate1',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '机器成本',
+          columnLabel: '其他税率',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table2AdjustToolCost',
+          serialNumber: '102001Table2Qty',
           tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustToolCost',
+          columnProp: 'taxUnitPrice',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '工具成本',
+          columnLabel: '含税单价(CNY)',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table2AdjustTestCost',
+          serialNumber: '102001Table2Qty',
           tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustTestCost',
+          columnProp: 'currencyDesc2',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '测试成本',
+          columnLabel: '币种',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table2AdjustElseCost',
+          serialNumber: '102001Table2Qty',
           tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustElseCost',
+          columnProp: 'exchangeRate2',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '其他成本',
+          columnLabel: '汇率',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table2TotalCost',
+          serialNumber: '102001Table2Qty',
           tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'totalCost',
+          columnProp: 'currencyTotalCost2',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '总成本',
+          columnLabel: '含税单价',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 140
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index dbb2472..fac35b2 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -2579,8 +2579,9 @@ export default {
             quotationInformationSave(this.modalData).then(({data}) => {
               this.saveLoading = false
               if (data && data.code === 0) {
-                this.modalFlag = false
-                this.$message('操作成功')
+                this.modalFlag = false;
+                this.searchData.quotationBatchNo = data.quotationBatchNo
+                this.$message.success('操作成功')
                 this.getDataList()
               } else {
                 this.$message(data.msg)
diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue
index e7a8396..e8c2afb 100644
--- a/src/views/modules/quotation/toBeQuoted.vue
+++ b/src/views/modules/quotation/toBeQuoted.vue
@@ -609,7 +609,11 @@ export default {
           this.$message.success(data.msg);
           this.quoteVisible = false;
           this.$refs.quotationTable.clearSelection();
-          this.$router.push({name:"quote-index",params:{ids:data.rows},})
+          if (this.$router.resolve('quote-index').resolved.name === '404') {
+            this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
+          } else {
+            this.$router.push({name:"quote-index",params:{ids:data.rows},})
+          }
         }else {
           this.$message.error(data.msg);
         }
diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index b01fd6e..86429ef 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -142,9 +142,9 @@ export default {
       this.quoteDetail.totalPrice =
         this.quoteDetail.totalCost + this.quoteDetail.profitAmount;
       this.quoteDetail.unitPrice =
-        this.quoteDetail.totalPrice ;
+        this.quoteDetail.quoteTaxTotalPrice ;
       this.quoteDetail.taxTotalPrice =
-        this.quoteDetail.totalPrice + this.quoteDetail.totalPrice * ((this.quoteDetail.taxRate+this.quoteDetail.exchangeRate1) / 100);
+        this.quoteDetail.unitPrice + this.quoteDetail.unitPrice * ((this.quoteDetail.taxRate+this.quoteDetail.exchangeRate1) / 100);
       this.quoteDetail.taxUnitPrice =
         this.quoteDetail.taxTotalPrice ;
       this.computeCurrencyTotalCost();
@@ -375,6 +375,12 @@ export default {
         this.quoteDetail.currencyTotalCost2 = 0;
       }
     },
+    'quoteDetail.quoteTaxTotalPrice'(newValue, oldValue){
+      if (newValue === undefined || newValue === null){
+        this.quoteDetail.quoteTaxTotalPrice = 0;
+      }
+      this.computeTaxCost();
+    },
     selectionChecked(newVal,oldVal){
       if (newVal.length === this.allCheckedLabel.length){
         this.checkAll = true;
diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue
index 13f1ec8..05140c6 100644
--- a/src/views/modules/quote/index.vue
+++ b/src/views/modules/quote/index.vue
@@ -381,7 +381,6 @@ export default {
         currency:[{required: true, message: '请输入币种', trigger: ['blur','change']}],
         quoteDate:[{required: true, message: '请选择报价日期', trigger: ['blur','change']}],
         quoter:[{required: true, message: '请输入报价专员', trigger: ['blur','change']}],
-        purchase:[{required: true, message: '请输入采购专员', trigger: ['blur','change']}],
       },
       customerVisible:false,
       projectVisible:false,
@@ -508,9 +507,12 @@ export default {
         if (data && data.code === 0){
           this.dataList = data.rows
           this.total = data.total
-          if (index !== undefined){
-            this.handleSelect(this.dataList[index])
+          if (this.dataList[0] !== undefined){
+            this.handleSelect(this.dataList[0])
           }
+          // if (index !== undefined){
+          //   this.handleSelect(this.dataList[index])
+          // }
         }else {
           this.$message.error(data.msg)
         }
@@ -602,6 +604,7 @@ export default {
       saveQuote(params).then(({data})=>{
         if (data && data.code === 0){
           this.saveVisible = false
+          this.quoteForm.quoteVersionNo = data.quoteVersionNo
           this.$message.success(data.msg)
         }else {
           this.$message.warning(data.msg)
diff --git a/src/views/modules/quote/primary/quoteSearch.vue b/src/views/modules/quote/primary/quoteSearch.vue
index f274b00..9cce0a7 100644
--- a/src/views/modules/quote/primary/quoteSearch.vue
+++ b/src/views/modules/quote/primary/quoteSearch.vue
@@ -24,49 +24,49 @@ export default {
       <el-row :gutter="10">
         <el-col :span="3">
           <el-form-item label="客户编码">
-            <el-input v-model="quote.customerNo"></el-input>
+            <el-input v-model="quote.customerNo" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item label="客户名称">
-            <el-input v-model="quote.customerDesc"></el-input>
+            <el-input v-model="quote.customerDesc" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item label="采购专员">
-            <el-input v-model="quote.purchase"></el-input>
+            <el-input v-model="quote.purchase" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item label="报价单号">
-            <el-input v-model="quote.quoteVersionNo"></el-input>
+            <el-input v-model="quote.quoteVersionNo" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item label="客户询价单号">
-            <el-input v-model="quote.customerInquiryNo"></el-input>
+            <el-input v-model="quote.customerInquiryNo" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item label="内部询价单号">
-            <el-input v-model="quote.insideInquiryNo"></el-input>
+            <el-input v-model="quote.insideInquiryNo" clearable></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="10">
         <el-col :span="3">
           <el-form-item label="项目编码">
-            <el-input v-model="quote.projectNo"></el-input>
+            <el-input v-model="quote.projectNo" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item label="项目名称">
-            <el-input v-model="quote.projectDesc"></el-input>
+            <el-input v-model="quote.projectDesc" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item label="报价专员">
-            <el-input v-model="quote.quoter"></el-input>
+            <el-input v-model="quote.quoter" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index d8bc922..05df012 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -2,6 +2,9 @@
   <div class="mod-config">
     <!-- 查询条件 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'测试编码'">
+        <el-input v-model="searchData.testNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'客户编码'">
         <el-input v-model="searchData.customerNo" clearable style="width: 120px"></el-input>
       </el-form-item>
@@ -2650,6 +2653,7 @@
       saveTest(){
         testInformationSave(this.modalData).then(({data}) => {
           if (data && data.code === 0) {
+            this.searchData.testNo = data.testNo
             this.getDataList();
             this.activeTabList = ['product','process','attribute','partAttribute','file']
             this.activeTab = 'attribute'