From 9729366b0c0376926e2582d6b59f99af2f08809c Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Thu, 29 May 2025 16:15:03 +0800
Subject: [PATCH] 2025/5/29

---
 .../test/testSoRouting/testRoutingTable.vue   | 181 ++++++++++++++----
 1 file changed, 148 insertions(+), 33 deletions(-)

diff --git a/src/views/modules/test/testSoRouting/testRoutingTable.vue b/src/views/modules/test/testSoRouting/testRoutingTable.vue
index e9ffec8..061c8e2 100644
--- a/src/views/modules/test/testSoRouting/testRoutingTable.vue
+++ b/src/views/modules/test/testSoRouting/testRoutingTable.vue
@@ -38,11 +38,19 @@ export default {
   },
   data(){
     return{
+      searchData: {
+        workCenterNo: undefined,   // 加工中心编码查询条件
+        workCenterDesc: undefined, // 加工中心名称查询条件
+        workCenterType: undefined, // 加工中心类型查询条件
+      },
       workCenter:{
         workCenterNo:undefined,
         workCenterDesc:undefined,
         workCenterType:undefined,
       },
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
       workCenterList:[],
       workCenterDialogFlag:false,
       saveStatus:true,
@@ -391,6 +399,47 @@ export default {
           columnWidth: 140
         },
       ],
+      workCenterColumnList: [
+        {
+          userId: this.$store.state.user.name,
+          tableName: '加工中心表',
+          columnProp: 'workCenterNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '编码',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          tableName: '加工中心表',
+          columnProp: 'workCenterDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '名称',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 200
+        },
+        {
+          userId: this.$store.state.user.name,
+          tableName: '加工中心表',
+          columnProp: 'workCenterType',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '类型',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
+      ],
     }
   },
   created() {
@@ -408,9 +457,9 @@ export default {
     searchWorkCenter(flag){
       let params = {
         site:this.$store.state.user.site,
-        workCenterNo:this.workCenter.workCenterNo,
-        workCenterDesc:this.workCenter.workCenterDesc,
-        workCenterType:this.workCenter.workCenterType,
+        workCenterNo:this.searchData.workCenterNo,
+        workCenterDesc:this.searchData.workCenterDesc,
+        workCenterType:this.searchData.workCenterType,
       };
       this.workCenterList = []
       searchWorkCenter(params).then(({data})=>{
@@ -615,7 +664,19 @@ export default {
     openWorkCenterDialog(){
       this.workCenter.workCenterNo = this.testSoRouting.workCenterNo;
       this.searchWorkCenter()
-    }
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.searchWorkCenter()
+    },
+
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.searchWorkCenter()
+    },
   },
 }
 </script>
@@ -781,37 +842,91 @@ export default {
       </span>
     </el-dialog>
 
-    <el-dialog title="加工中心信息" v-drag @open="openWorkCenterDialog" :visible.sync="workCenterDialogFlag" width="600px" append-to-body @close="closeWorkCenterDialog">
-      <el-form :model="workCenter" label-position="top">
-        <el-row :gutter="10">
-          <el-col :span="6">
-            <el-form-item label="加工中心">
-              <el-input v-model="workCenter.workCenterNo"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="加工中心名称">
-              <el-input v-model="workCenter.workCenterDesc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="加工中心类别">
-              <el-input v-model="workCenter.workCenterType"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label=" ">
-              <el-button type="primary" @click="searchWorkCenter">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--    <el-dialog title="加工中心信息" v-drag @open="openWorkCenterDialog" :visible.sync="workCenterDialogFlag" width="600px" append-to-body @close="closeWorkCenterDialog">-->
+<!--      <el-form :model="workCenter" label-position="top">-->
+<!--        <el-row :gutter="10">-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="加工中心">-->
+<!--              <el-input v-model="workCenter.workCenterNo"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="加工中心名称">-->
+<!--              <el-input v-model="workCenter.workCenterDesc"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="加工中心类别">-->
+<!--              <el-input v-model="workCenter.workCenterType"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="4">-->
+<!--            <el-form-item label=" ">-->
+<!--              <el-button type="primary" @click="searchWorkCenter">查询</el-button>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--      </el-form>-->
+<!--      <el-table border height="200px" stripe-->
+<!--      :data="workCenterList" @row-dblclick="dblClickWorkCenterTable">-->
+<!--        <el-table-column label="加工中心" prop="workCenterNo"></el-table-column>-->
+<!--        <el-table-column label="加工中心名称" prop="workCenterDesc"></el-table-column>-->
+<!--        <el-table-column label="加工中心类别" prop="workCenterType"></el-table-column>-->
+<!--      </el-table>-->
+<!--    </el-dialog>-->
+
+    <!--         加工中心模态框 -->
+    <el-dialog title="加工中心" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workCenterDialogFlag" width="940px">
+      <el-form :inline="true" label-position="top" :model="searchData">
+        <el-form-item :label="'加工中心'">
+          <el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'加工中心名称'">
+          <el-input v-model="searchData.workCenterDesc" clearable style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'加工中心类别'">
+          <el-input v-model="searchData.workCenterType" clearable style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button type="primary" @click="searchWorkCenter">查询</el-button>
+        </el-form-item>
       </el-form>
-      <el-table border height="200px" stripe
-      :data="workCenterList" @row-dblclick="dblClickWorkCenterTable">
-        <el-table-column label="加工中心" prop="workCenterNo"></el-table-column>
-        <el-table-column label="加工中心名称" prop="workCenterDesc"></el-table-column>
-        <el-table-column label="加工中心类别" prop="workCenterType"></el-table-column>
+      <el-table
+        :height="250"
+        :data="workCenterList"
+        @row-dblclick="dblClickWorkCenterTable"
+        border
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in workCenterColumnList" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed==''?false:item.fixed"
+          :min-width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
+        </el-table-column>
       </el-table>
+      <!-- 分页插件 -->
+      <el-pagination
+        style="margin-top: 5px"
+        @size-change="sizeChangeHandle"
+        @current-change="currentChangeHandle"
+        :current-page="pageIndex"
+        :page-sizes="[20, 50, 100, 200, 500]"
+        :page-size="pageSize"
+        :total="totalPage"
+        layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
+      <el-footer style="height:35px;margin-top:10px;text-align:center">
+        <el-button type="primary" @click="workCenterDialogFlag = false">关闭</el-button>
+      </el-footer>
     </el-dialog>
   </div>
 </template>