diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index 285d2860..b19b8c49 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -57,9 +57,8 @@ export function searchTable(check1, machine, check2, groupNum, check3, partNumbe
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_查询数据_状态_最新_MESWORK',
-      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
-      Pagination: pageCurrent + '&' + pageSize
+      name: '车间生产管理工艺_自制件状态查询_查询',
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 87edffbe..23c3bdde 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -34,9 +34,8 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       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&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string',
-      Pagination: pageCurrent + '&' + pageSize
+      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&客户名称_check=' + num11 + '=int&客户名称=' + num12 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/assets/img/StationLayout.jpg b/src/assets/img/StationLayout.jpg
index 5185b9a0..007f4b45 100644
Binary files a/src/assets/img/StationLayout.jpg and b/src/assets/img/StationLayout.jpg differ
diff --git a/src/assets/img/StationLayout.psd b/src/assets/img/StationLayout.psd
index b05addcc..2f5a3fbe 100644
Binary files a/src/assets/img/StationLayout.psd and b/src/assets/img/StationLayout.psd differ
diff --git a/src/utils/curd.js b/src/utils/curd.js
index 3ccfcb3b..1bef3311 100644
--- a/src/utils/curd.js
+++ b/src/utils/curd.js
@@ -53,30 +53,30 @@ export default {
       return numn
     }
     // 高精原CreateData
-    Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
-      var paramStr = ''
-      var paramarray = []
-      if (data !== undefined) {
-        for (let i = 0; i < data.length; i++) {
-          paramarray.push({
-            name: data[i][0],
-            value: data[i][1],
-            type: data[i][2],
-            output: data[i][3]
-          })
-        }
-        paramStr = JSON.stringify(paramarray)
-      }
-      var obj = []
-      obj[0] = {}
-      obj[0].type = type
-      obj[0].name = name
-      obj[0].param = paramStr
-      obj[0].pageSize = pageSize
-      obj[0].pageList = pageList
-      var numn = JSON.stringify(obj[0])
-      return numn
-    }
+    // Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
+    //   var paramStr = ''
+    //   var paramarray = []
+    //   if (data !== undefined) {
+    //     for (let i = 0; i < data.length; i++) {
+    //       paramarray.push({
+    //         name: data[i][0],
+    //         value: data[i][1],
+    //         type: data[i][2],
+    //         output: data[i][3]
+    //       })
+    //     }
+    //     paramStr = JSON.stringify(paramarray)
+    //   }
+    //   var obj = []
+    //   obj[0] = {}
+    //   obj[0].type = type
+    //   obj[0].name = name
+    //   obj[0].param = paramStr
+    //   obj[0].pageSize = pageSize
+    //   obj[0].pageList = pageList
+    //   var numn = JSON.stringify(obj[0])
+    //   return numn
+    // }
 
     // 用于打开增加框，方法能重置表单，并使表单内容回到初始化状态。
     // 传入参数
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index eec39480..43153eb3 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -84,7 +84,7 @@
         </el-tooltip>
         <el-tooltip :enterable="false" :id="OPNAME136" placement="top" @mouseover.native.prevent="changeActive($event)">
           <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
-          <div :id="OPNAME136" :title="tooltip" style="position: relative;left:159px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
+          <div :id="OPNAME136" :title="tooltip" style="position: relative;left:199px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
             <el-row>
               <!--<div :id="OPNAME136+fang" class="fang"/>-->
               <div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
@@ -504,31 +504,31 @@
         </el-tooltip>
         <el-tooltip :enterable="false" :id="OPNAME146" placement="top" @mouseover.native.prevent="changeActive($event)">
           <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
-          <div :id="OPNAME146" :title="tooltip" style="position: relative;left:1460px;top:-1167px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
+          <div :id="OPNAME146" :title="tooltip" style="position: relative;left:1450px;top:-1167px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
             <el-row>
               <!--<div :id="OPNAME135+fang" class="fang"/>-->
-              <!--<div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>-->
+              <div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>
               <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME146 }}</div>
             </el-row>
           </div>
         </el-tooltip>
         <el-tooltip :enterable="false" :id="OPNAME148" placement="top" @mouseover.native.prevent="changeActive($event)">
           <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
