diff --git a/dist.zip b/dist.zip
new file mode 100644
index 00000000..8044facb
Binary files /dev/null and b/dist.zip differ
diff --git a/src/api/MarketingCenter/CreateProject.js b/src/api/MarketingCenter/CreateProject.js
index 33408fec..d8ddfc41 100644
--- a/src/api/MarketingCenter/CreateProject.js
+++ b/src/api/MarketingCenter/CreateProject.js
@@ -10,14 +10,14 @@ export function initProject() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7, num8, num9, num10) {
+export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7, num8, num9, num10, num11, num12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '合同信息管理_合同信息_制造部_查询',
-      param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
+      name: '合同信息管理_合同信息_制造部_查询_新',
+      param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=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/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
index a3d40405..3336ea87 100644
--- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
@@ -7,7 +7,7 @@
           v-model="entryNameValue"
           :remote-method="remoteMethod"
           placeholder="项目名称"
-          style="margin-right: 10px"
+          style="margin-right: 10px; width: 150px"
           size="small"
           clearable
           filterable
@@ -21,14 +21,14 @@
             :value="item.value"/>
         </el-select>
         <span>机床图号:</span>
-        <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px" size="small" clearable @change="machineChange">
+        <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" clearable @change="machineChange">
           <el-option
             v-for="item in machineName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total1=0;pageSize1 = 10;pageCurrent1 = 1;searchData1()">查询</el-button>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total1=0;pageSize1 = 10000;pageCurrent1 = 1;searchData1()">查询</el-button>
       </el-row>
     </el-card>
     <el-card style="margin-top: 15px">
@@ -38,7 +38,6 @@
         style="width: 100%;max-height: 400px;"
         stripe
         size="mini"
-        height="300"
         highlight-current-row
         border
         @row-click="searchSpareParts">
@@ -68,137 +67,143 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
-      </div>
-    </el-card>
-    <el-card style="margin-top: 15px">
-      <el-row>
-        <span>组号:</span>
-        <el-select v-model="GroupNumValue" placeholder="组号" style="margin-right: 10px" size="small" clearable>
-          <el-option
-            v-for="item in GroupNum"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>零件图号:</span>
-        <el-input v-model="PartDrawingNumber" placeholder="零件图号" size="small" clearable style="width:200px"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total=0;pageSize = 10;pageCurrent = 1;searchData()">查询</el-button>
-      </el-row>
-    </el-card>
-    <el-card style="margin-top: 15px">
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        style="width: 100%;max-height: 400px;"
-        stripe
-        size="mini"
-        height="300"
-        highlight-current-row
-        border
-        @row-click="searchProcedure">
-        <el-table-column align="center" label="组号">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="零件图号">
-          <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="零件名称">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="零件数量">
-          <template slot-scope="scope">
-            {{ scope.row.投产数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="停产时间">
-          <template slot-scope="scope">
-            {{ scope.row.停产时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="停产原因">
-          <template slot-scope="scope">
-            {{ scope.row.停产原因 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="加工工时">
-          <template slot-scope="scope">
-            {{ scope.row.加工工时 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
-    <el-card style="margin-top: 15px">
-      <el-table
-        v-loading="listLoading1"
-        :data="tableData1"
-        style="width: 100%;max-height: 400px;"
-        stripe
-        size="mini"
-        height="300"
-        highlight-current-row
-        border>
-        <el-table-column align="center" label="工序顺序" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.工序顺序 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工艺名称" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.工艺名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工艺要求">
-          <template slot-scope="scope">
-            {{ scope.row.工艺要求 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="单件定额工时" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.单件定额工时 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="准结定额工时" width="130">
-          <template slot-scope="scope">
-            {{ scope.row.准结定额工时 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工艺是否完成" width="130">
-          <template slot-scope="scope">
-            {{ scope.row.工序状态 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工时" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.工序工时 }}
-          </template>
-        </el-table-column>
-      </el-table>
+      <!--      <div class="block" style="margin-top: 10px">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent1"-->
+      <!--          :page-sizes="[10, 20, 30, 40]"-->
+      <!--          :page-size="pageSize1"-->
+      <!--          :total="total1"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChange1"-->
+      <!--          @current-change="handleCurrentChange1"/>-->
+      <!--      </div>-->
     </el-card>
+    <!--    <el-card style="margin-top: 15px">-->
+    <!--      <el-row>-->
+    <!--        <span>组号:</span>-->
+    <!--        <el-select v-model="GroupNumValue" placeholder="组号" style="margin-right: 10px;width: 150px" size="small" clearable>-->
+    <!--          <el-option-->
+    <!--            v-for="item in GroupNum"-->
+    <!--            :key="item.value"-->
+    <!--            :label="item.label"-->
+    <!--            :value="item.value"/>-->
+    <!--        </el-select>-->
+    <!--        <span>零件图号:</span>-->
+    <!--        <el-input v-model="PartDrawingNumber" placeholder="零件图号" size="small" clearable style="width:150px"/>-->
+    <!--        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total=0;pageSize = 10;pageCurrent = 1;searchData()">查询</el-button>-->
+    <!--      </el-row>-->
+    <!--    </el-card>-->
+    <el-row>
+      <el-col style="width: 60%">
+        <el-card style="margin-top: 15px">
+          <el-table
+            v-loading="listLoading"
+            :data="tableData"
+            style="width: 100%"
+            stripe
+            size="mini"
+            height="460"
+            highlight-current-row
+            border
+            @row-click="searchProcedure">
+            <el-table-column align="center" label="组号" width="50px">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="零件图号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="零件名称" min-width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="零件数量">
+              <template slot-scope="scope">
+                {{ scope.row.投产数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="停产时间">
+              <template slot-scope="scope">
+                {{ scope.row.停产时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="停产原因">
+              <template slot-scope="scope">
+                {{ scope.row.停产原因 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="已完成工时">
+              <template slot-scope="scope">
+                {{ scope.row.加工工时 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px">
+            <el-pagination
+              :current-page="pageCurrent"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 40%">
+        <el-card style="margin-top: 15px">
+          <el-table
+            v-loading="listLoading1"
+            :data="tableData1"
+            style="width: 100%;"
+            stripe
+            size="mini"
+            height="500px"
+            highlight-current-row
+            border>
+            <el-table-column align="center" label="工序" width="50">
+              <template slot-scope="scope">
+                {{ scope.row.工序顺序 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="工艺名称" min-width="70">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="工艺要求" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.工艺要求 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="单件定额" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.单件定额工时 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="准结定额" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.准结定额工时 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="工序进度" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.工序状态 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="完成工时" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.工序工时 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -211,7 +216,7 @@ export default {
       pageSize: 10,
       total: 0,
       pageCurrent1: 1,
-      pageSize1: 10,
+      pageSize1: 1000000,
       total1: 0,
       list: [],
       check3: '',
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index 41579e2f..404f9fa7 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -3,9 +3,9 @@
     <el-card>
       <div slot="header">
         <el-row style="margin-bottom:-10px!important;">
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px; width: 120px;"/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
+          <!--          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
+          <!--          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
           <el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">
             <el-option
               v-for="item in inventoryName"
@@ -20,17 +20,17 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
+          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
           <!--          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
         </el-row>
       </div>
-      <el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 710px" size="mini">
+      <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 790px" size="mini">
         <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" prop="物料型号" align="center" width="180" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="物料型号" align="center" width="240" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
@@ -55,7 +55,7 @@
             {{ scope.row.货位名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="货位存量" align="center" width="80" prop="货位存量">
+        <el-table-column label="货位存量" align="center" width="100" prop="货位存量">
           <template slot-scope="scope">
             <template v-if="scope.row.changeValue">
               <el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
@@ -186,7 +186,7 @@ export default {
       locateName: [],
       tableData1: [],
       pageCurrent: 1,
-      pageSize: 20,
+      pageSize: 30,
       total: 0,
       dialogVisible: false,
       tableData01: [],
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 11a4aa3e..7d2a2e7b 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -3,8 +3,7 @@
     <el-card>
       <div style="margin-top: -10px;">
         <el-row>
-          <span>机床号:</span>
-          <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
+          <el-select v-model="toolNumValue" filterable clearable size="small" style="margin: 0px 10px;width: 150px" placeholder="机床号" @change="typeChange1()">
             <el-option
               v-for="item in toolNum"
               :key="item.value"
@@ -14,43 +13,39 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
             </el-option>
           </el-select>
-          <span>分组:</span>
-          <el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
+          <el-select v-model="NumValue" size="small" style="margin: 0px 10px;width: 90px" filterable clearable placeholder="组号">
             <el-option
               v-for="item in Num"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <span>零件图号:</span>
-          <el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 200px;"/>
+          <el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 150px;margin: 0px 10px;"/>
           <el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
           <el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
           <el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
+          <el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" style="margin-left:200px" placement="top">
+            <el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
+          </el-tooltip>
+          <el-date-picker
+            v-model="startTime"
+            size="small"
+            type="date"
+            value-format="yyyy-MM-dd"
+            style="width: 140px;margin: 0px 10px"
+            placeholder="开始日期"/>
+          <el-date-picker
+            v-model="endTime"
+            size="small"
+            type="date"
+            value-format="yyyy-MM-dd"
+            style="width: 140px;margin: 0px 10px"
+            placeholder="结束日期"/>
+          <el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
         </el-row>
       </div>
     </el-card>
     <el-card>
-      <span class="demonstration">开始日期: </span>
-      <el-date-picker
-        v-model="startTime"
-        size="small"
-        type="date"
-        value-format="yyyy-MM-dd"
-        style="top: 1px;"
-        placeholder="选择开始日期"/>
-      <span class="demonstration">结束日期: </span>
-      <el-date-picker
-        v-model="endTime"
-        size="small"
-        type="date"
-        value-format="yyyy-MM-dd"
-        style="top: 1px;"
-        placeholder="选择开始日期"/>
-      <el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" placement="top">
-        <el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
-      </el-tooltip>
-      <el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
       <el-table
         v-loading="listLoading"
         :data="tableData"
@@ -1512,10 +1507,10 @@ export default {
             }
           }
         } else {
-          this.$message.error('请输入结束时间')
+          this.$message.error('请输入结束日期')
         }
       } else {
-        this.$message.error('请输入开始时间')
+        this.$message.error('请输入开始日期')
       }
     },
     // 导出
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index d02ec422..892d0b23 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -2,145 +2,147 @@
   <div>
     <el-card>
       <div>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin-top: 3px">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin: 3px 10px">
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">机床型号：</span>
-        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-      </div>
-      <div style="margin-top: 10px">
-        <span style="margin-left: 0px">开始日期：</span>
-        <el-date-picker
-          v-model="startTime"
-          style="width: 200px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期：</span>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 200px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
+        <el-input v-model="contractNumber" clearable size="small" style="width:200px;margin: 3px 10px" placeholder="请输入合同编号"/>
+        <!--        <span style="margin-left: 10px">机床型号：</span>-->
+        <!--        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>-->
+        <!--      </div>-->
+        <!--      <div style="margin-top: 10px">-->
+        <!--        <span style="margin-left: 0px">开始日期：</span>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="startTime"-->
+        <!--          style="width: 200px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择开始日期"/>-->
+        <!--        <span style="margin-left: 10px">结束日期：</span>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="endTime"-->
+        <!--          style="width: 200px;"-->
+        <!--          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 = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
           <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
         </el-tooltip>
       </div>
     </el-card>
-    <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData1"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        style="width: 100%"
-        height="500"
-        border
-        stripe
-        size="mini"
-        @expand-change="selectMachine">
-        <el-table-column type="expand" label="详情">
-          <template slot-scope="scope">
-            <el-table :data="tableData2" class="subTableHeader" border stripe style="width: 612px; text-align: center" size="mini">
-              <el-table-column label="设备型号" align="center" width="150">
-                <template slot-scope="scope">
-                  {{ scope.row.机床图号 }}
+    <el-row>
+      <el-col style="width: 56%">
+        <el-card>
+          <el-table
+            v-loading="listLoading"
+            :data="tableData1"
+            :row-key="getRowKeys"
+            :expand-row-keys="expands"
+            style="width: 100%"
+            height="500"
+            border
+            stripe
+            size="mini"
+            @row-click="selectMachine">
+            <el-table-column align="center" label="合同编号" prop="合同编号" width="120">
+              <template slot-scope="scope">
+                <template>
+                  {{ scope.row.合同编号 }}
                 </template>
-              </el-table-column>
-              <el-table-column label="设备名称" align="center" width="160">
-                <template slot-scope="scope">
-                  {{ scope.row.机床名称 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="机床数量" align="center" width="100">
-                <template slot-scope="scope">
-                  {{ scope.row.机床数量 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" width="200" align="center">
-                <template slot-scope="scope">
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="项目名称" prop="项目名称" width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.项目名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.合同签订日期 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="合同信息备注" min-width="150">
+              <template slot-scope="scope">
+                {{ scope.row.合同信息备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="160">
+              <template slot-scope="scope">
+                <el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
                   <el-button
                     size="mini"
-                    type="text"
-                    icon="el-icon-edit"
-                    @click="editMachine(scope.row);flag = 2">编辑</el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="deleteMachine(scope.row)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
-          <template slot-scope="scope">
-            <template>
-              <el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
-            </template>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目名称" prop="项目名称" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.合同签订日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同信息备注" min-width="200">
-          <template slot-scope="scope">
-            {{ scope.row.合同信息备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="350">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
-              <el-button
-                size="mini"
-                type="warning"
-                plain
-                icon="el-icon-plus"
-                @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
-            </el-tooltip>
-            <el-button
-              size="mini"
-              plain
-              type="primary"
-              icon="el-icon-edit"
-              @click.stop="handleEdit(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              @click.stop="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="PageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="PageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
+                    type="warning"
+                    plain
+                    icon="el-icon-plus"
+                    @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
+                </el-tooltip>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click.stop="handleEdit(scope.row)"/>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click.stop="handleDelete(scope.row)"/>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="PageCurrent"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="PageSize"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 43%">
+        <el-card>
+          <el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">
+            <el-table-column label="设备型号" align="center" width="120">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="设备名称" align="center" min-width="160">
+              <template slot-scope="scope">
+                {{ scope.row.机床名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="机床数量" align="center" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.机床数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="140" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="editMachine(scope.row);flag = 2">编辑</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="deleteMachine(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
     <!--新增合同信息对话框-->
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
@@ -212,6 +214,8 @@ export default {
   },
   data() {
     return {
+      contractNumber_check: '',
+      contractNumber: '', // 合同编号
       entryName: [],
       entryNameValue: '',
       machine: '',
@@ -278,12 +282,13 @@ export default {
       this.fetchTableData1()
     },
     fetchTableData1() {
+      if (this.contractNumber === '' || this.contractNumber === null) { this.contractNumber_check = 0 } else { this.contractNumber_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_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.entryNameValue_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.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.contractNumber_check, this.contractNumber], ['tableData1', 'total', 'listLoading'])
     },
     selectMachine(row) {
       this.projectNum = row.项目流水号