suzhou-jichuang-lanhai
/
TcAssetVerificationPc
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationPc into lijinlong

Browse Source
lijinlong
李劲龙 2 months ago
parent cd5093a019 1e650783c5
commit dc95e75864
7 changed files with 192 additions and 197 deletions
Show Stats Download Patch File Download Diff File

6
src/assets/styles/public.scss
Unescape View File

@ -123,7 +123,7 @@
}
#L-pagination {
margin-top: 15px;
margin-top: 10px;
padding: 0px 10px;
.btn-prev,
@ -269,6 +269,10 @@
}
}
.teshu-top-info {
padding: 20px;
}
.top-info {
padding: 20px;
background: #FAFBFC;

2
src/assets/styles/sidebar.scss
Unescape View File

@ -134,7 +134,7 @@
& .theme-dark .nest-menu .el-submenu>.el-submenu__title,
& .theme-dark .el-submenu .el-menu-item {
background-color: $base-menu-background !important;
// background-color: $base-menu-background !important;
&:hover {
background-color: #1485EF !important;

6
src/views/auditPages/assetsManagement/assetsAuth.vue
Unescape View File

@ -2892,6 +2892,12 @@ export default {
this.select = arr[0]
this.ruleForm.fwwz = arr[1]
}
if(this.ruleForm.glymList.length == 0) {
this.ruleForm.glymList.push({key:""})
}
if(this.ruleForm.glIpList.length == 0) {
this.ruleForm.glIpList.push({key:""})
}
this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : [];
let chepingUnit = this.ruleForm.gylxxList.filter((item) => item.type == 1)
let yjgysUnit = this.ruleForm.gylxxList.filter((item) => item.type == 2)

42
src/views/auditPages/taskManagement/info.vue
Unescape View File

@ -3,26 +3,28 @@
<div class="info-left" id="L-size-main">
<div class="content-info" id="L-header">
<div class="info-title">任务详情</div>
<div class="top-info">
<el-row class="top-row">
<el-col :span="8">
任务编号：<span>{{ titleInfoObj.id }}</span>
</el-col>
<el-col :span="8">
任务名称：<span>{{ titleInfoObj.taskName }}</span>
</el-col>
<el-col :span="8">
任务状态：<span>{{ taskstatus(titleInfoObj.taskStatus) }}</span>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
任务期限：<span>{{ titleInfoObj.taskDeadline }}</span>
</el-col>
<el-col :span="8">
任务下发时间：<span>{{ titleInfoObj.taskTime }}</span>
</el-col>
</el-row>
<div class="teshu-top-info">
<div class="top-info">
<el-row class="top-row">
<el-col :span="8">
任务编号：<span>{{ titleInfoObj.id }}</span>
</el-col>
<el-col :span="8">
任务名称：<span>{{ titleInfoObj.taskName }}</span>
</el-col>
<el-col :span="8">
任务状态：<span>{{ taskstatus(titleInfoObj.taskStatus) }}</span>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
任务期限：<span>{{ titleInfoObj.taskDeadline }}</span>
</el-col>
<el-col :span="8">
任务下发时间：<span>{{ titleInfoObj.taskTime }}</span>
</el-col>
</el-row>
</div>
</div>
</div>
<div class="info-cut-off-rule" id="L-tab">

1
src/views/components/Pagination/index.vue
Unescape View File

@ -192,6 +192,7 @@ export default {
}
.my-pagination-container {
display: flex;
align-items: center;
justify-content: space-between;
background: #fff;
width: 100%;

31
src/views/unitPages/myTask/index.vue
Unescape View File

@ -5,17 +5,17 @@
<div class="search-title">查询条件</div>
<el-form :inline="true" :model="formInline" size="small" class="demo-form-inline">
<el-row>
<el-col :span="8">
<el-col :span="7">
<el-form-item label="任务名称：">
<el-input v-model="formInline.taskName" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="7">
<el-form-item label="任务编号：">
<el-input v-model="formInline.taskId" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="7">
<el-form-item label="任务状态：">
<el-select v-model="formInline.taskStatus" placeholder="请选择">
<el-option label="进行中" value="1">
@ -27,17 +27,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item >
<!-- <el-date-picker v-model="formInline.time" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="请选择">
</el-date-picker> -->
</el-form-item>
</el-col>
<el-col :span="16" style="text-align: right;padding-right: 20px;">
<el-form-item>
<el-col :span="3">
<el-form-item class="unit-form">
<el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
<el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
</el-form-item>
@ -83,16 +74,16 @@
<el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row)">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info" @click="goInfo(scope.row)"
style="color: #1485EF;cursor: pointer;">查看</span>
<span class="look-info"
style="color: #1485EF;margin-right: 15px;cursor: pointer;">查看</span>
</div>
<!-- v-if="scope.row.taskStatus == 1" -->
<div style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="delInfo(scope.row)">
<img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
<span class="del-info" @click="delInfo(scope.row)"
style="color: #1485EF;cursor: pointer;">开始核查</span>
<span class="del-info"
style="color: #1485EF;margin-right: 15px;cursor: pointer;">开始核查</span>
</div>
</div>
</template>

301
src/views/unitPages/myTask/info.vue
Unescape View File

@ -2,152 +2,156 @@
<!-- 任务核查 -->
<div class="L-task-info">
<div class="info-left" id="L-size-main">
<div class="content-info" id="L-header">
<div class="info-left info-left-two" id="L-size-main">
<div class="content-info content-info-two" id="L-header">
<div class="info-title">任务详情</div>
<div class="top-info">
<el-row class="top-row">
<el-col :span="8">
任务编号：<span>{{ titleInfoObj.id }}</span>
</el-col>
<el-col :span="8">
任务名称：<span>{{ titleInfoObj.taskName }}</span>
</el-col>
<el-col :span="8">
任务状态：<span>{{ taskstatus(titleInfoObj.taskStatus) }}</span>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
任务期限：<span>{{ titleInfoObj.taskDeadline }}</span>
</el-col>
<el-col :span="8">
任务下发时间：<span>{{ titleInfoObj.taskTime }}</span>
</el-col>
</el-row>
<div class="teshu-top-info">
<div class="top-info">
<el-row class="top-row">
<el-col :span="8">
任务编号：<span>{{ titleInfoObj.id }}</span>
</el-col>
<el-col :span="8">
任务名称：<span>{{ titleInfoObj.taskName }}</span>
</el-col>
<el-col :span="8">
任务状态：<span>{{ taskstatus(titleInfoObj.taskStatus) }}</span>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
任务期限：<span>{{ titleInfoObj.taskDeadline }}</span>
</el-col>
<el-col :span="8">
任务下发时间：<span>{{ titleInfoObj.taskTime }}</span>
</el-col>
</el-row>
</div>
</div>
</div>
<div class="content-info" id="L-header">
<div class="info-title">任务详情</div>
</div>
<div class="info-bottom-box">
<el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">
<el-row>
<el-col :span="8">
<el-form-item label="核查单位:">
<el-input v-model="formInline.dwmc" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="系统类型:">
<el-select v-model="formInline.xtlx" placeholder="请选择">
<el-option v-for="dict in dict.type.zc_xtlx" :key="dict.label" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="审核状态:">
<el-select v-model="formInline.status" placeholder="请选择">
<el-option label="未核查" value="0">
</el-option>
<el-option label="已核查" value="1">
</el-option>
<el-option label="审核通过" value="3">
</el-option>
<el-option label="审核不通过" value="4">
</el-option>
<el-option label="已报废" value="5">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button size="mini" type="primary" @click="handleQuery()">查询</el-button>
<el-button size="mini" @click="resetQuery()">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-form :inline="true" :model="formInlineTwo" size="small" class="demo-form-inline" v-if="index == 2">
<el-row>
<el-col :span="7">
<el-form-item label="单位名称：">
<el-input v-model="formInlineTwo.unitName" placeholder="请输入"></el-input>
<!-- <el-select v-model="formInline.unit" placeholder="请选择"> -->
<!-- <el-option
v-for="dict in dict.type.bms_approval_status"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option> -->
<!-- </el-select> -->
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button size="mini" type="primary" @click="handleQuery()">查询</el-button>
<el-button size="mini" @click="resetQuery()">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<section v-if="index == 1">
<el-table v-loading="loading" :data="tableData" :height="tabHeader" :max-height="tabHeader"
:row-class-name="tableRowClassName">
<el-table-column type="index" width="50" label="序号" align="center" />
<!-- <el-table-column label="资产编号" key="id" width="200px" prop="id" align="center" /> -->
<el-table-column label="系统名称" key="xtmc" prop="xtmc" align="center" />
<el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
<template slot-scope="scope">
<dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx" />
</template>
</el-table-column>
<el-table-column label="核查单位" key="zcdwmc" prop="zcdwmc" align="center" />
<el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.status == 0" style="color: #F59A23;">
未核查
</span>
<span v-if="scope.row.status == 1" style="color: #F43147;">
已核查
</span>
<span v-if="scope.row.status == 3" style="color: #00FF00;">
审核通过
</span>
<span v-if="scope.row.status == 4" style="color: #C51717;">
审核不通过
</span>
<span v-if="scope.row.status == 5" style="color: #C51717;">
已报废
</span>
</template>
</el-table-column>
<el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;">查看</span>
</div>
<!-- v-if="scope.row.taskStatus == 1" -->
<div v-if="($route.query.pageType == 'info' || $route.meta.pageType == 'info') && scope.row.status != 3&& scope.row.status != 5&&scope.row.status != 1" style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;" @click="goInfo(2,scope.row)">
<img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
<span class="del-info"
style="color: #1485EF;">核查</span>
<main class="renwuxiangqing">
<div class="info-cut-off-rule-my" id="L-tab">
<div class="info-title">资产信息</div>
</div>
<div class="info-bottom-box">
<el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">
<el-row>
<el-col :span="8">
<el-form-item label="核查单位:">
<el-input v-model="formInline.dwmc" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="系统类型:">
<el-select v-model="formInline.xtlx" placeholder="请选择">
<el-option v-for="dict in dict.type.zc_xtlx" :key="dict.label" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="审核状态:">
<el-select v-model="formInline.status" placeholder="请选择">
<el-option label="未核查" value="0">
</el-option>
<el-option label="已核查" value="1">
</el-option>
<el-option label="审核通过" value="3">
</el-option>
<el-option label="审核不通过" value="4">
</el-option>
<el-option label="已报废" value="5">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button size="mini" type="primary" @click="handleQuery()">查询</el-button>
<el-button size="mini" @click="resetQuery()">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-form :inline="true" :model="formInlineTwo" size="small" class="demo-form-inline" v-if="index == 2">
<el-row>
<el-col :span="7">
<el-form-item label="单位名称：">
<el-input v-model="formInlineTwo.unitName" placeholder="请输入"></el-input>
<!-- <el-select v-model="formInline.unit" placeholder="请选择"> -->
<!-- <el-option
v-for="dict in dict.type.bms_approval_status"
:key="dict.value"
:label="dict.label"
:value="dict.value">
</el-option> -->
<!-- </el-select> -->
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button size="mini" type="primary" @click="handleQuery()">查询</el-button>
<el-button size="mini" @click="resetQuery()">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<section v-if="index == 1">
<el-table v-loading="loading" :data="tableData" :height="tabHeader" :max-height="tabHeader"
:row-class-name="tableRowClassName">
<el-table-column type="index" width="50" label="序号" align="center" />
<!-- <el-table-column label="资产编号" key="id" width="200px" prop="id" align="center" /> -->
<el-table-column label="系统名称" key="xtmc" prop="xtmc" align="center" />
<el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
<template slot-scope="scope">
<dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx" />
</template>
</el-table-column>
<el-table-column label="核查单位" key="zcdwmc" prop="zcdwmc" align="center" />
<el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.status == 0" style="color: #F59A23;">
未核查
</span>
<span v-if="scope.row.status == 1" style="color: #F43147;">
已核查
</span>
<span v-if="scope.row.status == 3" style="color: #00FF00;">
审核通过
</span>
<span v-if="scope.row.status == 4" style="color: #C51717;">
审核不通过
</span>
<span v-if="scope.row.status == 5" style="color: #C51717;">
已报废
</span>
</template>
</el-table-column>
<el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;margin-right: 15px;">查看</span>
</div>
<!-- v-if="scope.row.taskStatus == 1" -->
<div v-if="($route.query.pageType == 'info' || $route.meta.pageType == 'info') && scope.row.status != 3&& scope.row.status != 5&&scope.row.status != 1" style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(2,scope.row)">
<img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
<span class="del-info"
style="color: #1485EF;margin-right: 15px;">核查</span>
</div>
</div>
</div>
</template>
</el-table-column>
</el-table>
</section>
<my-pagination id="L-pagination" :total="total" :page="pagination.current" :limit="pagination.size"
@pagination="getPagination" :current-page.sync="pagination.current"></my-pagination>
</div>
</template>
</el-table-column>
</el-table>
</section>
<my-pagination id="L-pagination" :total="total" :page="pagination.current" :limit="pagination.size"
@pagination="getPagination" :current-page.sync="pagination.current"></my-pagination>
</div>
</main>
</div>
<div class="info-right" v-if="$route.query.pageType == 'look' || $route.meta.pageType == 'look'">
<div class="info-title">任务流程节点</div>
@ -395,16 +399,3 @@ export default {
},
}
</script>
<style lang="scss" scoped>
::v-deep .el-timeline {
padding-left: 0;
font-size: 12px;
}
::v-deep .el-form-item__label {
padding-right: 3px;
}
.look-info {
}
</style>

Write Preview
Loading…
Cancel
Save