From 61febcbc0dc133de8ab5237921f5bf89c9558e69 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 17 三月 2025 09:39:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/productOrder/components/add.vue | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index e2d0238..5da2477 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -298,8 +298,7 @@
</el-table>
<el-table ref="productTable" v-loading="getProductLoad" :data="productList"
:row-class-name="tableRowClassName" border class="el-table"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- :key="upIndex"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
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="selectable0" type="selection" width="65"></el-table-column>
@@ -902,7 +901,6 @@
this.isSpecial = true
this.$nextTick(() => {
this.$refs.productTable.doLayout();
- this.upIndex++
});
},
getQuarterOnOrderList () {
@@ -983,7 +981,7 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getAuthorizedPerson() {
- selectUserCondition().then(res => {
+ selectUserCondition({ type: 1 }).then(res => {
let data = []
res.data.forEach(a => {
data.push({
--
Gitblit v1.9.3