aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '销售计提比例默认结束时间' (#48) from master-客户管理 into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/48
This commit is contained in:
wuteng 2025-07-31 17:23:45 +08:00
commit 2da9cba578
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/emis/salesCommissionRatio/editForm.vue
View File

@ -51,7 +51,7 @@
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择结束时间" placeholder="选择结束时间"
@change="changeEndDate" default-time="23:59:59"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -61,8 +61,8 @@
<!-- 选项水平显示 --> <!-- 选项水平显示 -->
<el-radio v-model="form.status" label="1">启用</el-radio> <el-radio v-model="form.status" label="1">启用</el-radio>
<el-radio v-model="form.status" label="0">未启用</el-radio> <el-radio v-model="form.status" label="0">未启用</el-radio>
<el-radio v-model="form.status" label="2">启用已过期</el-radio> <!-- <el-radio v-model="form.status" label="2">启用已过期</el-radio>
<el-radio v-model="form.status" label="3">启用未过期</el-radio> <el-radio v-model="form.status" label="3">启用未过期</el-radio> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -148,9 +148,6 @@ export default {
}); });
} }
}, },
changeEndDate(val){
this.form.endDate = val.split(' ')[0] + ' 23:59:59';
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.reset(); this.reset();

15
src/views/emis/salesCommissionRatio/index.vue
View File

@ -73,10 +73,10 @@
</el-table-column> </el-table-column>
<el-table-column label="启用状态" align="center" prop="status" min-width="100"> <el-table-column label="启用状态" align="center" prop="status" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status == '1'">启用</span> <el-tag type="success" v-if="scope.row.status == '1' && (queryParams.status == '1' || queryParams.status == null || queryParams.status == '')">启用</el-tag>
<span v-else-if="scope.row.status == '0'">未启用</span> <el-tag type="danger" v-else-if="scope.row.status == '0'">未启用</el-tag>
<span v-else-if="scope.row.status == '2'">启用已过期</span> <el-tag type="warning" v-else-if="scope.row.status == '1' && queryParams.status == '2'">启用已过期</el-tag>
<span v-else>启用未过期</span> <el-tag type="success" v-else-if="scope.row.status == '1' && queryParams.status == '3'">启用未过期</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开始时间" align="center" prop="startDate" width="170" /> <el-table-column label="开始时间" align="center" prop="startDate" width="170" />
@ -141,7 +141,14 @@ export default {
}, },
}; };
}, },
//监听查询条件
watch: { watch: {
queryParams: {
handler(newVal, oldVal) {
this.getList();
},
deep: true
}
}, },
created() { created() {
this.getList(); this.getList();