2026-07-14

异常规则配置

src/views/modules/sys/sceneExceptionRuleConfig.vue

@@ -29,10 +29,10 @@
         align="center"
         width="50">
       </el-table-column>
-      <el-table-column prop="site" label="Site" header-align="center" align="center" min-width="100"></el-table-column>
-      <el-table-column prop="buNo" label="BU" header-align="center" align="center" min-width="100"></el-table-column>
-      <el-table-column prop="ruleCode" label="规则编码" header-align="center" align="center" min-width="140"></el-table-column>
-      <el-table-column prop="ruleName" label="规则名称" header-align="center" align="left" min-width="200"></el-table-column>
+      <el-table-column prop="site" label="Site" header-align="center" align="center" min-width="80"></el-table-column>
+      <el-table-column prop="buNo" label="BU" header-align="center" align="center" min-width="80"></el-table-column>
+      <el-table-column prop="ruleCode" label="规则编码" header-align="center" align="center" min-width="120"></el-table-column>
+      <el-table-column prop="ruleName" label="规则名称" header-align="center" align="left" min-width="220"></el-table-column>
       <el-table-column prop="applyPage" label="应用页面" header-align="center" align="center" min-width="140"></el-table-column>
       <el-table-column prop="applyButton" label="应用按钮" header-align="center" align="center" min-width="140"></el-table-column>
       <el-table-column label="是否启用" header-align="center" align="center" min-width="100">

src/views/modules/yieldReport/produce_order.vue

@@ -136,7 +136,6 @@
       </el-form-item>
     </el-form>
     <!--  工单主表信息  -->
-    <el-main style="margin-left: -20px; margin-top: -20px; width: 104%;">
       <el-table @row-click="setCurrentRow"
                 :height="height"
                 highlight-current-row
@@ -161,7 +160,16 @@
           </template>
         </el-table-column>
       </el-table>
-    </el-main>
+    <el-pagination
+      style="margin-top: 0px"
+      @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>
 
     <!-- 切换操作员 -->
     <comSwitchOperator ref="comSwitchOperator" :close-on-click-modal="false"
@@ -309,6 +317,8 @@ export default {
         username: this.$store.state.user.name,
         searchFlag: false,
         exportFlag: "N",
+        page: 1,
+        limit: 20
       },
       currentRow: {},
       operatorData: {
@@ -322,6 +332,9 @@ export default {
       },
       produceScheduleList: [],
       dataListLoading: false,
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
       columnList: [
         {
           userId: this.$store.state.user.name,
@@ -1233,7 +1246,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 235
+      this.height = window.innerHeight - 243
     })
   },
   methods: {
@@ -1819,15 +1832,35 @@ export default {
       }
       // 开始真的查询;
       this.searchData.searchFlag = true
+      this.searchData.page = this.pageIndex
+      this.searchData.limit = this.pageSize
+      this.searchData.exportFlag = 'N'
+      this.dataListLoading = true
       getProduceScheduleList(this.searchData).then(({data}) => {
         // 设置查询数据
-        this.produceScheduleList = data.rows
+        this.produceScheduleList = data.rows || []
+        this.totalPage = data.total || 0
+        this.currentRow = {}
+      }).finally(() => {
+        this.dataListLoading = false
       })
     },
 
     /* 刷新页面table */
     refreshPageTables() {
       this.currentRow = {}
+      this.pageIndex = 1
+      this.getProduceScheduleList()
+    },
+    // 主表分页大小改变
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getProduceScheduleList()
+    },
+    // 主表当前页改变
+    currentChangeHandle(val) {
+      this.pageIndex = val
       this.getProduceScheduleList()
     },
     /* 设置选中行的参数 */
@@ -2287,12 +2320,7 @@ export default {
       const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== ''
       const hasOrderNo = this.searchData.orderNo && this.searchData.orderNo.trim() !== ''
       if (hasResourceId || hasSeqNo || hasOrderNo) {
-        this.searchData.searchFlag = true;
-        getProduceScheduleList(this.searchData).then(({data}) => {
-          // 设置查询数据
-          this.searchData.exportFlag = 'N';
-          this.produceScheduleList = data.rows
-        })
+        this.getProduceScheduleList()
       }
     })