diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js
index cf9639fd..c38ed0fb 100644
--- a/src/api/Assembly/QualityInspectionInformationInquiry.js
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -95,25 +95,23 @@ export function searchTableDetail(...params) {
     }
   })
 }
-export function searchData(pageSize, pageCurrent) {
+export function searchData() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW',
-      Pagination: pageCurrent + '&' + pageSize
+      name: '车间生产管理工艺_加工顺序调整_查询正在加工零件工序_NEW'
     }
   })
 }
-export function searchData1(pageSize, pageCurrent) {
+export function searchData1() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'MES_机加工MES_记录零件待加工显示_NEW',
-      Pagination: pageCurrent + '&' + pageSize
+      name: 'MES_机加工MES_记录零件待加工显示_NEW'
     }
   })
 }
diff --git a/src/api/BasicData/PartsNumberMaintenance.js b/src/api/BasicData/PartsNumberMaintenance.js
index 1233566a..f730742e 100644
--- a/src/api/BasicData/PartsNumberMaintenance.js
+++ b/src/api/BasicData/PartsNumberMaintenance.js
@@ -34,27 +34,25 @@ export function groupSelect(machineValue) {
     }
   })
 }
-export function searchTable5(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
+export function searchTable5(projectCheck, project, machineCheck, machine, groupCheck, group) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: 'PDM_零件明细表_外购件和标准件_临时表数据查询',
-      param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
     }
   })
 }
-export function searchTable6(pageCurrent, pageSize, projectCheck, project, machineCheck, machine, groupCheck, group) {
+export function searchTable6(projectCheck, project, machineCheck, machine, groupCheck, group) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: 'PDM_零件明细表_基本件_临时表数据查询',
-      param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
     }
   })
 }
@@ -70,27 +68,25 @@ export function searchTable7(pageCurrent, pageSize, projectCheck, project, machi
     }
   })
 }
-export function basicPartsData(project_check, project, machine_check, machine, group_check, group, pageSize, pageCurrent) {
+export function basicPartsData(project_check, project, machine_check, machine, group_check, group) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: 'PDM_零件明细表_基本件_查询数据_综合gj',
-      param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `项目流水号_check=${project_check}&项目流水号=${project}&机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`
     }
   })
 }
-export function purchasePartsData(num, pageCurrent, pageSize) {
+export function purchasePartsData(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: 'PDM_零件明细表_标准件和外购件_查询数据',
-      param: `组件流水号=${num}`,
-      pagination: pageCurrent + '&' + pageSize
+      param: `组件流水号=${num}`
     }
   })
 }
@@ -204,15 +200,14 @@ export function editBasicParts(num, num1) {
     }
   })
 }
-export function getTable(num, pageList, pageSize) {
+export function getTable(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_零件工艺计划_已投产_按组查',
-      param: '组件流水号=' + num + '=int',
-      Pagination: pageList + '&' + pageSize
+      param: '组件流水号=' + num + '=int'
     }
   })
 }
@@ -227,15 +222,14 @@ export function editProductNum(num, num1) {
     }
   })
 }
-export function getTable1(num, a, b, c, d, e, f, g, pageList, pageSize) {
+export function getTable1(num, a, b, c, d, e, f, g) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_新排产算法_能力平衡_查询数据_要平衡的零件',
-      param: '项目流水号_check=' + num + '=string&项目流水号=' + a + '=int&机床流水号_check=' + b + '=string&机床流水号=' + c + '=int&组件流水号_check=' + d + '=string&组件流水号=' + e + '=int&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=1=int&考核状态=5=int',
-      Pagination: pageList + '&' + pageSize
+      param: '项目流水号_check=' + num + '=string&项目流水号=' + a + '=int&机床流水号_check=' + b + '=string&机床流水号=' + c + '=int&组件流水号_check=' + d + '=string&组件流水号=' + e + '=int&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=1=int&考核状态=5=int'
     }
   })
 }
@@ -258,8 +252,7 @@ export function searchTable1(...params) {
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_数量维护',
-      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态=1`,
-      Pagination: params[0] + '&' + params[1]
+      param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}&物料状态=1`
     }
   })
 }
@@ -271,8 +264,7 @@ export function searchTable2(...params) {
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_数量维护',
-      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态=1`,
-      Pagination: params[0] + '&' + params[1]
+      param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}&物料状态=1`
     }
   })
 }
diff --git a/src/api/BasicData/SystemRrolemaintenance.js b/src/api/BasicData/SystemRrolemaintenance.js
index df3b93e5..c7d85663 100644
--- a/src/api/BasicData/SystemRrolemaintenance.js
+++ b/src/api/BasicData/SystemRrolemaintenance.js
@@ -1,13 +1,12 @@
 import request from '@/utils/request'
 
-export function InitRolefunction(pageCurrent, pageSize) {
+export function InitRolefunction() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '菜单系统模块_项目角色_查询数据_MESWORK',
-      Pagination: pageCurrent + '&' + pageSize
+      name: '菜单系统模块_项目角色_查询数据_MESWORK'
     }
   })
 }
diff --git a/src/api/BasicData/WorkshopPersonnelRoleMana.js b/src/api/BasicData/WorkshopPersonnelRoleMana.js
index d287983e..c3b5d0f0 100644
--- a/src/api/BasicData/WorkshopPersonnelRoleMana.js
+++ b/src/api/BasicData/WorkshopPersonnelRoleMana.js
@@ -136,15 +136,14 @@ export function initOrderType() {
     }
   })
 }
-export function searchTable(check1, staffName, check2, systemAdministrator, pageCurrent, pageSize) {
+export function searchTable(check1, staffName, check2, systemAdministrator) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '菜单系统模块_项目角色员工综合_查询数据',
-      param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int',
-      Pagination: pageCurrent + '&' + pageSize
+      param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int'
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js b/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js
index 9d5837f6..b9da9f53 100644
--- a/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js
+++ b/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js
@@ -1,14 +1,13 @@
 import request from '@/utils/request'
 
-export function getData(num, num1, pageCurrent, pageSize) {
+export function getData(num, num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理_设备运行情况_查询数据',
-      param: '工位号=' + num + '&日期=' + num1,
-      pagination: pageCurrent + '&' + pageSize
+      param: '工位号=' + num + '&日期=' + num1
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js
index 582033f8..bc448266 100644
--- a/src/api/ManufacturingCenter/GroupMatching.js
+++ b/src/api/ManufacturingCenter/GroupMatching.js
@@ -98,8 +98,8 @@ export function searchTable01(...params) {
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_分配后_加供应商',
-      param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}`,
-      Pagination: params[6] + '&' + params[7]
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`,
+      Pagination: params[4] + '&' + params[5]
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js
index ee02ffc3..78dd29ee 100644
--- a/src/api/ManufacturingCenter/machiningHoursStatistics.js
+++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js
@@ -62,15 +62,14 @@ export function initProject() {
   })
 }
 // 车间生产管理工艺_工时统计_机床查询_查询数据
-export function searchtable4(num1, num2, pageCurrent, pageSize) {
+export function searchtable4(num1, num2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_工时统计_机床查询_查询数据',
-      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2,
-      Pagination: pageCurrent + '&' + pageSize
+      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2
     }
   })
 }
@@ -87,15 +86,14 @@ export function searchtable44(num1, num2) {
   })
 }
 // 车间生产管理工艺_工时统计_组号查询_查询数据
