diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 8faab6e..b5b49be 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -79,3 +79,11 @@ } return fmt } +export function getDaysTime(day = 1,fmt='yyyy-MM-dd hh:mm:ss'){ + const startTime = new Date(new Date().getTime() - day * 24 * 3600 * 1000).Format(fmt) + const endTime = getToday(fmt) + return { + startTime, + endTime + } +} diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 8faab6e..b5b49be 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -79,3 +79,11 @@ } return fmt } +export function getDaysTime(day = 1,fmt='yyyy-MM-dd hh:mm:ss'){ + const startTime = new Date(new Date().getTime() - day * 24 * 3600 * 1000).Format(fmt) + const endTime = getToday(fmt) + return { + startTime, + endTime + } +} diff --git a/src/views/blackList/editBlack.vue b/src/views/blackList/editBlack.vue index 9ed148c..745db65 100644 --- a/src/views/blackList/editBlack.vue +++ b/src/views/blackList/editBlack.vue @@ -11,7 +11,7 @@ - + diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 8faab6e..b5b49be 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -79,3 +79,11 @@ } return fmt } +export function getDaysTime(day = 1,fmt='yyyy-MM-dd hh:mm:ss'){ + const startTime = new Date(new Date().getTime() - day * 24 * 3600 * 1000).Format(fmt) + const endTime = getToday(fmt) + return { + startTime, + endTime + } +} diff --git a/src/views/blackList/editBlack.vue b/src/views/blackList/editBlack.vue index 9ed148c..745db65 100644 --- a/src/views/blackList/editBlack.vue +++ b/src/views/blackList/editBlack.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index c01fd50..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -3,13 +3,7 @@
- +
@@ -25,13 +19,8 @@ - + @@ -46,45 +35,23 @@ - 添加到通讯录 + 添加到通讯录 - + - - + + - - + + 请先选择事件分类 @@ -156,17 +123,9 @@ - - + + @@ -188,47 +147,22 @@ --> - + - + - + - - + + @@ -237,67 +171,35 @@ - + - 地图选点 - ({{ form.lng }},{{ form.lat }}) + 地图选点 + ({{ form.lng }},{{ form.lat }}) - +
- 典型案例 + 典型案例
- 要情 + 要情
- 需要回访 + 需要回访
- + @@ -305,17 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -337,13 +232,7 @@
- 提交 + 提交
@@ -356,34 +245,18 @@
- + - 查询 - 确定 + 查询 + 确定 说明：双击添加位置, - 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} + 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} - 清除地图 + 清除地图 返回 @@ -479,7 +352,7 @@ }, typeSelectList: [], form: { - typeCode:"", // 二三级value + typeCode: "", // 二三级value caseId: "", // 案卷编号，年月日时分秒毫秒+坐席号 sound: "", // 来电录音编号 callTime: "", // 来电时间 @@ -598,8 +471,8 @@ validator: validateType, }, ], - typeCode:[ - { + typeCode: [ + { required: true, message: "事件类型必选", trigger: ["change"], @@ -634,22 +507,27 @@ }, ], }, // 表单验证 + pickerOptions: { + disabledDate(time) { + return new Date(getToday()).getTime() < time.getTime() + } + }, }; }, watch: { - "form.typeCode":function(val){ - console.log('631',val) - if(val == "" || val == undefined){ + "form.typeCode": function (val) { + console.log('631', val) + if (val == "" || val == undefined) { this.form.type.caseTypeCode = ""; this.form.type.caseDetailTypeCode = ""; } else { // this.form.type.caseTypeCode = val.slice(0,3) // this.form.type.caseDetailTypeCode = val; - if(val.length <= 3){ - this.$nextTick(()=>{ - this.form.typeCode = ""; - this.form.type.caseTypeCode = ""; - this.form.type.caseDetailTypeCode = ""; + if (val.length <= 3) { + this.$nextTick(() => { + this.form.typeCode = ""; + this.form.type.caseTypeCode = ""; + this.form.type.caseDetailTypeCode = ""; }) // this.form.type.caseTypeCode = val; // this.typeSelectList.map(item =>{ @@ -659,7 +537,7 @@ // }) } else { this.form.type.caseDetailTypeCode = val; - this.form.type.caseTypeCode = val.slice(0,3) + this.form.type.caseTypeCode = val.slice(0, 3) } } }, @@ -668,7 +546,7 @@ this.form.type.caseTypeCode = ""; this.form.type.caseDetailTypeCode = ""; } else { - this.$set(this.form,'typeCode','') + this.$set(this.form, 'typeCode', '') // this.form.typeCode = "" // this.form.type.caseTypeCode = ""; // this.form.type.caseDetailTypeCode = ""; @@ -719,7 +597,7 @@ this.fetchCommunityList(); } }, - deep:true + deep: true }, created() { // 获取大类 @@ -941,52 +819,52 @@ }); }, // 大类选中改变 - async changeEorc(node){ + async changeEorc(node) { let data2 = await this.getLevelData2(node); - let codeList = data2.map(item =>{ + let codeList = data2.map(item => { return item.id }) let data3 = await this.getLevelData3(codeList); - setTimeout(()=>{ - this.typeSelectList = toTreeList([...data2,...data3], "-1"); - },500) + setTimeout(() => { + this.typeSelectList = toTreeList([...data2, ...data3], "-1"); + }, 500) }, getLevelData2(node) { return new Promise((resolve) => { - getCaseType(node).then((res) => { - if (res.code === 200) { - let data = res.data.map(child =>{ - return { - id:child.typeCode, - pid:"-1", - level:1, - name:child.typeName, - value:child.typeCode, - } - }) - resolve(data); - } - }); + getCaseType(node).then((res) => { + if (res.code === 200) { + let data = res.data.map(child => { + return { + id: child.typeCode, + pid: "-1", + level: 1, + name: child.typeName, + value: child.typeCode, + } + }) + resolve(data); + } + }); }); }, getLevelData3(codeList) { return new Promise((resolve) => { getCaseDetailType().then((res) => { if (res.code === 200) { - res.data = res.data.map(child =>{ - return { - pid:child.typeCode, - id:child.typeDetailCode, - level:2, - name:child.typeDetailName, - value:child.typeDetailCode - } - }) - res.data = res.data.filter(item =>{ - if(codeList.includes(item.pid)){ - return item; - } - }) + res.data = res.data.map(child => { + return { + pid: child.typeCode, + id: child.typeDetailCode, + level: 2, + name: child.typeDetailName, + value: child.typeDetailCode + } + }) + res.data = res.data.filter(item => { + if (codeList.includes(item.pid)) { + return item; + } + }) resolve(res.data); } }); @@ -1069,7 +947,7 @@ this.processWayList = response.data; }); }, - fetchGridList() {}, + fetchGridList() { }, // 自动生成案卷编号，时间+坐席号 generateCaseId() { const id = getToday("yyMMddhhmmss"); @@ -1174,22 +1052,28 @@ diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 8faab6e..b5b49be 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -79,3 +79,11 @@ } return fmt } +export function getDaysTime(day = 1,fmt='yyyy-MM-dd hh:mm:ss'){ + const startTime = new Date(new Date().getTime() - day * 24 * 3600 * 1000).Format(fmt) + const endTime = getToday(fmt) + return { + startTime, + endTime + } +} diff --git a/src/views/blackList/editBlack.vue b/src/views/blackList/editBlack.vue index 9ed148c..745db65 100644 --- a/src/views/blackList/editBlack.vue +++ b/src/views/blackList/editBlack.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index c01fd50..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -3,13 +3,7 @@
- +
@@ -25,13 +19,8 @@ - + @@ -46,45 +35,23 @@ - 添加到通讯录 + 添加到通讯录 - + - - + + - - + + 请先选择事件分类 @@ -156,17 +123,9 @@ - - + + @@ -188,47 +147,22 @@ --> - + - + - + - - + + @@ -237,67 +171,35 @@ - + - 地图选点 - ({{ form.lng }},{{ form.lat }}) + 地图选点 + ({{ form.lng }},{{ form.lat }}) - +
- 典型案例 + 典型案例
- 要情 + 要情
- 需要回访 + 需要回访
- + @@ -305,17 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -337,13 +232,7 @@
- 提交 + 提交
@@ -356,34 +245,18 @@
- + - 查询 - 确定 + 查询 + 确定 说明：双击添加位置, - 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} + 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} - 清除地图 + 清除地图 返回 @@ -479,7 +352,7 @@ }, typeSelectList: [], form: { - typeCode:"", // 二三级value + typeCode: "", // 二三级value caseId: "", // 案卷编号，年月日时分秒毫秒+坐席号 sound: "", // 来电录音编号 callTime: "", // 来电时间 @@ -598,8 +471,8 @@ validator: validateType, }, ], - typeCode:[ - { + typeCode: [ + { required: true, message: "事件类型必选", trigger: ["change"], @@ -634,22 +507,27 @@ }, ], }, // 表单验证 + pickerOptions: { + disabledDate(time) { + return new Date(getToday()).getTime() < time.getTime() + } + }, }; }, watch: { - "form.typeCode":function(val){ - console.log('631',val) - if(val == "" || val == undefined){ + "form.typeCode": function (val) { + console.log('631', val) + if (val == "" || val == undefined) { this.form.type.caseTypeCode = ""; this.form.type.caseDetailTypeCode = ""; } else { // this.form.type.caseTypeCode = val.slice(0,3) // this.form.type.caseDetailTypeCode = val; - if(val.length <= 3){ - this.$nextTick(()=>{ - this.form.typeCode = ""; - this.form.type.caseTypeCode = ""; - this.form.type.caseDetailTypeCode = ""; + if (val.length <= 3) { + this.$nextTick(() => { + this.form.typeCode = ""; + this.form.type.caseTypeCode = ""; + this.form.type.caseDetailTypeCode = ""; }) // this.form.type.caseTypeCode = val; // this.typeSelectList.map(item =>{ @@ -659,7 +537,7 @@ // }) } else { this.form.type.caseDetailTypeCode = val; - this.form.type.caseTypeCode = val.slice(0,3) + this.form.type.caseTypeCode = val.slice(0, 3) } } }, @@ -668,7 +546,7 @@ this.form.type.caseTypeCode = ""; this.form.type.caseDetailTypeCode = ""; } else { - this.$set(this.form,'typeCode','') + this.$set(this.form, 'typeCode', '') // this.form.typeCode = "" // this.form.type.caseTypeCode = ""; // this.form.type.caseDetailTypeCode = ""; @@ -719,7 +597,7 @@ this.fetchCommunityList(); } }, - deep:true + deep: true }, created() { // 获取大类 @@ -941,52 +819,52 @@ }); }, // 大类选中改变 - async changeEorc(node){ + async changeEorc(node) { let data2 = await this.getLevelData2(node); - let codeList = data2.map(item =>{ + let codeList = data2.map(item => { return item.id }) let data3 = await this.getLevelData3(codeList); - setTimeout(()=>{ - this.typeSelectList = toTreeList([...data2,...data3], "-1"); - },500) + setTimeout(() => { + this.typeSelectList = toTreeList([...data2, ...data3], "-1"); + }, 500) }, getLevelData2(node) { return new Promise((resolve) => { - getCaseType(node).then((res) => { - if (res.code === 200) { - let data = res.data.map(child =>{ - return { - id:child.typeCode, - pid:"-1", - level:1, - name:child.typeName, - value:child.typeCode, - } - }) - resolve(data); - } - }); + getCaseType(node).then((res) => { + if (res.code === 200) { + let data = res.data.map(child => { + return { + id: child.typeCode, + pid: "-1", + level: 1, + name: child.typeName, + value: child.typeCode, + } + }) + resolve(data); + } + }); }); }, getLevelData3(codeList) { return new Promise((resolve) => { getCaseDetailType().then((res) => { if (res.code === 200) { - res.data = res.data.map(child =>{ - return { - pid:child.typeCode, - id:child.typeDetailCode, - level:2, - name:child.typeDetailName, - value:child.typeDetailCode - } - }) - res.data = res.data.filter(item =>{ - if(codeList.includes(item.pid)){ - return item; - } - }) + res.data = res.data.map(child => { + return { + pid: child.typeCode, + id: child.typeDetailCode, + level: 2, + name: child.typeDetailName, + value: child.typeDetailCode + } + }) + res.data = res.data.filter(item => { + if (codeList.includes(item.pid)) { + return item; + } + }) resolve(res.data); } }); @@ -1069,7 +947,7 @@ this.processWayList = response.data; }); }, - fetchGridList() {}, + fetchGridList() { }, // 自动生成案卷编号，时间+坐席号 generateCaseId() { const id = getToday("yyMMddhhmmss"); @@ -1174,22 +1052,28 @@ diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index c9f1c99..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -28,10 +28,26 @@