From 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 14 三月 2024 16:15:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaCompanyWindow.vue | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index d341fef..37f7315 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -16,17 +16,17 @@
<el-form-item label="娉曚汉濮撳悕" prop="legalName">
<el-input v-model="form.legalName" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="缁戝畾鎵嬫満鍙�" prop="phone" v-if="form.type !== 1">
+ <el-form-item label="缁戝畾鎵嬫満鍙�" prop="phone" v-if="!form.id">
<div style="width: 100%; display: flex; align-items: center;">
<el-input v-model="form.phone" maxlength="11" type="number" style="flex: 1;" placeholder="璇疯緭鍏�" v-trim/>
<el-button type="primary" style="flex-shrink: 0; margin-left: 15px;" @click="send" v-if="num === 0">鍙戦�侀獙璇佺爜</el-button>
<el-button type="primary" style="flex-shrink: 0; margin-left: 15px;" v-else>{{num}}s</el-button>
</div>
</el-form-item>
- <el-form-item label="楠岃瘉鐮�" prop="captche" v-if="form.type !== 1">
+ <el-form-item label="楠岃瘉鐮�" prop="captche" v-if="!form.id">
<el-input v-model="form.captche" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="鍏徃璐﹀彿" prop="username" v-if="form.type !== 1">
+ <el-form-item label="鍏徃璐﹀彿" prop="username" v-if="!form.id">
<el-input v-model="form.username" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="璁よ瘉閭" prop="email" >
@@ -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,20 +62,15 @@
<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-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>-->
</el-form>
- <el-button type="primary" style="margin-bottom: 15px;" @click="add" v-if="form.type !== 1">娣诲姞</el-button>
+ <el-button type="primary" style="margin-bottom: 15px;" @click="add" v-if="!form.id">娣诲姞</el-button>
<el-table
- v-if="form.type !== 1"
+ v-if="!form.id"
:data="form.solutionList"
border
style="width: 100%">
@@ -171,6 +161,7 @@
}
],
type: '0',
+ actionType: '0',
file: {
imgurl: '',
imgurlfull: ''
@@ -208,9 +199,9 @@
phone: [
{ required: true, message: '璇疯緭鍏ユ墜鏈哄彿' }
],
- taxAccount: [
- { required: true, message: '璇疯緭鍏ユ墜鏈哄彿' }
- ],
+ // taxAccount: [
+ // { required: true, message: '璇疯緭鍏ラ摱琛屽崱' }
+ // ],
email: [
{ required: true, message: '璇疯緭鍏ヨ璇侀偖绠�' }
],
@@ -227,7 +218,6 @@
{ required: true, message: '璇疯緭鍏ュ叕鍙歌处鍙�' }
]
},
-
programme: []
}
},
--
Gitblit v1.9.3