From 98022540127ca011a46ac14f7829b86755d939e5 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 18 Mar 2024 09:09:04 +0800
Subject: [PATCH] 2024-03-18

---
 .../modules/proofing/requestForProofing.vue   | 53 +++++++--------
 .../modules/quotation/requestForQuote.vue     |  2 +-
 .../modules/quotation/sellForQuotation.vue    | 65 +++++++++++++++----
 .../sellForQuotation/quoteDetail.vue          | 29 ++++++++-
 src/views/modules/test/requestForTest.vue     |  2 +-
 5 files changed, 105 insertions(+), 46 deletions(-)

diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 3c49c17..e6d2d90 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -1466,31 +1466,31 @@
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table3CustomerNo',
+            serialNumber: '102001Table3TestPartNo',
             tableId: '102001Table3',
             tableName: '项目物料表',
-            columnProp: 'customerNo',
+            columnProp: 'testPartNo',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '客户编码',
+            columnLabel: '产品编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100
+            columnWidth: 150
           },
           {
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table3CustomerDesc',
+            serialNumber: '102001Table3PartDesc',
             tableId: '102001Table3',
             tableName: '项目物料表',
-            columnProp: 'customerDesc',
+            columnProp: 'partDesc',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '客户名称',
+            columnLabel: '产品名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1498,53 +1498,50 @@
             status: true,
             fixed: '',
             columnWidth: 120
-          },
-          {
+          },{
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table3ProjectName',
+            serialNumber: '102001Table3PartSpec',
             tableId: '102001Table3',
             tableName: '项目物料表',
-            columnProp: 'projectId',
+            columnProp: 'partSpec',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '项目编码',
+            columnLabel: '产品规格',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100
-          },
-          {
+            columnWidth: 120
+          },{
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table3TestPartNo',
+            serialNumber: '102001Table3PartTypeDesc',
             tableId: '102001Table3',
             tableName: '项目物料表',
-            columnProp: 'testPartNo',
+            columnProp: 'partTypeDesc',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '产品编码',
+            columnLabel: '产品类型',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 150
-          },
-          {
+            columnWidth: 120
+          },{
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table3PartDesc',
+            serialNumber: '102001Table3CodeNo',
             tableId: '102001Table3',
             tableName: '项目物料表',
-            columnProp: 'partDesc',
+            columnProp: 'codeNo',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '产品名称',
+            columnLabel: '模板编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1555,13 +1552,13 @@
           },{
             userId: this.$store.state.user.name,
             functionId: 102001,
-            serialNumber: '102001Table3PartType',
+            serialNumber: '102001Table3CodeDesc',
             tableId: '102001Table3',
             tableName: '项目物料表',
-            columnProp: 'partType',
+            columnProp: 'codeDesc',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '产品类型',
+            columnLabel: '模板名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1910,7 +1907,7 @@
       updateModal (row) {
         this.modalData = {
           flag: '2',
-          title: '打样编辑',
+          title: '打样编辑-'+row.proofingNo,
           site: row.site,
           proofingNo: row.proofingNo,
           customerNo: row.customerNo,
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index d811e62..fcba61d 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -1906,7 +1906,7 @@
       updateModal (row) {
         this.modalData = {
           flag: '2',
-          title: '询价编辑',
+          title: '询价编辑-'+row.quotationNo,
           site: row.site,
           quotationNo: row.quotationNo,
           customerNo: row.customerNo,
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index a8a135e..f43845a 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -70,7 +70,7 @@
         fixed
         width="160">
         <template slot-scope="scope">
-          <el-link style="cursor: pointer" @click="editQuotationHeaderStatus(scope.row,'下达')">下达</el-link>
+          <el-link style="cursor: pointer" v-if="scope.row.quotationStatus !== '下达'" @click="editQuotationHeaderStatus(scope.row,'下达')">下达</el-link>
           <el-link style="cursor: pointer" @click="editQuotationHeader(scope.row)">编辑</el-link>
           <el-link style="cursor: pointer" @click="deleteQuotationHeader(scope.row)">删除</el-link>
           <el-link style="cursor: pointer" @click="quotationAgain(scope.row)">重新报价</el-link>
@@ -146,7 +146,7 @@
           <el-col :span="8">
             <el-form-item prop="customerNo" label="客户编码">
               <span slot="label" style="" v-if="insertData.internalInquiryBatchNo ===''" @click="getBaseList(102,1)"><a herf="#">客户编码</a></span>
-              <el-input v-model="insertData.customerNo" :disabled="insertData.internalInquiryBatchNo !==''" placeholder="请输入内容" clearable />
+              <el-input v-model="insertData.customerNo" :disabled="insertData.internalInquiryBatchNo !==''" placeholder="请输入内容" clearable @clear="clearCustomer"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="2">
@@ -222,8 +222,7 @@
     <el-dialog title="内部询价单号"
                @close="closeQuotationNoDialog"
                @open="openQuotationNoDialog"
-               :visible.sync="quotationNoDialogFlag"
-               width="685px" v-drag>
+               :visible.sync="quotationNoDialogFlag" v-drag>
       <el-form label-position="top"
                inline="inline"
                :model="quotationNoSearchData"
@@ -239,13 +238,13 @@
           <el-button type="primary" style="padding: 3px 12px" @click="searchQuotationData">查询</el-button>
         </el-form-item>
       </el-form>
-      <el-table :data="quotationNoData" height="200" stripe border @cell-dblclick="dblclickQuotationNo">
-        <el-table-column prop="quotationNo" label="询价单号"/>
-        <el-table-column prop="quotationBatchNo" label="询价批次号"/>
-        <el-table-column width="60" align="right" prop="quotationItemNo" label="询价序号"/>
-        <el-table-column prop="projectName" label="项目名称"/>
-        <el-table-column width="160" prop="testPartNo" label="项目料号"/>
-        <el-table-column prop="partName" label="物料名称"/>
+      <el-table :data="quotationNoData" height="300" stripe border @cell-dblclick="dblclickQuotationNo">
+        <el-table-column prop="quotationNo" header-align="center" label="询价单号"/>
+        <el-table-column prop="quotationBatchNo" header-align="center" label="询价批次号"/>
+        <el-table-column width="60" align="center" header-align="center" prop="quotationItemNo" label="询价序号"/>
+        <el-table-column prop="projectName" header-align="center" label="项目名称"/>
+        <el-table-column width="180" prop="testPartNo" header-align="center" label="项目料号"/>
+        <el-table-column prop="partName" header-align="center" label="物料名称"/>
       </el-table>
       <el-footer style="height:30px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="quotationNoDialogFlag = false">关闭</el-button>
@@ -1002,8 +1001,48 @@ export default {
       })
     },
     editQuotationHeaderStatus(row,status){
-      this.insertData = JSON.parse(JSON.stringify(row));
-      this.insertData.approvalStatus = status;
+      let params = JSON.parse(JSON.stringify(row));
+      params.approvalStatus = status;
+      saveQuotationHeader(params).then(({data})=>{
+        // 返回提示
+        if (data.code === 200){
+          this.initData();
+          this.restQuoteHeader();
+        }
+        this.$message.success(data.msg);
+      })
+    },
+    restQuoteHeader(){
+      this.insertData={
+        site:this.$store.state.user.site,
+        quotationNo:"",//客户报价单号
+        quotationDate:new Date(),//报价日期
+        customerNo:"", // 客户编号
+        customerName:"",//客户名称
+        versionCode:"001",
+        projectId:"",//项目编码
+        projectName:"",//项目名称
+        tracker:"",//跟单员
+        quoter:"",//销售编号
+        quoterName:"",//报价专员
+        trackerName:"",//跟单员
+        currency:"",//货币
+        quotationStatus:"草稿",//状态
+        remark:"",//备注
+        customerInquiryNo:"",//客户询价单号
+        internalInquiryNo:"",//内部询价单号
+        internalInquiryBatchNo:"",//内部询价单号
+        requireApproval:"",//需要审批
+        approvalStatus:"",//审批状态
+        createBy:this.$store.state.user.id,//当前登录账号
+        createTime:new Date(),//当前时间
+      }
+    },
+    clearCustomer(){
+      this.insertData.customerNo = '';
+      this.insertData.customerName = '';
+      this.insertData.projectId = '';
+      this.insertData.projectName = '';
     }
   },
   computed:{
diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
index d1b5bb9..3b624c2 100644
--- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
@@ -53,6 +53,7 @@ export default {
       })
     };
     return{
+      index:'',
       insertQuotationDetailLoading:false,
       projectPartDialogFlag:false,
       quotationLeadIntoDetailFlag:false,
@@ -254,7 +255,14 @@ export default {
       })
     },
     // 修改 报价详情
