diff --git a/src/views/modules/quotation/batchRequestForQuote.vue b/src/views/modules/quotation/batchRequestForQuote.vue
index 63ca4c7..bb691de 100644
--- a/src/views/modules/quotation/batchRequestForQuote.vue
+++ b/src/views/modules/quotation/batchRequestForQuote.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.quotationBatchNo" 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>
@@ -40,13 +43,16 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item label="批次序号">
+        <el-input v-model="searchData.quotationItemNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'项目编码'">
         <el-input v-model="searchData.projectId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'项目名称'">
         <el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'询价专员'">
+      <el-form-item :label="'报价专员'">
         <el-input v-model="searchData.quoterName" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'优先等级'">
@@ -314,6 +320,7 @@
         searchData: {
           site: this.$store.state.user.site,
           customerNo: '',
+          quotationItemNo: '',
           customerDesc: '',
           trackerName: '',
           testPartNo: '',
@@ -430,6 +437,40 @@
             status: true,
             fixed: '',
             columnWidth: 120
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 102001,
+            serialNumber: '102001Table1QuotationBatchNo',
+            tableId: '102001Table1',
+            tableName: '询价信息表',
+            columnProp: 'quotationBatchNo',
+            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: 102001,
+            serialNumber: '102001Table1QuotationItemNo',
+            tableId: '102001Table1',
+            tableName: '询价信息表',
+            columnProp: 'quotationItemNo',
+            headerAlign: 'center',
+            align: 'right',
+            columnLabel: '序号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
           },
           {
             userId: this.$store.state.user.name,
@@ -530,7 +571,7 @@
             columnProp: 'quoterName',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '询价专员',
+            columnLabel: '报价专员',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 2fe7e86..615bda5 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -2,7 +2,10 @@
   <div class="mod-config">
     <!-- 查询条件 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'客户编码'">
+      <el-form-item label="申请批次号">
+        <el-input v-model="searchData.quotationBatchNo" 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>
       <el-form-item :label="'客户名称'">
@@ -40,13 +43,16 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item label="批次序号">
+        <el-input v-model="searchData.quotationItemNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'项目编码'">
         <el-input v-model="searchData.projectId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'项目名称'">
         <el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'询价专员'">
+      <el-form-item :label="'报价专员'">
         <el-input v-model="searchData.quoterName" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'优先等级'">
@@ -207,7 +213,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item prop="quoterName">
-              <span slot="label" style="" @click="getBaseList(103,2)"><a herf="#">询价专员</a></span>
+              <span slot="label" style="" @click="getBaseList(103,2)"><a herf="#">报价专员</a></span>
               <el-input v-model="modalData.quoterName"></el-input>
             </el-form-item>
           </el-col>
@@ -895,6 +901,8 @@
           site: this.$store.state.user.site,
           customerNo: '',
           customerDesc: '',
+          quotationBatchNo:'',
+          quotationItemNo:'',
           trackerName: '',
           testPartNo: '',
           partName: '',
@@ -1071,6 +1079,40 @@
             status: true,
             fixed: '',
             columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 102001,
+            serialNumber: '102001Table1QuotationBatchNo',
+            tableId: '102001Table1',
+            tableName: '询价信息表',
+            columnProp: 'quotationBatchNo',
+            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: 102001,
+            serialNumber: '102001Table1QuotationItemNo',
+            tableId: '102001Table1',
+            tableName: '询价信息表',
+            columnProp: 'quotationItemNo',
+            headerAlign: 'center',
+            align: 'right',
+            columnLabel: '序号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
           },
           {
             userId: this.$store.state.user.name,
@@ -1098,7 +1140,7 @@
             tableName: '询价信息表',
             columnProp: 'customerDesc',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '客户名称',
             columnHidden: false,
             columnImage: false,
@@ -1134,7 +1176,7 @@
             tableName: '询价信息表',
             columnProp: 'projectName',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '项目名称',
             columnHidden: false,
             columnImage: false,
@@ -1152,7 +1194,7 @@
             tableName: '询价信息表',
             columnProp: 'trackerName',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '跟单员',
             columnHidden: false,
             columnImage: false,
@@ -1170,8 +1212,8 @@
             tableName: '询价信息表',
             columnProp: 'quoterName',
             headerAlign: 'center',
-            align: 'center',
-            columnLabel: '询价专员',
+            align: 'left',
+            columnLabel: '报价专员',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1206,7 +1248,7 @@
             tableName: '询价信息表',
             columnProp: 'partName',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '物料名称',
             columnHidden: false,
             columnImage: false,
@@ -1224,7 +1266,7 @@
             tableName: '询价信息表',
             columnProp: 'priorityLevel',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '优先等级',
             columnHidden: false,
             columnImage: false,
@@ -1296,7 +1338,7 @@
             tableName: '询价信息表',
             columnProp: 'createBy',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '创建人',
             columnHidden: false,
             columnImage: false,
@@ -1332,7 +1374,7 @@
             tableName: '询价信息表',
             columnProp: 'updateBy',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '更新人',
             columnHidden: false,
             columnImage: false,
@@ -2008,6 +2050,11 @@
               this.$message.warning('请选择询价专员名称！')
               return
             }
+            if (this.projectPartListSelections.length === 0){
+              this.$message.warning('请选择询价专员名称！')
+              return
+            }
+            this.confirmProjectPart();
             if (this.modalData.testPartNo === '' || this.modalData.testPartNo == null) {
               this.$message.warning('请选择产品编码！')
               return
@@ -2025,10 +2072,7 @@
               return
             }
           }else {
-            if (this.projectPartListSelections.length === 0){
-              this.$message.warning('请选择产品！')
-              return
-            }
+
             if (this.modalData.flag === '1') {
               quotationInformationSave(this.modalData).then(({data}) => {
                 if (data && data.code === 0) {
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index 8f6b453..ba08b6f 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -54,7 +54,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="2">
-          <el-form-item label="销售员">
+          <el-form-item label="报价专员">
             <el-input v-model="searchData.quoterName" size="large" clearable/>
           </el-form-item>
         </el-col>
@@ -158,7 +158,7 @@
         align="left"
         prop="quoterName"
         show-overflow-tooltip
-        label="销售员">
+        label="报价专员">
       </el-table-column>
       <el-table-column
         align="left"
@@ -235,7 +235,7 @@
           <el-col :span="8">
             <el-form-item prop="internalInquiryNo">
               <span slot="label" style="" @click="quotationNoDialogFlag = true"><a herf="#">内部询价单号</a></span>
-              <el-input v-model="insertData.internalInquiryNo" placeholder="请输入内容" clearable/>
+              <el-input v-model="insertData.internalInquiryBatchNo" placeholder="请输入内容" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="2">
@@ -294,9 +294,9 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-<!--            <el-form-item prop="quoter" label="销售员">-->
-            <el-form-item label="销售员">
-              <span slot="label" style="" @click="getBaseList(103,2)"><a herf="#">销售员</a></span>
+<!--            <el-form-item prop="quoter" label="报价专员">-->
+            <el-form-item label="报价专员">
+              <span slot="label" style="" @click="getBaseList(103,2)"><a herf="#">报价专员</a></span>
               <el-input v-model="insertData.quoterName" @clear="clearQuoter" placeholder="请输入内容" clearable />
             </el-form-item>
           </el-col>
@@ -336,17 +336,20 @@
         <el-form-item label="询价单号">
           <el-input v-model="quotationNoSearchData.quotationNo" clearable/>
         </el-form-item>
+        <el-form-item label="申请批次号">
+          <el-input v-model="quotationNoSearchData.quotationBatchNo" clearable style="width: 120px"></el-input>
+        </el-form-item>
         <el-form-item label=" ">
           <el-button type="primary" style="padding: 3px 12px" @click="searchQuotationData">查询</el-button>
         </el-form-item>
       </el-form>
       <el-table :data="quotationNoData" stripe border @cell-dblclick="dblclickQuotationNo">
-        <el-table-column prop="quotationNo" label="询价单号">
-
-        </el-table-column>
-        <el-table-column prop="projectName" label="项目名称">
-
-        </el-table-column>
+        <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>
       <el-footer style="height:30px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="quotationNoDialogFlag = false">关闭</el-button>
@@ -394,7 +397,7 @@ export default {
         quotationStatus:"", //状态
         projectId:"", // 项目编码
         projectName:"", // 项目名称
-        quoterName:"", // 销售员
+        quoterName:"", // 报价专员
         startDate:"", // 开始日期
         endDate:"", // 结束日期
         dateValue:[],// 开始时间结束时间数组
@@ -424,13 +427,14 @@ export default {
         projectName:"",//项目名称
         tracker:"",//跟单员
         quoter:"",//销售编号
-        quoterName:"",//销售员
+        quoterName:"",//报价专员
         trackerName:"",//跟单员
         currency:"",//货币
         quotationStatus:"草稿",//状态
         remark:"",//备注
         customerInquiryNo:"",//客户询价单号
         internalInquiryNo:"",//内部询价单号
+        internalInquiryBatchNo:"",//内部询价单号
         requireApproval:"",//需要审批
         approvalStatus:"",//审批状态
         createBy:this.$store.state.user.id,//当前登录账号
@@ -444,7 +448,7 @@ export default {
         {label:"versionCode",value:"版本号"},
         {label:"projectId",value:"项目编码"},
         {label:"projectName",value:"项目名称"},
-        {label:"quoterName",value:"销售员"},
+        {label:"quoterName",value:"报价专员"},
         {label:"trackerName",value:"跟单员"},
         {label:"currency",value:"货币"},
         {label:"quotationStatus",value:"状态"},
@@ -500,6 +504,7 @@ export default {
       // 内部报价单搜索表单对象
       quotationNoSearchData:{
         quotationNo:"",//单号
+        quotationBatchNo:"",//批次号
         site:this.$store.state.user.site,//工厂编号
       },
       //内部报价单搜索表格数据对象
@@ -596,6 +601,7 @@ export default {
     // 修改方法
     editQuotationHeader(row){
       this.insertData = JSON.parse(JSON.stringify(row));
+      this.insertData.internalInquiryBatchNo = this.insertData.internalInquiryNo.split("-")[0]
       this.insertDiaLogFlag = true;
     },
     // size 发送改变
@@ -654,7 +660,7 @@ export default {
         projectName:"",//项目名称
         tracker:"",//跟单员
         quoter:"",//销售编号
-        quoterName:"",//销售员
+        quoterName:"",//报价专员
         trackerName:"",//跟单员
         currency:"",//货币
         quotationStatus:"草稿",//状态
@@ -774,7 +780,9 @@ export default {
       this.insertData.tracker=row.tracker;//跟单员
       this.insertData.trackerName=row.trackerName;
       this.insertData.quoter=row.quoter;//销售编号
+      this.insertData.quoterName=row.quoterName;//销售编号
       this.insertData.internalInquiryNo=row.quotationNo;//内部询价单号
+      this.insertData.internalInquiryBatchNo=row.quotationBatchNo;//内部询价单号
       this.insertData.currency=row.customerCurrency;//内部询价单号
       // 关闭弹框
       this.quotationNoDialogFlag = false;
diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail.vue
index 5936374..f47c0ed 100644
--- a/src/views/modules/quotation/sellForQuotation/quotationDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quotationDetail.vue
@@ -135,7 +135,7 @@
           </el-table-column>
           <el-table-column show-overflow-tooltip
             label="询价单号" prop="internalInquiryNo"
-            width="80" align="center">
+            width="160" align="center">
           </el-table-column>
           <el-table-column show-overflow-tooltip
             label="报价次数" prop="quotationDetailCount"
diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue
index 8f890fd..8098a49 100644
--- a/src/views/modules/quotation/toBeQuoted.vue
+++ b/src/views/modules/quotation/toBeQuoted.vue
@@ -2,6 +2,11 @@
   <div>
     <el-form label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-row :gutter="20">
+        <el-col :span="defaultFlag?2:3">
+          <el-form-item label="申请批次号">
+            <el-input v-model="searchData.quotationBatchNo" clearable style="width: 120px"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="defaultFlag?2:3">
           <el-form-item label="客户编码">
             <el-input v-model="searchData.customerNo" clearable></el-input>
@@ -58,10 +63,15 @@
             </el-col>
           </el-row>
         </el-col>
-        <el-col :span="2" :offset="8" v-if="defaultFlag">
+        <el-col :span="2" :offset="6" v-if="defaultFlag">
           <el-form-item label=" ">
           </el-form-item>
         </el-col>
+        <el-col :span="2" v-if="defaultFlag">
+          <el-form-item label="批次序号">
+            <el-input v-model="searchData.quotationItemNo" clearable style="width: 120px"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="defaultFlag?2:3" >
           <el-form-item label="项目编码">
             <el-input v-model="searchData.projectId" clearable></el-input>
@@ -174,6 +184,8 @@ export default {
       // 查询条件
       searchData:{
         site: this.$store.state.user.site,
+        quotationBatchNo: '',
+        quotationItemNo: '',
         customerNo: '',
         customerDesc: '',
         trackerName: '',
@@ -219,6 +231,40 @@ export default {
           status: true,
           fixed: false,
           columnWidth: 120
+        },{
+          userId: this.$store.state.user.name,
+          functionId: 102001,
+          serialNumber: '102001Table1QuotationBatchNo',
+          tableId: '102001Table1',
+          tableName: '询价信息表',
+          columnProp: 'quotationBatchNo',
+          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: 102001,
+          serialNumber: '102001Table1QuotationItemNo',
+          tableId: '102001Table1',
+          tableName: '询价信息表',
+          columnProp: 'quotationItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60
         },
         {
           userId: this.$store.state.user.name,