Merge branch 'master' of http://123.56.95.229:10010/r/高精

2020-02-25 13:38:33 +08:00
parent f26e3ec4ac e284656a1e
commit 7e81b57ab4
18 changed files with 519 additions and 567 deletions
--- a/src/api/ManufacturingCenter/ContractDetailsInquiry.js
+++ b/src/api/ManufacturingCenter/ContractDetailsInquiry.js
@@ -32,7 +32,7 @@ export function initMachine(projectNum) {
 }

 // 查询项目详情
-export function searchatabledata(projectNum, machineValue) {
+export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) {
  return request({
    url: '',
    method: 'post',
@@ -41,7 +41,7 @@ export function searchatabledata(projectNum, machineValue) {
      ModularID: router.currentRoute.path,
      type: '1',
      name: '项目工时统计_合同详情查询_工时综合查询',
-      param: `项目流水号=${projectNum}&机床流水号=${machineValue}`
+      param: `项目流水号=${projectNum}&机床流水号=${machineValue}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
    }
  })
 }
--- a/src/api/ManufacturingCenter/MonthEndHourAccounting.js
+++ b/src/api/ManufacturingCenter/MonthEndHourAccounting.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 import state from '@/store'
 import router from '@/router'

-export function searchTable(time, time1) {
+export function searchTable(time, time1, order, orderName, pageCurrent, pageSize) {
  return request({
    url: '',
    method: 'post',
@@ -11,7 +11,8 @@ export function searchTable(time, time1) {
      ModularID: router.currentRoute.path,
      type: '1',
      name: '工艺月底工时核算_查询数据',
-      param: '开始时间=' + time + '&结束时间=' + time1
+      param: '开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName,
+      Pagination: pageCurrent + '&' + pageSize
    }
  })
 }
--- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
+++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
@@ -44,7 +44,7 @@ export function initPerson() {
  })
 }
 // 查询
-export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4) {
+export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6) {
  return request({
    url: '',
    method: 'post',
@@ -53,7 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3
      ModularID: router.currentRoute.path,
      type: '1',
      name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查',
-      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}`,
+      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}`,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
--- a/src/components/AmountInputBox/AmountInputBox.js
+++ b/src/components/AmountInputBox/AmountInputBox.js
@@ -0,0 +1,80 @@
+/**
+ * @desc 验证整数类型数字方法
+ * @param {Object} e
+ * @param {regular} reg 正则
+ * @param {Number} charcode 键盘code
+ * */
+const checkNumber = (e, reg, charcode) => {
+  if (!reg.test(String.fromCharCode(charcode)) && charcode > 9 && !e.ctrlKey) {
+    if (e.preventDefault) {
+      e.preventDefault()
+    } else {
+      e.returnValue = false
+    }
+  }
+}
+
+/**
+ * @desc 验证浮点类型小数方法(建议用text类型的表单)
+ * @param {Object} e
+ * @param {regular} reg 正则
+ * @param {Number} charcode 键盘code
+ * @param {Object} el dom对象
+ * */
+const checkFloat = (e, reg, charcode, el) => {
+  if (charcode === 46) {
+    if (el.children[0].value.includes('.')) {
+      e.preventDefault()
+    }
+    return
+  } else if (
+    !reg.test(String.fromCharCode(charcode)) &&
+    charcode > 9 &&
+    !e.ctrlKey
+  ) {
+    if (e.preventDefault) {
+      e.preventDefault()
+    } else {
+      e.returnValue = false
+    }
+  }
+}
+
+/**
+ * @author LeeYunxiang
+ * @description 限制数字输入格式 int => 正整数 , num => 自然数(正整数包括0) , float => 正数包括小数(建议用text类型的input表单)
+ *  */
+export default {
+  key: 'positive',
+  func: {
+    inserted(el, bind) {
+      el.addEventListener('keypress', e => {
+        e = e || window.event
+        const charcode = typeof e.charCode === 'number' ? e.charCode : e.keyCode
+        let reg = null
+        switch (bind.value) {
+          case 'num':
+            reg = /\d/
+            checkNumber(e, reg, charcode)
+            break
+          case 'int':
+            if (el.children[0].value.length === 0) {
+              reg = /^[1-9]$/
+            } else {
+              reg = /\d/
+            }
+            checkNumber(e, reg, charcode)
+            break
+          case 'float':
+            reg = /\d/
+            checkFloat(e, reg, charcode, el)
+            break
+          case 'notZero':
+            reg = (/^[1-9][0-9]*$/)
+            checkFloat(e, reg, charcode, el)
+            break
+        }
+      })
+    }
+  }
+}
--- a/src/components/AmountInputBox/index.js
+++ b/src/components/AmountInputBox/index.js
@@ -0,0 +1,11 @@
+import AmountInputBox from './AmountInputBox.js'
+const directives = [AmountInputBox]
+export default {
+  install: Vue => {
+    if (directives.length && directives.length > 0) {
+      directives.map(item => {
+        Vue.directive(item.key, item.func)
+      })
+    }
+  }
+}
--- a/src/main.js
+++ b/src/main.js
@@ -22,6 +22,10 @@ import 'viewerjs/dist/viewer.css'
 import VueBarcode from '@xkeshi/vue-barcode'
 import Direction from 'vue-direction-key'
 import elDragDialog from '@/directive/el-dragDialog'
+// 全局数字、金额输入框组件
+import directive from './components/AmountInputBox/index.js'
+Vue.use(directive)
+
 Vue.use(elDragDialog)
 Vue.component('barcode', VueBarcode)
 Vue.use(Direction)
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -1,128 +1,85 @@
 <template>
  <div class="app-container">
    <el-row>
-      <el-col :span="7">
+      <el-col style="width: 290px">
        <el-card>
-          <el-row style="margin-bottom: 10px">
-            <span>工艺分类：</span>
-          </el-row>
          <el-row>
-            <el-button type="distribution" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
-            <el-button size="small" style="margin-left: 10px" type="warning" icon="el-icon-edit-outline" plain @click="editProcessClassification()">编辑</el-button>
-            <el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" plain @click="delProcessClassification()">删除</el-button>
+            <el-button type="distribution" style="margin: 10px 10px 3px 0" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
+            <el-button size="small" style="margin: 10px 10px 3px 0" type="warning" icon="el-icon-edit-outline" plain @click="editProcessClassification()">编辑</el-button>
+            <el-button size="small" style="margin: 10px 0 3px 0" type="danger" icon="el-icon-delete" plain @click="delProcessClassification()">删除</el-button>
+            <el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" highlight-current-row stripe border tooltip-effect="dark" style="width: 100%" height="600">
+              <el-table-column align="center" label=" " width="50px">
+                <template slot-scope="scope">
+                  <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
+                    {{ a }}
+                  </el-radio>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="工艺分类">
+                <template slot-scope="scope">
+                  {{ scope.row.工艺分类名称 }}
+                </template>
+              </el-table-column>
+            </el-table>
          </el-row>
        </el-card>
      </el-col>
-      <el-col :span="17">
+      <el-col style="width: 350px;">
        <el-card>
-          <div style="height: 37px"/>
-          <el-button type="primary" plain style="margin-left: 10px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="7">
-        <el-card>
-          <el-table
-            v-loading="loading1"
-            ref="multipleTable"
-            :data="tableData1"
-            size="mini"
-            highlight-current-row
-            stripe
-            border
-            tooltip-effect="dark"
-            style="width: 100%"
-            height="550">
-            <el-table-column align="center" label=" " width="50px">
-              <template slot-scope="scope">
-                <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
-                  {{ a }}
-                </el-radio>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="工艺分类">
-              <template slot-scope="scope">
-                {{ scope.row.工艺分类名称 }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-      </el-col>
-
-      <el-col :span="17">
-        <el-card >
-          <el-table
-            :data="tableData2"
-            :row-key="getRowKeys"
-            :row-style="abc"
-            :expand-row-keys="expands"
-            size="mini"
-            highlight-current-row
-            stripe
-            border
-            height="550"
-            width="100%"
-            @expand-change="searchTechnologicalRequirementsOfProcessNum">
-            <el-table-column type="expand" label="详情">
-              <template slot-scope="scope">
-                <el-table :data="tableData3" class="subTableHeader" border stripe size="mini" style="width: 40%">
-                  <el-table-column label="工艺要求" align="center">
-                    <template slot-scope="scope">
-                      {{ scope.row.工艺要求 }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" align="center" >
-                    <template slot-scope="scope">
-                      <el-tooltip effect="dark" content="编辑" placement="top">
-                        <div style="display: inline-block">
-                          <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit-outline"
-                            @click="editTechnologicalRequirements(scope.row)"/>
-                        </div>
-                      </el-tooltip>
-                      <el-tooltip effect="dark" content="删除" placement="top">
-                        <div style="display: inline-block">
-                          <el-button
-                            size="mini"
-                            type="text"
-                            style="margin-left: 20px"
-                            icon="el-icon-delete"
-                            @click="delTechnologicalRequirements(scope.row)"/>
-                        </div>
-                      </el-tooltip>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </template>
-            </el-table-column>
-            <el-table-column label="工艺名称" width="200">
+          <el-button type="primary" plain style="margin: 10px 0 3px 0" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
+          <el-table :data="tableData2" :row-key="getRowKeys" size="mini" highlight-current-row stripe border height="600" width="100%">
+            <!--<el-table-column type="expand" label="详情">-->
+            <!--<template slot-scope="scope">-->
+            <!--<el-table :data="tableData3" class="subTableHeader" border stripe size="mini" style="width: 40%">-->
+            <!--<el-table-column label="工艺要求" align="center">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.工艺要求 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column label="操作" align="center" >-->
+            <!--<template slot-scope="scope">-->
+            <!--<el-tooltip effect="dark" content="编辑" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-edit-outline"-->
+            <!--@click="editTechnologicalRequirements(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--<el-tooltip effect="dark" content="删除" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--style="margin-left: 20px"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="delTechnologicalRequirements(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--</el-table>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <el-table-column label="工艺名称" align="center" width="200">
              <template slot-scope="scope">
                {{ scope.row.工艺名称 }}
              </template>
            </el-table-column>
-            <el-table-column align="center" label="操作" >
+            <el-table-column align="center" label="操作">
              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="warning"
-                  icon="el-icon-edit-outline"
-                  plain
-                  @click="editProcess(scope.row)">编辑工艺</el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  plain
-                  icon="el-icon-delete"
-                  @click="delProcess(scope.row)">删除工艺</el-button>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  plain
-                  icon="el-icon-circle-plus-outline"
-                  @click="addTechnologicalRequirements(scope.row)">新增要求</el-button>
+                <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
+                  <div style="display: inline-block">
+                    <el-button type="text" size="mini" icon="el-icon-edit-outline" style="margin-left: 10px" @click="delProcess(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
+                  <div style="display: inline-block">
+                    <el-button type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="editProcess(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <!--<el-button size="mini" type="primary" plain icon="el-icon-circle-plus-outline" @click="addTechnologicalRequirements(scope.row)">新增要求</el-button>-->
              </template>
            </el-table-column>
          </el-table>
@@ -259,11 +216,6 @@ export default {
    this.searchProcessClassification()
  },
  methods: {
-    abc() {
-      return {
-        height: '35px'
-      }
-    },
    searchProcessClassification() {
      this.loading1 = true
      searchProcessClassification().then(response => {
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -1,7 +1,6 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span style="margin-left: 10px">机床号:</span>
      <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 185px" placeholder="机床号" @change="getGroup()">
        <el-option
          v-for="item in Machines"
@@ -12,7 +11,6 @@
          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
        </el-option>
      </el-select>
-      <span>组号:</span>
      <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 100px;">
        <el-option
          v-for="item in Groups"
@@ -20,22 +18,12 @@
          :label="item.label"
          :value="item.value"/>
      </el-select>
-      <span>零件图号:</span>
      <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
-      <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
+      <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=100;total = 0;pageCurrent0=1;pageSize0=100;total0 = 0;getTableData();getTableData0()">查询</el-button>
    </el-card>

    <el-card style="width: 49.5%; float: left">
-      <el-table
-        v-loading="listLoading1"
-        :data="tableData1"
-        stripe
-        size="mini"
-        style="width: 100%"
-        highlight-current-row
-        class="table"
-        border
-        height="730">
+      <el-table v-loading="listLoading1" :data="tableData1" stripe size="mini" style="width: 100%" highlight-current-row border height="730">
        <el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
          <template slot-scope="scope">
            {{ scope.row.零件名称 }}
@@ -76,7 +64,7 @@
        <el-pagination
          v-if="!listLoading1"
          :current-page="pageCurrent"
-          :page-sizes="[15, 20, 30, 500]"
+          :page-sizes="[100, 200, 300, 500]"
          :page-size="pageSize"
          :total="total"
          layout="total, sizes, prev, pager, next, jumper"
@@ -86,22 +74,13 @@
    </el-card>

    <el-card style="width: 49.5%; float: left;margin-left: 10px">
-      <el-table
-        v-loading="listLoading2"
-        :data="tableData0"
-        class="table"
-        stripe
-        size="mini"
-        style="width: 100%"
-        highlight-current-row
-        border
-        height="730">
-        <el-table-column align="center" label="零件名称" prop="零件名称" width="150px">
+      <el-table v-loading="listLoading2" :data="tableData0" stripe size="mini" style="width: 100%" highlight-current-row border height="730">
+        <el-table-column align="center" label="零件名称" prop="零件名称" width="120px" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.零件名称 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="零件图号" prop="零件图号" min-idth="150px">
+        <el-table-column align="center" label="零件图号" prop="零件图号" width="130px" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.零件图号 }}
          </template>
@@ -111,22 +90,22 @@
            {{ scope.row.出库数量 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="机床图号" prop="机床图号" width="120px">
+        <el-table-column align="center" label="机床图号" prop="机床图号" width="90px">
          <template slot-scope="scope">
            {{ scope.row.机床图号 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="组号" prop="组号" width="80px">
+        <el-table-column align="center" label="组号" prop="组号" width="70px">
          <template slot-scope="scope">
            {{ scope.row.组号 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="领料人" prop="领料人" width="80px">
+        <el-table-column align="center" label="领料人" prop="领料人" width="70px">
          <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="90px">
          <template slot-scope="scope">
            {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
          </template>
@@ -136,12 +115,12 @@
        <el-pagination
          v-if="!listLoading2"
          :current-page="pageCurrent0"
-          :page-sizes="[15, 20, 30, 500]"
+          :page-sizes="[100, 200, 300, 500]"
          :page-size="pageSize0"
          :total="total0"
          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
+          @size-change="handleSizeChange0"
+          @current-change="handleCurrentChange0"/>
      </div>
    </el-card>

@@ -167,16 +146,17 @@ export default {
      listLoading1: false,
      listLoading2: false,
      total: 0, // 总条数
-      pageSize: 500,
+      pageSize: 100,
      pageCurrent: 1,
      total0: 0, // 总条数
-      pageSize0: 500,
+      pageSize0: 100,
      pageCurrent0: 1
    }
  },
  created() {
    this.getMachine()
    this.getTableData()
+    this.getTableData0()
  },
  methods: {
    getMachine() {
@@ -209,12 +189,10 @@ export default {
    // 按条件查询
    getTableData() {
      this.listLoading1 = true
-      this.listLoading2 = true
      this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
      this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
      this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
      this.tableData1 = []
-      this.tableData0 = []
      getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
        if (response.data.total === 0) {
          this.listLoading1 = false
@@ -224,6 +202,13 @@ export default {
          this.listLoading1 = false
        }
      })
+    },
+    getTableData0() {
+      this.listLoading2 = true
+      this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
+      this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
+      this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
+      this.tableData0 = []
      getTable1(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent0, this.pageSize0).then(response => {
        if (response.data.total === 0) {
          this.listLoading2 = false
@@ -237,17 +222,21 @@ export default {
    handleSizeChange(val) {
      this.pageCurrent = 1
      this.pageSize = val
-      this.pageCurrent0 = 1
-      this.pageSize0 = val
      this.getTableData()
    },
    handleCurrentChange(val) {
      this.pageCurrent = val
-      this.pageCurrent0 = val
      this.getTableData()
+    },
+    handleSizeChange0(val) {
+      this.pageCurrent0 = 1
+      this.pageSize0 = val
+      this.getTableData0()
+    },
+    handleCurrentChange0(val) {
+      this.pageCurrent0 = val
+      this.getTableData0()
    }
  }
 }
 </script>
-<style scoped>
-</style>
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -1,7 +1,6 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>项目名称</span>
      <el-select v-model="projectValue" filterable clearable size="small" style="margin-right:10px;width: 150px" placeholder="项目名称" @change="typeChange">
        <el-option
          v-for="item in project"
@@ -9,7 +8,6 @@
          :label="item.label"
          :value="item.value"/>
      </el-select>
-      <span>机床名称</span>
      <el-select v-model="machineValue" clearable filterable size="small" style="margin-right:10px;width: 150px" placeholder="机床名称">
        <el-option
          v-for="item in machine"
@@ -17,20 +15,6 @@
          :label="item.label"
          :value="item.value"/>
      </el-select>
-      <!--      <span>分组</span>-->
-      <!--      <el-select v-model="partValue" clearable filterable size="small" style="margin-right:10px;width: 80px" placeholder="分组">-->
-      <!--        <el-option-->
-      <!--          v-for="item in part"-->
-      <!--          :key="item.value"-->
-      <!--          :label="item.label"-->
-      <!--          :value="item.value"/>-->
-      <!--      </el-select>-->
-      <!--      <span>规格及型号</span>-->
-      <!--      <el-input v-model="specificationValue" clearable size="small" style="margin-right:10px;width: 150px" placeholder="规格型号"/>-->
-      <!--<span>加工总工时（小时）:</span>-->
-      <!--<el-input v-model="totalProcessingHours" clearable size="small" style="margin-right:10px;width: 100px"/>-->
-      <!--<span>计划总工时（小时）:</span>-->
-      <!--<el-input v-model="totalPlannedHours" clearable size="small" style="margin-right:10px;width: 100px"/>-->
      <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
      <el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
    </el-card>
@@ -122,6 +106,17 @@
          </template>
        </el-table-column>
      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[50, 100, 200, 300]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
    </el-card>
  </div>
 </template>
@@ -141,7 +136,10 @@ export default {
      specificationValue: '', // 规格型号
      totalProcessingHours: '', // 加工总工时
      totalPlannedHours: '', // 计划总工时
-      tableData: [] // 详情表
+      tableData: [], // 详情表
+      total: 0, // 总条数
+      pageSize: 50, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
    }
  },
  created() {
@@ -151,6 +149,7 @@ export default {
    fetchData() {
      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
    },
+    // 查询按钮
    typeChange() {
      this.machineValue = ''
      this.machine = []
@@ -162,64 +161,67 @@ export default {
          })
        }
      })
-    }, // 查询按钮
+    },
+    // 分页查询
    searchTable() {
      this.tableData = []
      if (this.machineValue) {
        this.loading = true
-        searchatabledata(this.projectValue, this.machineValue).then(response => {
-          if (response.data.length !== 0) {
-            for (let i = 0; i < response.data.length; i++) {
+        searchatabledata(this.projectValue, this.machineValue, this.pageCurrent, this.pageSize).then(response => {
+          this.loading = false
+          if (response.data.result.length !== 0) {
+            for (let i = 0; i < response.data.result.length; i++) {
              this.tableData.push({
-                跟单号: response.data[i].跟单号,
-                序号: response.data[i].工序顺序,
-                工序名: response.data[i].工艺名称,
-                计划数量: response.data[i].批次数量,
-                计划准备工时: response.data[i].准结定额工时,
-                单件计划工时: response.data[i].单件定额工时,
-                计划工时: response.data[i].计划工时,
-                计划加工日期: response.data[i].计划日期.split(' ')[0],
-                加工数量: response.data[i].完成数量,
-                加工准备工时: response.data[i].修补准结工时,
-                加工工时: response.data[i].设备工时,
-                扫码工时: response.data[i].扫码工时,
-                辅助工时: response.data[i].辅助工时,
-                工时比值: Number(response.data[i].计划工时) === 0 ? 0 : Math.round(response.data[i].扫码工时 / Number(response.data[i].计划工时) * 100) / 100.00,
-                加工日期: response.data[i].操作时间,
-                图号及规格: response.data[i].零件图号_零件工艺计划,
-                制品名称: response.data[i].零件名称
+                跟单号: response.data.result[i].跟单号,
+                序号: response.data.result[i].工序顺序,
+                工序名: response.data.result[i].工艺名称,
+                计划数量: response.data.result[i].批次数量,
+                计划准备工时: response.data.result[i].准结定额工时,
+                单件计划工时: response.data.result[i].单件定额工时,
+                计划工时: response.data.result[i].计划工时,
+                计划加工日期: response.data.result[i].计划日期.split(' ')[0],
+                加工数量: response.data.result[i].完成数量,
+                加工准备工时: response.data.result[i].修补准结工时,
+                加工工时: response.data.result[i].设备工时,
+                扫码工时: response.data.result[i].扫码工时,
+                辅助工时: response.data.result[i].辅助工时,
+                工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].扫码工时 / Number(response.data.result[i].计划工时) * 100) / 100.00,
+                加工日期: response.data.result[i].操作时间,
+                图号及规格: response.data.result[i].零件图号_零件工艺计划,
+                制品名称: response.data.result[i].零件名称
              })
            }
-            this.loading = false
          }
+          this.total = parseInt(response.data.output[0].ItemCount)
        })
      } else {
        this.$message.warning('请选择要查询的机床')
      }
    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        return v[j]
-      }))
-    },
    exportExcel() {
      if (this.tableData.length === 0) {
        this.$message.warning('请查询出要导出的数据')
        return
      }
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['跟单号', '工序', '工序名', '计划件数', '计划准结(分)', '计划定额(分)', '计划工时(分)', '计划加工日期', '加工件数', '录入准结(分)', '加工工时(分)', '扫码工时(分)', '辅助工时(分)', '工时比值', '加工日期', '图号及规格', '制品名称']
-        const filterVal = ['跟单号', '序号', '工序名', '计划数量', '计划准备工时', '单件计划工时', '计划工时', '计划加工日期', '加工数量', '加工准备工时', '加工工时', '扫码工时', '辅助工时', '工时比值', '加工日期', '图号及规格', '制品名称']
-        const list = this.tableData
-        const data = this.formatJson(filterVal, list)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: '机床工时表',
-          autoWidth: true,
-          bookType: 'xlsx'
-        })
-      })
+      var param = []
+      param[0] = ['项目流水号', this.projectValue]
+      param[1] = ['机床流水号', this.machineValue]
+      param[2] = ['PageCurrent', 1]
+      param[3] = ['PageSize', 999999]
+      param[4] = ['PageCount', '1111', 'int', '1']
+      param[5] = ['ItemCount', '1111', 'int', '1']
+      var Data = this.CreateData('2001', '报表_机床工时统计_查询', param)
+      this.exportExcel_NPOI(Data)
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
    }
  }
 }
--- a/src/views/ManufacturingCenter/Enter0therData/index.vue
+++ b/src/views/ManufacturingCenter/Enter0therData/index.vue
@@ -25,7 +25,7 @@
          type="month"
          size="small"
          value-format="yyyy-MM"
-          style="margin-left: 400px; width: 140px"
+          style="margin-left: 280px; width: 140px"
          placeholder="选择月"/>
        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-top: 10px;margin-bottom: 10px" @click="fetchDate">查询</el-button>
      </el-row>
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="app-container">
    <el-card>
-      <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="searchGroupList">
+      <el-select v-model="Machine" filterable clearable size="small" style="margin: 10px 10px 5px 0px;width: 150px;" placeholder="机床号" @change="searchGroupList">
        <el-option
          v-for="item in Machines"
          :key="item.value"
@@ -11,7 +11,7 @@
          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
        </el-option>
      </el-select>
-      <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 100px;" @change="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">
+      <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 150px;" @change="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">
        <el-option
          v-for="item in Groups"
          :key="item.value"
@@ -21,7 +21,7 @@
          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
        </el-option>
      </el-select>
-      <el-button type="primary" plain 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-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
    </el-card>
    <el-card>
      <h3 style="text-align: center;">车间生产</h3>
@@ -77,7 +77,7 @@
          </template>
        </el-table-column>
      </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <div class="block">
        <el-pagination
          :current-page="pageCurrent"
          :page-sizes="[10, 20, 30, 40, 50]"
--- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue
+++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <el-card style="width: 685px;">
+    <el-card style="width: 720px;">
      <el-date-picker
        v-model="startTime"
        value-format="yyyy-MM-dd"
@@ -21,8 +21,8 @@
        <el-button type="primary" size="small" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
      </el-tooltip>
    </el-card>
-    <el-card style="width: 685px">
-      <el-table v-loading="loading" :data="tableData" size="mini" stripe style="width: 685px" height="650px" border element-loading-text="拼命加载中">
+    <el-card style="width: 720px">
+      <el-table v-loading="loading" :data="tableData" size="mini" stripe height="650px" border element-loading-text="拼命加载中">
        <el-table-column label="操作者" align="center" width="110px">
          <template slot-scope="scope">
            {{ scope.row.姓名 }}
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -12,12 +12,12 @@
        style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
        start-placeholder="开始日期"
        end-placeholder="结束日期"/>
-      <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="searchTable">查询</el-button>
+      <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="searchTable()">查询</el-button>
      <el-button size="small" type="primary" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
    </el-card>
    <el-card>
-      <el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 720px" height="720px" border>
-        <el-table-column align="center" label="姓名" width="70px">
+      <el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 720px" height="720px" border @sort-change="sortChange">
+        <el-table-column align="center" label="姓名" width="80px" sortable="custom" prop="姓名">
          <template slot-scope="scope">
            {{ scope.row.姓名 }}
          </template>
@@ -77,16 +77,16 @@
            {{ scope.row.不合格数量 }}
          </template>
        </el-table-column>
+        <el-table-column align="center" label="加工日期" width="110px" sortable="custom" prop="操作时间">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 }}
+          </template>
+        </el-table-column>
        <el-table-column align="center" label="备注" width="100px">
          <template slot-scope="scope">
            {{ scope.row.备注 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="加工日期" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.操作时间 }}
-          </template>
-        </el-table-column>
        <el-table-column align="center" label="计划准结(分)" width="110px">
          <template slot-scope="scope">
            {{ scope.row.准结定额工时 }}
@@ -128,6 +128,17 @@
          </template>
        </el-table-column>
      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[50, 100, 200, 300]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
    </el-card>
  </div>
 </template>
@@ -136,49 +147,67 @@ import { searchTable } from '@/api/ManufacturingCenter/MonthEndHourAccounting'
 export default {
  data() {
    return {
-      tableData: [],
+      orderName: 0,
+      order: 0,
      startTime: '',
-      loading: false
+      tableData: [],
+      loading: false,
+      total: 0, // 总条数
+      pageSize: 50, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
    }
  },
  methods: {
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        return v[j]
-      }))
-    },
    exportExcel() {
      if (this.tableData.length === 0) {
        this.$message.warning('请查询出要导出的数据')
        return
      }
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['日期', '姓名', '图号', '跟单号', '工序', '工序名', '录入准结(分)', '实际工时(分)', '扫码工时(分)', '辅助工时(分)', '工时比值', '合格件数', '废品件数', '备注', '计划准结(分)', '计划定额(分)', '计划工时(分)', '项目名称', '机床图号', '组号', '设计', '材料']
-        const filterVal = ['操作时间', '姓名', '零件图号_零件工艺计划', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '扫码工时', '辅助工时', '工时比值', '合格数量', '不合格数量', '备注', '准结定额工时', '单件定额工时', '计划工时', '项目名称', '机床图号', '组号', '设计者', '材料']
-        const list = this.tableData
-        const data = this.formatJson(filterVal, list)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: '月工时核算表',
-          autoWidth: true,
-          bookType: 'xlsx'
-        })
-      })
+      var param = []
+      param[0] = ['开始时间', this.startTime[0]]
+      param[1] = ['结束时间', this.startTime[1]]
+      param[2] = ['排序名称', this.orderName]
+      param[3] = ['排序方式', this.order]
+      var Data = this.CreateData('2001', '报表_工艺月底工时核算_查询数据', param)
+      this.exportExcel_NPOI(Data)
+    },
+    sortChange(column, prop, order) {
+      if (column.prop === '姓名') {
+        this.orderName = 1
+      } else if (column.prop === '操作时间') { this.orderName = 2 } else {
+        this.orderName = 2
+      }
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = 0
+      }
+      this.searchTable()
    },
    searchTable() {
      if (this.startTime[0] && this.startTime[1]) {
        this.loading = true
-        searchTable(this.startTime[0], this.startTime[1]).then(response => {
-          response.data.map(v => {
+        searchTable(this.startTime[0], this.startTime[1], this.orderName, this.order, this.pageCurrent, this.pageSize).then(response => {
+          response.data.rows.map(v => {
            this.$set(v, '工时比值', v.计划工时 === 0 ? 0 : Math.round(v.扫码工时 / v.计划工时 * 100) / 100.00)
          })
-          this.tableData = response.data
+          this.tableData = response.data.rows
+          this.total = response.data.total
          this.loading = false
        })
      } else {
        this.$message.warning('请选择时间段')
      }
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
    }
  }
 }
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -28,63 +28,66 @@
              :label="item.label"
              :value="item.value"/>
          </el-select>
+          <el-date-picker
+            v-model="finishTime"
+            size="small"
+            type="daterange"
+            align="center"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            range-separator="～"
+            style="width:250px;margin-left: 10px"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"/>
          <el-button type="primary" size="small" style="margin: 0px 10px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
          <el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
-            <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
+            <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-back" size="small" @click="returnEdit">打回重新编制</el-button>
          </el-tooltip>
        </el-row>
      </div>
    </el-card>
    <el-row>
-      <el-col style="width: 670px">
+      <el-col style="width: 750px">
        <el-card>
-          <el-table
-            v-loading="loading"
-            :data="tableData"
-            size="mini"
-            height="740"
-            style="width: 650px"
-            border
-            stripe
-            highlight-current-row
-            @selection-change="handleSelectionChange"
-            @row-click="click">
-            <el-table-column
-              type="selection"
-              align="center"
-              width="55"/>
-            <el-table-column label="机床号" prop="机床图号" align="center" width="120px">
+          <el-table v-loading="loading" :data="tableData" size="mini" height="740" style="width: 750px" border stripe highlight-current-row @selection-change="handleSelectionChange" @row-click="click">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="机床号" prop="机床图号" align="center" width="95px">
              <template slot-scope="scope">
                {{ scope.row.机床图号 }}
              </template>
            </el-table-column>
-            <el-table-column label="组号" prop="组号" align="center" width="70px">
+            <el-table-column label="组号" prop="组号" align="center" width="50px">
              <template slot-scope="scope">
                {{ scope.row.组号 }}
              </template>
            </el-table-column>
-            <el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" min-width="140px">
+            <el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="175px">
              <template slot-scope="scope">
                {{ scope.row.零件图号 }}
              </template>
            </el-table-column>
-            <el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="100px">
+            <el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="130px">
              <template slot-scope="scope">
                {{ scope.row.零件名称 }}
              </template>
            </el-table-column>
-            <el-table-column label="数量" align="center" width="50px">
+            <el-table-column label="数量" align="center" width="52px">
              <template slot-scope="scope">
                {{ scope.row.批次数量 }}
              </template>
            </el-table-column>
-            <el-table-column label="工艺员" prop="工艺员" align="center" width="75px">
+            <el-table-column label="工艺员" prop="工艺员" align="center" width="67px">
              <template slot-scope="scope">
                {{ scope.row.工艺员 }}
              </template>
            </el-table-column>
+            <el-table-column label="编制时间" prop="工艺完成" align="center" width="85px">
+              <template slot-scope="scope">
+                {{ scope.row.工艺完成 }}
+              </template>
+            </el-table-column>
          </el-table>
-          <div class="block" style="margin-top: 10px;">
+          <div class="block">
            <el-pagination
              :current-page="pageCurrent"
              :page-sizes="[5, 10, 20, 300]"
@@ -167,85 +170,16 @@
        </el-card>
      </el-col>
    </el-row>
-    <!--    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" :title="title" center>-->
-    <!--      <div v-if="tableData2.length">-->
-    <!--        <table class="tg">-->
-    <!--          <tr>-->
-    <!--            <td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>-->
-    <!--            <td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>-->
-    <!--            <td class="tg-c3ow" colspan="3">零件图号</td>-->
-    <!--            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>-->
-    <!--            <td class="tg-c3ow">数量</td>-->
-    <!--          </tr>-->
-    <!--          <tr>-->
-    <!--            <td class="tg-c3ow" colspan="3">零件名称</td>-->
-    <!--            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>-->
-    <!--            <td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>-->
-    <!--          </tr>-->
-    <!--          <tr>-->
-    <!--            <td class="tg-c3ow" colspan="2">项目名称</td>-->
-    <!--            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>-->
-    <!--            <td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>-->
-    <!--            <td class="tg-c3ow" colspan="3">机床</td>-->
-    <!--            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>-->
-    <!--          </tr>-->
-    <!--          <tr>-->
-    <!--            <td class="tg-c3ow">材质</td>-->
-    <!--            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>-->
-    <!--            <td class="tg-c3ow">规格</td>-->
-    <!--            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>-->
-    <!--            <td class="tg-c3ow" colspan="3">组号</td>-->
-    <!--            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>-->
-    <!--          </tr>-->
-    <!--          <tr>-->
-    <!--            <td class="tg-c3ow">序次</td>-->
-    <!--            <td class="tg-c3ow">工艺名称</td>-->
-    <!--            <td class="tg-c3ow" colspan="3">工艺要求</td>-->
-    <!--            <td class="tg-c3ow">难度系数</td>-->
-    <!--            <td class="tg-c3ow">工作者</td>-->
-    <!--            <td class="tg-c3ow">单件</td>-->
-    <!--            <td class="tg-c3ow">准结</td>-->
-    <!--            <td class="tg-c3ow">检查结果</td>-->
-    <!--            <td class="tg-c3ow">计划完成日期</td>-->
-    <!--            <td class="tg-c3ow">工序条码</td>-->
-    <!--          </tr>-->
-    <!--          <tr v-for="(value,key) in tableData2" :id="key" :key="key">-->
-    <!--            <td class="tg-c3ow">{{ key + 1 }}</td>-->
-    <!--            <td class="tg-c3ow">{{ value.工艺名称 }}</td>-->
-    <!--            <td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>-->
-    <!--            <td class="tg-c3ow">{{ value.工艺难度等级 }}</td>-->
-    <!--            <td class="tg-c3ow"/>-->
-    <!--            <td class="tg-c3ow">{{ value.单件定额工时 }}</td>-->
-    <!--            <td class="tg-c3ow">{{ value.准结定额工时 }}</td>-->
-    <!--            <td class="tg-c3ow"/>-->
-    <!--            <td class="tg-c3ow">{{ value.计划日期 }}</td>-->
-    <!--            <td class="tg-c3ow">{{ value.工序流水号 }}</td>-->
-    <!--          </tr>-->
-    <!--          <tr>-->
-    <!--            <td class="tg-c3ow">工艺员</td>-->
-    <!--            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>-->
-    <!--            <td class="tg-c3ow">定额员</td>-->
-    <!--            <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>-->
-    <!--            <td class="tg-c3ow">工艺完成</td>-->
-    <!--            <td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>-->
-    <!--            <td class="tg-c3ow">加工开始</td>-->
-    <!--            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>-->
-    <!--            <td class="tg-c3ow">加工结束</td>-->
-    <!--            <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>-->
-    <!--          </tr>-->
-    <!--        </table>-->
-    <!--      </div>-->
-    <!--    </el-dialog>-->
  </div>
 </template>

 <script>
-import { initMachineProject, searchgroup, initPerson, search, searchtable1,
-  returnEdit } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
+import { initMachineProject, searchgroup, initPerson, search, searchtable1, returnEdit } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'

 export default {
  data() {
    return {
+      finishTime: '',
      partNumValue: [],
      machineNumberValue: '',
      machineNumber: [],
@@ -277,7 +211,7 @@ export default {
  },
  created() {
    this.fetchData()
-    this.searchData()
+    // this.searchData()
  },
  methods: {
    returnEdit() { // 在制零件工艺修改
@@ -340,12 +274,13 @@ export default {
    },
    searchData() {
      this.loading = true
-      let check1, check2, check3, check4
+      let check1, check2, check3, check4, check5
      this.machineNumberValue ? check1 = 1 : check1 = 0
      this.groupNumberValue ? check2 = 1 : check2 = 0
      this.PrNum ? check3 = 1 : check3 = 0
      this.personValue ? check4 = 1 : check4 = 0
-      search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue).then(response => {
+      this.finishTime ? check5 = 1 : (check5 = 0, this.finishTime = '')
+      search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1]).then(response => {
        this.tableData = response.data.rows
        this.total = response.data.total
        this.loading = false
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -2,13 +2,12 @@
  <div class="app-container">
    <el-card>
      <el-row>
-        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px;margin:0px 10px"/>
-        <!--        <span class="demonstration">完成加工时间:</span>-->
+        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width: 150px;margin:10px 10px 3px 0"/>
        <el-date-picker
          v-model="startTime"
          value-format="yyyy-MM-dd"
          size="small"
-          style="width: 170px;margin:0px 10px"
+          style="width: 150px"
          type="date"
          placeholder="选择开始加工日期"/>
        <span class="demonstration">~</span>
@@ -16,188 +15,159 @@
          v-model="endTime"
          value-format="yyyy-MM-dd"
          size="small"
-          style="width: 170px;margin:0px 10px"
+          style="width: 150px"
          type="date"
          placeholder="选择加工完成日期"/>
-        <el-button type="primary" plain class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
+        <el-button type="primary" plain class="el-icon-search" size="small" style="margin-left: 20px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
        <el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
          <el-button type="primary" plain size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
        </el-tooltip>
      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-table v-loading="loading" :data="tableData" highlight-current-row height="370" size="mini" stripe style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
+            <el-table-column label="操作者" align="center" width="110px">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="理论工时" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.理论加工时间段 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="实际工时" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.实际加工时间段 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block">
+            <el-pagination
+              v-if="!loading"
+              :current-page="pageCurrent"
+              :page-size="pageSize"
+              :total="total"
+              layout="total"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-col>
+        <el-col :span="17">
+          <el-table v-loading="loading2" :data="tableData2" height="370" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+            <el-table-column label="零件图号" align="center" width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件名称" align="center" width="130px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工艺名称" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="完成数量" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.完成数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="理论工时" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.理论加工时间段 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="实际工时" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.实际加工时间段 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="完成时间" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.加工完成时间 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block">
+            <el-pagination
+              v-if="!loading2"
+              :current-page="pageCurrent2"
+              :page-size="pageSize2"
+              :total="total2"
+              layout="total, prev, pager, next, jumper"
+              @size-change="handleSizeChange2"
+              @current-change="handleCurrentChange2"/>
+          </div>
+        </el-col>
+      </el-row>
    </el-card>
    <el-card>
-      <el-col :span="6">
-        <el-table
-          v-loading="loading"
-          :data="tableData"
-          highlight-current-row
-          height="380"
-          size="mini"
-          stripe
-          style="width: 100%;"
-          border
-          element-loading-text="拼命加载中"
-          @row-click="searchTable2">
-          <el-table-column label="操作者" align="center" width="110px">
-            <template slot-scope="scope">
-              {{ scope.row.姓名 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="理论工时" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.理论加工时间段 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="实际工时" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.实际加工时间段 }}
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="margin: 10px">
-          <el-pagination
-            v-if="!loading"
-            :current-page="pageCurrent"
-            :page-size="pageSize"
-            :total="total"
-            layout="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"/>
-        </div>
-      </el-col>
-      <el-col :span="17" style="margin-left: 30px;">
-        <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
-          <el-table-column label="零件图号" align="center" width="150px">
-            <template slot-scope="scope">
-              {{ scope.row.零件图号 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="零件名称" align="center" width="130px">
-            <template slot-scope="scope">
-              {{ scope.row.零件名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="工艺名称" align="center" width="120px">
-            <template slot-scope="scope">
-              {{ scope.row.工艺名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="完成数量" align="center" width="100px">
-            <template slot-scope="scope">
-              {{ scope.row.完成数量 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="理论工时" align="center" width="100px">
-            <template slot-scope="scope">
-              {{ scope.row.理论加工时间段 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="实际工时" align="center" width="100px">
-            <template slot-scope="scope">
-              {{ scope.row.实际加工时间段 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="完成时间" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.加工完成时间 }}
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="margin: 10px">
-          <el-pagination
-            v-if="!loading2"
-            :current-page="pageCurrent2"
-            :page-size="pageSize2"
-            :total="total2"
-            layout="total, prev, pager, next, jumper"
-            @size-change="handleSizeChange2"
-            @current-change="handleCurrentChange2"/>
-        </div>
-      </el-col>
-    </el-card>
-    <el-card>
-      <!--      <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"
-          :label="item.label"
-          :value="item.value">
-          <div style="float: left">{{ item.label }}</div>
-          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
-        </el-option>
-      </el-select>
-      <el-tooltip :open-delay="1000" content="导出机床工时统计明细表" placement="top">
-        <el-button type="primary" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
-      </el-tooltip>
-      <el-tooltip :open-delay="1000" content="导出组件工时统计明细表" placement="top">
-        <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" plain @click="exportUninquirySheet3()">组件导出</el-button>
-      </el-tooltip>
-    </el-card>
-    <el-card>
-      <el-col :span="6">
-        <el-table v-loading="loading3" :data="tableData3" stripe size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
-          <el-table-column label="机床编号" align="center" width="110px">
-            <template slot-scope="scope">
-              {{ scope.row.机床图号 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="理论工时" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.理论加工时间段 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="实际工时" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.实际加工时间段 }}
-            </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"-->
-        <!--            @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" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
-          <el-table-column label="机床编号" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.机床图号 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="组号" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.组号 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="理论工时" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.理论加工时间段 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="实际工时" align="center" width="120px">
-            <template slot-scope="scope">
-              {{ scope.row.实际加工时间段 }}
-            </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"-->
-        <!--            @size-change="handleSizeChange4"-->
-        <!--            @current-change="handleCurrentChange4"/>-->
-        <!--        </div>-->
-      </el-col>
+      <el-row>
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="width: 150px;margin:10px 0px 3px 0" clearable @change="searchTable4();searchTable6()">
+          <el-option
+            v-for="item in machineNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <el-tooltip :open-delay="1000" content="导出机床工时统计明细表" placement="top">
+          <el-button type="primary" size="mini" icon="el-icon-download" plain style="margin-left:20px" @click="exportUninquirySheet2()">机床导出</el-button>
+        </el-tooltip>
+        <el-tooltip :open-delay="1000" content="导出组件工时统计明细表" placement="top">
+          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" plain @click="exportUninquirySheet3()">组件导出</el-button>
+        </el-tooltip>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-table v-loading="loading3" :data="tableData3" stripe size="mini" highlight-current-row height="335" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
+            <el-table-column label="机床编号" align="center" width="110px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="理论工时" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.理论加工时间段 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="实际工时" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.实际加工时间段 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+        <el-col :span="17">
+          <el-table v-loading="loading4" :data="tableData4" size="mini" height="335" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+            <el-table-column label="机床编号" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="组号" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="理论工时" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.理论加工时间段 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="实际工时" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.实际加工时间段 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
    </el-card>
  </div>
 </template>
@@ -207,6 +177,7 @@ import { searchtable, searchtable2, searchtable4, searchtable5, initProject, sea
 export default {
  data() {
    return {
+      AmountInputBox: 231,
      workerName: '',
      startTime: '',
      endTime: '',
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -1,13 +1,11 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>厂家名称:</span>
-      <el-input v-model="ManufacturerName" clearable size="small" style="width:200px" @keyup.enter.native="pageCurrent=1;pageSize=50;searchTable()" @clear="pageCurrent=1;pageSize=50;searchTable()"/>
+      <el-input v-model="ManufacturerName" clearable placeholder="外协厂家名称" size="small" style="width:200px;margin: 10px 0 3px 0;" @keyup.enter.native="pageCurrent=1;pageSize=50;searchTable()" @clear="pageCurrent=1;pageSize=50;searchTable()"/>
+      <el-button type="primary" size="small" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button>
      <el-tooltip :open-delay="1200" effect="dark" content="新增外协厂家" placement="top">
-        <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
+        <el-button type="distribution" icon="el-icon-circle-plus-outline" style="margin-left: 10px" size="small" @click="editType1('form');param = 0">新增</el-button>
      </el-tooltip>
-    </el-card>
-    <el-card>
      <el-table v-loading="loading0" :data="tableData" height="550" style="width: 100%;" border>
        <el-table-column label="序号" align="center" type="index" width="50"/>
        <el-table-column label="外协厂家名称" align="center" width="280px">
@@ -45,19 +43,9 @@
            {{ scope.row.备注 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" align="center" width="150px" fixed="right">
+        <el-table-column label="操作" align="center" width="70px" fixed="right">
          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              plain
-              class="el-icon-edit"
-              @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-              <!--<el-button-->
-              <!--size="mini"-->
-              <!--type="danger"-->
-              <!--class="el-icon-delete"-->
-              <!--@click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
+            <el-button size="mini" type="text" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1"/>
          </template>
        </el-table-column>
      </el-table>
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -1,24 +1,14 @@
 <template>
  <div class="app-container">
    <el-card>
-      <!--<span>项目名称</span>-->
-      <!--<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">-->
-      <!--<el-option-->
-      <!--v-for="item in project"-->
-      <!--:key="item.value"-->
-      <!--:label="item.label"-->
-      <!--:value="item.value"/>-->
-      <!--</el-select>-->
-      <span>机床图号</span>
-      <el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
+      <el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small">
        <el-option
          v-for="item in machine"
          :key="item.value"
          :label="item.label"
          :value="item.value"/>
      </el-select>
-      <span>组号</span>
-      <el-select v-model="groupValue" placeholder="请选择组号" filterable size="small">
+      <el-select v-model="groupValue" placeholder="组号" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small">
        <el-option
          v-for="item in group"
          :key="item.value"
@@ -33,7 +23,7 @@
          <div class="content">
            <div class="action"/>
            <div v-if="file.suffix==='pdf'" class="icon"><svg-icon icon-class="pdf" /></div>
-            <div v-else-if="file.suffix==='docx'||file.suffix === 'doc'" class="icon"><svg-icon icon-class="doc" /></div>
+            <div v-else-if="file.suffix==='docx'|| file.suffix === 'doc'" class="icon"><svg-icon icon-class="doc" /></div>
            <div v-else-if="file.suffix==='xlsx' || file.suffix === 'xls'" class="icon"><svg-icon icon-class="excel" /></div>
            <div v-else-if="file.suffix==='pptx' || file.suffix === 'ppt'" class="icon"><svg-icon icon-class="ppt" /></div>
            <div v-else-if="file.suffix==='jpg' || file.suffix === 'jpeg'|| file.suffix === 'png'" class="icon"><svg-icon icon-class="pic" /></div>
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -100,7 +100,7 @@ export default {
    exportExcel() {
      var param = []
      param[0] = ['项目流水号', this.projectValue]
-      var Data = this.CreateData('12', '车间采购管理_项目总价_明细_查询数据_导出', param)
+      var Data = this.CreateData('2001', '车间采购管理_项目总价_明细_查询数据_导出', param)
      this.exportExcel_NPOI(Data)
    },
    searchTable1() {