|
@@ -1,20 +1,9 @@
|
|
|
<template>
|
|
|
<!-- 全流程管理列表组件 -->
|
|
|
<div id="WholeProcessManagement">
|
|
|
- <el-form
|
|
|
- :inline="true"
|
|
|
- ref="myTaskForm"
|
|
|
- :model="formInline"
|
|
|
- style="padding: 10px"
|
|
|
- >
|
|
|
+ <el-form :inline="true" ref="myTaskForm" :model="formInline" style="padding: 10px">
|
|
|
<el-form-item label="项目类型">
|
|
|
- <el-select
|
|
|
- size="mini"
|
|
|
- v-model="formInline.c_task_type"
|
|
|
- placeholder="项目类型"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- >
|
|
|
+ <el-select size="mini" v-model="formInline.c_task_type" placeholder="项目类型" clearable filterable>
|
|
|
<el-option
|
|
|
v-for="item in selectSelectDataMap['projectType']"
|
|
|
:key="item.index"
|
|
@@ -24,13 +13,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="所属街镇">
|
|
|
- <el-select
|
|
|
- size="mini"
|
|
|
- v-model="formInline.c_owning_street_town"
|
|
|
- placeholder="所属街镇"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- >
|
|
|
+ <el-select size="mini" v-model="formInline.c_owning_street_town" placeholder="所属街镇" clearable filterable>
|
|
|
<el-option
|
|
|
v-for="item in selectSelectDataMap['associatedItems']"
|
|
|
:key="item.index"
|
|
@@ -40,15 +23,8 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="创建时间">
|
|
|
- <el-date-picker
|
|
|
- size="mini"
|
|
|
- v-model="formInline.c_create_date"
|
|
|
- type="daterange"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- >
|
|
|
+ <el-form-item label="年份">
|
|
|
+ <el-date-picker size="mini" v-model="formInline.c_create_date" value-format="yyyy" type="year" placeholder="选择年">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item style="float: right">
|
|
@@ -67,8 +43,7 @@
|
|
|
>
|
|
|
<el-table-column type="index" width="50"> </el-table-column>
|
|
|
<el-table-column prop="c_project_id" label="项目编号"> </el-table-column>
|
|
|
- <el-table-column prop="c_project_name" label="项目名称">
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column prop="c_project_name" label="项目名称"> </el-table-column>
|
|
|
<el-table-column prop="c_task_type" label="项目类型">
|
|
|
<template slot-scope="scope">
|
|
|
{{ getSelectByIndex("projectType", scope.row.c_task_type) }}
|
|
@@ -76,9 +51,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="c_owning_street_town" label="所属街镇">
|
|
|
<template slot-scope="scope">
|
|
|
- {{
|
|
|
- getSelectByIndex("associatedItems", scope.row.c_owning_street_town)
|
|
|
- }}
|
|
|
+ {{ getSelectByIndex("associatedItems", scope.row.c_owning_street_town) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="c_create_date" label="创建时间">
|
|
@@ -86,16 +59,13 @@
|
|
|
{{ $dayjs(scope.row.c_create_date).format("YYYY-MM-DD HH:mm:ss") }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="c_year" label="年份"> </el-table-column>
|
|
|
</el-table>
|
|
|
<div id="WholeProcessManagement-footer">
|
|
|
<Pagination :paginationData="paginationData" />
|
|
|
</div>
|
|
|
<!-- 全流程管理流程组件 -->
|
|
|
- <StepsMyBox
|
|
|
- id="stepsBox"
|
|
|
- v-show="StepsMyBoxShowState"
|
|
|
- @hideStepsMyBoxState="StepsMyBoxShowState = false"
|
|
|
- />
|
|
|
+ <StepsMyBox id="stepsBox" v-show="StepsMyBoxShowState" @hideStepsMyBoxState="StepsMyBoxShowState = false" />
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
@@ -115,14 +85,14 @@ export default {
|
|
|
// 数据字典暂存对象
|
|
|
selectSelectDataMap: {
|
|
|
projectType: [],
|
|
|
- associatedItems: [],
|
|
|
+ associatedItems: []
|
|
|
},
|
|
|
StepsMyBoxShowState: false,
|
|
|
// 查询条件
|
|
|
formInline: {
|
|
|
c_task_type: "",
|
|
|
c_owning_street_town: "",
|
|
|
- c_create_date: "",
|
|
|
+ c_create_date: ""
|
|
|
},
|
|
|
// 我的任务form表单
|
|
|
tableData: [],
|
|
@@ -131,13 +101,13 @@ export default {
|
|
|
currentPage: 1,
|
|
|
pageSizes: [5, 10, 20, 50],
|
|
|
total: 0,
|
|
|
- currentChange: (val) => {
|
|
|
+ currentChange: val => {
|
|
|
this.handleCurrentChange(val);
|
|
|
},
|
|
|
- handleSizeChange: (val) => {
|
|
|
+ handleSizeChange: val => {
|
|
|
this.handleSizeChange(val);
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
},
|
|
|
props: {},
|
|
@@ -155,12 +125,12 @@ export default {
|
|
|
params.append("type", type);
|
|
|
params.append("cName", cName);
|
|
|
this.$Post(this.urlsCollection.selectByCNameAType, params).then(
|
|
|
- (res) => {
|
|
|
+ res => {
|
|
|
if (res.code === 200 && res.content.length > 0) {
|
|
|
this.selectSelectDataMap[keyName] = res.content;
|
|
|
}
|
|
|
},
|
|
|
- (error) => {
|
|
|
+ error => {
|
|
|
this.$message.error(error);
|
|
|
console.log(error);
|
|
|
}
|
|
@@ -169,11 +139,8 @@ export default {
|
|
|
// 数据字典对照显示
|
|
|
getSelectByIndex(selectName, index) {
|
|
|
let slotValue = "";
|
|
|
- if (
|
|
|
- this.selectSelectDataMap[selectName] &&
|
|
|
- this.selectSelectDataMap[selectName].length > 0
|
|
|
- ) {
|
|
|
- this.selectSelectDataMap[selectName].forEach((item) => {
|
|
|
+ if (this.selectSelectDataMap[selectName] && this.selectSelectDataMap[selectName].length > 0) {
|
|
|
+ this.selectSelectDataMap[selectName].forEach(item => {
|
|
|
if (item.index == index) {
|
|
|
slotValue = item.name;
|
|
|
}
|
|
@@ -209,8 +176,8 @@ export default {
|
|
|
field: "c_task_type",
|
|
|
searchType: "1",
|
|
|
content: {
|
|
|
- value: this.formInline.c_task_type,
|
|
|
- },
|
|
|
+ value: this.formInline.c_task_type
|
|
|
+ }
|
|
|
};
|
|
|
searchParam.push(param1);
|
|
|
}
|
|
@@ -219,39 +186,43 @@ export default {
|
|
|
field: "c_owning_street_town",
|
|
|
searchType: "1",
|
|
|
content: {
|
|
|
- value: this.formInline.c_owning_street_town,
|
|
|
- },
|
|
|
+ value: this.formInline.c_owning_street_town
|
|
|
+ }
|
|
|
};
|
|
|
searchParam.push(param1);
|
|
|
}
|
|
|
if (this.formInline.c_create_date) {
|
|
|
let param1 = {
|
|
|
- field: "c_create_date",
|
|
|
- searchType: "3",
|
|
|
+ field: "c_year",
|
|
|
+ searchType: "2",
|
|
|
content: {
|
|
|
- start: this.formInline.c_create_date[0],
|
|
|
- end: this.formInline.c_create_date[0],
|
|
|
- },
|
|
|
+ value: this.formInline.c_create_date
|
|
|
+ }
|
|
|
};
|
|
|
+ // let param1 = {
|
|
|
+ // field: "c_create_date",
|
|
|
+ // searchType: "3",
|
|
|
+ // content: {
|
|
|
+ // start: this.formInline.c_create_date,
|
|
|
+ // end: this.formInline.c_create_date + 365 * 24 * 60* 60 * 1000
|
|
|
+ // }
|
|
|
+ // };
|
|
|
searchParam.push(param1);
|
|
|
}
|
|
|
params.append("search", JSON.stringify(searchParam));
|
|
|
+ let sortparam = [{ field: "c_create_date", orderByType: 2 }];
|
|
|
+ params.append("orderBy", JSON.stringify(sortparam));
|
|
|
this.$Post(this.urlsCollection.selectContentList, params).then(
|
|
|
- (res) => {
|
|
|
+ res => {
|
|
|
if (res.code === 200 && res.content.data.length > 0) {
|
|
|
this.tableData = res.content.data;
|
|
|
this.tableInitLoading = false;
|
|
|
this.paginationData.total = res.content.count;
|
|
|
- console.log(
|
|
|
- "请求到的总条数为:",
|
|
|
- res.content.count,
|
|
|
- this.paginationData.total
|
|
|
- );
|
|
|
}
|
|
|
},
|
|
|
- (error) => {
|
|
|
+ error => {
|
|
|
this.tableInitLoading = false;
|
|
|
- console.log(error);
|
|
|
+ this.$message.error(error);
|
|
|
}
|
|
|
);
|
|
|
},
|
|
@@ -260,7 +231,7 @@ export default {
|
|
|
this.formInline = {
|
|
|
c_task_type: "",
|
|
|
c_owning_street_town: "",
|
|
|
- c_create_date: "",
|
|
|
+ c_create_date: ""
|
|
|
};
|
|
|
this.onSubmit();
|
|
|
},
|
|
@@ -277,8 +248,8 @@ export default {
|
|
|
ToView(index) {
|
|
|
this.StepsMyBoxShowState = true;
|
|
|
console.log("选中的历史项目的index:", index);
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="less" scoped>
|