From eb3f19421632d41cdba40a6d50704e9357bc751a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 六月 2025 18:17:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/enterprise/onlineReporting.vue | 16 ++++++++--------
company/src/components/business/OperaWtbApplyShopWindow.vue | 2 +-
company/.env.developmentCom | 8 +++-----
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 77ad9b7..820a72d 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -11,10 +11,8 @@
# VUE_APP_API = 'http://localhost:10031/'
-<<<<<<< HEAD
# VUE_APP_API = 'http://192.168.0.138:10031/'
-=======
-VUE_APP_API = 'http://192.168.0.138:10031/'
->>>>>>> 5337d6006b45ca61881623ad2e8738e03ad3bde2
-VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
+VUE_APP_API = 'http://192.168.0.129:10031/'
+
+# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 3ea73c1..99f3bbe 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -18,7 +18,7 @@
</div>
<div class="desc_item_label">
<div class="desc_item_label_left">
- <span>鎶曚繚浜猴細{{ model.shopName }}</span>
+ <span>濮旀墭浜猴細{{ model.shopName }}</span>
<span>琚繚闄╀汉锛歿{ model.companyName }}</span>
<span>淇濆崟鐘舵�侊細
<span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span>
diff --git a/company/src/components/enterprise/onlineReporting.vue b/company/src/components/enterprise/onlineReporting.vue
index 93d7e80..72bbc48 100644
--- a/company/src/components/enterprise/onlineReporting.vue
+++ b/company/src/components/enterprise/onlineReporting.vue
@@ -231,7 +231,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 1)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 1)" />
</div>
</div>
<div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -259,7 +259,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 2)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 2)" />
</div>
</div>
<div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -287,7 +287,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 3)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 3)" />
</div>
</div>
<div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -315,7 +315,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 4)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 4)" />
</div>
</div>
<div class="box_item_list_row" style="width: 100%; margin-bottom: 30px;">
@@ -343,7 +343,7 @@
<span>{{ item.name }}</span>
</div>
</div>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 5)" />
+ <upload width="100px" height="100px" :list="[]" folder="settle" @success="claimsUploadFile($event, 5)" />
</div>
</div>
</div>
@@ -360,17 +360,17 @@
</div>
<div class="box_desc_list">
<div class="box_desc_list_row">
- <el-form-item label="鏀舵閾惰" prop="receiveBank">
+ <el-form-item label="鏀舵閾惰" :prop="userInfo.type === 1 ? '' : 'receiveBank'">
<el-input v-model="form.receiveBank" placeholder="璇疯緭鍏ユ敹娆鹃摱琛屾敮琛屽悕绉�"></el-input>
</el-form-item>
</div>
<div class="box_desc_list_row">
- <el-form-item label="鏀舵浜�" prop="receiveUserName">
+ <el-form-item label="鏀舵浜�" :prop="userInfo.type === 1 ? '' : 'receiveUserName'">
<el-input v-model="form.receiveUserName" placeholder="璇疯緭鍏ュ紑鎴峰鍚�"></el-input>
</el-form-item>
</div>
<div class="box_desc_list_row">
- <el-form-item label="鏀舵璐﹀彿" prop="receiveAccount">
+ <el-form-item label="鏀舵璐﹀彿" :prop="userInfo.type === 1 ? '' : 'receiveAccount'">
<el-input v-model="form.receiveAccount" placeholder="璇疯緭鍏ラ摱琛岃处鍙�"></el-input>
</el-form-item>
</div>
--
Gitblit v1.9.3