From fb3eddf254dca5e2ffc5c55c3e854d1bbff153bc Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 9 Oct 2025 13:23:55 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-09=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E9=87=8CchooseList=E6=9C=BA=E5=8F=B0=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E6=9F=A5=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=9B=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/common/Chooselist_eam.vue     |  7 +++++--
 src/views/modules/yieldReport/produce_order.vue | 11 +++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/common/Chooselist_eam.vue b/src/views/modules/common/Chooselist_eam.vue
index dacc7d2..b22eb39 100644
--- a/src/views/modules/common/Chooselist_eam.vue
+++ b/src/views/modules/common/Chooselist_eam.vue
@@ -223,10 +223,10 @@ export default {
       if (this.param5) {
         sql += " and " + this.baseListData.fieldname5 + " like '%" + this.param5 + "%'"
       }
-      if (this.param6 ) {
+      if (this.param6) {
         sql += " and active like '%" + this.param6 + "%'"
       }
-      if (this.tagNo <= 500 && this.tagNo !== 93 && this.tagNo !== 201) {
+      if (this.tagNo <= 500 && this.tagNo !== 93 && this.tagNo !== 201 && this.tagNo !== 95) {
         if (this.param7) {
           sql += " and site in (select site from accessSite where userID = '" + this.param7 + "') " + " and bu_no in (select bu_no from AccessBu where username = '" + this.param7 + "')"
         }
@@ -236,6 +236,9 @@ export default {
           sql += " and site in (select site from accessSite where userID = '" + this.param7 + "') "
         }
       }
+      if (this.tagNo === 95) {
+        sql += " and ResourceID in (select ResourceID from AccessResource where userid = '" + this.param7 + "') "
+      }
       sql += this.conSql
       getChooselistDataEam({"sqlcode": sql}).then(({data}) => {
         if (data.code === 0) {
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index da46cb2..c822570 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -53,7 +53,7 @@
         <el-input v-model="searchData.site" style="width: 85px"></el-input>
       </el-form-item>
       <el-form-item :label=labels.resourceId>
-        <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台编号:</a></span>
+        <span slot="label" style="" @click="getBaseList(95)"><a herf="#">机台编号:</a></span>
         <el-input v-model="searchData.resourceId" clearable style="width: 110px"></el-input>
       </el-form-item>
       <el-form-item :label=labels.planStartTime>
@@ -275,7 +275,7 @@ import {
 } from '@/api/table.js'
 
 /* 引入组件 */
-import Chooselist from '@/views/modules/common/Chooselist'/* 列表组件 */
+import Chooselist from '@/views/modules/common/Chooselist_eam'
 import comSwitchOperator from './com_switch_operator'/* 切换操作员 */
 import comProduceReportNormal from './com_produce_report_normal'/* 报工的组件 */
 import comFinishSchedule from './com_finish_schedule'/* 结束派工的组件 */
@@ -1872,6 +1872,7 @@ export default {
         this.$refs.changePackaging.init(this.currentRow.seqNo, this.operatorData)
       })
     },
+
     /* 查询派工单 */
     getProduceScheduleList() {
       // 开始真的查询;
@@ -2153,7 +2154,7 @@ export default {
       this.tagNo = val
       this.$nextTick(() => {
         let strVal = ''
-        if (val === 88) {
+        if (val === 95) {
           strVal = this.searchData.resourceId
         }
         this.$refs.baseList.init(val, strVal, " AND WorkCenterNo <> 'FQC'")
@@ -2312,6 +2313,7 @@ export default {
     },
 
   },
+
   created() {
     // 根据登陆人员的username 查询机台授权表中的权限，筛选出对应的机台（默认第一个）
     let tempData = {
@@ -2325,10 +2327,11 @@ export default {
       }
     })
 
+    this.searchData.searchFlag = true;
     // 不查询
     getProduceScheduleList(this.searchData).then(({data}) => {
       // 设置查询数据
-      this.searchData.searchFlag = false;
+      //this.searchData.searchFlag = false;
       this.searchData.exportFlag = 'N';
       this.produceScheduleList = data.rows
     })