diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
index 9ef5544c1..0c8431830 100644
--- a/src/views/modules/communityService/gxxq/addForm.vue
+++ b/src/views/modules/communityService/gxxq/addForm.vue
@@ -193,24 +193,26 @@
label-width="150px"
prop="serviceTimeEnd"
>
-
+
-
+
至
{
//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
let nowData = Date.now();
- if (this.formData.serviceTimeStart) {
- let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+ if (this.newFormData.serviceTimeStart) {
+ let serviceTimeStart = new Date(this.newFormData.serviceTimeStart);
return (
- time.getTime() > nowData ||
- time.getTime() < serviceTimeStart ||
- time.getTime() === serviceTimeStart
+ time.getTime() < serviceTimeStart- 24 * 60 * 60 * 1000 ||
+ time.getTime() === serviceTimeStart- 24 * 60 * 60 * 1000
);
} else {
- return time.getTime() > nowData;
+ return (time.getTime() > nowData || time.getTime() === nowData) ;
}
};
let startDisabledDate = (time) => {
//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
- let nowData = Date.now();
- return time.getTime() > nowData;
+ let nowData = Date.now() - 24 * 60 * 60 * 1000;
+ return (time.getTime() < nowData ||
+ time.getTime() === nowData);
};
return {
@@ -346,6 +348,12 @@ export default {
assignInfo: {},
content: "", //
},
+ endPickerOptions: {
+ disabledDate: endDisabledDate
+ },
+ startPickerOptions: {
+ disabledDate: startDisabledDate
+ },
newFormData: {
noticeApproches: [],
serviceScopeList: [], //
@@ -392,7 +400,7 @@ export default {
},
watch: {
- "formData.serviceTimeEnd": function (val) {
+ "newFormData.serviceTimeEnd": function (val) {
if (val && val != "") {
let arrayTemp = val.split(" ");
this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
@@ -609,23 +617,33 @@ export default {
const url = "/gov/org/icServiceProject/service/serviceScopeTree";
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
let params = {};
-
const { data, code, msg } = await requestPost(url, params);
-
if (code === 0) {
++this.iscascaderShow;
this.casOptions = [];
this.scopeIdArray = [];
+ await this.handleData(data.children)
this.casOptions.push(data);
} else {
this.$message.error(rspMsg);
}
},
-
+ //子级为空数组的赋值为null解决有空白页的问题
+ handleData(data){
+ for(let i=0;i
-
+
至
@@ -91,7 +92,8 @@
class="u-item-width-daterange u-data-tag"
size="small"
type="date"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ :picker-options="endPickerOptions"
value="yyyy-MM-dd"
placeholder="结束时间"
>
@@ -271,6 +273,24 @@ import addForm from "./addForm.vue";
import detailForm from "./detailForm.vue";
export default {
data() {
+ let endDisabledDate = (time) => {
+ //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+ let nowData = Date.now();
+ if (this.formData.timeStart) {
+ let startTime = new Date(this.formData.timeStart);
+ return (
+ time.getTime() > nowData ||
+ time.getTime() < startTime ||
+ time.getTime() === startTime
+ );
+ } else {
+ return time.getTime() > nowData;
+ }
+ };
+ let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+ let nowData = Date.now()
+ return time.getTime() > nowData
+ }
return {
// 公共服务分类
serviceTypesLevel1: [],
@@ -297,6 +317,12 @@ export default {
label: "未指派服务",
},
],
+ endPickerOptions: {
+ disabledDate: endDisabledDate
+ },
+ startPickerOptions: {
+ disabledDate: startDisabledDate
+ },
selection: [],
selAllFlag: false,
tableData: [],
@@ -432,23 +458,23 @@ export default {
});
},
deleteBatch() {
- if (this.selection.length > 0) {
- this.$confirm("删除之后无法恢复，确认删除？", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- this.deleteresiBatch();
- })
- .catch((err) => {
- if (err == "cancel") {
- }
- });
- } else {
- this.$message.warning("请先选择要删除的需求");
- }
- },
+ if (this.selection.length > 0) {
+ this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.deleteresiBatch();
+ })
+ .catch((err) => {
+ if (err == "cancel") {
+ }
+ });
+ } else {
+ this.$message.warning("请先选择要删除的需求");
+ }
+ },
// 获取服务组织
async getDictOptions() {
const url = "/sys/dict/data/dictlist";
@@ -510,7 +536,14 @@ export default {
return this.$store.state.inIframe ? h : _h;
},
},
- watch: {},
+ watch: {
+ "formData.timeEnd": function (val) {
+ if (val && val != "") {
+ let arrayTemp = val.split(" ");
+ this.formData.timeEnd = arrayTemp[0] + " 23:59:59";
+ }
+ },
+ },
};