-    editQuotationDetail(row) {
+    editQuotationDetail(row,index) {
+      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.quotationDetail = JSON.parse(JSON.stringify(row));
       this.quotationDetailFlag = true;
     },
@@ -466,6 +474,20 @@ export default {
           .setCost(bomCost,0,0,0,toolCost,
             packCost,shippingCost)
       })
+    },
+    editQuotationDetailStatus(row,status){
+      let params = JSON.parse(JSON.stringify(row))
+      params.quotationDetailStatus = status;
+      updateQuotationDetail(params).then(({data}) => {
+        if (data.code === 200) {
+          this.initData();
+          this.$message.success(data.msg);
+        } else {
+          this.$message.warning(data.msg);
+        }
+      }).catch((error)=>{
+        this.$message.error(error);
+      })
     }
   },
 }
@@ -484,8 +506,8 @@ export default {
       fixed
       width="120" align="center">
       <template slot-scope="{row,$index}">
-        <el-link style="cursor: pointer">下达</el-link>
-        <el-link style="cursor: pointer" @click="editQuotationDetail(row)">编辑</el-link>
+        <el-link style="cursor: pointer" v-if="row.quotationDetailStatus !== '下达'" @click="editQuotationDetailStatus(row,'下达')">下达</el-link>
+        <el-link style="cursor: pointer" @click="editQuotationDetail(row,$index+1)">编辑</el-link>
         <el-link style="cursor: pointer" @click="deleteQuotationDetailData(row)">删除</el-link>
       </template>
     </el-table-column>
@@ -673,6 +695,7 @@ export default {
              width="60%" top="10vh" :close-on-click-modal="false">
     <div slot="title" class="medium">
       <div>
+        <span class="el-dialog__title">报价单号 {{this.header.quotationNo+"-"+this.header.versionCode+"-"+index}}</span>
         <span style="float: right;margin-right: 30px;cursor:pointer;" @click="fullscreen = !fullscreen">
           <svg v-if="!fullscreen" t="1710144122404" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4774" width="16" height="16"><path d="M145.066667 85.333333h153.6c25.6 0 42.666667-17.066667 42.666666-42.666666S324.266667 0 298.666667 0H34.133333C25.6 0 17.066667 8.533333 8.533333 17.066667 0 25.6 0 34.133333 0 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666666s42.666667-17.066667 42.666666-42.666666V145.066667l230.4 230.4c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733334L145.066667 85.333333z m170.666666 563.2L162.133333 802.133333l-76.8 76.8V725.333333C85.333333 699.733333 68.266667 682.666667 42.666667 682.666667s-42.666667 17.066667-42.666667 42.666666v256c0 25.6 17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666666-42.666667s-17.066667-42.666667-42.666666-42.666666H145.066667l76.8-76.8 153.6-153.6c17.066667-17.066667 17.066667-42.666667 0-59.733334-17.066667-17.066667-42.666667-17.066667-59.733334 0z m665.6 34.133334c-25.6 0-42.666667 17.066667-42.666666 42.666666v153.6l-76.8-76.8-153.6-153.6c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733334l153.6 153.6 76.8 76.8H725.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666s17.066667 42.666667 42.666666 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666666z m0-682.666667h-256c-25.6 0-42.666667 17.066667-42.666666 42.666667s17.066667 42.666667 42.666666 42.666666h153.6l-76.8 76.8-153.6 153.6c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733334 0l153.6-153.6 76.8-76.8v153.6c0 25.6 17.066667 42.666667 42.666666 42.666666s42.666667-17.066667 42.666667-42.666666v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z" fill="#8a8a8a" p-id="4775"></path></svg>
           <svg v-else t="1710143735808" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4603" width="16" height="16"><path d="M354.133333 682.666667H256v-42.666667h170.666667v170.666667H384v-98.133334L243.2 853.333333l-29.866667-29.866666L354.133333 682.666667z m358.4 0l140.8 140.8-29.866666 29.866666-140.8-140.8V810.666667h-42.666667v-170.666667h170.666667v42.666667h-98.133334zM354.133333 384L213.333333 243.2l29.866667-29.866667L384 354.133333V256h42.666667v170.666667H256V384h98.133333z m358.4 0H810.666667v42.666667h-170.666667V256h42.666667v98.133333L823.466667 213.333333l29.866666 29.866667L712.533333 384z" fill="#444444" p-id="4604"></path></svg>
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index 61e1dca..2e17e13 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -1974,7 +1974,7 @@
       updateModal (row) {
         this.modalData = {
           flag: '2',
-          title: '测试申请',
+          title: '测试申请-'+row.testNo,
           site: row.site,
           testNo: row.testNo,
           customerNo: row.customerNo,