|
|
@@ -37,6 +37,7 @@
|
|
|
<el-form-item label="" prop="type">
|
|
|
<div style="height: 30px">
|
|
|
<el-checkbox v-model="searchForm.isFullRebate">返利使用金额需满额使用</el-checkbox>
|
|
|
+ <el-checkbox v-model="searchForm.commercialType">商用空调政策</el-checkbox>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -65,8 +66,9 @@
|
|
|
placeholder="生效日期"
|
|
|
default-time="00:00:00"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- /> </el-form-item
|
|
|
- ></el-col>
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :xs="24" :ms="12" :lg="12">
|
|
|
<el-form-item label="失效日期" prop="endTime">
|
|
|
<el-date-picker
|
|
|
@@ -75,8 +77,9 @@
|
|
|
placeholder="失效日期"
|
|
|
default-time="00:00:00"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- /> </el-form-item
|
|
|
- ></el-col>
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :xs="24" :ms="24" :lg="24">
|
|
|
<el-form-item label="表头备注" prop="remark">
|
|
|
<el-input v-model="searchForm.remark" placeholder="新风机变频挂机。按提货数量1:3开单" />
|
|
|
@@ -310,8 +313,8 @@
|
|
|
<pl-table-column fixed="right" label="操作" align="center" min-width="150">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="text" class="textColor el-popover-left" @click="scope.row.fang = !scope.row.fang"
|
|
|
- >编辑</el-button
|
|
|
- >
|
|
|
+ >编辑
|
|
|
+ </el-button>
|
|
|
<el-popconfirm
|
|
|
confirm-button-text="好的"
|
|
|
cancel-button-text="不用了"
|
|
|
@@ -369,8 +372,8 @@
|
|
|
<el-row type="flex">
|
|
|
<el-col :span="12">
|
|
|
<h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
|
|
|
- <el-button type="primary" size="mini" @click="handleAddCondition">添加</el-button></el-col
|
|
|
- >
|
|
|
+ <el-button type="primary" size="mini" @click="handleAddCondition">添加</el-button>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-divider />
|
|
|
</el-row>
|
|
|
@@ -397,8 +400,8 @@
|
|
|
scope.row.fang = false
|
|
|
conditName = scope.row.name
|
|
|
"
|
|
|
- >编辑</el-button
|
|
|
- >
|
|
|
+ >编辑
|
|
|
+ </el-button>
|
|
|
<el-button type="text" size="mini" @click="handleCondition(scope.row.id, scope.$index)">删除</el-button>
|
|
|
<el-button type="text" size="mini" @click="catCond(scope.row)">查看条件</el-button>
|
|
|
</template>
|
|
|
@@ -499,7 +502,8 @@ export default {
|
|
|
mainId: '',
|
|
|
mainName: '',
|
|
|
type: '',
|
|
|
- isFullRebate: false
|
|
|
+ isFullRebate: false,
|
|
|
+ commercialType: false
|
|
|
},
|
|
|
conditName: '',
|
|
|
dataList: [],
|
|
|
@@ -748,7 +752,9 @@ export default {
|
|
|
remark: this.detail.remark,
|
|
|
startTime: this.detail.startTime,
|
|
|
title: this.detail.title,
|
|
|
- type: this.detail.type
|
|
|
+ type: this.detail.type,
|
|
|
+ isFullRebate: this.detail.isFullRebate,
|
|
|
+ commercialType: this.detail.commercialType
|
|
|
}),
|
|
|
(this.region = res.data.flag)
|
|
|
this.srcList = [this.$imageUrl + this.detail.imgSrc]
|
|
|
@@ -1003,24 +1009,30 @@ export default {
|
|
|
h4 {
|
|
|
margin: 0;
|
|
|
}
|
|
|
+
|
|
|
.yinput {
|
|
|
::v-deep input {
|
|
|
text-align: right;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.pdt {
|
|
|
padding-top: 20px;
|
|
|
}
|
|
|
+
|
|
|
.import-btn {
|
|
|
margin-right: 10px;
|
|
|
display: inline-block;
|
|
|
}
|
|
|
+
|
|
|
.radio {
|
|
|
padding: 20px 0;
|
|
|
}
|
|
|
+
|
|
|
.el-divider--horizontal {
|
|
|
margin: 20px 0;
|
|
|
}
|
|
|
+
|
|
|
.el-container .el-divider--horizontal {
|
|
|
margin: 10px;
|
|
|
}
|
|
|
@@ -1032,6 +1044,7 @@ h4 {
|
|
|
.footer {
|
|
|
margin-bottom: 20px;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-table__virtual-wrapper {
|
|
|
width: auto !important;
|
|
|
}
|
howie