a

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, check5, val5, val6) {
+export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6, val7) {
   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}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
+      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&排序=${val7}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -57,9 +57,20 @@
     <el-row>
       <el-col style="width: 700px">
         <el-card>
-          <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
+            v-loading="loading"
+            :data="tableData"
+            size="mini"
+            height="740"
+            style="width: 750px"
+            border
+            stripe
+            highlight-current-row
+            @sort-change="sortChange"
+            @selection-change="handleSelectionChange"
+            @row-click="click">
             <el-table-column type="selection" align="center" width="50"/>
-            <el-table-column label="进程" prop="进程" align="center" width="95px">
+            <el-table-column label="进程" prop="进程" align="center" width="95px" sortable>
               <template slot-scope="scope">
                 {{ scope.row.进程 }}
               </template>
@@ -202,6 +213,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1, retu
 export default {
   data() {
     return {
+      order: '',
       finishTime: '',
       partNumValue: [],
       machineNumberValue: '',
@@ -329,7 +341,7 @@ export default {
       this.PrNum ? check3 = 1 : check3 = 0
       this.personValue ? check4 = 1 : check4 = 0
       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 => {
+      search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1], this.order).then(response => {
         this.tableData = response.data.result
         this.tableData.map(v => {
           this.$set(v)
@@ -342,6 +354,16 @@ export default {
         this.loading = false
       })
     },
+    sortChange(column, prop, order) {
+      if (column.order === 'ascending') {
+        this.order = '进程'
+      } else if (column.order === 'descending') {
+        this.order = '进程 DESC'
+      } else {
+        this.order = 0
+      }
+      this.searchData()
+    },
     click(row) {
       this.零件图号 = row.零件图号
       searchtable1(row.工艺计划流水号).then(response => {

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -563,7 +563,7 @@ export default {
               工艺名称: 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].工序流水号,