From e622bd5e3b2638b9ab9a712ed1160a66018d6fd7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 22 二月 2024 09:21:15 +0800
Subject: [PATCH] mrshi
---
company/src/components/business/OperaCompanyWindow.vue | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index 95a701d..d341fef 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -50,22 +50,32 @@
<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">
+ <el-form-item label="娉曚汉韬唤璇�" prop="idcardImgList" style="height: 120px">
<div style="width: 100%; display: flex; align-items: center;">
<UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file1" @uploadSuccess="result1" />
<div style="width: 15px;height: 100%;"></div>
<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>
@@ -85,15 +95,15 @@
<el-table-column
align="center"
label="淇濋櫓鏂规">
- <template slot-scope="{row}">
- <el-select v-model="row.solutionBaseId" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in programme"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.solution" value-key="id" placeholder="璇烽�夋嫨" change="changeSolution($event,scope.$index)">
+ <el-option
+ v-for="item in programme"
+ :key="item.id"
+ :label="item.name"
+ :value="item">
+ </el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column
@@ -129,7 +139,7 @@
data () {
return {
// 琛ㄥ崟鏁版嵁
- form: {
+ initParam:{
id: null,
name: '',
code: '',
@@ -155,12 +165,12 @@
},
solutionList: [
{
- solutionBaseId: '',
+ solution: null,
canAdd: 0,
canReduce: 0
}
],
- type: '',
+ type: '0',
file: {
imgurl: '',
imgurlfull: ''
@@ -176,8 +186,9 @@
file3: {
imgurl: '',
imgurlfull: ''
- }
+ },
},
+ form: {},
timer: null,
num: 0,
// 楠岃瘉瑙勫垯
@@ -237,6 +248,10 @@
}
},
methods: {
+ changeSolution(row,index){
+ this.form.solutionList[index].solution=row
+ // console.log(this.form.solutionList)
+ },
send () {
if (!this.form.phone) {
this.$message.warning('璇疯緭鍏ユ墜鏈哄彿')
@@ -257,9 +272,10 @@
}
}, 1000)
},
- open (title, target) {
+ open (title, target,type) {
this.title = title
this.visible = true
+ this.form = this.initParam
this.getAll()
// 鏂板缓
if (target == null) {
@@ -292,7 +308,8 @@
},
add () {
this.form.solutionList.push({
- solutionName: '',
+ solutionId:null,
+ solution: {},
canAdd: '',
canReduce: ''
})
--
Gitblit v1.9.3