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 @@ - 机台编号: + 机台编号: @@ -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 })