elink-star
/
epmet-work-pc-chengyang
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bugs

feature
mk 2 years ago
parent
8f1ae8f9cf
commit
c32d0af4cd
5 changed files with 67 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      src/views/modules/communityService/commonDemand/addForm.vue
  2. 2
      src/views/modules/communityService/commonDemand/detailForm.vue
  3. 35
      src/views/modules/communityService/commonDemand/editForm.vue
  4. 40
      src/views/modules/communityService/commonDemand/index.vue
  5. 4
      src/views/modules/communityService/gxxq/index.vue

37
src/views/modules/communityService/commonDemand/addForm.vue
View File

@ -53,7 +53,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="服务事项" label="服务名称"
prop="serviceName" prop="serviceName"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
@ -61,7 +61,7 @@
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
placeholder="请输入服务事项" placeholder="请输入服务名称"
v-model="formData.serviceName" v-model="formData.serviceName"
> >
</el-input> </el-input>
@ -80,7 +80,7 @@
maxlength="1000" maxlength="1000"
show-word-limit show-word-limit
:rows="3" :rows="3"
placeholder="请输入备注，不超过1000字" placeholder="请输入服务内容，不超过1000字"
v-model="formData.remark" v-model="formData.remark"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -377,7 +377,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="备注" label="服务内容"
prop="serviceGoal" prop="serviceGoal"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
label-width="150px" label-width="150px"
@ -393,13 +393,13 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="详细位置" label-width="150px"> <!-- <el-form-item label="详细位置" label-width="150px">
<el-input <el-input
class="item_width_1" class="item_width_1"
v-model="feedbackFormData.address" v-model="feedbackFormData.address"
></el-input> ></el-input>
</el-form-item> </el-form-item> -->
<el-form-item <!-- <el-form-item
label="地图位置" label="地图位置"
label-width="150px" label-width="150px"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
@ -425,7 +425,7 @@
</div> </div>
</div> </div>
</div> </div>
</el-form-item> </el-form-item> -->
<!-- <el-form-item <!-- <el-form-item
class="block" class="block"
@ -573,21 +573,20 @@ export default {
if (this.formData.serviceTimeStart) { if (this.formData.serviceTimeStart) {
let serviceTimeStart = new Date(this.formData.serviceTimeStart); let serviceTimeStart = new Date(this.formData.serviceTimeStart);
return ( return (
time.getTime() > nowData || time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
time.getTime() === serviceTimeStart
); );
} else { } else {
return time.getTime() > nowData; return (time.getTime() > nowData || time.getTime() === nowData) ;
} }
}; };
let startDisabledDate = (time) => { let startDisabledDate = (time) => {
//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now(); let nowData = Date.now() - 24 * 60 * 60 * 1000;
return time.getTime() > nowData; return time.getTime() < nowData;
}; };
return { return {
// 公共服务分类 // 公共服务分类
serviceTypesLevel1: [], serviceTypesLevel1: [],
@ -640,10 +639,10 @@ export default {
}, },
endPickerOptions: { endPickerOptions: {
// disabledDate: endDisabledDate, disabledDate: endDisabledDate,
}, },
startPickerOptions: { startPickerOptions: {
// disabledDate: startDisabledDate, disabledDate: startDisabledDate,
}, },
showFeedback: false, showFeedback: false,
@ -757,8 +756,8 @@ export default {
this.getDictOptions(); this.getDictOptions();
this.getPolicyList(); this.getPolicyList();
if (this.formType === "feedback" || this.showFeedback) { if (this.formType === "feedback" || this.showFeedback) {
this.initMap(); // this.initMap();
this.$refs.ref_form_feedback.resetFields(); // this.$refs.ref_form_feedback.resetFields();
} }
if (this.formType === "add") { if (this.formType === "add") {

2
src/views/modules/communityService/commonDemand/detailForm.vue
View File

@ -50,7 +50,7 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">备注：</span> <span class="info-title-2">服务内容：</span>
<span>{{ formData.remark || "--" }}</span> <span>{{ formData.remark || "--" }}</span>
</div> </div>

35
src/views/modules/communityService/commonDemand/editForm.vue
View File

@ -153,7 +153,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="备注" <el-form-item label="服务内容"
prop="remark" prop="remark"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
@ -163,7 +163,7 @@
maxlength="500" maxlength="500"
show-word-limit show-word-limit
:rows="3" :rows="3"
placeholder="请输入备注，不超过500字" placeholder="请输入服务内容，不超过500字"
v-model="formData.remark"></el-input> v-model="formData.remark"></el-input>
</el-form-item> </el-form-item>
@ -379,20 +379,24 @@ import { nextTick } from 'vue';
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 let endDisabledDate = (time) => {
let nowData = Date.now() //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
if (this.formData.serviceTimeStart) { let nowData = Date.now();
let serviceTimeStart = new Date(this.formData.serviceTimeStart) if (this.formData.serviceTimeStart) {
return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart let serviceTimeStart = new Date(this.formData.serviceTimeStart);
} else { return (
return time.getTime() > nowData time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
} time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
);
} } else {
let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 return (time.getTime() > nowData || time.getTime() === nowData) ;
let nowData = Date.now()
return time.getTime() > nowData
} }
};
let startDisabledDate = (time) => {
//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now() - 24 * 60 * 60 * 1000;
return time.getTime() < nowData;
};
return { return {
btnDisable: false, btnDisable: false,
@ -439,7 +443,6 @@ import { nextTick } from 'vue';
this.getPolicyList() this.getPolicyList()
if (this.serviceRecordId) {//详情 if (this.serviceRecordId) {//详情
this.loadInfo() this.loadInfo()
} }
// this.initMap() // this.initMap()

40
src/views/modules/communityService/commonDemand/index.vue
View File

@ -61,7 +61,7 @@
</el-form-item> </el-form-item>
<el-form-item label="服务事项" <el-form-item label="服务名称"
prop="serviceName"> prop="serviceName">
<el-input v-model="formData.serviceName" <el-input v-model="formData.serviceName"
class="u-item-width-normal" class="u-item-width-normal"
@ -155,7 +155,7 @@
size="small" size="small"
@click="handleAdd" @click="handleAdd"
type="primary" type="primary"
>发起服务</el-button> >新增</el-button>
</div> </div>
<!-- <el-button @click="handleExport" <!-- <el-button @click="handleExport"
class="diy-button--reset" class="diy-button--reset"
@ -174,23 +174,23 @@
align="center" align="center"
width="50" /> width="50" />
<el-table-column prop="serviceTypeName"
align="center"
min-width="150"
label="服务类型"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="serviceName" <el-table-column prop="serviceName"
label="服务名称" label="服务名称"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="serviceOrgName"
align="center" align="center"
min-width="150" min-width="150"
label="服务组织名称"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="serviceTimeStart" <el-table-column prop="serviceTimeStart"
align="center" align="center"
width="300" width="200"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
label="服务时间"> label="服务时间">
<template slot-scope="scope"> <template slot-scope="scope">
@ -198,6 +198,22 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="serviceOrgName"
align="center"
min-width="150"
label="服务方"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="serviceTimeCreate"
align="center"
min-width="150"
label="服务发起时间"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="serviceStatus" <el-table-column prop="serviceStatus"
align="center" align="center"
width="100" width="100"
@ -207,13 +223,13 @@
<span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span> <span>{{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!--
<el-table-column prop="servicePeopleNumber" <el-table-column prop="servicePeopleNumber"
align="center" align="center"
width="110" width="110"
label="服务人数" label="服务人数"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column> -->
<el-table-column fixed="right" <el-table-column fixed="right"
label="操作" label="操作"

4
src/views/modules/communityService/gxxq/index.vue
View File

@ -128,7 +128,7 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
> >
添加需求</el-button 新增</el-button
> >
<el-button <el-button
@click="handleChu" @click="handleChu"
@ -592,7 +592,5 @@ export default {
@import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/management/list-main.scss";
.div_btn { .div_btn {
margin-bottom: 12px; margin-bottom: 12px;
display: flex;
justify-content: space-between;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save