-          <div :id="OPNAME148" :title="tooltip" style="position: relative;left:1578px;top:-1195px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
+          <div :id="OPNAME148" :title="tooltip" style="position: relative;left:1568px;top:-1195px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
             <el-row>
               <!--<div :id="OPNAME135+fang" class="fang"/>-->
-              <!--<div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>-->
+              <div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>
               <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME148 }}</div>
             </el-row>
           </div>
         </el-tooltip>
         <el-tooltip :enterable="false" :id="OPNAME147" placement="top" @mouseover.native.prevent="changeActive($event)">
           <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
-          <div :title="tooltip" style="position: relative;left:1346px;top:-548px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
+          <div :title="tooltip" style="position: relative;left:1330px;top:-660px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
             <el-row>
               <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME147 }}</div>
               <!--<div :id="OPNAME147+circle" class="circle"/>-->
-              <!--<div :id="OPNAME117+fang" class="fang" style="margin-left: 9px"/>-->
+              <div :id="OPNAME147+circle" class="circle" style="margin-left: 4px"/>
             </el-row>
           </div>
         </el-tooltip>
@@ -553,6 +553,9 @@
           </div>
         </div>
       </div>
+      <div style="position: absolute;margin-top: -825px;margin-left: 20px;height: 30px;width: 120px;font-weight: bold;font-size: 20px;color: black;z-index: 999;">
+        {{ nowdate }}
+      </div>
       <!--      <el-card style="position: absolute;background: #ffffff;margin-top: -825px;margin-left: 1540px;height: 130px;width: 120px">-->
       <!--        <div style="margin-top: 6px">-->
       <!--          <div class="circle4" style="margin-top: 3px"/>-->
