Browse Source

2025-10-09

过站采集里chooseList机台根据用户权限查
默认进页面查询数据
master
fengyuan_yang 3 months ago
parent
commit
fb3eddf254
  1. 5
      src/views/modules/common/Chooselist_eam.vue
  2. 11
      src/views/modules/yieldReport/produce_order.vue

5
src/views/modules/common/Chooselist_eam.vue

@ -226,7 +226,7 @@ export default {
if (this.param6) { if (this.param6) {
sql += " and active like '%" + 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) { 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 + "')" 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 + "') " 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 sql += this.conSql
getChooselistDataEam({"sqlcode": sql}).then(({data}) => { getChooselistDataEam({"sqlcode": sql}).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {

11
src/views/modules/yieldReport/produce_order.vue

@ -53,7 +53,7 @@
<el-input v-model="searchData.site" style="width: 85px"></el-input> <el-input v-model="searchData.site" style="width: 85px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label=labels.resourceId> <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-input v-model="searchData.resourceId" clearable style="width: 110px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label=labels.planStartTime> <el-form-item :label=labels.planStartTime>
@ -275,7 +275,7 @@ import {
} from '@/api/table.js' } 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 comSwitchOperator from './com_switch_operator'/* 切换操作员 */
import comProduceReportNormal from './com_produce_report_normal'/* 报工的组件 */ import comProduceReportNormal from './com_produce_report_normal'/* 报工的组件 */
import comFinishSchedule from './com_finish_schedule'/* 结束派工的组件 */ import comFinishSchedule from './com_finish_schedule'/* 结束派工的组件 */
@ -1872,6 +1872,7 @@ export default {
this.$refs.changePackaging.init(this.currentRow.seqNo, this.operatorData) this.$refs.changePackaging.init(this.currentRow.seqNo, this.operatorData)
}) })
}, },
/* 查询派工单 */ /* 查询派工单 */
getProduceScheduleList() { getProduceScheduleList() {
// ; // ;
@ -2153,7 +2154,7 @@ export default {
this.tagNo = val this.tagNo = val
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
if (val === 88) {
if (val === 95) {
strVal = this.searchData.resourceId strVal = this.searchData.resourceId
} }
this.$refs.baseList.init(val, strVal, " AND WorkCenterNo <> 'FQC'") this.$refs.baseList.init(val, strVal, " AND WorkCenterNo <> 'FQC'")
@ -2312,6 +2313,7 @@ export default {
}, },
}, },
created() { created() {
// username // username
let tempData = { let tempData = {
@ -2325,10 +2327,11 @@ export default {
} }
}) })
this.searchData.searchFlag = true;
// //
getProduceScheduleList(this.searchData).then(({data}) => { getProduceScheduleList(this.searchData).then(({data}) => {
// //
this.searchData.searchFlag = false;
//this.searchData.searchFlag = false;
this.searchData.exportFlag = 'N'; this.searchData.exportFlag = 'N';
this.produceScheduleList = data.rows this.produceScheduleList = data.rows
}) })

Loading…
Cancel
Save