Browse Source

软标不显示分类列

master
han\hanst 1 week ago
parent
commit
b2c67fcb11
  1. 22
      src/views/modules/sampleTracking/projectProofTracking.vue

22
src/views/modules/sampleTracking/projectProofTracking.vue

@ -23,7 +23,7 @@
<el-form-item label="料号描述"> <el-form-item label="料号描述">
<el-input v-model="searchData.partDesc" clearable placeholder="请输入料号描述" style="width: 160px" /> <el-input v-model="searchData.partDesc" clearable placeholder="请输入料号描述" style="width: 160px" />
</el-form-item> </el-form-item>
<el-form-item v-if="searchData.buNo==='03-RFID'" label="分类">
<el-form-item v-if="isRfidBuNo(searchData.buNo)" label="分类">
<el-select v-model="searchData.dryWetType" clearable placeholder="全部" style="width: 100px"> <el-select v-model="searchData.dryWetType" clearable placeholder="全部" style="width: 100px">
<el-option v-for="item in dryWetTypeList" :key="`searchDryWet_${item}`" :label="item" :value="item" /> <el-option v-for="item in dryWetTypeList" :key="`searchDryWet_${item}`" :label="item" :value="item" />
</el-select> </el-select>
@ -350,7 +350,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="80" align="center"> <el-table-column label="操作" fixed="right" width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="openOneKeyDialog('edit', scope.row)" v-if="scope.row.proofingNo && scope.row.proofingStatus !== '打样完成'">修改</a>
<a @click="openOneKeyDialog('edit', scope.row)" v-if="scope.row.proofingStatus !== '打样完成'">修改</a>
<a class="action-link detail-link" @click="openOneKeyDialog('detail', scope.row)" v-if="scope.row.proofingNo && scope.row.proofingStatus === '打样完成'">详情</a> <a class="action-link detail-link" @click="openOneKeyDialog('detail', scope.row)" v-if="scope.row.proofingNo && scope.row.proofingStatus === '打样完成'">详情</a>
<a class="action-link delete-link" v-if="scope.row.proofingStatus === '草稿'" @click="deleteProof(scope.row)">删除</a> <a class="action-link delete-link" v-if="scope.row.proofingStatus === '草稿'" @click="deleteProof(scope.row)">删除</a>
<!-- <a class="action-link end-link" v-if="scope.row.proofingNo && scope.row.proofingStatus === '进行中'" @click="finishProof(scope.row)">打样完成</a>--> <!-- <a class="action-link end-link" v-if="scope.row.proofingNo && scope.row.proofingStatus === '进行中'" @click="finishProof(scope.row)">打样完成</a>-->
@ -2061,7 +2061,14 @@ export default {
if (this.normalizeTrackingColumnBoolean(column.status, true) === false) { if (this.normalizeTrackingColumnBoolean(column.status, true) === false) {
return false return false
} }
return this.normalizeTrackingColumnBoolean(column.columnHidden, false) === false
if (this.normalizeTrackingColumnBoolean(column.columnHidden, false) !== false) {
return false
}
// RFID BU BU 使
if (column.columnProp === 'dryWetType' && !this.isRfidBuNo(this.getSelectedSearchBuNo())) {
return false
}
return true
}, },
// //
isSyncIconTrackingColumn (columnProp) { isSyncIconTrackingColumn (columnProp) {
@ -2774,6 +2781,11 @@ export default {
handleSearchBuChange () { handleSearchBuChange () {
this.ensureSearchBuNoSelected() this.ensureSearchBuNoSelected()
this.resetSearchCustomerOptions() this.resetSearchCustomerOptions()
// RFID
if (!this.isRfidBuNo(this.searchData.buNo)) {
this.searchData.dryWetType = ''
}
this.refreshTrackingTableLayout()
// BU // BU
this.queryProcessColumns().then(() => { this.queryProcessColumns().then(() => {
this.getDataList('Y') this.getDataList('Y')
@ -4058,6 +4070,10 @@ export default {
inData.sampleMakingMonth = this.normalizeSearchInteger(inData.sampleMakingMonth) inData.sampleMakingMonth = this.normalizeSearchInteger(inData.sampleMakingMonth)
inData.pmInqueryTimeStart = this.isBlankValue(inData.pmInqueryTimeStart) ? null : inData.pmInqueryTimeStart inData.pmInqueryTimeStart = this.isBlankValue(inData.pmInqueryTimeStart) ? null : inData.pmInqueryTimeStart
inData.pmInqueryTimeEnd = this.isBlankValue(inData.pmInqueryTimeEnd) ? null : inData.pmInqueryTimeEnd inData.pmInqueryTimeEnd = this.isBlankValue(inData.pmInqueryTimeEnd) ? null : inData.pmInqueryTimeEnd
// RFID
if (!this.isRfidBuNo(inData.buNo || this.searchData.buNo)) {
inData.dryWetType = ''
}
return inData return inData
}, },
getDataList (flag) { getDataList (flag) {

Loading…
Cancel
Save