ZheJiangNingBo
/
pingAnQiYeWeb
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'lukeyan' (#102) from lukeyan into master

Browse Source 
Reviewed-on: #102
pull/106/head^2
lukeyan 1 year ago
parent fc7f984f40 92c5b4339f
commit d00226a0a2
4 changed files with 93 additions and 41 deletions
Show Stats Download Patch File Download Diff File

45
src/views/closeLoopDispose/components/backlog.vue
Unescape View File

@ -3,10 +3,10 @@
<div> <div>
<div class="backlog_body"> <div class="backlog_body">
<div class="search_top"> <div class="search_top">
<div class="btn"> <!-- <div class="btn">
<el-button @click="search_data">搜索</el-button> <el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button> <el-button @click="reset">重置</el-button>
</div> </div> -->
<el-form :model="search" class="search_top_form"> <el-form :model="search" class="search_top_form">
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
@ -25,6 +25,10 @@
placeholder="请选择关键词" placeholder="请选择关键词"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search_table"> <div class="search_table">
@ -147,13 +151,15 @@ export default {
}; };
get_backlog(param).then((res) => { get_backlog(param).then((res) => {
// 根据返回码值判断流程状态 // 根据返回码值判断流程状态
for( let i = 0; i<res.rows.length;i++) { for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus) res.rows[i].process_status = this.process_change(
res.rows[i].alarmStatus
);
} }
console.log('res.rows',res.rows); console.log("res.rows", res.rows);
this.table_data = res.rows; this.table_data = res.rows;
this.total = res.total; this.total = res.total;
}) });
}, },
reset() { reset() {
this.search.backlog_time = [this.get_today(), this.get_tomorrow()]; this.search.backlog_time = [this.get_today(), this.get_tomorrow()];
@ -229,12 +235,12 @@ export default {
}, },
// 根据返回码值判断流程状态 // 根据返回码值判断流程状态
process_change(val) { process_change(val) {
switch(val) { switch (val) {
case 1 : case 1:
return "审核中"; return "审核中";
case 2 : case 2:
return "审核完成"; return "审核完成";
case 3 : case 3:
return "驳回"; return "驳回";
} }
}, },
@ -242,12 +248,12 @@ export default {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageNum = 1; this.pageNum = 1;
this.pageSize = val; this.pageSize = val;
this.search_data() this.search_data();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.pageNum = val; this.pageNum = val;
this.search_data() this.search_data();
}, },
}, },
}; };
@ -334,7 +340,6 @@ export default {
.el-input__inner { .el-input__inner {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed; // border: 0.5px dashed;
background: #283436; background: #283436;
@ -350,6 +355,20 @@ export default {
color: #fff; color: #fff;
background: #283436; background: #283436;
} }
.el-button {
width: 70px;
border: 0.1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
border: 2px solid #137868;
background: url("~@/assets/companyFile/2121.png") no-repeat !important;
background-size: 100% 100% !important;
}
} }
} }
/deep/.el-range-separator { /deep/.el-range-separator {

42
src/views/closeLoopDispose/components/complete.vue
Unescape View File

@ -3,10 +3,10 @@
<div> <div>
<div class="complete_body"> <div class="complete_body">
<div class="search_top"> <div class="search_top">
<div class="btn"> <!-- <div class="btn">
<el-button @click="search_data">搜索</el-button> <el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button> <el-button @click="reset">重置</el-button>
</div> </div> -->
<el-form :model="search" class="search_top_form"> <el-form :model="search" class="search_top_form">
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select <el-select
@ -39,6 +39,10 @@
placeholder="请选择关键词" placeholder="请选择关键词"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search_table"> <div class="search_table">
@ -65,8 +69,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="taskName" label="当前节点"> <el-table-column prop="taskName" label="当前节点"> </el-table-column>
</el-table-column>
<el-table-column prop="nextNodeUsers" label="未操作者" width="280"> <el-table-column prop="nextNodeUsers" label="未操作者" width="280">
</el-table-column> </el-table-column>
<el-table-column prop="operation" label="操作"> <el-table-column prop="operation" label="操作">
@ -179,10 +182,12 @@ export default {
}; };
get_complete(param).then((res) => { get_complete(param).then((res) => {
// 根据返回码值判断流程状态 // 根据返回码值判断流程状态
for( let i = 0; i<res.rows.length;i++) { for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus) res.rows[i].process_status = this.process_change(
res.rows[i].alarmStatus
);
} }
console.log('res.rows',res.rows); console.log("res.rows", res.rows);
this.table_data = res.rows; this.table_data = res.rows;
this.total = res.total; this.total = res.total;
}); });
@ -264,12 +269,12 @@ export default {
}, },
// 根据返回码值判断流程状态 // 根据返回码值判断流程状态
process_change(val) { process_change(val) {
switch(val) { switch (val) {
case 1 : case 1:
return "审核中"; return "审核中";
case 2 : case 2:
return "审核完成"; return "审核完成";
case 3 : case 3:
return "驳回"; return "驳回";
} }
}, },
@ -369,7 +374,6 @@ export default {
.el-input__inner { .el-input__inner {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed; // border: 0.5px dashed;
background: #283436; background: #283436;
@ -385,6 +389,20 @@ export default {
color: #fff; color: #fff;
background: #283436; background: #283436;
} }
.el-button {
width: 70px;
border: 0.1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
border: 2px solid #137868;
background: url("~@/assets/companyFile/2121.png") no-repeat !important;
background-size: 100% 100% !important;
}
} }
} }
/deep/.el-range-separator { /deep/.el-range-separator {

42
src/views/closeLoopDispose/components/copy.vue
Unescape View File

@ -3,16 +3,13 @@
<div> <div>
<div class="copy_body"> <div class="copy_body">
<div class="search_top"> <div class="search_top">
<div class="btn"> <!-- <div class="btn">
<el-button @click="search_data">搜索</el-button> <el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button> <el-button @click="reset">重置</el-button>
</div> </div> -->
<el-form :model="search" class="search_top_form"> <el-form :model="search" class="search_top_form">
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select <el-select v-model="search.copy_status" @change="change_copy">
v-model="search.copy_status"
@change="change_copy"
>
<el-option <el-option
v-for="item in copy_list" v-for="item in copy_list"
:key="item.value" :key="item.value"
@ -39,6 +36,10 @@
placeholder="请选择关键词" placeholder="请选择关键词"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<el-button @click="search_data">搜索</el-button>
<el-button @click="reset">重置</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="search_table"> <div class="search_table">
@ -178,8 +179,10 @@ export default {
}; };
get_copy(param).then((res) => { get_copy(param).then((res) => {
// 根据返回码值判断流程状态 // 根据返回码值判断流程状态
for( let i = 0; i<res.rows.length;i++) { for (let i = 0; i < res.rows.length; i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus) 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;
@ -261,12 +264,12 @@ export default {
}, },
// 根据返回码值判断流程状态 // 根据返回码值判断流程状态
process_change(val) { process_change(val) {
switch(val) { switch (val) {
case 1 : case 1:
return "审核中"; return "审核中";
case 2 : case 2:
return "审核完成"; return "审核完成";
case 3 : case 3:
return "驳回"; return "驳回";
} }
}, },
@ -367,7 +370,6 @@ export default {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
border: 1px solid #3d505e; border: 1px solid #3d505e;
// border: 0.5px dashed;
background: #283436; background: #283436;
color: #fff; color: #fff;
} }
@ -381,6 +383,20 @@ export default {
color: #fff; color: #fff;
background: #283436; background: #283436;
} }
.el-button {
width: 70px;
border: 0.1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
border: 2px solid #137868;
background: url("~@/assets/companyFile/2121.png") no-repeat !important;
background-size: 100% 100% !important;
}
} }
} }
/deep/.el-range-separator { /deep/.el-range-separator {

5
src/views/closeLoopDispose/components/myCourse.vue
Unescape View File

@ -375,7 +375,7 @@ export default {
.el-input__inner { .el-input__inner {
// width: 300px; // width: 300px;
border-radius: 0px; border-radius: 0px;
height: 3.7vh; // height: 3.7vh;
border: 1px solid #3d505e; border: 1px solid #3d505e;
background: #283436; background: #283436;
color: #fff; color: #fff;
@ -393,8 +393,7 @@ export default {
} }
.el-button { .el-button {
width: 70px; width: 70px;
height: 3.7vh !important; border: 0.1px solid #4a6072;
border: 1px solid #4a6072;
color: #fff; color: #fff;
border-radius: 0px !important; border-radius: 0px !important;
background: #323f43; background: #323f43;

Write Preview
Loading…
Cancel
Save