From 71e2d06dfa28d3bd60b0d9fa6d6c7ff32884a1a9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 14:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaCompanyWindow.vue | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index 00aa20c..f213aa5 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -86,12 +86,12 @@
align="center"
label="淇濋櫓鏂规">
<template slot-scope="scope">
- <el-select v-model="scope.row.solution" value-key="id" placeholder="璇烽�夋嫨" change="changeSolution($event,scope.$index)">
+ <el-select v-model="scope.row.solution.id" @change="changeSolution($event, scope.$index)" placeholder="璇烽�夋嫨">
<el-option
v-for="item in programme"
:key="item.id"
:label="item.name"
- :value="item">
+ :value="item.id">
</el-option>
</el-select>
</template>
@@ -100,7 +100,7 @@
align="center"
label="濮旀墭鍟嗘埛">
<template slot-scope="scope">
- <el-select v-model="scope.row.shopId" clearable value-key="id" placeholder="璇烽�夋嫨" >
+ <el-select v-model="scope.row.shopId" :disabled="scope.row.solution.type ==1" clearable value-key="id" placeholder="璇烽�夋嫨" >
<el-option
v-for="item in shops"
:key="item.id"
@@ -114,8 +114,8 @@
align="center"
label="鍔犲噺淇濆姛鑳�">
<template slot-scope="{row}">
- <el-checkbox :true-label="1" :false-label="0" v-model="row.canAdd">鍔犱繚</el-checkbox>
- <el-checkbox :true-label="1" :false-label="0" v-model="row.canReduce">鍑忎繚</el-checkbox>
+ <el-checkbox :true-label="1" :false-label="0" disabled v-model="row.canAdd">鍔犱繚</el-checkbox>
+ <el-checkbox :true-label="1" :false-label="0" disabled v-model="row.canReduce">鍑忎繚</el-checkbox>
</template>
</el-table-column>
<el-table-column
@@ -170,10 +170,10 @@
},
solutionList: [
{
- solution: null,
- shop: null,
- canAdd: 0,
- canReduce: 0
+ solution: { id: null, baseId: null,type:0 },
+ canAdd: 1,
+ shopId:null,
+ canReduce: 1
}
],
type: '0',
@@ -255,8 +255,21 @@
}
},
methods: {
- changeSolution(row,index){
- this.form.solutionList[index].solution=row
+ changeSolution(e,index){
+ let baseId = ''
+ this.programme.forEach(item => {
+ if (item.id === e) {
+ baseId = item.baseId
+ this.form.solutionList[index].solution.type = item.type
+ if(item.type == 1){
+ this.form.solutionList[index].shopId =item.shopId
+ }
+ }
+ })
+
+ this.form.solutionList[index].solution.baseId = baseId
+
+ // this.form.solutionList[index].solution=row
},
send () {
if (!this.form.phone) {
@@ -322,8 +335,8 @@
solutionId: null,
solution: {},
shopId: null,
- canAdd: '',
- canReduce: ''
+ canAdd: 1,
+ canReduce: 1
})
},
handleRemove (file, fileList) {
--
Gitblit v1.9.3