Commit ce3c5292 by gao_yingdong

jccxIndex.vue

parent 23335521
......@@ -911,8 +911,23 @@ export default {
console.log(column);
},
doQuery(flag) {
debugger;
let self = this,
json = {};
if (self.$route.path == "/cxqskdxxIndex") {
var first = self.formData.cxSj[0]; // 开始时间
var second = self.formData.cxSj[1]; // 结束时间
var data1 = Date.parse(first.replace(/-/g, "/"));
var data2 = Date.parse(second.replace(/-/g, "/"));
var datadiff = data2 - data1;
var time = 31 * 24 * 60 * 60 * 1000;
if (first.length > 0 && second.length > 0) {
if (datadiff < 0 || datadiff > time) {
this.$message.error('开始时间应小于结束时间并且间隔小于31天,请检查!')
return false;
}
}
}
for (let i in self.formData) {
if (i != "cxSj") {
json[i] = self.formData[i];
......@@ -1015,79 +1030,10 @@ export default {
self.$route.path != "/cxcbxlajxxIndex" &&
self.$route.path != "/cxcbxszxxIndex" &&
self.$route.path != "/cxtlqkryIndex" &&
self.$route.path != "/cxqskdxxIndex" &&
self.$route.path != "/cxclwzxxIndex"
) {
//全国火车订票和全国快递信息、全省快递信息、全国航班、通讯录、查询积分串并案件信息、查询串并系列案件信息、查询车辆违章信息没有查询时间
// const end = new Date()
// const start = new Date()
// let year = start.getFullYear()
// let month = start.getMonth() - 5
// let date = start.getDate()
// if (date < 10) {
// date = '0' + date
// }
// if (month === 0) {
// month = 12
// year = year - 1
// }
// if (month < 0) {
// month = 12 + month
// year = year - 1
// }
// if (month < 10 && month > 0) {
// month = '0' + month
// }
// let hours = end.getHours() < 10 ? '0' + end.getHours() : end.getHours()
// let minutes =
// end.getMinutes() < 10 ? '0' + end.getMinutes() : end.getMinutes()
// let seconds =
// end.getSeconds() < 10 ? '0' + end.getSeconds() : end.getSeconds()
// let firstDayOfPreMonth =
// year +
// '-' +
// month +
// '-' +
// date +
// ' ' +
// hours +
// ':' +
// minutes +
// ':' +
// seconds
// let endDay =
// end.getFullYear() +
// '-' +
// (end.getMonth() + 1 < 10
// ? '0' + (end.getMonth() + 1)
// : end.getMonth() + 1) +
// '-' +
// (end.getDate() < 10 ? '0' + end.getDate() : end.getDate()) +
// ' ' +
// hours +
// ':' +
// minutes +
// ':' +
// seconds
// let count = new Date(year, month, 0).getDate()
// if (date > count) {
// date = date - count < 10 ? '0' + (date - count) : date - count
// month++
// if (month < 10) {
// month = '0' + month
// }
// firstDayOfPreMonth =
// year +
// '-' +
// month +
// '-' +
// date +
// ' ' +
// hours +
// ':' +
// minutes +
// ':' +
// seconds
// }
var timeStamp = new Date().getTime();
var halfYear = (365 / 2) * 24 * 3600 * 1000;
var pastResult = timeStamp - halfYear;
......@@ -1126,6 +1072,13 @@ export default {
window.util.timeStampTurnTime(new Date()),
];
}
if (self.$route.path == "/cxqskdxxIndex") {
debugger;
self.formData["cxSj"] = [
this.$moment().subtract(1, "month").format("YYYY-MM-DD HH:mm:ss"),
this.$moment().format("YYYY-MM-DD HH:mm:ss"),
];
}
self.propQueryField.forEach((val) => {
if (val.type == "code") {
if (val.codeOptions.length == 0) {
......
......@@ -497,6 +497,7 @@ import axios from "@/utils/axiosHttp.js";
import url from "@/api/base";
import request from "@/api/interface/dictionaryCode.js";
import "@/assets/js/iconfont.js";
import { stringify } from 'qs';
export default {
name: "tableList",
......@@ -551,6 +552,7 @@ export default {
},
data() {
return {
// valString: [],
formData: this.formData,
tableDataLength: this.dataLength,
centerDialogVisible: false,
......@@ -604,10 +606,8 @@ export default {
console.log(val);
let _self = this;
console.log(keyword);
// let valString = "";
// // let valString1 = '';
// let listWord = [];
// listWord = keyword.split(",");
let valString = [];
let listWord = keyword.split(",");
console.log(listWord);
val = val + "";
if (val.indexOf(keyword) !== -1 && keyword !== "") {
......@@ -615,17 +615,20 @@ export default {
keyword,
'<font color="#409EFF">' + keyword + "</font>"
);
}
// else if (listWord.length > 0) {
// listWord.forEach((item,index) => {
// valString = item
// });
// let valString1 = val.replace(valString, '<font color="#409EFF">' + valString + "</font>" )
// // valString1 = valString.split();
// // valString1.join(',');
// // return valString1;
// }
else {
} else if (listWord.length > 0) {
listWord.forEach((item, index) => {
let zzStr = new RegExp(item,"g")
val = val.replace(zzStr, '<font color="#409EFF">' + item + "</font>")
});
let arrStr = valString.toString()
// let newStr = ''
// for (let i = 0; i < arrStr.length; i++) {
// if (newStr.indexOf(arrStr[i]) == -1) {
// newStr += arrStr[i]
//
// }
return val;
} else {
return val;
}
},
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -380,6 +380,7 @@ export default {
);
self.$set(list, list.length, obj);
}
self.$forceUpdate();
}
},
draggableList() {
......
......@@ -352,6 +352,7 @@ export default {
},
methods: {
move(obj, type, flag) {
debugger
if (obj.id != "ajzlb" && obj.id != "ajxzlb" && obj.id != "xalbdmbcms" && obj.id != "jyaqType" && obj.id != "jyaq") {
let list = [],
waitList = [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment