diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index efea22f..e8ee565 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -98,6 +98,9 @@
         <el-form-item :label="'制造类型'" prop="bomType" :rules="rules.bomType">
           <el-select v-model="modalData.bomType" :disabled="modalDisableFlag" style="width: 221px">
             <el-option label="Manufacturing" value="Manufacturing"></el-option>
+            <el-option label="ManufacturedRecipe" value="ManufacturedRecipe"></el-option>
+            <el-option label="PurchaseRaw" value="PurchaseRaw"></el-option>
+            <el-option label="Purchased" value="Purchased"></el-option>
           </el-select>
         </el-form-item>
 <!--        <el-form-item :label="'类型'" prop="typeFlag" :rules="rules.typeFlag">-->
@@ -384,13 +387,9 @@
         </el-form-item>
         <el-form-item :label="'生产属性'" prop="issueType" :rules="componentRules.issueType">
           <el-select v-model="componentData.issueType" clearable style="width: 142px">
-            <el-option label="领退料倒冲" value="A"></el-option>
-            <el-option label="工单倒冲" value="B"></el-option>
-            <el-option label="生产订单倒冲" value="C"></el-option>
-            <el-option label="投料倒冲" value="D"></el-option>
-            <el-option label="批次倒冲" value="E"></el-option>
-            <el-option label="销售订单倒冲" value="F"></el-option>
-            <el-option label="项目倒冲" value="G"></el-option>
+            <el-option label="ReserveAndBackflush" value="ReserveAndBackflush"></el-option>
+            <el-option label="Reserve" value="Reserve"></el-option>
+            <el-option label="Backflush" value="Backflush"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -1543,7 +1542,7 @@ export default {
         printUnitName: '',
         qtyPerAssembly: 0,
         componentScrap: 0,
-        issueType: '',
+        issueType: 'ReserveAndBackflush',
         shrinkageFactor: 0,
         lineItemNo: '',
         operationName: '',
diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index 317f994..9912fa1 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -135,11 +135,11 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="familyName" :rules="rules.familyName">
-          <span slot="label" @click="getBaseList(108)"><a herf="#">材料分类1</a></span>
+          <span slot="label" @click="getBaseList(108)"><a herf="#">材料分类</a></span>
           <el-input v-model="modalData.familyName" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item prop="groupName" :rules="rules.groupName">
-          <span slot="label" @click="getBaseList(109)"><a herf="#">材料分类2</a></span>
+          <span slot="label" @click="getBaseList(109)"><a herf="#">材料分组</a></span>
           <el-input v-model="modalData.groupName" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index ea625be..5b0a936 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -98,6 +98,8 @@
         <el-form-item :label="'工艺类型'" prop="routingType" :rules="rules.routingType">
           <el-select v-model="modalData.routingType" :disabled="modalDisableFlag" style="width: 221px">
             <el-option label="Manufacturing" value="Manufacturing"></el-option>
+            <el-option label="Repair" value="Repair"></el-option>
+            <el-option label="Prototype" value="Prototype"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/proofing/batchRequestForProofing.vue b/src/views/modules/proofing/batchRequestForProofing.vue
index 68a387b..73b903e 100644
--- a/src/views/modules/proofing/batchRequestForProofing.vue
+++ b/src/views/modules/proofing/batchRequestForProofing.vue
@@ -158,10 +158,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="打样结果信息" prop="proofingResultInformation" :rules="enterResultRules.proofingResultInformation">
-          <el-input type="textarea" v-model="enterResultData.proofingResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="enterResultData.proofingResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
+      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
         <el-form :inline="true" label-position="top" style="margin-top: 5px">
           <el-button type="primary" @click="uploadFile()">上传文件</el-button>
         </el-form>
@@ -198,7 +198,7 @@
           </el-table-column>
         </el-table>
       </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-footer style="height:35px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="saveProofingResult()">保存</el-button>
         <el-button type="primary" @click="closeProofingResultModal()">关闭</el-button>
       </el-footer>
@@ -221,10 +221,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="提交备注">
-          <el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
         <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
       </el-footer>
@@ -248,10 +248,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="客户回复信息">
-          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
         <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
       </el-footer>
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 3113c85..d70d76b 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -194,7 +194,7 @@
           <input type="checkbox" value="Y" name="sendSamples" v-model="modalData.isNeedToSendSamples"/>
         </el-form-item>
         <el-form-item label="送样地址">
-          <el-input v-model="modalData.sendSamplesAddress" style="width: 356px"></el-input>
+          <el-input v-model="modalData.sendSamplesAddress" style="width: 369px"></el-input>
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="modalData.remark" style="width: 456px"></el-input>
@@ -202,18 +202,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="技术注意事项">
-          <el-input
-            type="textarea"
-            v-model="modalData.technicalConsiderations"
-            :rows="1"
-            resize='none'
-            maxlength="300"
-            show-word-limit
-            style="width: 456px;height: 20px">
-          </el-input>
+          <el-input type="textarea" v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit style="width: 456px;height: 20px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:30px;margin-top: 20px;text-align:center">
+      <el-footer style="height:30px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
@@ -228,10 +220,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="打样结果信息" prop="proofingResultInformation" :rules="enterResultRules.proofingResultInformation">
-          <el-input type="textarea" v-model="enterResultData.proofingResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="enterResultData.proofingResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
+      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
         <el-form :inline="true" label-position="top" style="margin-top: 5px">
           <el-button type="primary" @click="uploadFile()">上传文件</el-button>
         </el-form>
@@ -268,7 +260,7 @@
           </el-table-column>
         </el-table>
       </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-footer style="height:35px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="saveProofingResult()">保存</el-button>
         <el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button>
       </el-footer>
@@ -293,10 +285,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="送货备注">
-          <el-input type="textarea" v-model="submitResultData.deliverGoodsRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="submitResultData.deliverGoodsRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
         <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
       </el-footer>
@@ -320,10 +312,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="客户回复信息">
-          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
         <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
       </el-footer>
@@ -389,16 +381,7 @@
       <el-tab-pane label="打样详细信息" name="proofing_detail_information">
         <el-form :inline="true" label-position="top" :model="proofingDetailData" style="margin-left: 10px;margin-top: 10px;">
           <el-form-item label="技术注意事项">
-            <el-input
-              type="textarea"
-              v-model="proofingDetailData.technicalConsiderations"
-              readonly
-              :rows="3"
-              resize='none'
-              maxlength="300"
-              show-word-limit
-              style="width: 600px;height: 30px">
-            </el-input>
+            <el-input type="textarea" v-model="proofingDetailData.technicalConsiderations" readonly :rows="3" resize='none' show-word-limit style="width: 600px;height: 30px"></el-input>
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" :model="proofingDetailData" style="margin-left: 10px;margin-top: 46px;">
@@ -1769,12 +1752,19 @@
             this.pageSize = data.page.pageSize
             this.totalPage = data.page.totalCount
             this.$refs.selectDiv.setLengthAll( this.dataList.length)
-            //判断是否全部存在数据
-            if(this.totalPage > 0){
+            // 判断是否全部存在数据
+            if (this.totalPage > 0) {
               //设置选中行
               this.$refs.proofingTable.setCurrentRow(this.dataList[0])
-              this.refreshCurrentTabTable() //加载当前的页签的table
+              //加载当前的页签的table
+              this.refreshCurrentTabTable()
               this.proofingClickRow(this.dataList[0])
+            } else {
+              //设置选中行
+              this.$refs.proofingTable.setCurrentRow({})
+              // 加载当前的页签的table
+              this.refreshCurrentTabTable()
+              this.testClickRow({})
             }
           }
           this.dataListLoading = false
diff --git a/src/views/modules/quotation/batchRequestForQuote.vue b/src/views/modules/quotation/batchRequestForQuote.vue
index 12df996..63ca4c7 100644
--- a/src/views/modules/quotation/batchRequestForQuote.vue
+++ b/src/views/modules/quotation/batchRequestForQuote.vue
@@ -158,10 +158,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="询价结果信息" prop="quotationResultInformation" :rules="enterResultRules.quotationResultInformation">
-          <el-input type="textarea" v-model="enterResultData.quotationResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="enterResultData.quotationResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
+      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
         <el-form :inline="true" label-position="top" style="margin-top: 5px">
           <el-button type="primary" @click="uploadFile()">上传文件</el-button>
         </el-form>
@@ -198,7 +198,7 @@
           </el-table-column>
         </el-table>
       </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-footer style="height:35px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="saveQuotationResult()">保存</el-button>
         <el-button type="primary" @click="closeQuotationResultModal()">关闭</el-button>
       </el-footer>
@@ -221,10 +221,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="提交备注">
-          <el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
         <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
       </el-footer>
@@ -248,10 +248,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="客户回复信息">
-          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
         <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
       </el-footer>
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 8450222..7b7cf20 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -201,7 +201,6 @@
             v-model="modalData.technicalConsiderations"
             :rows="1"
             resize='none'
-            maxlength="300"
             show-word-limit
             style="width: 456px;height: 20px">
           </el-input>
@@ -222,10 +221,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="询价结果信息" prop="quotationResultInformation" :rules="enterResultRules.quotationResultInformation">
-          <el-input type="textarea" v-model="enterResultData.quotationResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="enterResultData.quotationResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
+      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
         <el-form :inline="true" label-position="top" style="margin-top: 5px">
           <el-button type="primary" @click="uploadFile()">上传文件</el-button>
         </el-form>
@@ -262,7 +261,7 @@
           </el-table-column>
         </el-table>
       </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-footer style="height:35px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="saveQuotationResult()">保存</el-button>
         <el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button>
       </el-footer>
@@ -285,10 +284,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="提交备注">
-          <el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
         <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
       </el-footer>
@@ -312,10 +311,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="客户回复信息">
-          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
         <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
       </el-footer>
@@ -387,7 +386,6 @@
               readonly
               :rows="3"
               resize='none'
-              maxlength="300"
               show-word-limit
               style="width: 600px;height: 30px">
             </el-input>
diff --git a/src/views/modules/test/batchRequestForTest.vue b/src/views/modules/test/batchRequestForTest.vue
new file mode 100644
index 0000000..158c57e
--- /dev/null
+++ b/src/views/modules/test/batchRequestForTest.vue
@@ -0,0 +1,1431 @@
+<template>
+  <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.customerNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'客户名称'">
+        <el-input v-model="searchData.customerDesc" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'跟单员'">
+        <el-input v-model="searchData.trackerName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'产品编码'">
+        <el-input v-model="searchData.testPartNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'产品名称'">
+        <el-input v-model="searchData.partName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'要求交付日期'">
+        <el-date-picker
+          style="width: 120px"
+          v-model="searchData.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item style="margin-top: 23px;">
+        <laber style="margin-left: 0px;font-size: 19px">&#10142</laber>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-date-picker
+          style="width: 120px"
+          v-model="searchData.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </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.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-input v-model="searchData.engineerName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'优先等级'">
+        <el-select v-model="searchData.priorityLevel" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="紧急" value="紧急"></el-option>
+          <el-option label="一般" value="一般"></el-option>
+          <el-option label="不紧急" value="不紧急"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select v-model="searchData.testStatus" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="草稿" value="草稿"></el-option>
+          <el-option label="下达" value="下达"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="' '">
+        <el-button @click="testResultModal()" class="el-button el-button--primary el-button--medium">录入测试结果</el-button>
+        <el-button @click="submitTestModal()" class="el-button el-button--primary el-button--medium">录入送样信息</el-button>
+        <el-button @click="customerResponseModal()" class="el-button el-button--primary el-button--medium">客户回复</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 测试列表 -->
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      ref="testTable"
+      @row-click="testClickRow"
+      @selection-change="selectionTest"
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        :selectable="selectFlag"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="testResultStatus"
+        header-align="center"
+        align="center"
+        label="状态">
+        <template slot-scope="scope">
+          <span v-show="scope.row.testResultStatus === 'C'">已创建</span>
+          <span v-show="scope.row.testResultStatus === 'E'">已录入</span>
+          <span v-show="scope.row.testResultStatus === 'S'">已送样</span>
+          <span v-show="scope.row.testResultStatus === 'R'">已回复</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed === ''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <selectDiv ref="selectDiv"></selectDiv>
+
+    <!-- 分页插件 -->
+    <el-pagination style="margin-top: 0px"
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 录入测试结果模态框 -->
+    <el-dialog title="录入测试结果" :close-on-click-modal="false" v-drag :visible.sync="enterResultModalFlag" width="785px">
+      <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left: 0px;margin-top: 10px;">
+        <el-form-item label="实际交付日期" prop="actualityDeliveryDate" :rules="enterResultRules.actualityDeliveryDate">
+          <el-date-picker v-model="enterResultData.actualityDeliveryDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期" style="width: 200px"></el-date-picker>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
+        <el-form-item label="测试结果信息" prop="testResultInformation" :rules="enterResultRules.testResultInformation">
+          <el-input type="textarea" v-model="enterResultData.testResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
+        <el-form :inline="true" label-position="top" style="margin-top: 5px">
+          <el-button type="primary" @click="uploadFile()">上传文件</el-button>
+        </el-form>
+        <el-table
+          :height="200"
+          :data="enterResultData.fileContentList"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%">
+          <el-table-column
+            v-for="(item,index) in fileColumnList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed===''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            header-align="center"
+            align="center"
+            width="100"
+            label="操作">
+            <template slot-scope="scope">
+              <a @click="deleteFile(scope.row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveTestResult()">保存</el-button>
+        <el-button type="primary" @click="closeTestResultModal()">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 录入送样信息模态框 -->
+    <el-dialog title="录入送样信息" :close-on-click-modal="false" v-drag :visible.sync="submitResultModalFlag" width="620px">
+      <el-form :inline="true" label-position="top" :model="submitResultData" :rules="submitResultRules" style="margin-left: 0px;margin-top: 10px;">
+        <el-form-item label="实际提交客户日期" prop="actualitySubmissionDate" :rules="submitResultRules.actualitySubmissionDate">
+          <el-date-picker v-model="submitResultData.actualitySubmissionDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期" style="width: 200px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="提交方式" prop="submissionMethod" :rules="submitResultRules.submissionMethod">
+          <el-select v-model="submitResultData.submissionMethod" style="width: 221px">
+            <el-option label="邮件" value="邮件"></el-option>
+            <el-option label="口头" value="口头"></el-option>
+            <el-option label="微信" value="微信"></el-option>
+            <el-option label="其它" value="其它"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
+        <el-form-item label="提交备注">
+          <el-input type="textarea" v-model="submitResultData.submissionRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+        <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
+        <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 客户回复模态框 -->
+    <el-dialog title="客户回复" :close-on-click-modal="false" v-drag :visible.sync="customerResponseModalFlag" width="620px">
+      <el-form :inline="true" label-position="top" :model="customerResponseData" :rules="customerResponseRules" style="margin-left: 0px;margin-top: 10px;">
+        <el-form-item label="实际回复日期" prop="actualityReplyDate" :rules="customerResponseRules.actualityReplyDate">
+          <el-date-picker v-model="customerResponseData.actualityReplyDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期" style="width: 185px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="客户确认结果" prop="confirmResults" :rules="customerResponseRules.confirmResults">
+          <el-select v-model="customerResponseData.confirmResults" style="width: 185px">
+            <el-option label="接受" value="接受"></el-option>
+            <el-option label="不接受" value="不接受"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户确认人" prop="confirmBy" :rules="customerResponseRules.confirmBy">
+          <el-input v-model="customerResponseData.confirmBy" style="width: 185px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
+        <el-form-item label="客户回复信息">
+          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+        <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
+        <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 上传文件的modal -->
+    <testUploadFile ref="testUploadFile" @refreshPageTables="getFileContentData()" v-drag></testUploadFile>
+  </div>
+</template>
+
+<script>
+  import {
+    testInformationSearch, // 测试信息列表查询
+    getFileContentList, // 获取报价单附件列表
+    batchDeleteTestFile, // 批量文件删除
+    saveTestResult, // 保存测试结果
+    saveSubmitResult, // 保存提交结果
+    saveCustomerResponse, // 保存客户回复
+    checkTestStatus, // 检查测试进度
+    closeModalDeleteFile, // 关闭模态框删除文件
+  } from '@/api/test/testInformation.js'
+  import testUploadFile from "./test_upload_file"
+  export default {
+    components: {
+      testUploadFile
+    },
+    watch: {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.customerNo = this.searchData.customerNo.toUpperCase()
+          this.searchData.projectId = this.searchData.projectId.toUpperCase()
+        }
+      },
+      modalData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.modalData.customerNo = this.modalData.customerNo.toUpperCase()
+          this.modalData.projectId = this.modalData.projectId.toUpperCase()
+          this.modalData.testNo = this.modalData.testNo.toUpperCase()
+        }
+      }
+    },
+    data () {
+      return {
+        // 导出
+        exportData: [],
+        exportName: '设备分类' + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ['设备分类'],
+        exportFooter: [],
+        resultList: [],
+        // ======== 行高 ========
+        height: 200,
+        // ======== 分页 ========
+        pageIndex: 1,
+        pageSize: 50,
+        totalPage: 0,
+        selectedDataNum: 0,
+        // 条件查询
+        searchData: {
+          site: this.$store.state.user.site,
+          customerNo: '',
+          customerDesc: '',
+          trackerName: '',
+          testPartNo: '',
+          partName: '',
+          testStatus: '',
+          startDate: '',
+          endDate: '',
+          projectId: '',
+          projectName: '',
+          engineerName: '',
+          priorityLevel: '',
+          page: 1,
+          limit: 10
+        },
+        // 其它
+        dataListLoading: false,
+        // ======== 数据对象 ========
+        modalData: {
+          flag: '',
+          title: '',
+          site: this.$store.state.user.site,
+          quotationNo: '',
+          customerNo: '',
+          customerDesc: '',
+          projectId: '',
+          projectName: '',
+          tracker: '',
+          trackerName: '',
+          quoter: '',
+          quoterName: '',
+          quotationStatus: '',
+          testPartNo: '',
+          partName: '',
+          priorityLevel: '',
+          requiredCompletionDate: '',
+          remark: '',
+          technicalConsiderations: '',
+          customerResponsiblePerson: '',
+          customerResponsiblePersonPhone: '',
+          nextToDo: '',
+          actualityQuotationDate: '',
+          quotationResultInformation: '',
+          actualitySubmissionDate: '',
+          submissionMethod: '',
+          submissionRemark: '',
+          actualityReplyDate: '',
+          confirmResults: '',
+          confirmBy: '',
+          confirmInformation: '',
+          testResultStatus: '',
+          createDate: '',
+          createBy: '',
+          updateDate: '',
+          updateBy: ''
+        },
+        quotationResultData: {
+          actualityQuotationDate: '',
+          quotationResultInformation: '',
+          actualitySubmissionDate: '',
+          submissionMethod: '',
+          submissionRemark: '',
+          confirmResults: '',
+          actualityReplyDate: '',
+          confirmBy: '',
+          confirmInformation: '',
+          testResultStatus: '',
+        },
+        enterResultData: {
+          site: this.$store.state.user.site,
+          testNo: '',
+          actualityDeliveryDate: '',
+          testResultInformation: '',
+          updateBy: this.$store.state.user.name,
+          testResultStatus: '',
+          fileContentList: []
+        },
+        submitResultData: {
+          site: this.$store.state.user.site,
+          quotationNo: '',
+          actualitySubmissionDate: '',
+          submissionMethod: '',
+          submissionRemark: '',
+          updateBy: this.$store.state.user.name,
+          testResultStatus: ''
+        },
+        customerResponseData: {
+          site: this.$store.state.user.site,
+          quotationNo: '',
+          actualityReplyDate: '',
+          confirmResults: '',
+          confirmBy: '',
+          confirmInformation: '',
+          updateBy: this.$store.state.user.name,
+          testResultStatus: ''
+        },
+        // ======== 数据列表 ========
+        dataList: [],
+        // ======== 列表表头 ========
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1TestNo',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'testNo',
+            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: 103001,
+            serialNumber: '103001Table1CustomerNo',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'customerNo',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '客户编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1CustomerDesc',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'customerDesc',
+            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: 103001,
+            serialNumber: '103001Table1ProjectId',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'projectId',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1ProjectName',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'projectName',
+            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: 103001,
+            serialNumber: '103001Table1TrackerName',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'trackerName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '跟单员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1EngineerName',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'engineerName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '工程师',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1TestPartNo',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'testPartNo',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '项目料号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1PartName',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'partName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '物料名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1PriorityLevel',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'priorityLevel',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '优先等级',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1TestNumber',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'testNumber',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '测试数量',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1RequiredDeliveryDate',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'requiredDeliveryDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '要求交付日期',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1TestStatus',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'testStatus',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '状态',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1CreateDate',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'createDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '创建时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1CreateBy',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'createBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '创建人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1UpdateDate',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'updateDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '更新时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1UpdateBy',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'updateBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '更新人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }
+        ],
+        fileColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 102001,
+            serialNumber: '102001Table2FileName',
+            tableId: '102001Table2',
+            tableName: '文件信息表',
+            columnProp: 'fileName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '文件名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 102001,
+            serialNumber: '102001Table2FileRemark',
+            tableId: '102001Table2',
+            tableName: '文件信息表',
+            columnProp: 'fileRemark',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 240
+          },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   functionId: 102001,
+          //   serialNumber: '102001Table2OrderRef3',
+          //   tableId: '102001Table2',
+          //   tableName: '文件信息表',
+          //   columnProp: 'orderRef3',
+          //   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: '102001Table2CreateDate',
+            tableId: '102001Table2',
+            tableName: '文件信息表',
+            columnProp: 'createDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '上传时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 102001,
+            serialNumber: '102001Table2CreatedBy',
+            tableId: '102001Table2',
+            tableName: '文件信息表',
+            columnProp: 'createdBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '上传人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          }
+        ],
+        // ======== 必填规则 ========
+        rules: {
+          customerDesc: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          trackerName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          projectName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          quoterName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          partName: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          priorityLevel: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          requiredCompletionDate: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ]
+        },
+        enterResultRules: {
+          actualityDeliveryDate: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          testResultInformation: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ]
+        },
+        submitResultRules: {
+          actualitySubmissionDate: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          submissionMethod: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ]
+        },
+        customerResponseRules: {
+          actualityReplyDate: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          confirmResults: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          confirmBy: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ]
+        },
+        // ======== 复选数据集 ========
+        testSelections: [],
+        // ======== 选中的当前行数据 ========
+        testCurrentRow: {},
+        // ======== 模态框开关控制 ========
+        modalFlag: false,
+        modalDisableFlag: false,
+        enterResultModalFlag: false,
+        submitResultModalFlag: false,
+        customerResponseModalFlag: false,
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // ======== 分页相关方法 ========
+      /**
+       * 每页数
+       * @param val
+       */
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      /**
+       * 当前页
+       * @param val
+       */
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+
+      // ======== 复选框操作相关方法 ========
+      /**
+       * 未知
+       * @returns {boolean}
+       */
+      selectFlag () {
+        return true;
+      },
+
+      // ======== 列表数据刷新方法 ========
+      /**
+       * 获取数据列表
+       */
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        testInformationSearch(this.searchData).then(({data}) => {
+          if (data.code === 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+            this.$refs.selectDiv.setLengthAll( this.dataList.length)
+            // 判断是否全部存在数据
+            if(this.totalPage > 0){
+              // 设置选中行
+              this.$refs.testTable.setCurrentRow(this.dataList[0])
+              this.testClickRow(this.dataList[0])
+            }
+          }
+          this.dataListLoading = false
+        })
+      },
+
+      // ======== 列表操作方法 ========
+      /**
+       * 单机选中测试信息
+       * @param row
+       */
+      testClickRow (row) {
+        this.$refs.testTable.toggleRowSelection(row)
+        this.testCurrentRow = JSON.parse(JSON.stringify(row))
+      },
+      /**
+       * 复选测试信息
+       * @param val
+       */
+      selectionTest (val) {
+        this.testSelections = val
+        this.$refs.selectDiv.setLengthselected(this.testSelections.length)
+      },
+
+      // ======== 报价结果相关方法 ========
+      /**
+       * 录入测试结果
+       */
+      testResultModal () {
+        // 判断是否选中测试单
+        if (this.testSelections == null || this.testSelections.length <= 0) {
+          this.$message.warning('请勾选测试单！')
+          return
+        }
+        let tempData = {
+          currentStatus: 'C',
+          informationList: this.testSelections,
+        }
+        // 检查测试单状态
+        checkTestStatus(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            if (data.flag === 1) { // 状态一致
+              this.packTestResultModal()
+            } else { // 状态不同
+              this.$message.warning('选中的测试单进度不一致或与按钮不符，请确认！')
+            }
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      /**
+       * 封装录入方法
+       */
+      packTestResultModal () {
+        // 重置对象
+        this.enterResultData = {
+          site: this.$store.state.user.site,
+          testNo: '',
+          actualityDeliveryDate: '',
+          testResultInformation: '',
+          testResultStatus: 'E',
+          fileContentList: [],
+          updateBy: this.$store.state.user.name
+        }
+        // 获得选中的测试号
+        this.testSelections.forEach(val => {
+          this.enterResultData.testNo += ';' + val.testNo
+        })
+        this.enterResultData.testNo = this.enterResultData.testNo.substring(1)
+        this.enterResultModalFlag = true
+      },
+      /**
+       * 保存测试结果
+       */
+      saveTestResult () {
+        if (this.enterResultData.actualityDeliveryDate === '' || this.enterResultData.actualityDeliveryDate == null) {
+          this.$message.warning('请选择实际交付日期！')
+          return
+        }
+        if (this.enterResultData.testResultInformation === '' || this.enterResultData.testResultInformation == null) {
+          this.$message.warning('请填写测试结果信息！')
+          return
+        }
+        if (this.testSelections.length > 1) {
+          this.$confirm(`是否录入多条测试结果?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            saveTestResult(this.enterResultData).then(({data}) => {
+              if (data && data.code === 0) {
+                this.getDataList()
+                this.enterResultModalFlag = false
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {}
+                })
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            })
+          }).catch(() => {
+          })
+        } else {
+          saveTestResult(this.enterResultData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.enterResultModalFlag = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+      /**
+       * 关闭报价结果模态框
+       */
+      closeTestResultModal () {
+        // 删除已上传的文件
+        let tempData = {
+          orderRef1: this.enterResultData.site,
+          testNo: this.enterResultData.testNo
+        }
+        closeModalDeleteFile(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.enterResultModalFlag = false
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+
+      /**
+       * 录入送样信息
+       */
+      submitTestModal () {
+        // 判断是否选中测试单
+        if (this.testSelections == null || this.testSelections.length <= 0) {
+          this.$message.warning('请勾选测试单！')
+          return
+        }
+        let tempData = {
+          currentStatus: 'E',
+          informationList: this.testSelections,
+        }
+        // 检查测试单状态
+        checkTestStatus(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            if (data.flag === 1) { // 状态一致
+              this.packSubmitTestModal()
+            } else { // 状态不同
+              this.$message.warning('选中的测试单进度不一致或与按钮不符，请确认！')
+            }
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      /**
+       * 封装送样方法
+       */
+      packSubmitTestModal () {
+        this.submitResultData = {
+          site: this.$store.state.user.site,
+          testNo: '',
+          actualitySendSamplesDate: '',
+          sendSamplesMethod: '',
+          deliverGoodsInformation: '',
+          deliverGoodsRemark: '',
+          testResultStatus: 'S',
+          updateBy: this.$store.state.user.name,
+        }
+        // 获得选中的测试号
+        this.testSelections.forEach(val => {
+          this.submitResultData.testNo += ';' + val.testNo
+        })
+        this.submitResultData.testNo = this.submitResultData.testNo.substring(1)
+        this.submitResultModalFlag = true
+      },
+      /**
+       * 保存送样结果
+       */
+      saveSubmitResult () {
+        if (this.submitResultData.actualitySendSamplesDate === '' || this.submitResultData.actualitySendSamplesDate == null) {
+          this.$message.warning('请选择实际送样日期！')
+          return
+        }
+        if (this.submitResultData.sendSamplesMethod === '' || this.submitResultData.sendSamplesMethod == null) {
+          this.$message.warning('请选择提交方式！')
+          return
+        }
+        if (this.testSelections.length > 1) {
+          this.$confirm(`是否录入多条送样信息?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            saveSubmitResult(this.submitResultData).then(({data}) => {
+              if (data && data.code === 0) {
+                this.getDataList()
+                this.submitResultModalFlag = false
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {}
+                })
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      },
+
+
+      /**
+       * 客户回复
+       */
+      customerResponseModal () {
+        // 判断是否选中测试单
+        if (this.testSelections == null || this.testSelections.length <= 0) {
+          this.$message.warning('请勾选测试单！')
+          return
+        }
+        let tempData = {
+          currentStatus: 'S',
+          informationList: this.testSelections,
+        }
+        // 检查测试单状态
+        checkTestStatus(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            if (data.flag === 1) { // 状态一致
+              this.packCustomerResponseModal()
+            } else { // 状态不同
+              this.$message.warning('选中的测试单进度不一致或与按钮不符，请确认！')
+            }
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      /**
+       * 封装回复方法
+       */
+      packCustomerResponseModal () {
+        this.customerResponseData = {
+          site: this.$store.state.user.site,
+          testNo: '',
+          actualityReplyDate: '',
+          confirmResults: '',
+          confirmBy: '',
+          confirmInformation: '',
+          testResultStatus: 'R',
+          updateBy: this.$store.state.user.name
+        }
+        // 获得选中的测试号
+        this.testSelections.forEach(val => {
+          this.customerResponseData.testNo += ';' + val.testNo
+        })
+        this.customerResponseData.testNo = this.customerResponseData.testNo.substring(1)
+        this.customerResponseModalFlag = true
+      },
+      /**
+       * 保存客户回复
+       */
+      saveCustomerResponse () {
+        if (this.customerResponseData.actualityReplyDate === '' || this.customerResponseData.actualityReplyDate == null) {
+          this.$message.warning('请选择实际回复日期！')
+          return
+        }
+        if (this.customerResponseData.confirmResults === '' || this.customerResponseData.confirmResults == null) {
+          this.$message.warning('请选择客户确认结果！')
+          return
+        }
+        if (this.customerResponseData.confirmBy === '' || this.customerResponseData.confirmBy == null) {
+          this.$message.warning('请填写客户确认人！')
+          return
+        }
+        if (this.testSelections.length > 1) {
+          this.$confirm(`是否提交多条客户回复?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            saveCustomerResponse(this.customerResponseData).then(({data}) => {
+              if (data && data.code === 0) {
+                this.getDataList()
+                this.customerResponseModalFlag = false
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {}
+                })
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      },
+
+      // ======== 报价单附件的相关方法 ========
+      /**
+       * 获取报价单附件列表
+       */
+      getFileContentData () {
+        let currentData = {
+          orderRef1: this.$store.state.user.site,
+          orderRef2: this.enterResultData.testNo.split(';')[0]
+        }
+        getFileContentList(currentData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.enterResultData.fileContentList = data.rows
+          } else {
+            this.enterResultData.fileContentList = []
+          }
+        })
+      },
+      /**
+       * 上传文件
+       */
+      uploadFile () {
+        let currentData = {
+          titleCon: '批量测试附件上传',
+          site: this.$store.state.user.site,
+          createBy: this.$store.state.user.name,
+          testNo: this.enterResultData.testNo,
+          fileRemark: '',
+          folder: 'testFile',
+        }
+        //打开组件 去做新增业务
+        this.$nextTick(() => {
+          this.$refs.testUploadFile.init(currentData)
+        })
+      },
+      /**
+       * 文件删除
+       * @param row
+       */
+      deleteFile (row) {
+        this.$confirm('确定要删除此文件?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let tempData = {
+            id: row.id,
+            fileName: row.fileName,
+            orderRef1: row.orderRef1,
+            orderRef2: row.orderRef2,
+            orderRef3: row.orderRef3,
+            testNo: this.enterResultData.testNo
+          }
+          batchDeleteTestFile(tempData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.getFileContentData()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+
+      // ======== 导出相关方法 ========
+      /**
+       * 导出excel
+       */
+      async createExportData () {
+        this.searchData.limit = -1
+        this.searchData.page = 1
+        await testInformationSearch(this.searchData).then(({data}) => {
+          this.resultList = data.page.list
+        })
+        return this.resultList
+      },
+      startDownload () {
+      },
+      finishDownload () {
+      },
+      fields () {
+        let json = '{'
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"'
+          } else {
+            json += '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"' + ','
+          }
+        })
+        json += '}'
+        let s = eval('(' + json + ')')
+        return s
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+/deep/ .customer-tab .el-tabs__content {
+  padding: 0px !important;
+  height: 459px;
+}
+</style>
+
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index 7ced838..56d6a9c 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -194,7 +194,7 @@
           <input type="checkbox" value="Y" name="sendSamples" v-model="modalData.isNeedToSendSamples"/>
         </el-form-item>
         <el-form-item label="送样地址">
-          <el-input v-model="modalData.sendSamplesAddress" style="width: 356px"></el-input>
+          <el-input v-model="modalData.sendSamplesAddress" style="width: 369px"></el-input>
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="modalData.remark" style="width: 456px"></el-input>
@@ -202,18 +202,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="技术注意事项">
-          <el-input
-            type="textarea"
-            v-model="modalData.technicalConsiderations"
-            :rows="1"
-            resize='none'
-            maxlength="300"
-            show-word-limit
-            style="width: 456px;height: 20px">
-          </el-input>
+          <el-input type="textarea" v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit style="width: 456px;height: 20px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:30px;margin-top: 20px;text-align:center">
+      <el-footer style="height:30px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
       </el-footer>
@@ -228,10 +220,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="enterResultData" :rules="enterResultRules" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="测试结果信息" prop="testResultInformation" :rules="enterResultRules.testResultInformation">
-          <el-input type="textarea" v-model="enterResultData.testResultInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 500px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="enterResultData.testResultInformation" :rows="3" resize='none' show-word-limit style="width: 500px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 60px;">
+      <el-form :inline="true" label-position="top" :model="enterResultData" style="margin-left: 0px;margin-top: 50px;">
         <el-form :inline="true" label-position="top" style="margin-top: 5px">
           <el-button type="primary" @click="uploadFile()">上传文件</el-button>
         </el-form>
@@ -268,7 +260,7 @@
           </el-table-column>
         </el-table>
       </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-footer style="height:35px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="saveTestResult()">保存</el-button>
         <el-button type="primary" @click="enterResultModalFlag = false">关闭</el-button>
       </el-footer>
@@ -293,10 +285,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="submitResultData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="送货备注">
-          <el-input type="textarea" v-model="submitResultData.deliverGoodsRemark" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 456px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="submitResultData.deliverGoodsRemark" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveSubmitResult()">保存</el-button>
         <el-button type="primary" @click="submitResultModalFlag = false">关闭</el-button>
       </el-footer>
@@ -320,10 +312,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="customerResponseData" style="margin-left:0px;margin-top: 5px;">
         <el-form-item label="客户回复信息">
-          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' maxlength="300" show-word-limit style="width: 595px;height: 30px"></el-input>
+          <el-input type="textarea" v-model="customerResponseData.confirmInformation" :rows="3" resize='none' show-word-limit style="width: 595px;height: 30px"></el-input>
         </el-form-item>
       </el-form>
-      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+      <el-footer style="height:35px;margin-top: 50px;text-align:center">
         <el-button type="primary" @click="saveCustomerResponse()">保存</el-button>
         <el-button type="primary" @click="customerResponseModalFlag = false">关闭</el-button>
       </el-footer>
@@ -389,16 +381,7 @@
       <el-tab-pane label="测试详细信息" name="test_detail_information">
         <el-form :inline="true" label-position="top" :model="testDetailData" style="margin-left: 10px;margin-top: 10px;">
           <el-form-item label="技术注意事项">
-            <el-input
-              type="textarea"
-              v-model="testDetailData.technicalConsiderations"
-              readonly
-              :rows="3"
-              resize='none'
-              maxlength="300"
-              show-word-limit
-              style="width: 600px;height: 30px">
-            </el-input>
+            <el-input type="textarea" v-model="testDetailData.technicalConsiderations" readonly :rows="3" resize='none' show-word-limit style="width: 600px;height: 30px"></el-input>
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" :model="testDetailData" style="margin-left: 10px;margin-top: 46px;">
@@ -1769,12 +1752,19 @@
             this.pageSize = data.page.pageSize
             this.totalPage = data.page.totalCount
             this.$refs.selectDiv.setLengthAll( this.dataList.length)
-            //判断是否全部存在数据
-            if(this.totalPage > 0){
+            // 判断是否全部存在数据
+            if (this.totalPage > 0) {
               //设置选中行
               this.$refs.testTable.setCurrentRow(this.dataList[0])
-              this.refreshCurrentTabTable() //加载当前的页签的table
+              // 加载当前的页签的table
+              this.refreshCurrentTabTable()
               this.testClickRow(this.dataList[0])
+            } else {
+              //设置选中行
+              this.$refs.testTable.setCurrentRow({})
+              // 加载当前的页签的table
+              this.refreshCurrentTabTable()
+              this.testClickRow({})
             }
           }
           this.dataListLoading = false