From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/modification.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/company/src/components/business/modification.vue b/company/src/components/business/modification.vue
index 53e9d17..7d186a0 100644
--- a/company/src/components/business/modification.vue
+++ b/company/src/components/business/modification.vue
@@ -10,6 +10,7 @@
<el-table v-if="form.solutionList && form.solutionList.length>0"
:data="form.solutionList"
border
+ border
style="width: 100%">
<el-table-column
label="搴忓彿"
@@ -23,8 +24,7 @@
align="center"
label="淇濋櫓鏂规">
<template slot-scope="scope">
-<!-- :value="{ id:item.id, baseId: item.baseId }"-->
- <el-select v-model="scope.row.solution.id" @change="changeSolution($event, scope.$index)" placeholder="璇烽�夋嫨">
+ <el-select v-model="scope.row.solution.id" :disabled="scope.row.disabled" filterable @change="changeSolution($event, scope.$index)" placeholder="璇烽�夋嫨">
<el-option
v-for="item in programme"
:key="item.id"
@@ -38,7 +38,7 @@
align="center"
label="濮旀墭鍟嗘埛">
<template slot-scope="scope">
- <el-select :ref="'shopSelect'+scope.$index" :disabled="scope.row.solution.type ==1" v-model="scope.row.shopId" clearable value-key="id" placeholder="璇烽�夋嫨">
+ <el-select :ref="'shopSelect'+scope.$index" disabled v-model="scope.row.shopId" clearable value-key="id" placeholder="璇烽�夋嫨">
<el-option
v-for="item in shops"
:key="item.id"
@@ -54,6 +54,14 @@
<template slot-scope="{row}">
<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
+ align="center"
+ label="绛剧讲鐘舵��">
+ <template slot-scope="{row}">
+ <template v-if="row.signStatus === 0">寰呯绔�</template>
+ <template v-else-if="row.signStatus === 1">宸茬绔�</template>
</template>
</el-table-column>
<el-table-column
@@ -116,9 +124,10 @@
if (item.id === e) {
baseId = item.baseId
this.form.solutionList[index].solution.type = item.type
- if(item.type == 1){
+ // console.log(item.type)
+ // if(item.type == 1){
this.form.solutionList[index].shopId =item.shopId
- }
+ // }
}
})
@@ -163,18 +172,20 @@
.then(resa => {
resa.forEach(item => {
this.form.solutionList.push({
+ disabled: true,
solution: { id: item.solutionId, baseId: item.solutionBaseId,type:item.solutionType },
shopId: item.shopId,
canAdd: 1,
- canReduce: 1
+ canReduce: 1,
+ signStatus: item.signStatus
})
})
- console.log(this.form.solutionList)
that.visible = true
})
},
add () {
this.form.solutionList.push({
+ disabled: false,
solution: { id: null, baseId: null },
shopId: null,
canAdd: 1,
--
Gitblit v1.9.3