From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突
---
src/views/warehouse/returnstock/stock-part.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/warehouse/returnstock/stock-part.vue b/src/views/warehouse/returnstock/stock-part.vue
index 65f387f..e74701f 100644
--- a/src/views/warehouse/returnstock/stock-part.vue
+++ b/src/views/warehouse/returnstock/stock-part.vue
@@ -18,7 +18,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:selColValArr="paramTemplateSelArr"
@@ -381,7 +381,6 @@
// 鑾峰彇涓嶅彲閫変腑鐨勬暟鎹�
queryUsingApplyDetail().then((response) => {
const resData = response.data
- console.log(resData)
this.paramTemplateSelArr = resData.data
if (this.$refs.commonPartTable !== undefined) {
// 榛樿鐨勮繃婊ゆ潯浠�
--
Gitblit v1.9.3