commit
This commit is contained in:
@@ -15,62 +15,67 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
</style>
|
||||
<div id="app" v-cloak>
|
||||
<guava>
|
||||
<guava ref="guava">
|
||||
<el-card shadow="never">
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-input placeholder="请输入内容" clearable v-model="pageForm.searchKeyword" @keyup.enter.native="doSearch">
|
||||
<el-select v-model="pageForm.searchName" slot="prepend" placeholder="查询类型" style="width: 120px;"
|
||||
clearable>
|
||||
<el-option label="编号" value="zcbh"></el-option>
|
||||
<el-option label="名称" value="zcmc"></el-option>
|
||||
<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
|
||||
v-model="pageForm.searchKeyword">
|
||||
<el-select clearable placeholder="查询类型" slot="prepend"
|
||||
style="width: 120px;"
|
||||
v-model="pageForm.searchName">
|
||||
<el-option label="资产编号" value="zcbh"></el-option>
|
||||
<el-option label="资产名称" value="zcmc"></el-option>
|
||||
<el-option label="存放地" value="zccfdmc"></el-option>
|
||||
</el-select>
|
||||
</el-input>
|
||||
</div>
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-select v-model="pageForm.zczt" placeholder="资产状态" style="width: 180px;" clearable>
|
||||
<el-select clearable placeholder="资产状态" style="width: 180px;"
|
||||
v-model="pageForm.zczt">
|
||||
<el-option label="在用" value="在用"></el-option>
|
||||
<el-option label="闲置" value="闲置"></el-option>
|
||||
<el-option label="未使用" value="未使用"></el-option>
|
||||
<el-option label="待报废" value="待报废"></el-option>
|
||||
<el-option label="校外转入" value="校外转入"></el-option>
|
||||
<el-option label="校内转入" value="校内转入"></el-option>
|
||||
<el-option label="其它" value="其它"></el-option>
|
||||
<el-option label="损坏" value="损坏"></el-option>
|
||||
<el-option label="外携" value="外携"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-date-picker
|
||||
v-model="time"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="购置日期"
|
||||
end-placeholder="购置日期"
|
||||
format="yyyy 年 MM 月 dd 日"
|
||||
range-separator="-"
|
||||
start-placeholder="购置日期"
|
||||
type="daterange"
|
||||
v-model="time"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-select v-model="pageForm.zcghlx" placeholder="请选择资产类型">
|
||||
<el-option value="2" label="工会固定资产"></el-option>
|
||||
<el-option value="1" label="分工会固定资产"></el-option>
|
||||
<el-select placeholder="请选择资产类型" v-model="pageForm.zcghlx">
|
||||
<el-option label="校工会" value="2"></el-option>
|
||||
<el-option label="院级工会" value="1"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="btn-group tool-button mt5" v-if="pageForm.zcghlx==='1'">
|
||||
<el-select v-model="pageForm.ghid" placeholder="领用工会" style="width: 180px;" clearable>
|
||||
<el-option v-for="item in ghlist" :label="item.unionname" :value="item.id"></el-option>
|
||||
<el-select clearable placeholder="领用工会" style="width: 180px;"
|
||||
v-model="pageForm.ghid">
|
||||
<el-option :label="item.unionname" :value="item.id"
|
||||
v-for="item in ghlist"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-button icon="el-icon-search" @click="doSearch" type="primary"></el-button>
|
||||
</div>
|
||||
|
||||
<div class="pull-right offscreen-right mt5">
|
||||
<el-button type="primary" @click="doAllExport" icon="el-icon-download">总账导出</el-button>
|
||||
<el-button @click="doSearch" icon="el-icon-search" type="primary"></el-button>
|
||||
</div>
|
||||
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool :app="this" label="资产列表">
|
||||
<template #func>
|
||||
<el-button @click="doAllExport" size="small" type="primary"><i class="download"></i>
|
||||
台账导出
|
||||
</el-button>
|
||||
</template>
|
||||
</table-tool>
|
||||
<!--个人-->
|
||||
<el-table
|
||||
:data="tableData"
|
||||
@@ -78,149 +83,140 @@ layout("/layouts/platform.html"){
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table-column
|
||||
align="center"
|
||||
header-align="center"
|
||||
label="序号"
|
||||
type="index"
|
||||
header-align="center"
|
||||
align="center"
|
||||
>
|
||||
<template scope="scope">
|
||||
<span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="zcbh"
|
||||
label="编号"
|
||||
header-align="center"
|
||||
align="center">
|
||||
<template scope="scope">
|
||||
{{isNull(scope.row.zcbh)}}
|
||||
</template>
|
||||
<el-table-column align="center" header-align="center" label="资产编号" prop="zcbh"
|
||||
width="150px">
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150"
|
||||
prop="zcmc"
|
||||
show-overflow-tooltip
|
||||
label="名称"
|
||||
header-align="center"
|
||||
align="center">
|
||||
<template scope="scope">
|
||||
{{isNull(scope.row.zcmc)}}
|
||||
</template>
|
||||
<el-table-column align="center" header-align="center" label="资产名称" prop="zcmc"
|
||||
show-overflow-tooltip
|
||||
width="150">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zcxh"
|
||||
label="型号"
|
||||
header-align="center"
|
||||
align="center">
|
||||
<el-table-column align="center" header-align="center" label="型号规格"
|
||||
prop="zcxh"
|
||||
show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
{{isNull(scope.row.zcxh)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zcgg"
|
||||
label="规格"
|
||||
header-align="center"
|
||||
align="center">
|
||||
<template scope="scope">
|
||||
{{isNull(scope.row.zcgg)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zcgzrq"
|
||||
label="购置日期"
|
||||
sortable
|
||||
header-align="center"
|
||||
align="center">
|
||||
<!-- <el-table-column show-overflow-tooltip align="center" header-align="center" label="类别编号"
|
||||
prop="contentCode">
|
||||
</el-table-column>-->
|
||||
<!-- <el-table-column label="类别名称" prop="content" show-overflow-tooltip header-align="center"
|
||||
align="center">
|
||||
</el-table-column>-->
|
||||
<el-table-column align="center" header-align="center" label="购置日期"
|
||||
prop="zcgzrq"
|
||||
show-overflow-tooltip
|
||||
sortable>
|
||||
<template slot-scope="scope">
|
||||
{{isNull(scope.row.zcgzrq)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zclyrname"
|
||||
label="领用人"
|
||||
header-align="center"
|
||||
align="center">
|
||||
<el-table-column align="center" header-align="center" label="领用人"
|
||||
prop="zclyrname"
|
||||
show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
{{isNull(scope.row.zclyrname)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zclydwh"
|
||||
label="领用单位"
|
||||
header-align="center"
|
||||
sortable
|
||||
align="center">
|
||||
<el-table-column align="center" header-align="center" label="领用工会" prop="zclydwh"
|
||||
show-overflow-tooltip
|
||||
sortable>
|
||||
<template scope="scope">
|
||||
{{isNull(scope.row.zclydwh)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccfdmc"
|
||||
label="存放地名称"
|
||||
header-align="center"
|
||||
align="center">
|
||||
<el-table-column align="center" header-align="center" label="存放地名称"
|
||||
prop="zccfdmc"
|
||||
show-overflow-tooltip>
|
||||
<template scope="scope">
|
||||
{{isNull(scope.row.zccfdmc)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="状态"
|
||||
prop="zczt"
|
||||
header-align="center"
|
||||
sortable
|
||||
align="center">
|
||||
<!-- <template scope="scope">
|
||||
<span v-if="scope.row.zczt==1"><i class="fa fa-circle text-success ml5"></i> 在用</span>
|
||||
<span v-if="scope.row.zczt==2"><i class="fa fa-circle text-warning ml5"></i> 停用</span>
|
||||
<span v-if="scope.row.zczt==3"><i class="fa fa-circle text-danger ml5"></i> 报废</span>
|
||||
</template>-->
|
||||
</el-table-column>
|
||||
<el-table-column label="类型" prop="zcghlx" header-align="center" align="center" sortable>
|
||||
<el-table-column align="center" header-align="center" label="使用现状"
|
||||
prop="zczt"
|
||||
sortable>
|
||||
<template scope="scope">
|
||||
{{scope.row.zcghlx==='1'?'分工会固定资产':'工会固定资产'}}
|
||||
{{isNull(scope.row.zczt)}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="资产类型" prop="zcghlx"
|
||||
sortable>
|
||||
<template scope="scope">
|
||||
{{scope.row.zcghlx==='1'?'院级工会':'校工会'}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="200"
|
||||
label="操作"
|
||||
align="center"
|
||||
header-align="center"
|
||||
align="center">
|
||||
label="操作"
|
||||
width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="primary" @click="viewInfo(scope)">查看</el-button>
|
||||
<el-button size="mini" type="primary" @click="doExport(scope.row.zcid)">导出</el-button>
|
||||
<el-button @click="viewInfo(scope)" size="small" type="primary">查看
|
||||
</el-button>
|
||||
<!-- <el-button size="small" @click="doExport(scope.row.zcid)">导出</el-button>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</el-table>
|
||||
<el-row class="el-pagination-container">
|
||||
<el-pagination
|
||||
@size-change="pageSizeChange"
|
||||
@current-change="pageNumberChange"
|
||||
:current-page="pageForm.pageNumber"
|
||||
:page-sizes="[10, 20, 30, 50]"
|
||||
:page-size="pageForm.pageSize"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
:total="pageForm.totalCount">
|
||||
:page-sizes="[10, 20, 30, 50]"
|
||||
:total="pageForm.totalCount"
|
||||
@current-change="pageNumberChange"
|
||||
@size-change="pageSizeChange"
|
||||
layout="total, sizes, prev, pager, next, jumper">
|
||||
</el-pagination>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<template #view>
|
||||
<el-descriptions border>
|
||||
<el-descriptions-item label="资产名称">
|
||||
<div style="font-weight:bold;">
|
||||
{{ viewData.zcmc}}
|
||||
</div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="单价">{{viewData.zcdj}}元</el-descriptions-item>
|
||||
<el-descriptions-item label="数量">{{viewData.sl}}</el-descriptions-item>
|
||||
<el-descriptions-item label="资产类型"> {{viewData.zcghlx==='1'?'院级工会':'校工会'}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="规格型号">{{viewData.zcxh}}</el-descriptions-item>
|
||||
<el-descriptions-item label="类别编号">{{viewData.contentCode}}</el-descriptions-item>
|
||||
<el-descriptions-item label="类别名称">{{viewData.content}}</el-descriptions-item>
|
||||
<el-descriptions-item label="存放地点">{{viewData.zccfdmc}}</el-descriptions-item>
|
||||
<el-descriptions-item label="入库日期">{{viewData.zcrksj}}</el-descriptions-item>
|
||||
<el-descriptions-item label="购置日期">{{viewData.zcgzrq}}</el-descriptions-item>
|
||||
<el-descriptions-item label="资产编号">{{viewData.zcbh}}</el-descriptions-item>
|
||||
<el-descriptions-item label="领用人">{{viewData.zclyrname}}</el-descriptions-item>
|
||||
<el-descriptions-item label="领用工会">{{viewData.zclydwh}}</el-descriptions-item>
|
||||
<el-descriptions-item label="盘点情况">{{viewData.pdzt}}</el-descriptions-item>
|
||||
<el-descriptions-item label="使用现状">{{viewData.zczt}}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
|
||||
</template>
|
||||
</guava>
|
||||
|
||||
|
||||
<!-- 个人 查看详情-->
|
||||
<el-dialog
|
||||
title="详情"
|
||||
:visible.sync="viewDialogVisible"
|
||||
width="60%"
|
||||
custom-class="ViewDialogClass"
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="viewDialogVisible"
|
||||
custom-class="ViewDialogClass"
|
||||
title="详情"
|
||||
width="60%"
|
||||
>
|
||||
<el-tabs v-model="activeNames">
|
||||
<el-tab-pane label="基本信息" name="1">
|
||||
@@ -260,7 +256,7 @@ layout("/layouts/platform.html"){
|
||||
<el-form-item label="领用人">{{viewData.zclyrname}}</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item label="领用单位">{{viewData.zclydwh}}</el-form-item>
|
||||
<el-form-item label="领用工会">{{viewData.zclydwh}}</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item label="经手人">{{viewData.zcjsrname}}</el-form-item>
|
||||
@@ -353,17 +349,17 @@ layout("/layouts/platform.html"){
|
||||
const {searchKeyword, searchName, zczt, zcghlx, ghid} = this.pageForm
|
||||
let startTime = ''
|
||||
let endTime = ''
|
||||
if (this.time && this.time .length>0) {
|
||||
if (this.time && this.time.length > 0) {
|
||||
startTime = this.time[0];
|
||||
endTime = this.time[1];
|
||||
}
|
||||
window.location.href = '/platform/zcgl/zhcx/doExport?searchKeyword='+searchKeyword+
|
||||
'&searchName='+searchName+
|
||||
'&zczt='+zczt+
|
||||
'&zcghlx='+zcghlx+
|
||||
"&ghid="+ghid+
|
||||
'&startTime='+startTime+
|
||||
'&endTime='+endTime
|
||||
window.location.href = '/platform/zcgl/zhcx/doExport?searchKeyword=' + searchKeyword +
|
||||
'&searchName=' + searchName +
|
||||
'&zczt=' + zczt +
|
||||
'&zcghlx=' + zcghlx +
|
||||
"&ghid=" + ghid +
|
||||
'&startTime=' + startTime +
|
||||
'&endTime=' + endTime
|
||||
},
|
||||
|
||||
doExport(id) {
|
||||
@@ -418,10 +414,9 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
}, "json");
|
||||
},
|
||||
viewInfo: function (scope) {
|
||||
var self = this;
|
||||
self.viewData = JSON.parse(JSON.stringify(scope.row));
|
||||
self.viewDialogVisible = true;
|
||||
viewInfo(scope) {
|
||||
this.viewData = JSON.parse(JSON.stringify(scope.row));
|
||||
this.$refs.guava.view()
|
||||
},
|
||||
getUnion: function () {
|
||||
var self = this;
|
||||
@@ -439,4 +434,4 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
#-->
|
||||
|
||||
Reference in New Issue
Block a user