提交 #100

Merged
lukeyan merged 1 commits from lukeyan into master 1 year ago

@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
const request = axios.create({
//baseURL: 'http://172.18.113.50:8080/zhapi',
//baseURL: 'http://172.18.11//.13:8080/zhapi', // 孙强
//baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
//baseURL: 'http://192.168.0.188:8888/zhapi',
baseURL: `http://${window.location.host}/zhapi`,
timeout: 50000,

@ -38,7 +38,7 @@
</el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column>
<el-table-column prop="course_type" label="流程类型" width="200">
<el-table-column prop="processType" label="流程类型" width="200">
</el-table-column>
<el-table-column prop="process_status" label="流程状态">
<template slot-scope="scope">
@ -223,7 +223,7 @@ export default {
// return "#FDA722";
case "审核完成":
return "#2eb9ef";
case "驳回完成":
case "驳回":
return "#e55b5b";
}
},
@ -235,7 +235,7 @@ export default {
case 2 :
return "审核完成";
case 3 :
return "驳回完成";
return "驳回";
}
},
handleSizeChange(val) {

@ -117,7 +117,7 @@
<!-- 第一行处理意见 -->
<div class="dispose_idea">
<div class="backlog_text">处理意见:</div>
<div class="backlog_value">{{ item.comment }}</div>
<div class="backlog_value">{{ item.comment.comment }}</div>
</div>
<!-- 第二行附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment">

@ -258,7 +258,7 @@ export default {
// return "#FDA722";
case "审核完成":
return "#2eb9ef";
case "驳回完成":
case "驳回":
return "#e55b5b";
}
},
@ -270,7 +270,7 @@ export default {
case 2 :
return "审核完成";
case 3 :
return "驳回完成";
return "驳回";
}
},
handleSizeChange(val) {

@ -85,7 +85,7 @@
<!-- 第一行处理意见 -->
<div class="dispose_idea">
<div class="complete_text">处理意见:</div>
<div class="complete_value">{{ item.comment }}</div>
<div class="complete_value">{{ item.comment.comment }}</div>
</div>
<!-- 第二行附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> -->

@ -255,7 +255,7 @@ export default {
// return "#FDA722";
case "审核完成":
return "#2eb9ef";
case "驳回完成":
case "驳回":
return "#e55b5b";
}
},
@ -267,7 +267,7 @@ export default {
case 2 :
return "审核完成";
case 3 :
return "驳回完成";
return "驳回";
}
},
handleSizeChange(val) {

@ -85,7 +85,7 @@
<!-- 第一行处理意见 -->
<div class="dispose_idea">
<div class="course_text">处理意见:</div>
<div class="course_value">{{ item.comment }}</div>
<div class="course_value">{{ item.comment.comment }}</div>
</div>
<!-- 第二行附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> -->

@ -3,10 +3,10 @@
<div>
<div class="course_body">
<div class="search_top">
<div class="btn">
<!-- <div class="btn">
<el-button @click="search_data"></el-button>
<el-button @click="reset"></el-button>
</div>
</div> -->
<el-form :model="search" class="search_top_form">
<el-form-item label="流程状态">
<el-select v-model="search.course_status" @change="change_course">
@ -36,6 +36,10 @@
placeholder="请选择关键词"
></el-input>
</el-form-item>
<el-form-item>
<el-button @click="search_data"></el-button>
<el-button @click="reset"></el-button>
</el-form-item>
</el-form>
</div>
<div class="search_table">
@ -176,10 +180,12 @@ export default {
};
get_my_course(param).then((res) => {
//
for( let i = 0; i<res.rows.length;i++) {
res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
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);
console.log("res.rows", res.rows);
this.table_data = res.rows;
this.total = res.total;
});
@ -194,7 +200,7 @@ export default {
},
//
check_details(val) {
console.log('12344',val);
console.log("12344", val);
this.$emit("change_to_detail", val); //
},
//
@ -257,31 +263,31 @@ export default {
// return "#FDA722";
case "审核完成":
return "#2eb9ef";
case "驳回完成":
case "驳回":
return "#e55b5b";
}
},
//
process_change(val) {
switch(val) {
case 1 :
switch (val) {
case 1:
return "审核中";
case 2 :
case 2:
return "审核完成";
case 3 :
return "驳回完成";
case 3:
return "驳回";
}
},
handleSizeChange(val) {
console.log(`每页 ${val}`);
this.pageNum = 1;
this.pageSize = val;
this.search_data()
this.search_data();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNum = val;
this.search_data()
this.search_data();
},
},
};
@ -371,7 +377,6 @@ export default {
border-radius: 0px;
height: 3.7vh;
border: 1px solid #3d505e;
// border: 0.5px dashed;
background: #283436;
color: #fff;
}
@ -386,6 +391,21 @@ export default {
background: #283436;
}
}
.el-button {
width: 70px;
height: 3.7vh !important;
border: 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 {
color: #fff;

@ -85,7 +85,7 @@
<!-- 第一行处理意见 -->
<div class="dispose_idea">
<div class="course_text">处理意见:</div>
<div class="course_value">{{ item.comment }}</div>
<div class="course_value">{{ item.comment.comment }}</div>
</div>
<!-- 第二行附件 按需显示或者隐藏 -->
<!-- <div v-if="attachment_show" class="attachment"> -->

Loading…
Cancel
Save