diff --git a/src/api/MarketingCenter/ComprehensiveInquiryMS.js b/src/api/MarketingCenter/ComprehensiveInquiryMS.js
index 92319fb9..a5dba081 100644
--- a/src/api/MarketingCenter/ComprehensiveInquiryMS.js
+++ b/src/api/MarketingCenter/ComprehensiveInquiryMS.js
@@ -31,14 +31,14 @@ export function SelectMarketingManager(code) {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index b828ad70..6774730b 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -20,14 +20,14 @@ export function initMarketingManager() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
index 5d5720e0..4529970a 100644
--- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
@@ -1653,9 +1653,16 @@ export default {
     }
   }
   .gongyizhiding {
+    .el-tree-node{
+      overflow: hidden;
+      font-weight:  bolder;
+      color: black;
+    }
     .el-tree-node>.el-tree-node__children {
       overflow: hidden;
       background-color: #d8e5f6;
+      font-weight:  bolder;
+      color: black;
     }
   }
 </style>
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 6996890a..6d2e3d84 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -9,22 +9,23 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
-        <el-date-picker
-          v-model="startTime"
-          style="margin-right:5px;width:150px"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 150px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
+        <el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
+        <!--        <el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/>-->
+        <!--        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="startTime"-->
+        <!--          style="margin-right:5px;width:150px"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择开始日期"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="endTime"-->
+        <!--          style="width: 150px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择结束日期"/>-->
         <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
       </el-row>
     </el-card>
@@ -121,7 +122,7 @@
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同信息备注" width="auto">
+        <el-table-column align="center" label="合同信息备注" width="120">
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
@@ -645,6 +646,8 @@ export default {
   },
   data() {
     return {
+      customerName1: '',
+      customerName1_check: '',
       tableDataLoadingDeliveryManagement: false,
       tableDataDeliveryManagement: [],
       dialogVisible: false,
@@ -726,13 +729,14 @@ export default {
       this.peoplename = row.姓名
     },
     fetchTableData1() {
+      if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
       if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
       this.tableDataInvoiceRecord = []
       this.tableDataContractCapitalManagement = []
       this.tableDataSafetyMargin = []
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 06681715..7fbfe6a0 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -2,29 +2,30 @@
   <div class="app-container">
     <el-card style="background: rgb(233,240,250)">
       <div>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px 10px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
-        <el-date-picker
-          v-model="startTime"
-          style="width: 150px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 150px;margin-bottom: 3px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
+        <!--        <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>-->
+        <el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
+        <!--        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="startTime"-->
+        <!--          style="width: 150px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择开始日期"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="endTime"-->
+        <!--          style="width: 150px;margin-bottom: 3px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择结束日期"/>-->
         <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
       </div>
@@ -117,7 +118,7 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="付款方式" width="70">
+        <el-table-column align="center" label="付款方式" width="80">
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
@@ -162,7 +163,7 @@
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同信息备注" >
+        <el-table-column align="center" label="合同信息备注" width="120">
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
@@ -569,6 +570,8 @@ export default {
   },
   data() {
     return {
+      customerName1: '',
+      customerName1_check: '',
       machineDATA: '',
       name: '',
       a: 1,
@@ -748,6 +751,7 @@ export default {
       this.peoplename = ''
     },
     fetchTableData1() {
+      if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
@@ -757,7 +761,7 @@ export default {
       this.uploader = false
       this.ExecutionProgress = null
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
     },
     fetchExecutionProgressdata(row) {
       this.projectNum = row.项目流水号