-export function searchtable5(num1, pageCurrent, pageSize) {
+export function searchtable5(num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_工时统计_组号查询_查询数据',
-      param: '机床流水号=' + num1,
-      Pagination: pageCurrent + '&' + pageSize
+      param: '机床流水号=' + num1
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index da3f9d7b..f5d89e37 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 3de576d4..74dc3854 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -61,7 +61,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
           <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
         </el-tooltip>
@@ -254,7 +254,7 @@
       </div>
     </el-card>
     <el-card>
-      <h4 style="margin-left: 45%;">正在加工零件列表</h4>
+      <span style="margin-left: 45%;font-size: 20px;">正在加工零件列表</span>
       <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
         <el-table-column label="机床图号" prop="机床图号" align="center">
           <template slot-scope="scope">
@@ -312,19 +312,19 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40, 100]"
-          :page-size="pageSize1"
-          :total="total1"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
-      </div>
+      <!--      <div class="block">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent1"-->
+      <!--          :page-sizes="[10, 20, 30, 40, 100]"-->
+      <!--          :page-size="pageSize1"-->
+      <!--          :total="total1"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChange1"-->
+      <!--          @current-change="handleCurrentChange1"/>-->
+      <!--      </div>-->
     </el-card>
     <el-card>
-      <h4 style="margin-left: 45%;">待加工零件列表</h4>
+      <span style="margin-left: 45%;font-size: 20px">待加工零件列表</span>
       <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
         <el-table-column label="机床图号" prop="机床图号" align="center" width="110px">
           <template slot-scope="scope">
@@ -382,16 +382,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40, 100]"
-          :page-size="pageSize2"
-          :total="total2"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
+      <!--      <div class="block">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent2"-->
+      <!--          :page-sizes="[10, 20, 30, 40, 100]"-->
+      <!--          :page-size="pageSize2"-->
+      <!--          :total="total2"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChange2"-->
+      <!--          @current-change="handleCurrentChange2"/>-->
+      <!--      </div>-->
     </el-card>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
       <el-row>
@@ -402,7 +402,7 @@
       </el-row>
       <el-table
         :data="tableData5"
-        style="width: 100%;max-height: 400px;margin-top: 20px"
+        style="width: 100%;margin-top: 20px"
         size="mini"
         height="300"
         stripe
