Commit 11f17b92 by xue_wengang

统计单位字段修改

parent 91428f6e
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<el-date-picker <el-date-picker
v-model="formData.daterange" v-model="formData.daterange"
type="daterange" type="daterange"
value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
...@@ -251,7 +252,7 @@ export default { ...@@ -251,7 +252,7 @@ export default {
// djsjKssj: this.$moment().subtract(1, "year").format("YYYY-MM-DD"), // djsjKssj: this.$moment().subtract(1, "year").format("YYYY-MM-DD"),
// djsjJssj: this.$moment().format("YYYY-MM-DD"), // djsjJssj: this.$moment().format("YYYY-MM-DD"),
daterange: [], daterange: [],
unitcode:"" unitCode:""
}, },
queryTypeList: [ queryTypeList: [
{ name: "侦查脑图", value: "0206", type: "ntCount" }, { name: "侦查脑图", value: "0206", type: "ntCount" },
...@@ -272,7 +273,7 @@ export default { ...@@ -272,7 +273,7 @@ export default {
], ],
dwData: { dwData: {
name: "单位代码", name: "单位代码",
id: "unitcode", id: "unitCode",
type: "codeTreeDialog", //字典弹框 type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段 props: [], //字典弹框需要的字段
value: "", value: "",
...@@ -296,8 +297,8 @@ export default { ...@@ -296,8 +297,8 @@ export default {
}, },
methods: { methods: {
initParam() { initParam() {
let start = new Date(new Date().setDate(1)); let start = this.$moment().subtract(1, "month").format("YYYY-MM-DD");
let current = new Date(); let current = this.$moment().format("YYYY-MM-DD");
this.formData.daterange.push(start); this.formData.daterange.push(start);
this.formData.daterange.push(current); this.formData.daterange.push(current);
}, },
...@@ -400,7 +401,7 @@ export default { ...@@ -400,7 +401,7 @@ export default {
let self = this; let self = this;
this.tableLoading = true; this.tableLoading = true;
this.qeruestGet({ this.qeruestGet({
unitCode: unitCode ? unitCode : self.formData.unitcode, unitCode: unitCode ? unitCode : self.formData.unitCode,
//yymcdm: self.formData.yymcdm, //yymcdm: self.formData.yymcdm,
djsjKssj: self.formData.djsjKssj, djsjKssj: self.formData.djsjKssj,
djsjJssj: self.formData.djsjJssj, djsjJssj: self.formData.djsjJssj,
...@@ -424,7 +425,7 @@ export default { ...@@ -424,7 +425,7 @@ export default {
this.formData.daterange = []; this.formData.daterange = [];
this.formData.djsjJssj = ""; this.formData.djsjJssj = "";
this.formData.djsjKssj = ""; this.formData.djsjKssj = "";
this.formData.unitcode = ""; this.formData.unitCode = "";
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.formData.limit = val; this.formData.limit = val;
...@@ -436,6 +437,7 @@ export default { ...@@ -436,6 +437,7 @@ export default {
}, },
exportFile() { exportFile() {
const { djsjJssj, djsjKssj, unitCode, yymcdm } = this.formData; const { djsjJssj, djsjKssj, unitCode, yymcdm } = this.formData;
debugger
this.qeruestFile( this.qeruestFile(
`/ywsjTj/exportDwczTj?djsjJssj=${djsjJssj}&djsjKssj=${djsjKssj}&unitCode=${unitCode}&yymcdm=${yymcdm}` `/ywsjTj/exportDwczTj?djsjJssj=${djsjJssj}&djsjKssj=${djsjKssj}&unitCode=${unitCode}&yymcdm=${yymcdm}`
).then((res) => { ).then((res) => {
......
...@@ -168,7 +168,7 @@ export default { ...@@ -168,7 +168,7 @@ export default {
djsjJssj: "", djsjJssj: "",
page: 1, page: 1,
limit: 10, limit: 10,
unitcode: "", unitCode: "",
}, },
queryTypeList: [ queryTypeList: [
{ name: "单位登录统计", value: "1" }, { name: "单位登录统计", value: "1" },
...@@ -183,7 +183,7 @@ export default { ...@@ -183,7 +183,7 @@ export default {
}, },
dwData: { dwData: {
name: "单位代码", name: "单位代码",
id: "unitcode", id: "unitCode",
type: "codeTreeDialog", //字典弹框 type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段 props: [], //字典弹框需要的字段
value: "", value: "",
...@@ -213,7 +213,7 @@ export default { ...@@ -213,7 +213,7 @@ export default {
params: { params: {
djsjKssj: this.formData.djsjKssj, djsjKssj: this.formData.djsjKssj,
djsjJssj: this.formData.djsjJssj, djsjJssj: this.formData.djsjJssj,
unitcode: this.formData.unitcode, unitCode: this.formData.unitCode,
}, },
method: "get", method: "get",
responseType: "blob", responseType: "blob",
...@@ -240,7 +240,7 @@ export default { ...@@ -240,7 +240,7 @@ export default {
}, },
getNextUnitInfo(row) { getNextUnitInfo(row) {
console.log(row); console.log(row);
this.formData.unitcode = row.unitcode; this.formData.unitCode = row.unitCode;
this.query(); this.query();
}, },
initDate() { initDate() {
...@@ -253,7 +253,7 @@ export default { ...@@ -253,7 +253,7 @@ export default {
this.formData.daterange = []; this.formData.daterange = [];
this.formData.djsjJssj = ""; this.formData.djsjJssj = "";
this.formData.djsjKssj = ""; this.formData.djsjKssj = "";
this.formData.unitcode = ""; this.formData.unitCode = "";
}, },
query() { query() {
let dataRange = this.formData.daterange; let dataRange = this.formData.daterange;
...@@ -271,7 +271,7 @@ export default { ...@@ -271,7 +271,7 @@ export default {
params: { params: {
djsjKssj: this.formData.djsjKssj, djsjKssj: this.formData.djsjKssj,
djsjJssj: this.formData.djsjJssj, djsjJssj: this.formData.djsjJssj,
unitcode: this.formData.unitcode, unitCode: this.formData.unitCode,
}, },
method: "get", method: "get",
}).then((res) => { }).then((res) => {
......
...@@ -155,7 +155,7 @@ export default { ...@@ -155,7 +155,7 @@ export default {
tableData: [], tableData: [],
dataCount: 0, dataCount: 0,
formData: { formData: {
unitcode: "", unitCode: "",
yymc: "", yymc: "",
djsjKssj: '', djsjKssj: '',
djsjJssj: '', djsjJssj: '',
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
], ],
dwData: { dwData: {
name: "单位代码", name: "单位代码",
id: "unitcode", id: "unitCode",
type: "codeTreeDialog", //字典弹框 type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段 props: [], //字典弹框需要的字段
value: "", value: "",
...@@ -283,7 +283,7 @@ export default { ...@@ -283,7 +283,7 @@ export default {
this.formData.daterange = []; this.formData.daterange = [];
this.formData.djsjJssj = ""; this.formData.djsjJssj = "";
this.formData.djsjKssj = ""; this.formData.djsjKssj = "";
this.formData.unitcode = ""; this.formData.unitCode = "";
}, },
// query() { // query() {
// let dataRange = this.formData.daterange; // let dataRange = this.formData.daterange;
...@@ -302,7 +302,7 @@ export default { ...@@ -302,7 +302,7 @@ export default {
// params: { // params: {
// djsjKssj: this.formData.djsjKssj, // djsjKssj: this.formData.djsjKssj,
// djsjJssj: this.formData.djsjJssj, // djsjJssj: this.formData.djsjJssj,
// unitcode: this.formData.unitcode, // unitCode: this.formData.unitCode,
// }, // },
// method: "get", // method: "get",
// }).then((res) => { // }).then((res) => {
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<el-date-picker <el-date-picker
v-model="formData.daterange" v-model="formData.daterange"
type="daterange" type="daterange"
value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
...@@ -208,7 +209,7 @@ export default { ...@@ -208,7 +209,7 @@ export default {
djsjJssj: "", djsjJssj: "",
page: 1, page: 1,
limit: 10, limit: 10,
unitcode: "", unitCode: "",
}, },
queryTypeList: [ queryTypeList: [
{ name: "单位登录统计", value: "1" }, { name: "单位登录统计", value: "1" },
...@@ -223,7 +224,7 @@ export default { ...@@ -223,7 +224,7 @@ export default {
}, },
dwData: { dwData: {
name: "单位代码", name: "单位代码",
id: "unitcode", id: "unitCode",
type: "codeTreeDialog", //字典弹框 type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段 props: [], //字典弹框需要的字段
value: "", value: "",
...@@ -250,7 +251,7 @@ export default { ...@@ -250,7 +251,7 @@ export default {
let param = { let param = {
djsjKssj: this.formData.djsjKssj, djsjKssj: this.formData.djsjKssj,
djsjJssj: this.formData.djsjJssj, djsjJssj: this.formData.djsjJssj,
unitcode: this.formData.unitcode, unitCode: this.formData.unitCode,
}; };
request({ request({
...@@ -286,7 +287,7 @@ export default { ...@@ -286,7 +287,7 @@ export default {
} }
this.dataInner.queryForm.djsjKssj = this.formData.djsjKssj; this.dataInner.queryForm.djsjKssj = this.formData.djsjKssj;
this.dataInner.queryForm.djsjJssj = this.formData.djsjJssj; this.dataInner.queryForm.djsjJssj = this.formData.djsjJssj;
this.dataInner.queryForm.unitcode = this.formData.unitcode; this.dataInner.queryForm.unitCode = this.formData.unitCode;
this.dataInner.queryForm.page = this.dataInner.currentPage; this.dataInner.queryForm.page = this.dataInner.currentPage;
this.dataInner.queryForm.limit = this.dataInner.pageCount; this.dataInner.queryForm.limit = this.dataInner.pageCount;
...@@ -314,7 +315,7 @@ export default { ...@@ -314,7 +315,7 @@ export default {
this.formData.daterange = []; this.formData.daterange = [];
this.formData.djsjJssj = ""; this.formData.djsjJssj = "";
this.formData.djsjKssj = ""; this.formData.djsjKssj = "";
this.formData.unitcode = ""; this.formData.unitCode = "";
}, },
query() { query() {
let dataRange = this.formData.daterange; let dataRange = this.formData.daterange;
...@@ -330,7 +331,7 @@ export default { ...@@ -330,7 +331,7 @@ export default {
let param = { let param = {
djsjKssj: this.formData.djsjKssj, djsjKssj: this.formData.djsjKssj,
djsjJssj: this.formData.djsjJssj, djsjJssj: this.formData.djsjJssj,
unitcode: this.formData.unitcode, unitCode: this.formData.unitCode,
page: this.page.currentPage, page: this.page.currentPage,
limit: this.page.pageCount, limit: this.page.pageCount,
}; };
......
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