Commit 8ac764d1 authored by dragondean@qq.com's avatar dragondean@qq.com Committed by houjn@hikoon.cn

修复几个bug

parent 4a4106d3
...@@ -158,6 +158,7 @@ ...@@ -158,6 +158,7 @@
v-model="form.isSimilarSuperposition" v-model="form.isSimilarSuperposition"
formatter="bool" formatter="bool"
:placeholder="$t('请选择类型')" :placeholder="$t('请选择类型')"
defaultable
/> />
</el-form-item> </el-form-item>
...@@ -182,7 +183,7 @@ ...@@ -182,7 +183,7 @@
v-if="form.type != 1" v-if="form.type != 1"
> >
<!---第一个不是全部,所以不能使用defaultable--> <!---第一个不是全部,所以不能使用defaultable-->
<dict-selector :type="DICT_TYPE.ECW_SUITABLE_LINE_TYPE" v-model="form.suitableLineType" formatter="number" /> <dict-selector :type="DICT_TYPE.ECW_SUITABLE_LINE_TYPE" v-model="form.suitableLineType" formatter="number" defaultable />
<routers-selector v-if="showRouterSelector" v-model="form.lineIds" style="margin-top:5px" /> <routers-selector v-if="showRouterSelector" v-model="form.lineIds" style="margin-top:5px" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
...@@ -259,6 +260,7 @@ import RoutersSelector from '@/components/RoutersSelector' ...@@ -259,6 +260,7 @@ import RoutersSelector from '@/components/RoutersSelector'
import ProductsSelector from '@/components/ProductsSelector' import ProductsSelector from '@/components/ProductsSelector'
import Editor from '@/components/Editor' import Editor from '@/components/Editor'
import Selector from '@/components/Selector/index' import Selector from '@/components/Selector/index'
import {parseTime} from '@/utils/ruoyi'
export default { export default {
...@@ -593,7 +595,7 @@ export default { ...@@ -593,7 +595,7 @@ export default {
let data = Object.assign({}, this.form, {discountDetailedVOs}) let data = Object.assign({}, this.form, {discountDetailedVOs})
// 开始时间必填 // 开始时间必填
if(!data.startTime)data.startTime = '2022-01-01 00:00:00' if(!data.startTime)data.startTime = parseTime(Date.now()) // '2022-01-01 00:00:00'
// status必填 // status必填
data.status = status data.status = status
data.couponIds = this.couponIds.join(',') data.couponIds = this.couponIds.join(',')
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('审核状态')" prop="auditStatus"> <el-form-item :label="$t('上架状态')" prop="auditStatus">
<dict-selector :type="DICT_TYPE.ECW_PRICE_AUDIT_STATUS" v-model="queryParams.auditStatus" clearable/> <dict-selector :type="DICT_TYPE.ECW_PRICE_AUDIT_STATUS" v-model="queryParams.auditStatus" clearable/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('状态')" prop="combStatus"> <el-form-item :label="$t('状态')" prop="combStatus">
...@@ -349,7 +349,7 @@ export default { ...@@ -349,7 +349,7 @@ export default {
} }
let setPriceText = notSetPrice ? '(' + this.$t('未设置价格') + ')' : ''; let setPriceText = notSetPrice ? '(' + this.$t('未设置价格') + ')' : '';
if(row.blacklist) return this.$t('黑名单') + setPriceText; if(row.blacklist) return this.$t('黑名单') + setPriceText;
if(row.auditStatus === AuditStatusEnum.PASS) return this.$t('审核') + setPriceText; if(row.auditStatus === AuditStatusEnum.PASS) return this.$t('上架') + setPriceText;
return this.$t('已下架') + setPriceText; return this.$t('已下架') + setPriceText;
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment