From c4cfd5c566d137fb60781b8b2e0057d11cf4b051 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 17:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/materialOrder/copperOrder.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 8bc060d..8001abe 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -134,6 +134,7 @@
</div>
<div style="height: auto;">
<el-table ref="sampleTable" :data="sampleList" class="el-table sampleTable" highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
<el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
@@ -195,6 +196,7 @@
<el-table-column align="center" label="寰呮椤规暟閲�" prop="proNum" width="105"></el-table-column>
</el-table>
<el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" class="el-table"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
@select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
<el-table-column v-if="active==1" :selectable="selectable" type="selection" width="65"></el-table-column>
@@ -396,7 +398,6 @@
</template>
<script>
-// import ValueTable from '../../tool/value-table.vue'
import Vue from 'vue'
import {
addRawCopperOrder,
@@ -617,11 +618,12 @@
mounted() {
this.active = this.$route.query.active
this.currentId = this.$route.query.currentId
+ this.getInfoRow();
},
activated() {
- if (this.active==1) {
- this.getInfoRow();
- }
+ this.active = this.$route.query.active
+ this.currentId = this.$route.query.currentId
+ this.getInfoRow();
},
methods: {
getInfoRow() {
@@ -729,7 +731,6 @@
})
}).then(res => {
this.noNeedCheckLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.closeOpenPage()
}).catch(e=>{
@@ -1170,7 +1171,6 @@
})
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
this.closeOpenPage()
--
Gitblit v1.9.3