@@ -642,9 +645,10 @@ export default {
       tooltip1: '',
       tooltip2: '',
       tooltip3: '',
+      nowdate: '',
       socketConnect: true,
-      机床总装: '机床总装',
-      部件装配: '部件装配',
+      机床总装: '总装机床',
+      部件装配: '装配部件',
       OPNAME101: 'OP1010',
       OPNAME102: 'OP1020',
       OPNAME103: 'OP1030',
@@ -713,6 +717,16 @@ export default {
     }
   },
   mounted() {
+    // 获取时间
+    var date = new Date()
+    var y = date.getFullYear()
+    var m = date.getMonth() + 1
+    m = m < 10 ? '0' + m : m
+    var d = date.getDate()
+    d = d < 10 ? ('0' + d) : d
+    var time1 = y + '-' + m + '-' + d
+    this.nowdate = time1
+    // 获取时间
     this.connect()
     // this.getwork_state()
     this.getOP_state()
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index f14ca5c5..0f1374da 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -46,20 +46,8 @@
       </div>
     </el-card>
     <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        :row-class-name="tableRowClassName"
-        border
-        stripe
-        style="max-height: 400px;margin-top:10px"
-        height="400"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          align="center"
-          width="50"/>
+      <el-table v-loading="listLoading" :data="tableData" :row-class-name="tableRowClassName" border stripe style="max-height: 400px;margin-top:10px" height="400" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" align="center" width="50"/>
         <el-table-column label="零件图号" prop="零件图号" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
@@ -90,42 +78,6 @@
             {{ 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="100" align="center">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="加工件合格" align="center" width="230">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-date-picker-->
-        <!--v-model="tableData[scope.$index].加工件合格时间"-->
-        <!--size="mini"-->
-        <!--type="date"-->
-        <!--value-format="yyyy-MM-dd"-->
-        <!--placeholder="选择加工件合格时间"-->
-        <!--@change="timeChange(scope.row)"/>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="板焊结束" width="150" align="center">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.板焊 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="操作" width="200px" align="center" fixed="right">-->
-        <!--<template slot-scope="scope" align="center">-->
-        <!--<el-button-->
-        <!--size="mini"-->
-        <!--type="primary"-->
-        <!--class="el-icon-edit"-->
-        <!--@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>-->
-        <!--&lt;!&ndash;<el-button size="mini" type="primary" @click="inBatches">分批</el-button>&ndash;&gt;-->
-        <!--</template>-->
-        <!--</el-table-column>-->
       </el-table>
       <div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
         <el-pagination
@@ -159,14 +111,7 @@
 
     <el-card>
       <div>
-        <el-table
-          v-loading="listLoading1"
-          :data="tableData1"
-          class="table"
-          borde
-          stripe
-          style="max-height: 500px"
-          height="500">
+        <el-table v-loading="listLoading1" :data="tableData1" class="table" borde stripe style="max-height: 500px" height="500">
           <el-table-column label="零件图号" align="center" min-width="160">
             <template slot-scope="scope">
               {{ 零件图号[scope.$index] }}
@@ -192,11 +137,6 @@
               {{ 机加工结束时间[scope.$index] }}
             </template>
           </el-table-column>
-          <!--<el-table-column label="是否预计外协" align="center" width="110">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ 预计外协[scope.$index] }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="零件加工计划进度（工艺名称、计划日期、工序工时）" align="">
             <el-table-column label="[1]" align="center" width="120px">
               <template slot-scope="scope">
@@ -465,11 +405,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      v-el-drag-dialog
-      :visible.sync="dialogTableVisible520"
-      title="调整工序计划"
-      width="45%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogTableVisible520" title="调整工序计划" width="45%">
       <div style="overflow: auto;max-height: 450px;">
         <el-row v-if="false">
           <span>开始时间:</span>
@@ -491,12 +427,7 @@
           <el-button size="mini" type="success" icon="el-icon-search" style="margin: 10px 0 10px 10px" @click="searchChart1">查询</el-button>
         </el-row>
         <div v-if="false" id="myChart1" style="width: 58%;height: 300px;display: inline-block"/>
-        <el-table
-          v-if="false"
-          :data="tableData01"
-          border
-          style="max-height: 300px;width:40%;display: inline-block"
-          height="300">
+        <el-table v-if="false" :data="tableData01" border style="max-height: 300px;width:40%;display: inline-block" height="300">
           <el-table-column label="名称" align="center">
             <template slot-scope="scope">
               {{ scope.row.设备名称 }}
@@ -536,7 +467,9 @@
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
-          </el-select>～<el-select v-model="month2" size="mini" style="width:60px" placeholder="月">
+          </el-select>
+          ～
+          <el-select v-model="month2" size="mini" style="width:60px" placeholder="月">
             <el-option
               v-for="item in months"
               :key="item.value"
@@ -550,7 +483,9 @@
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
-          </el-select>～<el-select v-model="week2" size="mini" style="width:60px" placeholder="周">
+          </el-select>
+          ～
+          <el-select v-model="week2" size="mini" style="width:60px" placeholder="周">
             <el-option
               v-for="item in weeks"
               :key="item.value"
@@ -562,13 +497,7 @@
           <span>零件类型：</span>{{ partType }}
         </el-row>
         <div v-if="false" id="myChart2" style="width: 58%;height: 300px;display: inline-block"/>
-        <!--@row-click="rowClick"-->
-        <el-table
-          :data="tableData02"
-          :row-class-name="rowClassName"
-          border
-          style="max-height: 300px;display: inline-block"
-          height="300">
+        <el-table :data="tableData02" :row-class-name="rowClassName" border style="max-height: 300px;display: inline-block" height="300">
           <el-table-column label="工序顺序" align="center" width="80" type="index">
             <template slot-scope="scope">
               {{ 工序顺序[scope.$index] }}
@@ -602,9 +531,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <!--<div slot="footer" class="dialog-footer" style="margin-right: 20px;float:right">-->
-        <!--<el-button size="mini" type="primary" @click="refreshTable" icon="el-icon-refresh"  style="margin-left: 750px">确定</el-button>-->
-        <!--</div>-->
       </div>
     </el-dialog>
 
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index b49b41b7..797a164b 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -172,15 +172,15 @@ export default {
       if (this.partTypeValue) { check5 = 1 } else { check5 = 0 }
       this.loading0 = true
       searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
-          if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
-            response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
+        for (let i = 0; i < response.data.result.length; i++) {
+          response.data.result[i].考核状态 = parseInt(response.data.result[i].考核状态) - 2
+          if (response.data.result[i].传递时间 !== undefined || response.data.result[i].hasOwnProperty('传递时间')) {
+            response.data.result[i].传递时间 = response.data.result[i].传递时间.split(' ', 2)[0]
           }
         }
         this.loading0 = false
-        this.total = response.data.total
-        this.tableData = response.data.rows
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.tableData = response.data.result
       })
     },
     handleSizeChange(val) {
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 4872b6ae..8c54e73f 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -38,7 +38,7 @@
         :expand-row-keys="expands"
         :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
         highlight-current-row
-        style="margin: 3px 0px;width: 1208px"
+        style="margin: 3px 0px;width: 1218px"
         height="700"
         border
         stripe
@@ -124,7 +124,7 @@
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="发货节点" width="80">
+        <el-table-column align="center" label="发货节点" width="90">
           <template slot-scope="scope">
             {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
           </template>
@@ -680,14 +680,12 @@ export default {
     this.fetchData()
     this.fetchTableData1()
     this.fetchCustomerData()
-    console.log(this.$toTop(), 222)
   },
   methods: {
     // 2020 02 18  刘路加 增加
     fun() {
       this.form.contractAmount = Number(this.form.contractAmount).toFixed(2)
     },
-
     searchName() { // 模糊查询姓名
       this.tableData3 = []
       SelectMarketingManager().then(response => {
@@ -767,7 +765,12 @@ 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.check1, this.check1, this.dateRange[0], this.dateRange[1], this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
+      searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.machine_check, this.machine, this.customerName1_check, this.customerName1).then(response => {
+        console.log(response.data)
+        this.listLoading = false
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.tableData1 = response.data.result
+      })
     },
     exportExcel() {
       if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 5af57b6e..11b0a7a2 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -50,30 +50,20 @@
     <el-row>
       <el-col style="width: 680px">
         <el-card>
-          <el-table
-            v-loading="listLoading"
-            :data="tableData1"
-            :row-key="getRowKeys"
-            :expand-row-keys="expands"
-            style="width: 100%"
-            height="700"
-            border
-            stripe
-            size="mini"
-            @row-click="selectMachine">
-            <el-table-column align="center" label="合同编号" prop="合同编号" width="130px">
+          <el-table v-loading="listLoading" :data="tableData1" :row-key="getRowKeys" :expand-row-keys="expands" style="width: 100%" height="700" border stripe size="mini" @row-click="selectMachine">
+            <el-table-column align="center" label="合同编号" prop="合同编号" width="120px">
               <template slot-scope="scope">
                 <template>
                   {{ scope.row.合同编号 }}
                 </template>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="项目名称" prop="项目名称" width="140px" show-overflow-tooltip>
+            <el-table-column align="center" label="项目名称" prop="项目名称" width="130px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100px">
+            <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.合同签订日期.substring(0,10) }}
               </template>
@@ -85,24 +75,9 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="130px">
               <template slot-scope="scope">
-                <el-button
-                  style="margin-left: 5px"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-circle-plus-outline"
-                  @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
-                <el-button
-                  style="margin-left: 5px"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click.stop="handleEdit(scope.row)"/>
-                <el-button
-                  style="margin-left: 5px;margin-right: 5px"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click.stop="handleDelete(scope.row)"/>
+                <el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-circle-plus-outline" @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
+                <el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-edit" @click.stop="handleEdit(scope.row)"/>
+                <el-button style="margin-left: 5px;margin-right: 5px" size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
@@ -139,18 +114,8 @@
             </el-table-column>
             <el-table-column label="操作" width="80" align="center">
               <template slot-scope="scope">
-                <el-button
-                  style="margin-left: 5px"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="editMachine(scope.row);flag = 2"/>
-                <el-button
-                  style="margin-left: 5px"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="deleteMachine(scope.row)"/>
+                <el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-edit" @click="editMachine(scope.row);flag = 2"/>
+                <el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-delete" @click="deleteMachine(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
@@ -304,7 +269,7 @@ export default {
       param[2] = ['日期_check', this.time_check]
       param[3] = ['开始日期', this.startTime]
       param[4] = ['结束日期', this.endTime]
-      var Data = this.CreateData('04', '报表_自家项目报表_查询', param)
+      var Data = this.CreateData('2001', '报表_自家项目报表_查询', param)
       this.exportExcel_NPOI(Data)
     },
     init() {
diff --git a/src/views/MarketingCenter/MarginManagement/index.vue b/src/views/MarketingCenter/MarginManagement/index.vue
index 408ce091..5d3543f9 100644
--- a/src/views/MarketingCenter/MarginManagement/index.vue
+++ b/src/views/MarketingCenter/MarginManagement/index.vue
@@ -29,7 +29,6 @@ export default {
     }
   },
   methods: {
-
     handleClick(tab) {
       this.handle = tab.name
     }
diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue
index 19758c9e..ff146094 100644
--- a/src/views/MarketingCenter/ShippingInquiries/index.vue
+++ b/src/views/MarketingCenter/ShippingInquiries/index.vue
@@ -194,42 +194,10 @@ export default {
       }))
     },
     exportExcel() {
-      this.tableDataSearchList = []
       this.invoiceNumber !== null && this.invoiceNumber !== '' ? this.invoiceNumber_check = 1 : this.invoiceNumber_check = 0
       this.receivingUnit !== null && this.receivingUnit !== '' ? this.receivingUnit_check = 1 : this.receivingUnit_check = 0
       this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
       InvoiceListSearch_Excel(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check, this.check1, this.dateRange[0], this.dateRange[1]).then(val => {
-        console.log(val)
-        // for (let i = 0; i < val.data.length; i++) {
-        //   // if (val.data[i].投标结果 !== '' && val.data[i].交付日期 !== null) {
-        //   //   val.data[i].交付日期 = val.data[i].交付日期.substring(0, val.data[i].交付日期.length - 8)
-        //   // }
-        //   if (val.data[i].投标结果 === 0) {
-        //     val.data[i].投标结果 = ''
-        //   } else if (val.data[i].投标结果 === 1) {
-        //     val.data[i].投标结果 = '已中标'
-        //   } else if (val.data[i].投标结果 === 2) {
-        //     val.data[i].投标结果 = '未中标'
-        //   }
-        //   if (val.data[i].公布日期 !== '' && val.data[i].公布日期 !== null) {
-        //     val.data[i].公布日期 = val.data[i].公布日期.substring(0, val.data[i].公布日期.length - 8)
-        //   }
-        //   if (val.data[i].投标日期 !== '' && val.data[i].投标日期 !== null) {
-        //     val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
-        //   }
-        //   // if (val.data[i].投标日期 !== '' && val.data[i].投标日期 !== null) {
-        //   //   val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
-        //   // }
-        //   if (parseInt(val.data[i].是否收回) !== 2) {
-        //     val.data[i].应收回金额 = '未收回'
-        //   } else {
-        //     val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
-        //   }
-        //   val.data[i].保证金金额 = (val.data[i].保证金金额).toFixed(2)
-        //   val.data[i].中标服务费 = (val.data[i].中标服务费).toFixed(2)
-        //   val.data[i].未收金额 = (val.data[i].未收金额).toFixed(2)
-        //   val.data[i].转履约保证金金额 = (val.data[i].转履约保证金金额).toFixed(2)
-        // }
         if (val.length !== 0) {
           import('@/vendor/Export2Excel').then(excel => {
             const tHeader = ['状态', '发货单号', '收货单位', '收货人', '联系电话', '收货地址', '发货日期', '车辆牌号', '司机姓名', '司机电话', '货品类别', '货品编号', '货品名称', '货品规格', '货品型号', '数量', '设计者']
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 79dcd13d..4bec95a8 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -81,16 +81,16 @@
         </el-table-column>
         <el-table-column
           label="零件数量"
-          min-width="70"
+          width="80"
           align="center">
           <template slot-scope="scope">{{ scope.row.零件数量 }}</template>
         </el-table-column>
-        <el-table-column label="部件数量" align="center" min-width="70">
+        <el-table-column label="部件数量" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.部件数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床数量" align="center" min-width="70">
+        <el-table-column label="机床数量" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.机床数量 }}
           </template>