闭环修改

pull/90/head
lukeyan 1 year ago
parent 695bcfaf11
commit 7f7cfbbeab

@ -39,10 +39,10 @@
</el-table-column> </el-table-column>
<el-table-column prop="course_type" label="流程类型" width="280"> <el-table-column prop="course_type" label="流程类型" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="course_status" label="流程状态" width="220"> <el-table-column prop="process_status" label="流程状态" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{ color: styleChange(scope.row.course_status) }"> <div :style="{ color: styleChange(scope.row.process_status) }">
{{ scope.row.course_status }} {{ scope.row.process_status }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -145,6 +145,11 @@ export default {
searchKey: this.search.word, searchKey: this.search.word,
}; };
get_backlog(param).then((res) => { get_backlog(param).then((res) => {
//
for( let i = 0; i<res.rows.length;i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
}
console.log('res.rows',res.rows);
this.table_data = res.rows; this.table_data = res.rows;
this.total = res.total; this.total = res.total;
}) })
@ -211,16 +216,27 @@ export default {
// //
styleChange(val) { styleChange(val) {
switch (val) { switch (val) {
case "进行中": case "审核中":
return "#3eba75"; return "#3eba75";
// case "yellow": // case "yellow":
// return "#FDA722"; // return "#FDA722";
case "处置成功": case "审核完成":
return "#2eb9ef"; return "#2eb9ef";
case "处置失败": case "驳回完成":
return "#e55b5b"; return "#e55b5b";
} }
}, },
//
process_change(val) {
switch(val) {
case 1 :
return "审核中";
case 2 :
return "审核完成";
case 3 :
return "驳回完成";
}
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val}`); console.log(`每页 ${val}`);
this.pageNum = 1; this.pageNum = 1;
@ -238,7 +254,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
/deep/.el-table { /deep/.el-table {
// width: 96vw; // width: 96vw;
height: 60vh; height: 57vh;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
border: 0.1px solid #3f5564; border: 0.1px solid #3f5564;
thead { thead {

@ -524,7 +524,7 @@ export default {
margin-left: 1vw; margin-left: 1vw;
display: flex; display: flex;
.backlog_idea_person_img { .backlog_idea_person_img {
width: 10vw; width: 15vw;
height: 7vh; height: 7vh;
margin-left: 1.5vw; margin-left: 1.5vw;
// border: 0.1px solid #3f5564; // border: 0.1px solid #3f5564;

@ -45,7 +45,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="candidate" label="候选办理" width="280"> <el-table-column prop="candidate" label="候选办理" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="type" label="操作状态" width="280"> <el-table-column prop="processType" label="操作状态" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="finishTime" label="接收时间" width="280"> <el-table-column prop="finishTime" label="接收时间" width="280">
</el-table-column> </el-table-column>

@ -57,10 +57,10 @@
</el-table-column> </el-table-column>
<el-table-column prop="startDeptName" label="创建单位" width="220"> <el-table-column prop="startDeptName" label="创建单位" width="220">
</el-table-column> </el-table-column>
<el-table-column prop="course_status" label="流程状态" width="200"> <el-table-column prop="process_status" label="流程状态" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{ color: styleChange(scope.row.course_status) }"> <div :style="{ color: styleChange(scope.row.process_status) }">
{{ scope.row.course_status }} {{ scope.row.process_status }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -110,10 +110,10 @@ export default {
word: "", word: "",
}, },
complete_list: [ complete_list: [
{ label: "待审核", value: "1" }, // { label: "", value: "1" },
{ label: "通过", value: "2" }, { label: "审核中", value: "1" },
{ label: "驳回", value: "3" }, { label: "审核完成", value: "2" },
{ label: "处置中", value: "4" }, { label: "驳回完成", value: "3" },
], ],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -177,6 +177,11 @@ export default {
procStatus: this.search.procStatus, procStatus: this.search.procStatus,
}; };
get_complete(param).then((res) => { get_complete(param).then((res) => {
//
for( let i = 0; i<res.rows.length;i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
}
console.log('res.rows',res.rows);
this.table_data = res.rows; this.table_data = res.rows;
this.total = res.total; this.total = res.total;
}); });
@ -246,16 +251,27 @@ export default {
// //
styleChange(val) { styleChange(val) {
switch (val) { switch (val) {
case "进行中": case "审核中":
return "#3eba75"; return "#3eba75";
// case "yellow": // case "yellow":
// return "#FDA722"; // return "#FDA722";
case "处置成功": case "审核完成":
return "#2eb9ef"; return "#2eb9ef";
case "处置失败": case "驳回完成":
return "#e55b5b"; return "#e55b5b";
} }
}, },
//
process_change(val) {
switch(val) {
case 1 :
return "审核中";
case 2 :
return "审核完成";
case 3 :
return "驳回完成";
}
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val}`); console.log(`每页 ${val}`);
this.pageNum = 1; this.pageNum = 1;
@ -273,7 +289,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
/deep/.el-table { /deep/.el-table {
// width: 96vw; // width: 96vw;
height: 60vh; height: 57vh;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
border: 0.1px solid #3f5564; border: 0.1px solid #3f5564;
thead { thead {

@ -359,7 +359,7 @@ export default {
margin-left: 1vw; margin-left: 1vw;
display: flex; display: flex;
.complete_idea_person_img { .complete_idea_person_img {
width: 10vw; width: 15vw;
height: 7vh; height: 7vh;
margin-left: 1.5vw; margin-left: 1.5vw;
// border: 0.1px solid #3f5564; // border: 0.1px solid #3f5564;

@ -45,7 +45,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="candidate" label="候选办理" width="280"> <el-table-column prop="candidate" label="候选办理" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="type" label="操作状态" width="280"> <el-table-column prop="processType" label="操作状态" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="finishTime" label="接收时间" width="280"> <el-table-column prop="finishTime" label="接收时间" width="280">
</el-table-column> </el-table-column>

@ -11,7 +11,7 @@
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select <el-select
v-model="search.copy_status" v-model="search.copy_status"
@change="change_complete" @change="change_copy"
> >
<el-option <el-option
v-for="item in copy_list" v-for="item in copy_list"
@ -57,10 +57,10 @@
</el-table-column> </el-table-column>
<el-table-column prop="build_unit" label="创建单位" width="200"> <el-table-column prop="build_unit" label="创建单位" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="course_status" label="流程状态" width="200"> <el-table-column prop="process_status" label="流程状态" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{ color: styleChange(scope.row.course_status) }"> <div :style="{ color: styleChange(scope.row.process_status) }">
{{ scope.row.course_status }} {{ scope.row.process_status }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -109,10 +109,10 @@ export default {
word: "", word: "",
}, },
copy_list: [ copy_list: [
{ label: "待审核", value: "1" }, // { label: "", value: "1" },
{ label: "通过", value: "2" }, { label: "审核中", value: "1" },
{ label: "驳回", value: "3" }, { label: "审核完成", value: "2" },
{ label: "处置中", value: "4" }, { label: "驳回完成", value: "3" },
], ],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -176,6 +176,10 @@ export default {
procStatus: this.search.procStatus, procStatus: this.search.procStatus,
}; };
get_copy(param).then((res) => { get_copy(param).then((res) => {
//
for( let i = 0; i<res.rows.length;i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
}
this.table_data = res.rows; this.table_data = res.rows;
this.total = res.total; this.total = res.total;
}); });
@ -244,16 +248,27 @@ export default {
// //
styleChange(val) { styleChange(val) {
switch (val) { switch (val) {
case "进行中": case "审核中":
return "#3eba75"; return "#3eba75";
// case "yellow": // case "yellow":
// return "#FDA722"; // return "#FDA722";
case "处置成功": case "审核完成":
return "#2eb9ef"; return "#2eb9ef";
case "处置失败": case "驳回完成":
return "#e55b5b"; return "#e55b5b";
} }
}, },
//
process_change(val) {
switch(val) {
case 1 :
return "审核中";
case 2 :
return "审核完成";
case 3 :
return "驳回完成";
}
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val}`); console.log(`每页 ${val}`);
this.pageNum = 1; this.pageNum = 1;
@ -271,7 +286,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
/deep/.el-table { /deep/.el-table {
// width: 96vw; // width: 96vw;
height: 60vh; height: 57vh;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
border: 0.1px solid #3f5564; border: 0.1px solid #3f5564;
thead { thead {

@ -45,7 +45,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="candidate" label="候选办理" width="280"> <el-table-column prop="candidate" label="候选办理" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="type" label="操作状态" width="280"> <el-table-column prop="processType" label="操作状态" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="finishTime" label="接收时间" width="280"> <el-table-column prop="finishTime" label="接收时间" width="280">
</el-table-column> </el-table-column>

@ -48,12 +48,12 @@
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="280"> <el-table-column prop="createTime" label="创建时间" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="course_type" label="流程类型" width="280"> <el-table-column prop="processType" label="流程类型" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="course_status" label="流程状态" width="220"> <el-table-column prop="process_status" label="流程状态" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{ color: styleChange(scope.row.course_status) }"> <div :style="{ color: styleChange(scope.row.process_status) }">
{{ scope.row.course_status }} {{ scope.row.process_status }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -103,10 +103,10 @@ export default {
word: "", word: "",
}, },
course_list: [ course_list: [
{ label: "待审核", value: "1" }, // { label: "", value: "1" },
{ label: "通过", value: "2" }, { label: "审核中", value: "1" },
{ label: "驳回", value: "3" }, { label: "审核完成", value: "2" },
{ label: "处置中", value: "4" }, { label: "驳回完成", value: "3" },
], ],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -174,7 +174,11 @@ export default {
procStatus: this.search.procStatus, procStatus: this.search.procStatus,
}; };
get_my_course(param).then((res) => { get_my_course(param).then((res) => {
console.log("get_data", res); //
for( let i = 0; i<res.rows.length;i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
}
console.log('res.rows',res.rows);
this.table_data = res.rows; this.table_data = res.rows;
this.total = res.total; this.total = res.total;
}); });
@ -190,7 +194,7 @@ export default {
// //
check_details(val) { check_details(val) {
console.log('12344',val); console.log('12344',val);
this.$emit("change_complete_detail", val); // this.$emit("change_to_detail", val); //
}, },
// //
dateConversion(value) { dateConversion(value) {
@ -246,16 +250,27 @@ export default {
// //
styleChange(val) { styleChange(val) {
switch (val) { switch (val) {
case "进行中": case "审核中":
return "#3eba75"; return "#3eba75";
// case "yellow": // case "yellow":
// return "#FDA722"; // return "#FDA722";
case "处置成功": case "审核完成":
return "#2eb9ef"; return "#2eb9ef";
case "处置失败": case "驳回完成":
return "#e55b5b"; return "#e55b5b";
} }
}, },
//
process_change(val) {
switch(val) {
case 1 :
return "审核中";
case 2 :
return "审核完成";
case 3 :
return "驳回完成";
}
},
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val}`); console.log(`每页 ${val}`);
this.pageNum = 1; this.pageNum = 1;
@ -273,7 +288,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
/deep/.el-table { /deep/.el-table {
// width: 96vw; // width: 96vw;
height: 60vh; height: 57vh;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
border: 0.1px solid #3f5564; border: 0.1px solid #3f5564;
thead { thead {
@ -304,7 +319,6 @@ export default {
background-color: #5e666a; background-color: #5e666a;
border-radius: 4px; border-radius: 4px;
} }
/deep/.el-table__body-wrapper::-webkit-scrollbar-thumb { /deep/.el-table__body-wrapper::-webkit-scrollbar-thumb {
display: none; display: none;
width: 5px; width: 5px;

@ -402,7 +402,7 @@ export default {
margin-left: 1vw; margin-left: 1vw;
display: flex; display: flex;
.course_idea_person_img { .course_idea_person_img {
width: 10vw; width: 15vw;
height: 7vh; height: 7vh;
margin-left: 1.5vw; margin-left: 1.5vw;
// border: 0.1px solid #3f5564; // border: 0.1px solid #3f5564;

@ -45,7 +45,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="candidate" label="候选办理" width="280"> <el-table-column prop="candidate" label="候选办理" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="type" label="操作状态" width="280"> <el-table-column prop="processType" label="操作状态" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="finishTime" label="接收时间" width="280"> <el-table-column prop="finishTime" label="接收时间" width="280">
</el-table-column> </el-table-column>

Loading…
Cancel
Save