From e4be5ba9eea9fe8408f3a7048a315b3767b33f49 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 09:54:38 +0800
Subject: [PATCH] mrshi
---
company/src/components/business/OperaCompanyWindow.vue | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index d341fef..14bfedd 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -50,15 +50,10 @@
<el-form-item label="绾歌川鍙戠エ鎺ユ敹鍦板潃" prop="invoiceAddr">
<el-input v-model="form.invoiceAddr" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
-<<<<<<< HEAD
<el-form-item label="钀ヤ笟鎵х収" prop="businessImg">
<div style="width: 100%; height: 100px; display: flex; align-items: center;">
<UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file" @uploadSuccess="result" />
</div>
-=======
- <el-form-item label="钀ヤ笟鎵х収" prop="businessImg" style="height: 120px">
- <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file" @uploadSuccess="result" />
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
</el-form-item>
<el-form-item label="娉曚汉韬唤璇�" prop="idcardImgList" style="height: 120px">
<div style="width: 100%; display: flex; align-items: center;">
@@ -67,15 +62,10 @@
<UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file2" @uploadSuccess="result2" />
</div>
</el-form-item>
-<<<<<<< HEAD
<el-form-item label="鐢靛瓙绛剧珷" prop="signImg">
<div style="width: 100%; height: 100px; display: flex; align-items: center;">
<UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file3" @uploadSuccess="result3" />
</div>
-=======
- <el-form-item label="鐢靛瓙绛剧珷" prop="signImg" style="height: 120px">
- <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file3" @uploadSuccess="result3" />
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
</el-form-item>
</el-form>
<el-button type="primary" style="margin-bottom: 15px;" @click="add" v-if="form.type !== 1">娣诲姞</el-button>
--
Gitblit v1.9.3