From 447a90bc08eeaa8483d2950d75fabf7d0adc5906 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 26 Jun 2026 17:14:24 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-26=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/site.js                          |   2 +
 .../unqualifiedInspectionReasons.js           |   2 +
 src/views/modules/base/shutDownReason.vue     | 123 +++++++++++++----
 .../unqualifiedInspectionReasons.vue          | 125 ++++++++++++++----
 .../modules/warehouse/labelTransactionLog.vue |   2 +
 5 files changed, 205 insertions(+), 49 deletions(-)

diff --git a/src/api/base/site.js b/src/api/base/site.js
index bfcd604..2a5d96a 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -38,6 +38,8 @@ export const searchPartNoDataWithPage = data => createAPI(`/base/searchPartNoDat
 //------------停机原因----------------
 // 获取停机原因
 export const getShutDownReasonData = data => createAPI(`/base/getShutDownReasonData`,'post',data)
+// 获取停机原因(分页)
+export const getShutDownReasonDataWithPage = data => createAPI(`/base/getShutDownReasonDataWithPage`,'post',data)
 
 // 保存修改停机原因
 export const saveShutDownReasonData = data => createAPI(`/base/saveShutDownReasonData`,'post',data)
diff --git a/src/api/qualityAssurance/unqualifiedInspectionReasons.js b/src/api/qualityAssurance/unqualifiedInspectionReasons.js
index f29a16e..e1afc07 100644
--- a/src/api/qualityAssurance/unqualifiedInspectionReasons.js
+++ b/src/api/qualityAssurance/unqualifiedInspectionReasons.js
@@ -2,6 +2,8 @@ import { createAPI } from "@/utils/httpRequest.js";
 
 // 获取计量单位数据
 export const getUnqualifiedInspectionReasonsData = data => createAPI(`/qualityAssurance/getUnqualifiedInspectionReasonsData`,'post',data)
+// 获取计量单位数据(分页)
+export const getUnqualifiedInspectionReasonsDataWithPage = data => createAPI(`/qualityAssurance/getUnqualifiedInspectionReasonsDataWithPage`,'post',data)
 
 // 保存修改计量单位数据
 export const saveUnqualifiedInspectionReasonsData = data => createAPI(`/qualityAssurance/saveUnqualifiedInspectionReasonsData`,'post',data)
diff --git a/src/views/modules/base/shutDownReason.vue b/src/views/modules/base/shutDownReason.vue
index 43cc04c..0043bc8 100644
--- a/src/views/modules/base/shutDownReason.vue
+++ b/src/views/modules/base/shutDownReason.vue
@@ -1,22 +1,48 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-button @click="getData()" type="primary"  style="margin-left: 2px;margin-top: 0px">{{buttons.search}}</el-button>
-      <el-button @click="addModal()" type="primary" :disabled = "authAdd" style="margin-left: 2px;margin-top: 0px">{{buttons.add}}</el-button>
-      <download-excel
-        :fields="fields()"
-        :data="exportData"
-        type="xls"
-        :name="exportName"
-        :header="exportHeader"
-        :footer="exportFooter"
-        :fetch="createExportData"
-        :before-generate="startDownload"
-        :before-finish="finishDownload"
-        worksheet="导出信息"
-        class="el-button el-button--primary el-button--medium">
-        {{ buttons.download }}
-      </download-excel>
+      <el-form-item :label="labels.reasonCode">
+        <el-input v-model="searchData.reasonCode" clearable style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="labels.reasonDescription">
+        <el-input v-model="searchData.reasonDescription" clearable style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="labels.workCenterNo">
+        <el-select v-model="searchData.workCenterNo" clearable filterable style="width: 130px">
+          <el-option
+            v-for="i in workCenterList"
+            :key="i.workCenterNo"
+            :label="i.workCenterDesc"
+            :value="i.workCenterNo">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="labels.active">
+        <el-select v-model="searchData.active" clearable filterable style="width: 130px">
+          <el-option :label="labels.all" value=""></el-option>
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button @click="getData()" type="primary">{{buttons.search}}</el-button>
+        <el-button @click="addModal()" type="primary" :disabled="authAdd">{{buttons.add}}</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium"
+          >
+          {{ buttons.download }}
+        </download-excel>
+      </el-form-item>
     </el-form>
     <el-table
       :height="height"
@@ -52,6 +78,16 @@
         </template>
       </el-table-column>
     </el-table>
+    <el-pagination
+      style="margin-top: 8px"
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
     <el-dialog :title="labels.shutDownReason" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="350px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="labels.site">
@@ -104,7 +140,7 @@
     removerUser
   } from "@/api/table.js"
   import {
-    getShutDownReasonData,
+    getShutDownReasonDataWithPage,
     saveShutDownReasonData,
     deleteShutDownReasonData
   } from "@/api/base/site.js"
@@ -142,6 +178,7 @@
           reasonCode:'原因代码:',
           reasonDescription:'原因描述:',
           active:'在用:',
+          all:'全部',
           error:'错误',
           true:'确定',
           point:'提示',
@@ -196,6 +233,15 @@
           active:'',
           user:'',
         },
+        searchData: {
+          reasonCode: '',
+          reasonDescription: '',
+          workCenterNo: '',
+          active: ''
+        },
+        pageIndex: 1,
+        pageSize: 20,
+        totalPage: 0,
         dataList:[],
         dataListLoading: false,
         workCenterList: [],
@@ -321,14 +367,43 @@
       })
     },
     methods: {
-      getData(){
-        let inData={
-          user:this.$store.state.user.name
+      getData(resetPage = true){
+        if (resetPage) {
+          this.pageIndex = 1
+        }
+        this.dataListLoading = true
+        const inData = {
+          user: this.$store.state.user.name,
+          page: this.pageIndex,
+          limit: this.pageSize,
+          reasonCode: this.searchData.reasonCode,
+          reasonDescription: this.searchData.reasonDescription,
+          workCenterNo: this.searchData.workCenterNo,
+          active: this.searchData.active
         }
-        getShutDownReasonData(inData).then(({data}) => {
-          this.dataList = data.rows
+        getShutDownReasonDataWithPage(inData).then(({data}) => {
+          if (data && data.code === 0 && data.page) {
+            this.dataList = data.page.list || []
+            this.totalPage = data.page.totalCount || 0
+            this.pageIndex = data.page.currPage || this.pageIndex
+            this.pageSize = data.page.pageSize || this.pageSize
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        }).catch(() => {
+          this.dataListLoading = false
         })
       },
+      sizeChangeHandle(val) {
+        this.pageSize = val
+        this.getData(true)
+      },
+      currentChangeHandle(val) {
+        this.pageIndex = val
+        this.getData(false)
+      },
       loadWorkCenterList() {
         const inData = {
           username: this.$store.state.user.name
@@ -412,7 +487,7 @@
         saveShutDownReasonData(this.modelData).then(({data}) => {
           if (data && data.code == 200) {
             this.modelFlag = false
-            this.getData();
+            this.getData(false);
             this.$message.success( this.labels.doYes)
           } else {
             this.$alert(data.msg, this.labels.error,{
@@ -436,7 +511,7 @@
           deleteShutDownReasonData(inData).then(({data}) => {
             if (data && data.code == 200) {
               this.modelFlag = false
-              this.getData();
+              this.getData(false);
              this.$message.success( this.labels.doYes)
             } else {
               this.$alert(data.msg, this.labels.error,{
diff --git a/src/views/modules/qualityAssurance/unqualifiedInspectionReasons.vue b/src/views/modules/qualityAssurance/unqualifiedInspectionReasons.vue
index 926ef95..209c1a4 100644
--- a/src/views/modules/qualityAssurance/unqualifiedInspectionReasons.vue
+++ b/src/views/modules/qualityAssurance/unqualifiedInspectionReasons.vue
@@ -1,23 +1,49 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-button @click="getData()" type="primary"  style="margin-left: 2px;margin-top: 0px">{{buttons.search}}</el-button>
-      <el-button @click="addModal()" type="primary" :disabled = "authAdd" style="margin-left: 2px;margin-top: 0px">{{buttons.add}}</el-button>
-      <el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
-      <download-excel
-        :fields="fields()"
-        :data="exportData"
-        type="xls"
-        :name="exportName"
-        :header="exportHeader"
-        :footer="exportFooter"
-        :fetch="createExportData"
-        :before-generate="startDownload"
-        :before-finish="finishDownload"
-        worksheet="导出信息"
-        class="el-button el-button--primary el-button--medium">
-        {{ buttons.download }}
-      </download-excel>
+      <el-form-item :label="labels.defectCode">
+        <el-input v-model="searchData.defectCode" clearable style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="labels.defectDesc">
+        <el-input v-model="searchData.defectDesc" clearable style="width: 130px"></el-input>
+      </el-form-item>
+      <el-form-item :label="labels.workCenterNo">
+        <el-select v-model="searchData.workCenterNo" clearable filterable style="width: 130px">
+          <el-option
+            v-for="i in workCenterList"
+            :key="i.workCenterNo"
+            :label="i.workCenterDesc"
+            :value="i.workCenterNo">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="labels.active">
+        <el-select v-model="searchData.active" clearable filterable style="width: 130px">
+          <el-option :label="labels.all" value=""></el-option>
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button @click="getData()" type="primary" >{{buttons.search}}</el-button>
+        <el-button @click="addModal()" type="primary" :disabled="authAdd">{{buttons.add}}</el-button>
+        <el-button @click="userSetting" type="primary" >{{ buttons.settingTable }}</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium"
+          >
+          {{ buttons.download }}
+        </download-excel>
+      </el-form-item>
     </el-form>
     <el-table
       :height="height"
@@ -53,6 +79,16 @@
         </template>
       </el-table-column>
     </el-table>
+    <el-pagination
+      style="margin-top: 8px"
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
     <el-dialog :title=labels.reasons :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="500px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="labels.site">
@@ -108,7 +144,7 @@
   } from "@/api/table.js"
   import column from "@/views/modules/common/column";
   import {
-    getUnqualifiedInspectionReasonsData,
+    getUnqualifiedInspectionReasonsDataWithPage,
     saveUnqualifiedInspectionReasonsData,
     deleteUnqualifiedInspectionReasonsData
   } from "@/api/qualityAssurance/unqualifiedInspectionReasons.js"
@@ -164,6 +200,15 @@
           active:'',
           user:'',
         },
+        searchData: {
+          defectCode: '',
+          defectDesc: '',
+          workCenterNo: '',
+          active: ''
+        },
+        pageIndex: 1,
+        pageSize: 20,
+        totalPage: 0,
         dataList:[],
         dataListLoading: false,
         workCenterList: [],
@@ -289,6 +334,7 @@
           site:'工厂编码:',
           inspectionType:'检验类型:',
           active:'在用:',
+          all:'全部',
           defectCode:'原因代码:',
           defectDesc:'原因描述',
           workCenterNo:'加工中心:',
@@ -334,14 +380,43 @@
       })
     },
     methods: {
-      getData(){
-        let inData={
-          user:this.$store.state.user.name
+      getData(resetPage = true){
+        if (resetPage) {
+          this.pageIndex = 1
+        }
+        this.dataListLoading = true
+        const inData = {
+          user: this.$store.state.user.name,
+          page: this.pageIndex,
+          limit: this.pageSize,
+          defectCode: this.searchData.defectCode,
+          defectDesc: this.searchData.defectDesc,
+          workCenterNo: this.searchData.workCenterNo,
+          active: this.searchData.active
         }
-        getUnqualifiedInspectionReasonsData(inData).then(({data}) => {
-          this.dataList = data.rows
+        getUnqualifiedInspectionReasonsDataWithPage(inData).then(({data}) => {
+          if (data && data.code === 0 && data.page) {
+            this.dataList = data.page.list || []
+            this.totalPage = data.page.totalCount || 0
+            this.pageIndex = data.page.currPage || this.pageIndex
+            this.pageSize = data.page.pageSize || this.pageSize
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        }).catch(() => {
+          this.dataListLoading = false
         })
       },
+      sizeChangeHandle(val) {
+        this.pageSize = val
+        this.getData(true)
+      },
+      currentChangeHandle(val) {
+        this.pageIndex = val
+        this.getData(false)
+      },
       loadWorkCenterList() {
         const inData = {
           username: this.$store.state.user.name
@@ -432,7 +507,7 @@
         saveUnqualifiedInspectionReasonsData(this.modelData).then(({data}) => {
           if (data && data.code == 200) {
             this.modelFlag = false
-            this.getData();
+            this.getData(false);
             this.$message.success('操作成功')
           } else {
             this.$alert(data.msg, '错误', {
@@ -456,7 +531,7 @@
           deleteUnqualifiedInspectionReasonsData(inData).then(({data}) => {
             if (data && data.code == 200) {
               this.modelFlag = false
-              this.getData();
+              this.getData(false);
              this.$message.success('操作成功')
             } else {
               this.$alert(data.msg, '错误', {
diff --git a/src/views/modules/warehouse/labelTransactionLog.vue b/src/views/modules/warehouse/labelTransactionLog.vue
index 1729c5c..ce3320c 100644
--- a/src/views/modules/warehouse/labelTransactionLog.vue
+++ b/src/views/modules/warehouse/labelTransactionLog.vue
@@ -234,6 +234,7 @@
       <el-table-column v-if="showBomItemNo" prop="bomItemNo" label="Bom行号" header-align="center" align="center" width="100"></el-table-column>
       <el-table-column prop="rollQty" label="变动数量" header-align="center" align="right" width="100"></el-table-column>
       <el-table-column prop="batchNo" label="合约号码" header-align="center" align="left" min-width="150" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="wdrBarchNo" label="批次号" header-align="center" align="left" min-width="120" show-overflow-tooltip></el-table-column>
       <el-table-column prop="partNo" label="物料编码" header-align="center" align="left" min-width="150" show-overflow-tooltip></el-table-column>
       <el-table-column prop="partDesc" label="物料名称" header-align="center" align="left" min-width="180" show-overflow-tooltip></el-table-column>
       <el-table-column prop="spec" label="规格型号" header-align="center" align="left" min-width="120" show-overflow-tooltip></el-table-column>
@@ -333,6 +334,7 @@ export default {
         { columnProp: 'rollNo', columnLabel: '标签条码', headerAlign: 'center', align: 'left', columnWidth: 180 },
         { columnProp: 'rollQty', columnLabel: '变动数量', headerAlign: 'center', align: 'right', columnWidth: 100 },
         { columnProp: 'batchNo', columnLabel: '合约号码', headerAlign: 'center', align: 'left', columnWidth: 150 },
+        { columnProp: 'wdrBarchNo', columnLabel: '批次号', headerAlign: 'center', align: 'left', columnWidth: 120 },
         { columnProp: 'partNo', columnLabel: '物料编码', headerAlign: 'center', align: 'left', columnWidth: 150 },
         { columnProp: 'partDesc', columnLabel: '物料名称', headerAlign: 'center', align: 'left', columnWidth: 180 },
         { columnProp: 'spec', columnLabel: '规格型号', headerAlign: 'center', align: 'left', columnWidth: 120 },