From dbe4d740a7b0b5696c89f4df14b6804a71364432 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 08 五月 2024 14:56:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/product/workbench/productrecord-tab.vue | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/views/product/workbench/productrecord-tab.vue b/src/views/product/workbench/productrecord-tab.vue index 292ee23..275b8aa 100644 --- a/src/views/product/workbench/productrecord-tab.vue +++ b/src/views/product/workbench/productrecord-tab.vue @@ -120,12 +120,12 @@ :show-overflow-tooltip="true" > <template slot="header" slot-scope="scope"> - <div style="line-height: 14px;">SN鍙�</div> + <div style="line-height: 14px;">鎵规鍙�</div> <div class="th" @click.stop> <template> <el-input type="text" - placeholder="SN鍙�" + placeholder="鎵规鍙�" v-model="searchContent.outBatchNo" clearable size="mini" @@ -280,7 +280,7 @@ </el-table-column> </el-table> </el-tab-pane> - <el-tab-pane label="闄勪欢"> + <!-- <el-tab-pane label="闄勪欢"> <el-upload ref="upload" action="/mes/operationTask/upload" @@ -292,7 +292,7 @@ :auto-upload="false" list-type="picture" ></el-upload> - </el-tab-pane> + </el-tab-pane> --> </el-tabs> </div> </div> @@ -560,30 +560,25 @@ // dutyRecordId: this.isDutyFilter ? this.currentDutyRecord.id : null, // workstationId: this.isWorkstationFilter ? this.workstationId : null // }) - // console.log(val, res) // this.productRecords = res.data.data }, // 澶氶�夊垹闄� select(selection, row) { - console.log(selection, row) const arr = [] // this.idList = [] selection.forEach((item) => { arr.push(item.id) }) this.idList = [...new Set(arr)] - console.log(this.idList) }, // 鍏ㄩ�夊垹闄� selectAll(selection) { - console.log(selection) const arr = [] // this.idList = [] selection.forEach((item) => { arr.push(item.id) }) this.idList = [...new Set(arr)] - console.log(this.idList) }, async delAlls() { let isContinue = true @@ -601,7 +596,6 @@ isContinue = true // this.idList = [] const res = await delAll(this.idList) - console.log(res) this.getProductRecords() this.$message.success('鍒犻櫎鎴愬姛锛�') this.idList = [] @@ -657,7 +651,6 @@ }, // 鑾峰彇鐢熶骇璁板綍鍒楄〃 getProductRecords() { - console.log(this.createDateRange) let templateJson if (this.createDateRange != null && this.createDateRange !== '') { templateJson = { @@ -702,13 +695,11 @@ item.toggleRowSelection(row) }) const index = this.idList.indexOf(row.id) - console.log(index) if (index >= 0) { this.idList.splice(index, 1) } else { this.idList.push(row.id) } - console.log(this.idList) this.currProductRecordId = row.id this.paramValues = [] var productRecordJson = { @@ -745,7 +736,6 @@ nextFocus(index) { index++ this.$refs['reference_' + index].focus() - // console.log(this.i) }, // 鍒犻櫎鏌愭潯鐢熶骇璁板綍 delProductrecord(index, row) { @@ -835,10 +825,8 @@ // JSON.stringify(paramValueArray) // ) updateProductRecord(obj).then((response) => { - console.log(this.idList) if (response.data.code === 0) { this.$message.success('淇敼鎴愬姛') - console.log(this.$refs.productRecordTable) this.$refs.productRecordTable.forEach((item) => { item.clearSelection() }) -- Gitblit v1.9.3