From ff95e73d12418ee4b1e400eaceac3d4d623f85b6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 18:44:04 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaCompanyWindow.vue | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index 14bfedd..f5e35b1 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" >
@@ -62,15 +62,15 @@
<UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file2" @uploadSuccess="result2" />
</div>
</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-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%">
@@ -92,6 +92,20 @@
:key="item.id"
:label="item.name"
:value="item">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ label="濮旀墭鍟嗘埛">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.shopId" clearable="true" value-key="id" placeholder="璇烽�夋嫨" >
+ <el-option
+ v-for="item in shops"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</template>
@@ -122,6 +136,7 @@
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import { all } from '@/api/business/solutions'
import { sendSms } from '@/api/business/smsEmail'
+import { pageAll as shopList } from '@/api/business/company'
export default {
name: 'OperaCompanyWindow',
extends: BaseOpera,
@@ -156,11 +171,13 @@
solutionList: [
{
solution: null,
+ shop: null,
canAdd: 0,
canReduce: 0
}
],
type: '0',
+ actionType: '0',
file: {
imgurl: '',
imgurlfull: ''
@@ -198,9 +215,9 @@
phone: [
{ required: true, message: '璇疯緭鍏ユ墜鏈哄彿' }
],
- taxAccount: [
- { required: true, message: '璇疯緭鍏ユ墜鏈哄彿' }
- ],
+ // taxAccount: [
+ // { required: true, message: '璇疯緭鍏ラ摱琛屽崱' }
+ // ],
email: [
{ required: true, message: '璇疯緭鍏ヨ璇侀偖绠�' }
],
@@ -217,8 +234,8 @@
{ required: true, message: '璇疯緭鍏ュ叕鍙歌处鍙�' }
]
},
-
- programme: []
+ programme: [],
+ shops:[]
}
},
created () {
@@ -240,7 +257,6 @@
methods: {
changeSolution(row,index){
this.form.solutionList[index].solution=row
- // console.log(this.form.solutionList)
},
send () {
if (!this.form.phone) {
@@ -288,6 +304,11 @@
.then(res => {
this.programme = res
})
+ shopList({ type: 1, status: 0 })
+ .then(res => {
+ console.log(res)
+ this.shops = res
+ })
},
dele (index) {
if (this.form.solutionList.length === 1) {
@@ -298,8 +319,9 @@
},
add () {
this.form.solutionList.push({
- solutionId:null,
+ solutionId: null,
solution: {},
+ shopId: null,
canAdd: '',
canReduce: ''
})
--
Gitblit v1.9.3