@@ -494,14 +494,14 @@ export default {
       dialogFormVisible4: false,
       loading: false,
       total: 0, // 总条数
-      pageSize: 10, // 每页显示条数
-      pageCurrent: 1, // 后台获取页
-      total1: 0, // 总条数
-      pageSize1: 10, // 每页显示条数
-      pageCurrent1: 1, // 后台获取页
-      total2: 0, // 总条数
-      pageSize2: 10, // 每页显示条数
-      pageCurrent2: 1 // 后台获取页
+      pageSize: 20, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
+      // total1: 0, // 总条数
+      // pageSize1: 10, // 每页显示条数
+      // pageCurrent1: 1, // 后台获取页
+      // total2: 0, // 总条数
+      // pageSize2: 10, // 每页显示条数
+      // pageCurrent2: 1 // 后台获取页
     }
   },
   created() {
@@ -595,15 +595,15 @@ export default {
       })
     },
     fetchData() {
-      searchData(this.pageSize1, this.pageCurrent1).then(response => {
-        this.tableData10 = response.data.rows
+      searchData().then(response => {
+        this.tableData10 = response.data
         this.total1 = response.data.total
       })
     },
     fetchData1() {
-      searchData1(this.pageSize2, this.pageCurrent2).then(response => {
+      searchData1().then(response => {
         console.log(response)
-        this.tableData20 = response.data.rows
+        this.tableData20 = response.data
         this.total2 = response.data.total
       })
     },
@@ -672,25 +672,25 @@ export default {
     handleCurrentChange(val) {
       this.pageCurrent = val
       this.selecttable()
-    },
-    handleSizeChange1(val) {
-      this.pageCurrent1 = 1
-      this.pageSize1 = val
-      this.fetchData()
-    },
-    handleCurrentChange1(val) {
-      this.pageCurrent1 = val
-      this.fetchData()
-    },
-    handleSizeChange2(val) {
-      this.pageCurrent2 = 1
-      this.pageSize2 = val
-      this.fetchData1()
-    },
-    handleCurrentChange2(val) {
-      this.pageCurrent2 = val
-      this.fetchData1()
     }
+    // handleSizeChange1(val) {
+    //   this.pageCurrent1 = 1
+    //   this.pageSize1 = val
+    //   this.fetchData()
+    // },
+    // handleCurrentChange1(val) {
+    //   this.pageCurrent1 = val
+    //   this.fetchData()
+    // },
+    // handleSizeChange2(val) {
+    //   this.pageCurrent2 = 1
+    //   this.pageSize2 = val
+    //   this.fetchData1()
+    // },
+    // handleCurrentChange2(val) {
+    //   this.pageCurrent2 = val
+    //   this.fetchData1()
+    // }
   }
 }
 
diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index 25233287..572c2ff5 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <span>项目名称</span>
-      <el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">
+      <el-select v-model="projectValue" placeholder="请选择项目名称" style="margin: 0px 20px 0px 0px" filterable size="small">
         <el-option
           v-for="item in project"
           :key="item.value"
@@ -10,7 +10,7 @@
           :value="item.value"/>
       </el-select>
       <span>机床图号</span>
-      <el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
+      <el-select v-model="machineValue" placeholder="请选择机床图号" style="margin: 0px 20px 0px 0px" filterable size="small">
         <el-option
           v-for="item in machine"
           :key="item.value"
@@ -19,7 +19,7 @@
       </el-select>
 
       <span>组号</span>
-      <el-select v-model="groupValue" placeholder="请选择组号" filterable size="small">
+      <el-select v-model="groupValue" placeholder="请选择组号" style="margin: 0px 20px 0px 0px" filterable size="small">
         <el-option
           v-for="item in group"
           :key="item.value"
@@ -36,7 +36,7 @@
       <div>
         <span style="font-size: 20px">基本件三表数量</span>
         <el-tooltip :open-delay="1000" effect="dark" content="删除基本件三表数量" placement="top">
-          <el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
+          <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
         </el-tooltip>
       </div>
       <el-table
@@ -144,22 +144,22 @@
           </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="handleSizeChanges"
-          @current-change="handleCurrentChanges"/>
-      </div>
+      <!--      <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="handleSizeChanges"-->
+      <!--          @current-change="handleCurrentChanges"/>-->
+      <!--      </div>-->
     </el-card>
     <el-card>
       <div>
         <span style="font-size: 20px">外购件和标准件三表数量</span>
         <el-tooltip :open-delay="1000" effect="dark" content="删除外购件和标准件数量" placement="top">
-          <el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
+          <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
         </el-tooltip>
       </div>
       <el-table
@@ -240,16 +240,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px">
-        <el-pagination
-          :current-page="pageCurrentWB"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSizeWB"
-          :total="totalWB"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChangeWB"
-          @current-change="handleCurrentChangeWB"/>
-      </div>
+      <!--      <div class="block" style="margin-top: 10px">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrentWB"-->
+      <!--          :page-sizes="[10, 20, 30, 40]"-->
+      <!--          :page-size="pageSizeWB"-->
+      <!--          :total="totalWB"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChangeWB"-->
+      <!--          @current-change="handleCurrentChangeWB"/>-->
+      <!--      </div>-->
     </el-card>
     <el-card>
       <div>
@@ -303,17 +303,17 @@
             </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"
-            style="width:50%;display:inline-block;"
-            layout="total, sizes, prev, pager, next, jumper"
-            @size-change="handleSizeChange1"
-            @current-change="handleCurrentChange1"/>
-        </div>
+        <!--        <div class="block" style="margin-top: 10px;">-->
+        <!--          <el-pagination-->
+        <!--            :current-page="pageCurrent1"-->
+        <!--            :page-sizes="[10, 20, 30, 40]"-->
+        <!--            :page-size="pageSize1"-->
+        <!--            :total="total1"-->
+        <!--            style="width:50%;display:inline-block;"-->
+        <!--            layout="total, sizes, prev, pager, next, jumper"-->
+        <!--            @size-change="handleSizeChange1"-->
+        <!--            @current-change="handleCurrentChange1"/>-->
+        <!--        </div>-->
       </div>
     </el-card>
     <el-card>
@@ -362,17 +362,17 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="float:left"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
+      <!--      <div class="block" style="margin-top: 10px;">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent2"-->
+      <!--          :page-sizes="[10, 20, 30, 40]"-->
+      <!--          :page-size="pageSize2"-->
+      <!--          :total="total2"-->
+      <!--          style="float:left"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChange2"-->
+      <!--          @current-change="handleCurrentChange2"/>-->
+      <!--      </div>-->
     </el-card>
     <el-card>
       <div style="font-size: 20px">未分配采购零件数量</div>
@@ -433,17 +433,17 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <el-pagination
-              :current-page="pageCurrent3"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="pageSize3"
-              :total="total3"
-              style="display:inline-block;width:50%"
-              layout="total, sizes, prev, pager, next, jumper"
-              @size-change="handleSizeChange3"
-              @current-change="handleCurrentChange3"/>
-          </div>
+          <!--          <div class="block">-->
+          <!--            <el-pagination-->
+          <!--              :current-page="pageCurrent3"-->
+          <!--              :page-sizes="[10, 20, 30, 40]"-->
+          <!--              :page-size="pageSize3"-->
+          <!--              :total="total3"-->
+          <!--              style="display:inline-block;width:50%"-->
+          <!--              layout="total, sizes, prev, pager, next, jumper"-->
+          <!--              @size-change="handleSizeChange3"-->
+          <!--              @current-change="handleCurrentChange3"/>-->
+          <!--          </div>-->
         </el-tab-pane>
         <el-tab-pane label="基本件">
           <el-table :data="tableData4" size="mini" style="max-height: 320px" height="320px" border>
@@ -496,17 +496,17 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <el-pagination
-              :current-page="pageCurrent4"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="pageSize4"
-              :total="total4"
-              style="display:inline-block;width:50%"
-              layout="total, sizes, prev, pager, next, jumper"
-              @size-change="handleSizeChange4"
-              @current-change="handleCurrentChange4"/>
-          </div>
+          <!--          <div class="block">-->
+          <!--            <el-pagination-->
+          <!--              :current-page="pageCurrent4"-->
+          <!--              :page-sizes="[10, 20, 30, 40]"-->
+          <!--              :page-size="pageSize4"-->
+          <!--              :total="total4"-->
+          <!--              style="display:inline-block;width:50%"-->
+          <!--              layout="total, sizes, prev, pager, next, jumper"-->
+          <!--              @size-change="handleSizeChange4"-->
+          <!--              @current-change="handleCurrentChange4"/>-->
+          <!--          </div>-->
         </el-tab-pane>
       </el-tabs>
     </el-card>
@@ -515,7 +515,7 @@
         <span style="font-size: 20px">临时表</span>
         <el-button style="float: right" type="danger" size="small" @click="alldelete5()">全部删除</el-button>
       </div>
-      <el-tabs v-model="activeName" style="margin-top: 20px" type="border-card" @tab-click="searchTable5();searchTable6()">
+      <el-tabs v-model="activeName" style="margin-top: 10px" type="border-card" @tab-click="searchTable5();searchTable6()">
         <el-tab-pane label="标准件和外购件" name="1">
           <el-table :data="tableData5" size="mini" style="max-height: 320px" height="320px" border>
             <el-table-column align="center" label="项目" min-width="100px">
@@ -562,17 +562,17 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <el-pagination
-              :current-page="pageCurrent5"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="pageSize5"
-              :total="total5"
-              style="display:inline-block;width:50%"
-              layout="total, sizes, prev, pager, next, jumper"
-              @size-change="handleSizeChange5"
-              @current-change="handleCurrentChange5"/>
-          </div>
+          <!--          <div class="block">-->
+          <!--            <el-pagination-->
+          <!--              :current-page="pageCurrent5"-->
+          <!--              :page-sizes="[10, 20, 30, 40]"-->
+          <!--              :page-size="pageSize5"-->
+          <!--              :total="total5"-->
+          <!--              style="display:inline-block;width:50%"-->
+          <!--              layout="total, sizes, prev, pager, next, jumper"-->
+          <!--              @size-change="handleSizeChange5"-->
+          <!--              @current-change="handleCurrentChange5"/>-->
+          <!--          </div>-->
         </el-tab-pane>
         <el-tab-pane label="基本件" name="2">
           <el-table :data="tableData6" size="mini" style="max-height: 320px" height="320px" border>
@@ -615,17 +615,17 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
-            <el-pagination
-              :current-page="pageCurrent6"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="pageSize6"
-              :total="total6"
-              style="display:inline-block;width:50%"
-              layout="total, sizes, prev, pager, next, jumper"
-              @size-change="handleSizeChange6"
-              @current-change="handleCurrentChange6"/>
-          </div>
+          <!--          <div class="block">-->
+          <!--            <el-pagination-->
+          <!--              :current-page="pageCurrent6"-->
+          <!--              :page-sizes="[10, 20, 30, 40]"-->
+          <!--              :page-size="pageSize6"-->
+          <!--              :total="total6"-->
+          <!--              style="display:inline-block;width:50%"-->
+          <!--              layout="total, sizes, prev, pager, next, jumper"-->
+          <!--              @size-change="handleSizeChange6"-->
+          <!--              @current-change="handleCurrentChange6"/>-->
+          <!--          </div>-->
         </el-tab-pane>
       </el-tabs>
     </el-card>
@@ -677,7 +677,7 @@ export default {
       dialogFormVisible3: false,
       loading: false,
       loadingWB: false,
-      total: 0,
+      // total: 0,
       tableData: [],
       tableData1: [],
       tableData2: [],
@@ -687,32 +687,32 @@ export default {
       tableData6: [],
       tableData7: [],
       tableDataWB: [],
-      pageCurrent: 1,
-      pageSize: 10,
-      pageCurrent1: 1,
-      pageSize1: 10,
-      total1: 0,
-      pageCurrent2: 1,
-      pageSize2: 10,
-      total2: 0,
-      pageCurrent3: 1,
-      pageSize3: 10,
-      total3: 0,
-      pageCurrent4: 1,
-      pageSize4: 10,
-      total4: 0,
-      pageCurrent5: 1,
-      pageSize5: 10,
-      total5: 0,
-      pageCurrent6: 1,
-      pageSize6: 10,
-      total6: 0,
+      // pageCurrent: 1,
+      // pageSize: 10,
+      // pageCurrent1: 1,
+      // pageSize1: 10,
+      // total1: 0,
+      // pageCurrent2: 1,
+      // pageSize2: 10,
+      // total2: 0,
+      // pageCurrent3: 1,
+      // pageSize3: 10,
+      // total3: 0,
+      // pageCurrent4: 1,
+      // pageSize4: 10,
+      // total4: 0,
+      // pageCurrent5: 1,
+      // pageSize5: 10,
+      // total5: 0,
+      // pageCurrent6: 1,
+      // pageSize6: 10,
+      // total6: 0,
       pageCurrent7: 1,
       pageSize7: 10,
-      total7: 0,
-      pageCurrentWB: 1,
-      pageSizeWB: 10,
-      totalWB: 0
+      total7: 0
+      // pageCurrentWB: 1,
+      // pageSizeWB: 10,
+      // totalWB: 0
     }
   },
   computed: {
@@ -871,12 +871,12 @@ export default {
       const machine_check = this.machineValue ? 1 : 0
       const group_check = this.groupValue ? 1 : 0
       this.loading = true
-      basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
+      basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue).then(response => {
         this.loading = false
         const res = response.data
         this.total = res.total
         // console.log(this.tableData)
-        this.tableData = res.rows.map(item => {
+        this.tableData = res.map(item => {
           if (item.整改类型 === '1') {
             item.整改类型 = '新增'
           } else if (item.整改类型 === '2') {
@@ -888,11 +888,11 @@ export default {
         })
       })
       this.loadingWB = true
-      purchasePartsData(this.groupValue, this.pageCurrentWB, this.pageSizeWB).then(response => {
+      purchasePartsData(this.groupValue).then(response => {
         this.loadingWB = false
         const data = response.data
         this.totalWB = data.total
-        this.tableDataWB = data.rows.map(item => {
+        this.tableDataWB = data.map(item => {
           console.log(item)
           item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件'
           return item
@@ -901,22 +901,22 @@ export default {
     },
     getTable() {
       this.tableData1 = []
-      getTable(this.groupValue, this.pageCurrent1, this.pageSize1).then(response => {
+      getTable(this.groupValue).then(response => {
         this.total1 = parseInt(response.data.total)
         this.tableData1 = []
-        for (let i = 0; i < response.data.rows.length; i++) {
+        for (let i = 0; i < response.data.length; i++) {
           this.tableData1.push({
-            零件图号: response.data.rows[i].零件图号,
-            零件名称: response.data.rows[i].零件名称,
-            投产总数量: response.data.rows[i].投产总数量,
-            最大投产批次: response.data.rows[i].最大投产批次,
-            已投产数量: response.data.rows[i].已投产数量,
-            未投产数量: response.data.rows[i].未投产数量,
-            零件类型名称: response.data.rows[i].零件类型名称,
-            组件零件基本件流水号: response.data.rows[i].组件零件基本件流水号,
-            投产类型流水号: response.data.rows[i].投产类型流水号,
-            数据类型: response.data.rows[i].数据类型,
-            材料流水号: response.data.rows[i].材料流水号
+            零件图号: response.data[i].零件图号,
+            零件名称: response.data[i].零件名称,
+            投产总数量: response.data[i].投产总数量,
+            最大投产批次: response.data[i].最大投产批次,
+            已投产数量: response.data[i].已投产数量,
+            未投产数量: response.data[i].未投产数量,
+            零件类型名称: response.data[i].零件类型名称,
+            组件零件基本件流水号: response.data[i].组件零件基本件流水号,
+            投产类型流水号: response.data[i].投产类型流水号,
+            数据类型: response.data[i].数据类型,
+            材料流水号: response.data[i].材料流水号
           })
         }
       })
@@ -939,21 +939,21 @@ export default {
       } else {
         this.checked_partNumber = false
       }
-      getTable1(this.checked_entryName, '', this.checked_toolNum, this.machineValue, this.checked_Num, this.groupValue, this.checked_partNumber, this.partNumber, this.pageCurrent2, this.pageSize2).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].机加工开始时间_长日期 = response.data.rows[i].机加工开始时间_长日期.substring(0, response.data.rows[i].机加工开始时间_长日期.indexOf(' '))
-          response.data.rows[i].机加工结束时间_长日期 = response.data.rows[i].机加工结束时间_长日期.substring(0, response.data.rows[i].机加工结束时间_长日期.indexOf(' '))
+      getTable1(this.checked_entryName, '', this.checked_toolNum, this.machineValue, this.checked_Num, this.groupValue, this.checked_partNumber, this.partNumber).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          response.data[i].机加工开始时间_长日期 = response.data[i].机加工开始时间_长日期.substring(0, response.data[i].机加工开始时间_长日期.indexOf(' '))
+          response.data[i].机加工结束时间_长日期 = response.data[i].机加工结束时间_长日期.substring(0, response.data[i].机加工结束时间_长日期.indexOf(' '))
         }
         this.total2 = parseInt(response.data.total)
-        for (let i = 0; i < response.data.rows.length; i++) {
+        for (let i = 0; i < response.data.length; i++) {
           this.tableData2.push({
-            零件图号: response.data.rows[i].零件图号,
-            零件名称: response.data.rows[i].零件名称,
-            投产数量: response.data.rows[i].投产数量,
-            机加工开始时间: response.data.rows[i].机加工开始时间_长日期,
-            机加工结束时间: response.data.rows[i].机加工结束时间_长日期,
-            工序数量: response.data.rows[i].工序数量,
-            工艺计划流水号: response.data.rows[i].工艺计划流水号
+            零件图号: response.data[i].零件图号,
+            零件名称: response.data[i].零件名称,
+            投产数量: response.data[i].投产数量,
+            机加工开始时间: response.data[i].机加工开始时间_长日期,
+            机加工结束时间: response.data[i].机加工结束时间_长日期,
+            工序数量: response.data[i].工序数量,
+            工艺计划流水号: response.data[i].工艺计划流水号
           })
         }
       })
@@ -963,8 +963,8 @@ export default {
       this.projectValue ? check2 = 1 : check2 = 0
       this.machineValue ? check0 = 1 : check0 = 0
       this.groupValue ? check1 = 1 : check1 = 0
-      searchTable1(this.pageCurrent3, this.pageSize3, check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
-        this.tableData3 = response.data.rows
+      searchTable1(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
+        this.tableData3 = response.data
         this.total3 = response.data.total
       })
     },
@@ -973,8 +973,8 @@ export default {
       this.projectValue ? check2 = 1 : check2 = 0
       this.machineValue ? check0 = 1 : check0 = 0
       this.groupValue ? check1 = 1 : check1 = 0
-      searchTable2(this.pageCurrent4, this.pageSize4, check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
-        this.tableData4 = response.data.rows
+      searchTable2(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
+        this.tableData4 = response.data
         this.total4 = response.data.total
       })
     },
@@ -983,9 +983,9 @@ export default {
       this.projectName ? check2 = 1 : check2 = 0
       this.machineName ? check0 = 1 : check0 = 0
       this.groupName ? check1 = 1 : check1 = 0
-      searchTable5(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
+      searchTable5(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
         console.log(response, 5, this.activeName)
-        this.tableData5 = response.data.rows
+        this.tableData5 = response.data
         this.total5 = response.data.total
       })
     },
@@ -995,9 +995,9 @@ export default {
       this.machineName ? check0 = 1 : check0 = 0
       this.groupName ? check1 = 1 : check1 = 0
       // console.log(this.projectName, this.machineName, this.groupName, 44)
-      searchTable6(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
+      searchTable6(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
         console.log(response, 6)
-        this.tableData6 = response.data.rows
+        this.tableData6 = response.data
         this.total6 = response.data.total
       })
     },
@@ -1126,78 +1126,78 @@ export default {
         })
       }
     },
-    handleSizeChanges(val) {
-      this.pageCurrent = 1
-      this.pageSize = val
-      this.getTableData()
-    },
-    handleCurrentChanges(val) {
-      this.pageCurrent = val
-      this.getTableData()
-    },
-    handleSizeChangeWB(val) {
-      this.pageCurrentWB = 1
-      this.pageSizeWB = val
-      this.getTableData()
-    },
-    handleCurrentChangeWB(val) {
-      this.pageCurrentWB = val
-      this.getTableData()
-    },
-    handleSizeChange1(val) {
-      this.pageCurrent1 = 1
-      this.pageSize1 = val
-      this.getTable()
-    },
-    handleCurrentChange1(val) {
-      this.pageCurrent1 = val
-      this.getTable()
-    },
-    handleSizeChange2(val) {
-      this.pageSize2 = val
-      this.pageCurrent2 = 1
-      this.getTable1()
-    },
-    handleCurrentChange2(val) {
-      this.pageCurrent2 = val
-      this.getTable1()
-    },
-    handleSizeChange3(val) {
-      this.pageSize3 = val
-      this.pageCurrent3 = 1
-      this.searchTable1()
-    },
-    handleCurrentChange3(val) {
-      this.pageCurrent3 = val
-      this.searchTable1()
-    },
-    handleSizeChange4(val) {
-      this.pageSize4 = val
-      this.pageCurrent4 = 1
-      this.searchTable2()
-    },
-    handleCurrentChange4(val) {
-      this.pageCurrent4 = val
-      this.searchTable2()
-    },
-    handleSizeChange5(val) {
-      this.pageSize5 = val
-      this.pageCurrent5 = 1
-      this.searchTable5()
-    },
-    handleCurrentChange5(val) {
-      this.pageCurrent5 = val
-      this.searchTable5()
-    },
-    handleSizeChange6(val) {
-      this.pageSize6 = val
-      this.pageCurrent6 = 1
-      this.searchTable6()
-    },
-    handleCurrentChange6(val) {
-      this.pageCurrent6 = val
-      this.searchTable6()
-    },
+    // handleSizeChanges(val) {
+    //   this.pageCurrent = 1
+    //   this.pageSize = val
+    //   this.getTableData()
+    // },
+    // handleCurrentChanges(val) {
+    //   this.pageCurrent = val
+    //   this.getTableData()
+    // },
+    // handleSizeChangeWB(val) {
+    //   this.pageCurrentWB = 1
+    //   this.pageSizeWB = val
+    //   this.getTableData()
+    // },
+    // handleCurrentChangeWB(val) {
+    //   this.pageCurrentWB = val
+    //   this.getTableData()
+    // },
+    // handleSizeChange1(val) {
+    //   this.pageCurrent1 = 1
+    //   this.pageSize1 = val
+    //   this.getTable()
+    // },
+    // handleCurrentChange1(val) {
+    //   this.pageCurrent1 = val
+    //   this.getTable()
+    // },
+    // handleSizeChange2(val) {
+    //   this.pageSize2 = val
+    //   this.pageCurrent2 = 1
+    //   this.getTable1()
+    // },
+    // handleCurrentChange2(val) {
+    //   this.pageCurrent2 = val
+    //   this.getTable1()
+    // },
+    // handleSizeChange3(val) {
+    //   this.pageSize3 = val
+    //   this.pageCurrent3 = 1
+    //   this.searchTable1()
+    // },
+    // handleCurrentChange3(val) {
+    //   this.pageCurrent3 = val
+    //   this.searchTable1()
+    // },
+    // handleSizeChange4(val) {
+    //   this.pageSize4 = val
+    //   this.pageCurrent4 = 1
+    //   this.searchTable2()
+    // },
+    // handleCurrentChange4(val) {
+    //   this.pageCurrent4 = val
+    //   this.searchTable2()
+    // },
+    // handleSizeChange5(val) {
+    //   this.pageSize5 = val
+    //   this.pageCurrent5 = 1
+    //   this.searchTable5()
+    // },
+    // handleCurrentChange5(val) {
+    //   this.pageCurrent5 = val
+    //   this.searchTable5()
+    // },
+    // handleSizeChange6(val) {
+    //   this.pageSize6 = val
+    //   this.pageCurrent6 = 1
+    //   this.searchTable6()
+    // },
+    // handleCurrentChange6(val) {
+    //   this.pageCurrent6 = val
+    //   this.searchTable6()
+    // },
     handleSizeChange7(val) {
       this.pageSize7 = val
       this.pageCurrent7 = 1
@@ -1212,7 +1212,7 @@ export default {
 </script>
 
 <style scoped>
-  span{
-    margin: 20px;
-  }
+  /*span{*/
+  /*  margin: 20px;*/
+  /*}*/
 </style>
diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue
index f1f56607..9c4d1c72 100644
--- a/src/views/BasicData/ShiftManagement/index.vue
+++ b/src/views/BasicData/ShiftManagement/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span style="margin-left: 15px">班次类型:</span>
+      <!--      <span style="margin-left: 15px">班次类型:</span>-->
       <el-select v-model="roleName" placeholder="班次类型" clearable size="small" style="width:200px">
         <el-option
           v-for="item in roleNames"
@@ -20,7 +20,7 @@
         border
         stripe
         size="mini"
-        height="550"
+        height="820"
         center
         style="width: 100%">
         <el-table-column label="开始工作时间" align="center">
@@ -90,16 +90,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40, 50]"
-          :page-size="10"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
+      <!--      <div class="block" style="margin-top: 10px;">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent"-->
+      <!--          :page-sizes="[10, 20, 30, 40, 50]"-->
+      <!--          :page-size="10"-->
+      <!--          :total="total"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChange"-->
+      <!--          @current-change="handleCurrentChange"/>-->
+      <!--      </div>-->
     </el-card>
     <el-dialog v-el-drag-dialog :visible.sync ="dialogFormVisible1" title="新增班次人员" center style="min-height: 270px" width="900px">
       <el-form ref="form1" :model="form1" :rules="rules" label-position="right" label-width="160px" class="demo-ruleForm">
@@ -327,9 +327,9 @@ export default {
       },
       dialogFormVisible1: false,
       dialogFormVisible2: false,
-      pageCurrent: 1,
-      pageSize: 10,
-      total: 0,
+      // pageCurrent: 1,
+      // pageSize: 10,
+      // total: 0,
       rules2: { // 表单验证规则
         value: [{ required: true, message: '请选择时间', trigger: 'blur' }],
         value2: [{ required: true, message: '请选择时间', trigger: 'blur' }],
@@ -456,16 +456,16 @@ export default {
       this.form1 = {}
       this.dialogFormVisible2 = false
       this.form2 = {}
-    },
-    handleSizeChange(val) {
-      this.pageSize = val
-      this.pageCurrent = 1
-      this.searchTable()
-    },
-    handleCurrentChange(val) {
-      this.pageCurrent = val
-      this.searchTable()
     }
+    // handleSizeChange(val) {
+    //   this.pageSize = val
+    //   this.pageCurrent = 1
+    //   this.searchTable()
+    // },
+    // handleCurrentChange(val) {
+    //   this.pageCurrent = val
+    //   this.searchTable()
+    // }
   }
 }
 </script>
diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue
index 3f4c889e..595fea12 100644
--- a/src/views/BasicData/SystemRrolemaintenance/index.vue
+++ b/src/views/BasicData/SystemRrolemaintenance/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>角色功能:</span>
-      <el-input v-model="RoleFunctioning" size="small" clearable style="width:200px"/>
+      <!--      <span>角色功能:</span>-->
+      <el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="pageCurrent=1;pageSize = 10;searchData()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
     </el-card>
@@ -10,6 +10,7 @@
       <el-table
         v-loading="loading"
         :data="tableData"
+        height="830"
         highlight-current-row
         border>
         <el-table-column align="center" label="角色编号" width="100">
@@ -44,16 +45,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40, 50]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
+      <!--      <div class="block" style="margin-top: 10px;">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent"-->
+      <!--          :page-sizes="[10, 20, 30, 40, 50]"-->
+      <!--          :page-size="pageSize"-->
+      <!--          :total="total"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChange"-->
+      <!--          @current-change="handleCurrentChange"/>-->
+      <!--      </div>-->
     </el-card>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="新增角色" center style="min-height: 200px" width="400px">
@@ -126,8 +127,8 @@ export default {
   },
   methods: {
     fetchData() {
-      InitRolefunction(this.pageCurrent, this.pageSize).then(response => { // 初始化
-        this.tableData = response.data.rows
+      InitRolefunction().then(response => { // 初始化
+        this.tableData = response.data
         this.total = response.data.total
       })
     },
@@ -140,15 +141,15 @@ export default {
         console.log(response.data)
       })
     },
-    handleSizeChange(val) {
-      this.pageCurrent = 1
-      this.pageSize = val
-      this.fetchData()
-    },
-    handleCurrentChange(val) {
-      this.pageCurrent = val
-      this.fetchData()
-    },
+    // handleSizeChange(val) {
+    //   this.pageCurrent = 1
+    //   this.pageSize = val
+    //   this.fetchData()
+    // },
+    // handleCurrentChange(val) {
+    //   this.pageCurrent = val
+    //   this.fetchData()
+    // },
     handleEdit(row) {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
index 88b60d6f..ede3a0eb 100644
--- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
+++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
@@ -3,22 +3,22 @@
     <table style="width: 100%">
 
       <el-card>
-        <span>员工姓名:</span>
-        <el-input v-model="staffName" placeholder="员工姓名" size="small" clearable style="width:200px"/>
-        <span style="margin-left: 15px">角色名称:</span>
-        <el-select v-model="roleName" placeholder="角色名称" clearable size="small" style="width:200px">
+        <!--        <span>员工姓名:</span>-->
+        <el-input v-model="staffName" placeholder="员工姓名" size="small" clearable style="width:200px;margin: 0px 10px"/>
+        <!--        <span style="margin-left: 15px">角色名称:</span>-->
+        <el-select v-model="roleName" placeholder="角色名称" clearable size="small" style="width:200px;margin: 0px 10px">
           <el-option
             v-for="item in roleNames"
             :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="pageCurrent1=1;searchData()">查询</el-button>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="searchData">查询</el-button>
         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handelAdd">增加</el-button>
       </el-card>
 
       <el-card>
-        <el-table :data="tableData" highlight-current-row stripe size="mini" height="550" border style="width: 100%">
+        <el-table :data="tableData" highlight-current-row stripe size="mini" height="820" border style="width: 100%">
           <el-table-column
             label="序号"
             align="center"
@@ -66,16 +66,16 @@
             </template>
           </el-table-column>
         </el-table>
-        <div class="block" style="margin-top: 10px;">
-          <el-pagination
-            :current-page="pageCurrent1"
-            :page-sizes="[10, 20, 30, 40, 50]"
-            :page-size="10"
-            :total="total1"
-            layout="total, sizes, prev, pager, next, jumper"
-            @size-change="handleSizeChange1"
-            @current-change="handleCurrentChange1"/>
-        </div>
+        <!--        <div class="block" style="margin-top: 10px;">-->
+        <!--          <el-pagination-->
+        <!--            :current-page="pageCurrent1"-->
+        <!--            :page-sizes="[10, 20, 30, 40, 50]"-->
+        <!--            :page-size="10"-->
+        <!--            :total="total1"-->
+        <!--            layout="total, sizes, prev, pager, next, jumper"-->
+        <!--            @size-change="handleSizeChange1"-->
+        <!--            @current-change="handleCurrentChange1"/>-->
+        <!--        </div>-->
       </el-card>
     </table>
 
@@ -232,9 +232,9 @@ export default {
       staffNum: '',
       personnelNumber: '',
       personnelStream: '',
-      pageCurrent1: 1,
-      pageSize1: 10,
-      total1: null,
+      // pageCurrent1: 1,
+      // pageSize1: 10,
+      // total1: null,
       roleName: null,
       roleNames: [],
       rybh: '',
@@ -283,9 +283,9 @@ export default {
       } else {
         this.check2 = 0
       }
-      searchTable(this.check1, this.staffName, this.check2, this.roleName, this.pageCurrent1, this.pageSize1).then(response => {
+      searchTable(this.check1, this.staffName, this.check2, this.roleName).then(response => {
         console.log(response)
-        this.tableData = response.data.rows
+        this.tableData = response.data
         this.total1 = response.data.total
       })
     },
@@ -304,15 +304,15 @@ export default {
       })
       this.searchData()
     },
-    handleSizeChange1(val) {
-      this.pageCurrent1 = 1
-      this.pageSize1 = val
-      this.searchData()
-    },
-    handleCurrentChange1(val) {
-      this.pageCurrent1 = val
-      this.searchData()
-    },
+    // handleSizeChange1(val) {
+    //   this.pageCurrent1 = 1
+    //   this.pageSize1 = val
+    //   this.searchData()
+    // },
+    // handleCurrentChange1(val) {
+    //   this.pageCurrent1 = val
+    //   this.searchData()
+    // },
     submitAdd1() {
       this.$refs['form1'].validate((valid) => {
         if (valid) {
diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
index 1677c574..e7ef503c 100644
--- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>工位号:</span>
-      <el-select v-model="MachineValue" filterable size="small" style="width:160px;margin-bottom:10px" placeholder="工位号">
+      <!--      <span>工位号:</span>-->
+      <el-select v-model="MachineValue" filterable size="small" style="width:160px;margin:0px 10px" placeholder="工位号">
         <el-option
           v-for="item in Machine"
           :key="item.value"
@@ -12,7 +12,7 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-      <span>日期:</span>
+      <!--      <span>日期:</span>-->
       <el-date-picker
         v-model="Time"
         value-format="yyyy-MM-dd"
@@ -20,7 +20,7 @@
         style="width: 160px"
         type="date"
         placeholder="选择日期"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin:0px 10px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
     </el-card>
     <el-card>
       <el-table
@@ -71,16 +71,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block">
-        <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>
+      <!--      <div class="block">-->
+      <!--        <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="width: 49.8%; float: left;margin-right: 5px">
       <div id="myChart1" style="width: 1000px; height: 570px; margin: auto"/>
@@ -187,9 +187,9 @@ export default {
       time22: '',
       time33: '',
       time44: '',
-      pageCurrent: 1,
-      pageSize: 10,
-      total: 0,
+      // pageCurrent: 1,
+      // pageSize: 10,
+      // total: 0,
       table: []
     }
   },
@@ -214,13 +214,13 @@ export default {
       })
     },
     searchData() {
-      getData(this.MachineValue, this.Time, this.pageCurrent, this.pageSize).then(response => {
-        this.tableDataA = response.data.rows
-        this.total = response.data.total
-        this.time1 = response.data.rows[0].运行持续时间
-        this.time2 = response.data.rows[0].等待持续时间
-        this.time3 = response.data.rows[0].停机持续时间
-        this.time4 = response.data.rows[0].报警持续时间
+      getData(this.MachineValue, this.Time).then(response => {
+        this.tableDataA = response.data
+        // this.total = response.data.total
+        this.time1 = response.data[0].运行持续时间
+        this.time2 = response.data[0].等待持续时间
+        this.time3 = response.data[0].停机持续时间
+        this.time4 = response.data[0].报警持续时间
       }).then(() => {
         this.drawLine1()
       })
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index cb6dcf4e..b7a586f1 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -20,7 +20,7 @@
       <el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @change="empty1" @dblclick.native="SearchMachine"/>
       <span>组号:</span>
       <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=10;pageCurrent=1;searchData();searchTable()">查询</el-button>
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
     </el-card>
     <el-card>
       <h3 style="text-align: center;">车间生产</h3>
@@ -82,7 +82,7 @@
           :page-sizes="[10, 20, 30, 40, 50]"
           :page-size="pageSize"
           :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
+          layout="total"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
@@ -140,7 +140,7 @@
               :page-size="pageSize00"
               :total="total00"
               style="margin-top:10px;display:inline-block;width:50%"
-              layout="total, sizes, prev, pager, next, jumper"
+              layout="total"
               @size-change="handleSizeChange00"
               @current-change="handleCurrentChange00"/>
           </div>
@@ -195,7 +195,7 @@
               :page-size="pageSize01"
               :total="total01"
               style="margin-top:10px;display:inline-block;width:50%"
-              layout="total, sizes, prev, pager, next, jumper"
+              layout="total"
               @size-change="handleSizeChange01"
               @current-change="handleCurrentChange01"/>
           </div>
@@ -255,7 +255,7 @@
               :page-size="pageSize02"
               :total="total02"
               style="margin-top:10px;display:inline-block;width:50%"
-              layout="total, sizes, prev, pager, next, jumper"
+              layout="total"
               @size-change="handleSizeChange02"
               @current-change="handleCurrentChange02"/>
           </div>
@@ -312,7 +312,7 @@
           :page-sizes="[10, 20, 30, 40]"
           :page-size="pageSize5"
           :total="total5"
-          layout="total, sizes, prev, pager, next, jumper"
+          layout="total"
           @size-change="handleSizeChange5"
           @current-change="handleCurrentChange5"/>
       </div>
@@ -495,13 +495,13 @@ export default {
       num: null,
       PartType: '标准件',
       pageCurrent00: 1,
-      pageSize00: 10,
+      pageSize00: 1000,
       pageCurrent01: 1,
       pageSize01: 10,
       pageCurrent02: 1,
-      pageSize02: 10,
+      pageSize02: 1000,
       pageCurrent: 1,
-      pageSize: 10,
+      pageSize: 1000,
       pageCurrent1: 1,
       pageSize1: 10,
       pageCurrent2: 1,
@@ -726,12 +726,16 @@ export default {
       this.dialogFormVisible3 = false
     },
     searchTable() {
-      if (this.PartType === '标准件') {
-        this.searchTable0()
-      } else if (this.PartType === '外购件') {
-        this.searchTable1()
-      } else if (this.PartType === '基本件') {
-        this.searchTable2()
+      if (this.machine === '' || this.machine === null) {
+        this.$message.warning('请先选择机床组号')
+      } else {
+        if (this.PartType === '标准件') {
+          this.searchTable0()
+        } else if (this.PartType === '外购件') {
+          this.searchTable1()
+        } else if (this.PartType === '基本件') {
+          this.searchTable2()
+        }
       }
     },
     searchTable0() { // 查询标准件
@@ -744,11 +748,10 @@ export default {
       })
     },
     searchTable1() { // 查询外购件
-      let check1, check2, check3
+      let check1, check2
       this.machine ? check1 = 1 : check1 = 0
       this.groupNum ? check2 = 1 : check2 = 0
-      this.entryNameValue ? check3 = 1 : check3 = 0
-      searchTable01(check3, this.entryNameValue, check1, this.machine, check2, this.groupNum, this.pageCurrent01, this.pageSize01, 2).then(response => {
+      searchTable01(check1, this.machine, check2, this.groupNum, this.pageCurrent01, this.pageSize01, 2).then(response => {
         this.tableData01 = response.data.rows
         this.total01 = response.data.total
       })
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 70f1731b..dbc730b1 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -53,7 +53,7 @@
         v-loading="loading0"
         :data="tableData"
         style="width: 100%"
-        height="780"
+        height="820"
         stripe
         size="mini"
         highlight-current-row
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index c3a8518f..72225ecb 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -2,27 +2,26 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span style="margin-left: 10px">操作者:</span>
-        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/>
-        <span class="demonstration">完成加工时间:</span>
+        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px;margin:0px 10px"/>
+        <!--        <span class="demonstration">完成加工时间:</span>-->
         <el-date-picker
           v-model="startTime"
           value-format="yyyy-MM-dd"
           size="small"
-          style="width: 160px"
+          style="width: 170px;margin:0px 10px"
           type="date"
-          placeholder="选择日期"/>
+          placeholder="选择开始加工日期"/>
         <span class="demonstration">~</span>
         <el-date-picker
           v-model="endTime"
           value-format="yyyy-MM-dd"
           size="small"
-          style="width: 160px"
+          style="width: 170px;margin:0px 10px"
           type="date"
-          placeholder="选择日期"/>
-        <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
+          placeholder="选择加工完成日期"/>
+        <el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
         <el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
-          <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet1()">导出</el-button>
+          <el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
@@ -61,7 +60,7 @@
             :current-page="pageCurrent"
             :page-size="pageSize"
             :total="total"
-            layout="total, prev, pager, next"
+            layout="total"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
         </div>
@@ -117,8 +116,8 @@
       </el-col>
     </el-card>
     <el-card>
-      <span style="margin-left: 10px">机床编号:</span>
-      <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 10px" clearable @change="searchTable4();searchTable6()">
+      <!--      <span style="margin-left: 10px">机床编号:</span>-->
+      <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="searchTable4();searchTable6()">
         <el-option
           v-for="item in machineNumber"
           :key="item.value"
@@ -154,16 +153,16 @@
             </template>
           </el-table-column>
         </el-table>
-        <div style="margin: 10px">
-          <el-pagination
-            v-if="!loading3"
-            :current-page="pageCurrent3"
-            :page-size="pageSize3"
-            :total="total3"
-            layout="total, prev, pager, next"
-            @size-change="handleSizeChange3"
-            @current-change="handleCurrentChange3"/>
-        </div>
+        <!--        <div style="margin: 10px">-->
+        <!--          <el-pagination-->
+        <!--            v-if="!loading3"-->
+        <!--            :current-page="pageCurrent3"-->
+        <!--            :page-size="pageSize3"-->
+        <!--            :total="total3"-->
+        <!--            layout="total"-->
+        <!--            @size-change="handleSizeChange3"-->
+        <!--            @current-change="handleCurrentChange3"/>-->
+        <!--        </div>-->
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
         <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
@@ -188,16 +187,16 @@
             </template>
           </el-table-column>
         </el-table>
-        <div style="margin: 10px">
-          <el-pagination
-            v-if="!loading4"
-            :current-page="pageCurrent4"
-            :page-size="pageSize4"
-            :total="total4"
-            layout="total, prev, pager, next, jumper"
-            @size-change="handleSizeChange4"
-            @current-change="handleCurrentChange4"/>
-        </div>
+        <!--        <div style="margin: 10px">-->
+        <!--          <el-pagination-->
+        <!--            v-if="!loading4"-->
+        <!--            :current-page="pageCurrent4"-->
+        <!--            :page-size="pageSize4"-->
+        <!--            :total="total4"-->
+        <!--            layout="total"-->
+        <!--            @size-change="handleSizeChange4"-->
+        <!--            @current-change="handleCurrentChange4"/>-->
+        <!--        </div>-->
       </el-col>
     </el-card>
   </div>
@@ -214,7 +213,7 @@ export default {
       loading: false,
       tableData: [], // 表格数据
       total: null, // 总条数
-      pageSize: 10, // 每页显示条数
+      pageSize: 1000, // 每页显示条数
       pageCurrent: 1, // 后台获取页
       gongzuozhebianhao: '',
       machinenumber: '',
@@ -224,17 +223,17 @@ export default {
       loading2: false,
       tableData2: [], // 表格数据
       total2: null, // 总条数
-      pageSize2: 10, // 每页显示条数
+      pageSize2: 1000, // 每页显示条数
       pageCurrent2: 1, // 后台获取页
       loading3: false,
       tableData3: [], // 表格数据
       total3: null, // 总条数
-      pageSize3: 10, // 每页显示条数
+      pageSize3: 1000, // 每页显示条数
       pageCurrent3: 1, // 后台获取页
       loading4: false,
       tableData4: [], // 表格数据
       total4: null, // 总条数
-      pageSize4: 10, // 每页显示条数
+      pageSize4: 1000, // 每页显示条数
       pageCurrent4: 1 // 后台获取页
     }
   },
@@ -414,12 +413,12 @@ export default {
       this.tableData4 = []
       this.total3 = 0
       if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
-      searchtable4(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
+      searchtable4(this.check1, this.machineNumberValue).then(response => {
         if (response.data.total === 0) {
           this.loading3 = false
         } else {
           this.total3 = response.data.total
-          this.tableData3 = response.data.rows
+          this.tableData3 = response.data
         }
       }).then(() => {
         this.loading3 = false
@@ -430,12 +429,12 @@ export default {
       this.tableData4 = []
       this.pageCurrent4 = 1
       this.machineNumberValue = parseInt(row.机床流水号)
-      searchtable5(this.machineNumberValue, this.pageCurrent4, this.pageSize4).then(response => {
+      searchtable5(this.machineNumberValue).then(response => {
         if (response.data.total === 0) {
           this.loading4 = false
         } else {
           this.total4 = response.data.total
-          this.tableData4 = response.data.rows
+          this.tableData4 = response.data
         }
       }).then(() => {
         this.loading4 = false
@@ -473,26 +472,26 @@ export default {
     handleCurrentChange2(val) {
       this.pageCurrent2 = val
       this.searchTable3()
-    },
-    // 分页
-    handleSizeChange3(val) {
-      this.pageCurrent3 = 1
-      this.pageSize3 = val
-      this.searchTable4()
-    },
-    handleCurrentChange3(val) {
-      this.pageCurrent3 = val
-      this.searchTable4()
-    },
-    handleSizeChange4(val) {
-      this.pageCurrent4 = 1
-      this.pageSize4 = val
-      this.searchTable6()
-    },
-    handleCurrentChange4(val) {
-      this.pageCurrent4 = val
-      this.searchTable6()
     }
+    // 分页
+    // handleSizeChange3(val) {
+    //   this.pageCurrent3 = 1
+    //   this.pageSize3 = val
+    //   this.searchTable4()
+    // },
+    // handleCurrentChange3(val) {
+    //   this.pageCurrent3 = val
+    //   this.searchTable4()
+    // },
+    // handleSizeChange4(val) {
+    //   this.pageCurrent4 = 1
+    //   this.pageSize4 = val
+    //   this.searchTable6()
+    // },
+    // handleCurrentChange4(val) {
+    //   this.pageCurrent4 = val
+    //   this.searchTable6()
+    // }
   }
 }
 </script>
diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
index 054cc9b6..fefbaab7 100644
--- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span style="margin-left: 10px">外协到货单号:</span>
-      <el-input v-model="orderNumber" clearable style="width: 200px" size="small"/>
-      <span style="margin-left: 10px">外协厂家:</span>
+
+      <el-input v-model="orderNumber" clearable style="width: 200px" placeholder="请输入外协到货单" size="small"/>
+      <!--      <span style="margin-left: 10px">外协厂家:</span>-->
       <el-input v-model="outsourcingSupplier" clearable style="width: 200px" size="small"/>
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
diff --git a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
index d826b790..00f6d427 100644
--- a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
+++ b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
@@ -2,16 +2,16 @@
   <div class="app-container">
     <el-card>
       <div slot="header">
-        <span>供应商:</span>
-        <el-select v-model="gongyingsValue" placeholder="供应商" size="small" filterable clearable @change="fetchData();searchTable1()">
+        <!--        <span>供应商:</span>-->
+        <el-select v-model="gongyingsValue" placeholder="供应商" size="small" style="margin: 0px 10px" filterable clearable @change="fetchData();searchTable1()">
           <el-option
             v-for="item in gongyings"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>合同号:</span>
-        <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="searchTable1()">
+        <!--        <span>合同号:</span>-->
+        <el-select v-model="contractNumValue" placeholder="合同号" size="small" style="margin: 0px 10px" filterable clearable @change="searchTable1()">
           <el-option
             v-for="item in contractNum"
             :key="item.value"
@@ -26,7 +26,7 @@
           size="small"
           icon="el-icon-search"
           style="margin-left:10px"
-          @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+          @click="total1=0;pageCurrent1=1;pageSize1=1000;searchTable1()">查询</el-button>
       </div>
       <el-table
         v-loading=""
@@ -34,8 +34,8 @@
         border
         stripe
         highlight-current-row
-        style="width: 100%;max-height: 250px;"
-        height="250px"
+        style="width: 100%;"
+        height="400px"
         size="mini"
         @row-click="searchTable2">
         <el-table-column label="采购编码" align="center" min-width="100">
@@ -87,18 +87,18 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <div class="block">
         <el-pagination
           :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 40, 1000]"
           :page-size="pageSize1"
           :total="total1"
           style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
+          layout="total"
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
-      <el-table v-loading="" :data="tableData2" stripe border style="width: 100%;max-height: 300px;margin-top: 10px" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData2" stripe border style="width: 100%;" height="380px" size="mini">
         <el-table-column label="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -150,7 +150,7 @@ export default {
       contractNum: [],
       supplierName: '',
       tableData1: [],
-      pageSize1: 10,
+      pageSize1: 1000,
       pageCurrent1: 1,
       total1: 0,
       tableData2: []
diff --git a/src/views/TechnologyCenter/ProcurementInquiry/index.vue b/src/views/TechnologyCenter/ProcurementInquiry/index.vue
index ab080500..626f50b1 100644
--- a/src/views/TechnologyCenter/ProcurementInquiry/index.vue
+++ b/src/views/TechnologyCenter/ProcurementInquiry/index.vue
@@ -2,12 +2,12 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>名称:</span>
-        <el-input v-model="Name" placeholder="名称" size="small" clearable style="width:200px"/>
-        <span>规格:</span>
-        <el-input v-model="spec" placeholder="规格" size="small" clearable style="width:200px"/>
-        <span>型号:</span>
-        <el-input v-model="model" placeholder="型号" size="small" clearable style="width:200px"/>
+        <!--        <span>名称:</span>-->
+        <el-input v-model="Name" placeholder="名称" size="small" clearable style="width:200px;margin:0px 10px"/>
+        <!--        <span>规格:</span>-->
+        <el-input v-model="spec" placeholder="规格" size="small" clearable style="width:200px;margin:0px 10px"/>
+        <!--        <span>型号:</span>-->
+        <el-input v-model="model" placeholder="型号" size="small" clearable style="width:200px;margin:0px 10px"/>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
       </el-row>
       <el-row v-show="false">
@@ -35,7 +35,7 @@
 
     <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
       <el-tab-pane label="标准件" name="标准件">
-        <el-table :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe>
+        <el-table :data="tableData0" size="mini" height="740px" border stripe>
           <el-table-column align="center" label="采购情况" width="80px">
             <template slot-scope="scope">
               <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
@@ -93,7 +93,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="外购件" name="外购件">
-        <el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe>
+        <el-table :data="tableData1" size="mini" height="740px" border stripe>
           <el-table-column align="center" label="采购情况" width="80px">
             <template slot-scope="scope">
               <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
@@ -181,7 +181,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="基本件" name="基本件">
-        <el-table :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe>
+        <el-table :data="tableData2" size="mini" height="740px" border stripe>
           <el-table-column align="center" label="采购情况" width="80px">
             <template slot-scope="scope">
               <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>