Browse Source

省满意度社区自查日期组件去除保留月份/bug#569事件指派bug

V1.0
mk 2 years ago
parent
commit
21f37a64c8
  1. 2
      src/views/modules/satisfaction/communitySelfInsp/index.vue
  2. 2
      src/views/modules/satisfaction/satisfactionProvince/index.vue
  3. 14
      src/views/modules/shequzhili/event/cpts/process-form-designate.vue

2
src/views/modules/satisfaction/communitySelfInsp/index.vue

@ -5,7 +5,7 @@
<div class="m-search"> <div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'"> <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<el-form-item label="自评周期"> <el-form-item label="自评周期">
<el-date-picker v-model="formData.period" type="date" value-format="yyyy-MM" placeholder="选择日期" <el-date-picker v-model="formData.period" type="month" value-format="yyyy-MM" placeholder="选择日期"
style="width: 202px" clearable> style="width: 202px" clearable>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

2
src/views/modules/satisfaction/satisfactionProvince/index.vue

@ -5,7 +5,7 @@
<div class="m-search"> <div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'"> <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<el-form-item label="自评周期"> <el-form-item label="自评周期">
<el-date-picker v-model="formData.periodStart" type="date" value-format="yyyy-MM" placeholder="选择日期" <el-date-picker v-model="formData.periodStart" type="month" value-format="yyyy-MM" placeholder="选择日期"
style="width: 202px" clearable> style="width: 202px" clearable>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

14
src/views/modules/shequzhili/event/cpts/process-form-designate.vue

@ -1,8 +1,8 @@
<!-- <!--
* @Author: yanLu xgktv007@163.com * @Author: yanLu xgktv007@163.com
* @Date: 2023-09-05 10:21:34 * @Date: 2023-09-05 10:21:34
* @LastEditors: yanLu xgktv007@163.com * @LastEditors: mk 2403457699@qq.com
* @LastEditTime: 2023-09-05 10:21:34 * @LastEditTime: 2023-09-18 17:16:40
* @Description: 事件转办表单 * @Description: 事件转办表单
* *
--> -->
@ -91,7 +91,10 @@ export default {
timeLimit: [ timeLimit: [
{ required: true, message: "办结时限不能为空", trigger: "blur" }, { required: true, message: "办结时限不能为空", trigger: "blur" },
] ]
} },
selCateObj:{
id:""
},
}; };
}, },
components: {}, components: {},
@ -123,9 +126,10 @@ export default {
this.getCategoryList(); this.getCategoryList();
if (this.eventId) { if (this.eventId) {
this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
console.log(this.eventDetailCopy);
// eventDetailCopy // eventDetailCopy
if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) { if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
this.selCateObj = this.eventDetailCopy.selCateObj this.selCateObj.id = this.eventDetailCopy.categoryId
this.formData.categoryId = this.eventDetailCopy.categoryId this.formData.categoryId = this.eventDetailCopy.categoryId
this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId) this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId)
} }
@ -177,6 +181,7 @@ export default {
if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) { if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) {
this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
this.formData.categoryId = this.selCateObj.id this.formData.categoryId = this.selCateObj.id
console.log(this.formData.categoryId,'this.formData.categoryId');
} else { } else {
this.selCateObj = {} this.selCateObj = {}
} }
@ -201,6 +206,7 @@ export default {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj); app.util.validateRule(messageObj);
} else { } else {
console.log(this.selCateObj);
if (!this.selCateObj || !this.selCateObj.id) { if (!this.selCateObj || !this.selCateObj.id) {
this.$message.error("请选择事件分类"); this.$message.error("请选择事件分类");
return false; return false;

Loading…
Cancel
Save