2026-03-05

1、仓库信息维护页面，非超级管理员看不到权限列表
2、国战采集再加一个“生产订单号”，填写生产订单号也能查询

src/api/warehouse/warehouse.js

@@ -26,8 +26,8 @@ export const saveWarehouseStorageConfig = data => createAPI(`warehouse/saveWareh
 export const deleteWarehouseStorageConfig = data => createAPI(`warehouse/deleteWarehouseStorageConfig`,'POST',data)
 
 // ==================== 权限授权 ====================
-// 获取用户列表
-export const getUserList = data => createAPI(`sys/user/list`,'get',data)
+// 获取可选用户列表（不受 sys:user:list 权限限制）
+export const getUserList = data => createAPI(`warehouse/getAvailableUserList`,'POST',data)
 
 // 获取已授权用户列表
 export const getAccessWarehouseList = data => createAPI(`warehouse/getAccessWarehouseList`,'POST',data)

src/views/modules/warehouse/warehouse.vue

@@ -1500,17 +1500,14 @@ import {
       // 加载权限授权列表
       async loadAccessAuthLists() {
         try {
-          // 加载可选用户（从sys_user表）
-          const {data: availableData} = await getUserList({
-            page: 1,
-            limit: 10000
-          });
-
-          // 加载已授权用户（从AccessWarehouse表）
-          const {data: selectedData} = await getAccessWarehouseList({
-            site: this.currentWarehouse.site,
-            warehouseId: this.currentWarehouse.wareHouseId
-          });
+          // 并行加载可选用户和已授权用户
+          const [{ data: availableData }, { data: selectedData }] = await Promise.all([
+            getUserList({ site: this.currentWarehouse.site }),
+            getAccessWarehouseList({
+              site: this.currentWarehouse.site,
+              warehouseId: this.currentWarehouse.wareHouseId
+            })
+          ]);
 
           if (selectedData && selectedData.code === 0) {
             this.selectedUserList = selectedData.list || [];
@@ -1519,7 +1516,7 @@ import {
           // 过滤掉已授权的用户
           if (availableData && availableData.code === 0) {
             const selectedUserIds = this.selectedUserList.map(item => item.userid);
-            this.availableUserListAll = (availableData.page.list || []).filter(item =>
+            this.availableUserListAll = (availableData.list || []).filter(item =>
               !selectedUserIds.includes(item.username)
             );
             this.availableUserList = this.availableUserListAll;

src/views/modules/yieldReport/produce_order.vue

@@ -43,7 +43,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item :label=labels.orderNo>
-        <el-input v-model="searchData.orderNo" style="width: 120px" @keyup.enter.native="refreshPageTables"></el-input>
+        <el-input v-model="searchData.orderNo" clearable style="width: 140px" @keyup.enter.native="refreshPageTables"></el-input>
       </el-form-item>
       <el-form-item :label=labels.seqNo>
         <el-input v-model="searchData.seqNo" clearable style="width: 120px" @keyup.enter.native="refreshPageTables"></el-input>
@@ -1808,11 +1808,12 @@ export default {
 
     /* 查询派工单 */
     getProduceScheduleList() {
-      // 校验：派工单号和机台必须填一个
+      // 校验：派工单号、机台、生产订单号必须填一个
       const hasResourceId = this.searchData.resourceId && this.searchData.resourceId.trim() !== ''
       const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== ''
-      if (!hasResourceId && !hasSeqNo) {
-        this.$message.warning('派工单号和机台必须填一个！')
+      const hasOrderNo = this.searchData.orderNo && this.searchData.orderNo.trim() !== ''
+      if (!hasResourceId && !hasSeqNo && !hasOrderNo) {
+        this.$message.warning('派工单号、机台、生产订单号必须填一个！')
         return
       }
       // 开始真的查询;
@@ -2231,11 +2232,12 @@ export default {
 
     //导出excel
     async createExportData() {
-      // 校验：派工单号和机台必须填一个
+      // 校验：派工单号、机台、生产订单号必须填一个
       const hasResourceId = this.searchData.resourceId && this.searchData.resourceId.trim() !== ''
       const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== ''
-      if (!hasResourceId && !hasSeqNo) {
-        this.$message.warning('派工单号和机台必须填一个！')
+      const hasOrderNo = this.searchData.orderNo && this.searchData.orderNo.trim() !== ''
+      if (!hasResourceId && !hasSeqNo && !hasOrderNo) {
+        this.$message.warning('派工单号、机台、生产订单号必须填一个！')
         return []
       }
       // 开始真的查询;
@@ -2279,10 +2281,11 @@ export default {
       }
 
       // 等待getResourceByUser执行完成后，再查询生产排程列表
-      // 只有当机台编号或派工单号有值时才查询
+      // 只有当机台编号、派工单号或生产订单号有值时才查询
       const hasResourceId = this.searchData.resourceId && this.searchData.resourceId.trim() !== ''
       const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== ''
-      if (hasResourceId || hasSeqNo) {
+      const hasOrderNo = this.searchData.orderNo && this.searchData.orderNo.trim() !== ''
+      if (hasResourceId || hasSeqNo || hasOrderNo) {
         this.searchData.searchFlag = true;
         getProduceScheduleList(this.searchData).then(({data}) => {
           // 设置查询数据