diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 75483c4..a1c6e89 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -23,6 +23,8 @@
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partName" clearable style="width: 120px"></el-input>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'要求完成日期'">
         <el-date-picker
           style="width: 120px"
@@ -54,8 +56,22 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'优先等级'">
+        <dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false" dict-type="priority_Level"/>
+      </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select v-model="searchData.quotationStatus" 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-input v-model="searchData.createBy2" clearable style="width: 120px"></el-input>
+      </el-form-item>
     </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item label="BU">
         <bu-select v-model="searchData.buNo" style="width: 120px"></bu-select>
       </el-form-item>
@@ -77,17 +93,6 @@
       <el-form-item :label="'客户物料编码'">
         <el-input v-model="searchData.customerPartNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'优先等级'">
-        <dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false" dict-type="priority_Level"/>
-      </el-form-item>
-      <el-form-item :label="'状态'">
-        <el-select v-model="searchData.quotationStatus" 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-button @click="getDataList()">查询</el-button>
         <el-button type="primary" @click="addModal()" v-if="isAuth('102001001:save')">新增</el-button>
@@ -1008,7 +1013,8 @@ export default {
         menuId: this.$route.meta.menuId,
         quotationNo: '',
         nodeId: '',
-        approvalUsername: ''
+        approvalUsername: '',
+        createBy2: ''
       },
       // 其它
       dataListLoading: false,
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index 122c82f..cf9a911 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -314,21 +314,17 @@
                 herf="#">Artwork</a></span>
               <el-input :disabled="(testInformationFlag('tracker') === 'N' && modalData.flag === '2') || detailFlag"
                         v-model="modalData.trackerName" readonly>
-                <span slot="suffix" v-show="modalData.trackerName && !detailFlag" @click="clearModalData('tracker')"><i
+                <span slot="suffix" v-show="modalData.trackerName && !detailFlag && !(testInformationFlag('tracker') === 'N' && modalData.flag === '2')" @click="clearModalData('tracker')"><i
                   class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item prop="engineerName">
-              <span v-if="(testInformationFlag('engineer') === 'N' && modalData.flag === '2') || detailFlag"
-                    slot="label">TP工程师</span>
+              <span v-if="(testInformationFlag('engineer') === 'N' && modalData.flag === '2') || detailFlag" slot="label">TP工程师</span>
               <span v-else slot="label" @click="getBaseList(2042)"><a herf="#">TP工程师</a></span>
-              <el-input :disabled="(testInformationFlag('engineer') === 'N' && modalData.flag === '2') || detailFlag"
-                        v-model="modalData.engineerName" readonly>
-                <span slot="suffix" v-show="modalData.engineerName && !detailFlag"
-                      @click="clearModalData('engineer')"><i class="el-icon-circle-close"
-                                                             style="margin-left: 5px;cursor: pointer;"></i></span>
+              <el-input :disabled="(testInformationFlag('engineer') === 'N' && modalData.flag === '2') || detailFlag" v-model="modalData.engineerName" readonly>
+                <span slot="suffix" v-show="modalData.engineerName && !detailFlag && !(testInformationFlag('engineer') === 'N' && modalData.flag === '2')" @click="clearModalData('engineer')"><i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
               </el-input>
             </el-form-item>
           </el-col>
@@ -339,7 +335,7 @@
               <span v-else slot="label"><a herf="#" @click="getBaseList(2007)">CQC</a></span>
               <el-input :disabled="(testInformationFlag('artwork') === 'N' && modalData.flag === '2') || detailFlag"
                         v-model="modalData.artworkName">
-                <span slot="suffix" v-show="modalData.artworkName && !detailFlag" @click="clearModalData('artwork')"><i
+                <span slot="suffix" v-show="modalData.artworkName && !detailFlag && !(testInformationFlag('artwork') === 'N' && modalData.flag === '2')" @click="clearModalData('artwork')"><i
                   class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
               </el-input>
             </el-form-item>
@@ -351,15 +347,16 @@
               <span v-else slot="label"><a herf="#" @click="getBaseList(2008)">FAI</a></span>
               <el-input :disabled="(testInformationFlag('planner') === 'N' && modalData.flag === '2') || detailFlag"
                         v-model="modalData.plannerName">
-                <span slot="suffix" v-show="modalData.plannerName && !detailFlag" @click="clearModalData('planner')"><i
+                <span slot="suffix" v-show="modalData.plannerName && !detailFlag && !(testInformationFlag('planner') === 'N' && modalData.flag === '2')" @click="clearModalData('planner')"><i
                   class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="15">
-          <el-col :span="24">
-            <el-form-item style="height: 150px">
+          <el-col :span="24" style="position: relative;">
+            <span style="margin-right: 10px; color: #f56c6c; font-weight: bold; font-size: 14px; position: absolute; right: 0; top: 0; z-index: 2; pointer-events: none;">材料总金额：{{ materialTotalAmount.toFixed(2) }}</span>
+            <el-form-item style="height: 150px;">
               <template slot="label">
                 <el-button v-if="isAuth('107001:dataEntry')" style="margin-left: 2px;width: 115px;line-height: 1;font-size: 12px;" type="primary" @click="handleDataEntry">备注区：数据录入</el-button>
               </template>
@@ -1038,6 +1035,15 @@ export default {
         return 'N'
       }
     },
+    // 计算材料总金额
+    materialTotalAmount() {
+      if (!this.testSoBomList || this.testSoBomList.length === 0) {
+        return 0
+      }
+      return this.testSoBomList.reduce((sum, item) => {
+        return sum + (Number(item.totalCost) || 0)
+      }, 0)
+    }
   },
   name: "test",
   components: {
@@ -1280,6 +1286,7 @@ export default {
         customerNoFlag: false,
         projectIdFlag: true,
         testPartNoFlag: false,
+        materialTotalAmount: 0,
       },
       testDetailData: {
         technicalConsiderations: '',
@@ -1399,8 +1406,9 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
-        }, {
+          columnWidth: 60
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 103001,
           serialNumber: '103001Table1TestNo',
@@ -1408,7 +1416,7 @@ export default {
           tableName: '测试信息表',
           columnProp: 'testNo',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '测试单号',
           columnHidden: false,
           columnImage: false,
@@ -1418,6 +1426,24 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1SoNumber',
+          tableId: '103001Table1',
+          tableName: '测试信息表',
+          columnProp: 'soNumber',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
@@ -1426,7 +1452,7 @@ export default {
           tableName: '测试信息表',
           columnProp: 'customerNo',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '客户编码',
           columnHidden: false,
           columnImage: false,
@@ -1506,7 +1532,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 140
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
@@ -1524,7 +1550,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 140
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
@@ -1542,6 +1568,24 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1MaterialTotalAmount',
+          tableId: '103001Table1',
+          tableName: '测试信息表',
+          columnProp: 'materialTotalAmount',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '材料总金额',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
           columnWidth: 100
         },
         {
@@ -2897,6 +2941,9 @@ export default {
           //   return
           // }
           // this.confirmProjectPart();
+          // 计算材料总金额
+          this.modalData.materialTotalAmount = this.materialTotalAmount;
+
           if (this.modalData.flag === '1') {
             this.testSoRoutingList = []
             this.testSoBomList = []