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

Merge pull request '提交' (#98) from lukeyan into master

Browse Source 
Reviewed-on: #98
pull/101/head^2
lukeyan 1 year ago
parent 932c4daadf 4e6b43538e
commit 8b38aebeb8
11 changed files with 26 additions and 54 deletions
Show Stats Download Patch File Download Diff File

2
src/api/closeLoopDispose/index.js
Unescape View File

@ -35,7 +35,7 @@ export function get_backlog_company_tree(params) {
// 审批流程 // 审批流程
export function get_backlog_approve(data) { export function get_backlog_approve(data) {
return request({ return request({
url: '/workflow/external/task/approve', url: '/closedloopdisposal/workflow/updateFlowableStatus',
method: 'post', method: 'post',
data data
}) })

4
src/utils/request.js
Unescape View File

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

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

@ -30,10 +30,11 @@
<div class="search_table"> <div class="search_table">
<el-table <el-table
:data="table_data" :data="table_data"
height="580"
:header-cell-style="table_header" :header-cell-style="table_header"
:cell-style="{ background: 'revert', 'text-align': 'center' }" :cell-style="{ background: 'revert', 'text-align': 'center' }"
> >
<el-table-column prop="procDefName" label="流程名称" width="380"> <el-table-column prop="processName" label="流程名称" width="380">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200"> <el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column> </el-table-column>

4
src/views/closeLoopDispose/components/backlogDetailDialog.vue
Unescape View File

@ -180,7 +180,7 @@ export default {
margin-left: 8px; margin-left: 8px;
width: 550px; width: 550px;
// border: 0.1px solid #5b748c; // border: 0.1px solid #5b748c;
height: 49vh; height: 38vh;
// overflow-y: auto; // overflow-y: auto;
} }
// .section_tree::-webkit-scrollbar { // .section_tree::-webkit-scrollbar {
@ -211,7 +211,7 @@ export default {
} }
.el-tree { .el-tree {
/* 树形数据过长添加滚动条 */ /* 树形数据过长添加滚动条 */
height: 49vh; height: 38vh;
overflow: auto; overflow: auto;
// box-shadow: 5px 5px 10px #126a58; // box-shadow: 5px 5px 10px #126a58;
border-radius: 0px; border-radius: 0px;

38
src/views/closeLoopDispose/components/backlogDetailForm.vue
Unescape View File

@ -166,44 +166,6 @@ export default {
section: "", section: "",
}, },
backlog_list: [ backlog_list: [
{
id: "1",
personUrl: "../../../assets/companyFile/avatar.png",
name: "吴沁",
team: "技侦大队",
backlog_value:
"2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。",
attachment_value: "20220820现场处置照片.jpg",
send_person: "蔡坤、黄毅、李丹丹、张强强",
backlog_time: "2022-11-13 12:10:08",
},
{
id: "2",
personUrl: "../../../assets/companyFile/avatar.png",
name: "吴沁",
team: "技侦大队",
backlog_value:
"2022年8月26日12时许,经过分析,我队决定对浙江浙江鑫甬生物化工股份有限公司的外来租赁危化品运输车(浙B2M50R)司机王某(身份证号:42109119880717****）做出吊销货车驾照处罚，立即执行。",
},
{
id: "3",
personUrl: "../../../assets/companyFile/avatar.png",
name: "吴沁",
team: "技侦大队",
backlog_value:
"2022年8月26日12时许,经过分析,我队决定对浙江浙江鑫甬生物化工股份有限公司的外来租赁危化品运输车(浙B2M50R)司机王某(身份证号:42109119880717****）做出吊销货车驾照处罚，立即执行。",
},
{
id: "4",
personUrl: "../../../assets/companyFile/avatar.png",
name: "吴沁",
team: "技侦大队",
backlog_value:
"2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。2022年8月20日0时32分,我队接到预警称浙江浙江鑫甬生物化工股份有限公司存在运输车辆频繁违章情况。接报后值班民警于立即到达现场,经现场了解到:危化品运输车(浙B2M50R)为外来租赁货车,司机王某(身份证号:42109119880717****)疑似前科重点人员。目前司机已经带回所以便进一步调查。",
attachment_value: "20220820现场处置照片.jpg",
send_person: "蔡坤、黄毅、李丹丹、张强强",
backlog_time: "2022-11-13 12:10:08",
},
], ],
status_list: [ status_list: [
{ label: "待审核", value: "1" }, { label: "待审核", value: "1" },

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

@ -44,10 +44,11 @@
<div class="search_table"> <div class="search_table">
<el-table <el-table
:data="table_data" :data="table_data"
height="580"
:header-cell-style="table_header" :header-cell-style="table_header"
:cell-style="{ background: 'revert', 'text-align': 'center' }" :cell-style="{ background: 'revert', 'text-align': 'center' }"
> >
<el-table-column prop="procDefName" label="流程名称" width="380"> <el-table-column prop="processName" label="流程名称" width="380">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200"> <el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column> </el-table-column>
@ -113,7 +114,7 @@ export default {
// { label: "待审核", value: "1" }, // { label: "待审核", value: "1" },
{ label: "审核中", value: "1" }, { label: "审核中", value: "1" },
{ label: "审核完成", value: "2" }, { label: "审核完成", value: "2" },
{ label: "驳回完成", value: "3" }, { label: "驳回", value: "3" },
], ],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [

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

@ -44,6 +44,7 @@
<div class="search_table"> <div class="search_table">
<el-table <el-table
:data="table_data" :data="table_data"
height="580"
:header-cell-style="table_header" :header-cell-style="table_header"
:cell-style="{ background: 'revert', 'text-align': 'center' }" :cell-style="{ background: 'revert', 'text-align': 'center' }"
> >
@ -73,7 +74,7 @@
size="small" size="small"
class="operation" class="operation"
@click="check_details(scope.row)" @click="check_details(scope.row)"
>处置 >详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -112,7 +113,7 @@ export default {
// { label: "待审核", value: "1" }, // { label: "待审核", value: "1" },
{ label: "审核中", value: "1" }, { label: "审核中", value: "1" },
{ label: "审核完成", value: "2" }, { label: "审核完成", value: "2" },
{ label: "驳回完成", value: "3" }, { label: "驳回", value: "3" },
], ],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [

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

@ -41,10 +41,11 @@
<div class="search_table"> <div class="search_table">
<el-table <el-table
:data="table_data" :data="table_data"
height="580"
:header-cell-style="table_header" :header-cell-style="table_header"
:cell-style="{ background: 'revert', 'text-align': 'center' }" :cell-style="{ background: 'revert', 'text-align': 'center' }"
> >
<el-table-column prop="procDefName" label="流程名称" width="380"> <el-table-column prop="processName" label="流程名称" width="380">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间" width="200"> <el-table-column prop="createTime" label="创建时间" width="200">
</el-table-column> </el-table-column>
@ -106,7 +107,7 @@ export default {
// { label: "待审核", value: "1" }, // { label: "待审核", value: "1" },
{ label: "审核中", value: "1" }, { label: "审核中", value: "1" },
{ label: "审核完成", value: "2" }, { label: "审核完成", value: "2" },
{ label: "驳回完成", value: "3" }, { label: "驳回", value: "3" },
], ],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -396,6 +397,7 @@ export default {
.btn { .btn {
margin-left: 8px; margin-left: 8px;
margin-right: 2px; margin-right: 2px;
height: 3.7vh;
.el-button { .el-button {
width: 70px; width: 70px;
height: 3.7vh !important; height: 3.7vh !important;

9
src/views/systemManagement/companyList/components/clearDialog.vue
Unescape View File

@ -9,7 +9,7 @@
<div class="text">删除后将同时清空企业的全部信息，确认继续吗？</div> <div class="text">删除后将同时清空企业的全部信息，确认继续吗？</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="saveFormData">确 定</el-button> <el-button @click="saveFormData">确 定</el-button>
<el-button>取 消</el-button> <el-button @click="close">取 消</el-button>
</div></el-dialog </div></el-dialog
> >
</template> </template>
@ -25,12 +25,12 @@ export default {
}, },
methods: { methods: {
open(num, item) { open(num, item) {
console.log(num,item,'item'); console.log(num, item, "item");
this.visible = true; this.visible = true;
this.id = item.id; this.id = item.id;
}, },
saveFormData() { saveFormData() {
const params = `idList=${this.id}` const params = `idList=${this.id}`;
deleteCompanyList(params).then((res) => { deleteCompanyList(params).then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.$message.success("删除成功"); this.$message.success("删除成功");
@ -42,6 +42,9 @@ export default {
} }
}); });
}, },
close() {
this.visible = false;
},
}, },
}; };
</script> </script>

2
src/views/systemManagement/companyScore/components/companyTable.vue
Unescape View File

@ -223,12 +223,14 @@ export default {
border: 0.1px solid #3f5564; border: 0.1px solid #3f5564;
} }
/deep/.el-table__body-wrapper::-webkit-scrollbar { /deep/.el-table__body-wrapper::-webkit-scrollbar {
display: none;
width: 6px; width: 6px;
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;
width: 5px; width: 5px;
background-color: #3c4b4a; background-color: #3c4b4a;
border-radius: 4px; border-radius: 4px;

2
src/views/systemManagement/companyScore/index.vue
Unescape View File

@ -275,7 +275,7 @@ export default {
} }
.table_body { .table_body {
width: 85.2vw; width: 85.2vw;
height: 71vh; height: 68vh;
margin-top: 3vh; margin-top: 3vh;
// border: 0.1px solid #4d8f89; // border: 0.1px solid #4d8f89;
} }

Write Preview
Loading…
Cancel
Save