xuhuajiao
/
RIFD-management-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

页面需求优化

master
xuhuajiao 2 weeks ago
parent
99282675ce
commit
5fc5c15064
4 changed files with 101 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      src/views/assetManage/assetWhitelist/index.vue
  2. 4
      src/views/assetManage/inOutLog/index.vue
  3. 4
      src/views/assetManage/inventory/index-tag.vue
  4. 85
      src/views/assetManage/inventory/index.vue

57
src/views/assetManage/assetWhitelist/index.vue
View File

@ -63,12 +63,12 @@
<div class="detail-tab tab-content"> <div class="detail-tab tab-content">
<div class="detail-check"> <div class="detail-check">
<div style="flex: 1;"> <div style="flex: 1;">
<ul class="book-detail asset-detail">
<ul class="book-detail asset-detail" style="max-height: 680px; overflow: auto;">
<li><span>资产编号：</span>{{ selectedAsset && selectedAsset.mark }}</li> <li><span>资产编号：</span>{{ selectedAsset && selectedAsset.mark }}</li>
<li><span>资产名称：</span>{{ selectedAsset && selectedAsset.name }}</li> <li><span>资产名称：</span>{{ selectedAsset && selectedAsset.name }}</li>
<li><span>资产类型：</span>{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}</li> <li><span>资产类型：</span>{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}</li>
<li><span>规格型号：</span>{{ selectedAsset && selectedAsset.capitalspec || '——' }}</li> <li><span>规格型号：</span>{{ selectedAsset && selectedAsset.capitalspec || '——' }}</li>
<li><span>设备用途：</span>{{ selectedAsset && selectedAsset.sbyt || '——' }}</li>
<!-- <li><span>设备用途：</span>{{ selectedAsset && selectedAsset.sbyt || '——' }}</li> -->
<li><span>价值类型：</span>{{ selectedAsset && selectedAsset.jzlx || '——' }}</li> <li><span>价值类型：</span>{{ selectedAsset && selectedAsset.jzlx || '——' }}</li>
<li><span>价值：</span>{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}</li> <li><span>价值：</span>{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}</li>
<li><span>数量：</span>{{ selectedAsset && selectedAsset.capitalnum }}</li> <li><span>数量：</span>{{ selectedAsset && selectedAsset.capitalnum }}</li>
@ -81,17 +81,24 @@
<li><span>存放地：</span>{{ selectedAsset && selectedAsset.cfdname }}</li> <li><span>存放地：</span>{{ selectedAsset && selectedAsset.cfdname }}</li>
<li><span>供应商：</span>{{ selectedAsset && selectedAsset.gys }}</li> <li><span>供应商：</span>{{ selectedAsset && selectedAsset.gys }}</li>
<li><span>项目名称：</span>{{ selectedAsset && selectedAsset.xmmc }}</li> <li><span>项目名称：</span>{{ selectedAsset && selectedAsset.xmmc }}</li>
<li><span>无线电设备用途：</span>{{ selectedAsset && selectedAsset.wxdsbyt }}</li>
<!-- <li><span>无线电设备用途：</span>{{ selectedAsset && selectedAsset.wxdsbyt }}</li> -->
<li><span>领用日期：</span>{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}</li> <li><span>领用日期：</span>{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}</li>
<li><span>投入使用日期：</span>{{ selectedAsset && selectedAsset.trsyrq | parseTime }}</li> <li><span>投入使用日期：</span>{{ selectedAsset && selectedAsset.trsyrq | parseTime }}</li>
<li><span>入账日期：</span>{{ selectedAsset && selectedAsset.rzrq | parseTime }}</li> <li><span>入账日期：</span>{{ selectedAsset && selectedAsset.rzrq | parseTime }}</li>
<li><span>保修截至日期：</span>{{ selectedAsset && selectedAsset.bxjzrq | parseTime }}</li> <li><span>保修截至日期：</span>{{ selectedAsset && selectedAsset.bxjzrq | parseTime }}</li>
</ul> </ul>
<ul class="book-detail white-detail">
<li class="white-item"><span>加入时间：</span>{{ selectedAsset && selectedAsset.whiteCreateTime | parseTime }}</li>
<li class="white-item"><span>操作人：</span>{{ selectedAsset && selectedAsset.whiteLastname || '——' }}</li>
<li class="white-item"><span>备注：</span>{{ selectedAsset && selectedAsset.whiteRemark || '——' }}</li>
</ul>
<div class="book-detail white-detail">
<div class="white-title">
<span class="small-line" />
<p>已加入白名单</p>
<span class="big-line" />
</div>
<ul>
<li class="white-item"><span>加入时间：</span>{{ selectedAsset && selectedAsset.whiteCreateTime | parseTime }}</li>
<li class="white-item"><span>操作人：</span>{{ selectedAsset && selectedAsset.whiteLastname || '——' }}</li>
<li class="white-item"><span>备注：</span>{{ selectedAsset && selectedAsset.whiteRemark || '——' }}</li>
</ul>
</div>
</div> </div>
<!-- 资产图片列表（竖向滚动 + 删除按钮） --> <!-- 资产图片列表（竖向滚动 + 删除按钮） -->
<div class="asset-image-wrapper"> <div class="asset-image-wrapper">
@ -311,6 +318,8 @@ export default {
// 合并详情接口数据 + 列表行的白名单字段 // 合并详情接口数据 + 列表行的白名单字段
this.selectedAsset = { this.selectedAsset = {
...(res || {}), ...(res || {}),
capitaltyepname: row.capitaltyepname,
resourcename: row.resourcename,
whiteCreateTime: row.whiteCreateTime, whiteCreateTime: row.whiteCreateTime,
whiteLastname: row.whiteLastname, whiteLastname: row.whiteLastname,
whiteRemark: row.whiteRemark whiteRemark: row.whiteRemark
@ -588,6 +597,14 @@ export default {
width: 1000px !important; width: 1000px !important;
.el-dialog__body{ .el-dialog__body{
padding: 0 0 30px 0; padding: 0 0 30px 0;
::-webkit-scrollbar{
width: 5px !important;
height: 5px !important;
}
::-webkit-scrollbar-thumb{
background-color: #f5f7fa !important;
}
} }
} }
.detail-check{ .detail-check{
@ -602,6 +619,7 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
li{ li{
line-height: 30px; line-height: 30px;
span{ span{
@ -629,6 +647,29 @@ export default {
border-radius: 4px; border-radius: 4px;
background-color: #EEF5FE; background-color: #EEF5FE;
margin-top: 4px; margin-top: 4px;
& .white-title{
display: flex;
justify-content: flex-start;
align-items: center;
font-size: 12px;
color: #606266;
padding: 6px;
p{
padding: 0 10px;
}
.small-line{
display: inline-block;
width: 40px;
border-bottom: 1px solid #a9aeb8;
}
.big-line{
display: inline-block;
flex: 1;
// height: 1px;
border-bottom: 1px solid #a9aeb8;
// background-color: #a9aeb8;
}
}
} }
} }
::v-deep .dialog-footer{ ::v-deep .dialog-footer{

4
src/views/assetManage/inOutLog/index.vue
View File

@ -66,7 +66,7 @@
<el-table-column prop="mainBillNo" label="任务单号" min-width="180px" :show-overflow-tooltip="true" /> <el-table-column prop="mainBillNo" label="任务单号" min-width="180px" :show-overflow-tooltip="true" />
<el-table-column prop="fondsName" label="所属市州" /> <el-table-column prop="fondsName" label="所属市州" />
<el-table-column prop="branchBillNo" label="关联单号" min-width="180px" :show-overflow-tooltip="true" /> <el-table-column prop="branchBillNo" label="关联单号" min-width="180px" :show-overflow-tooltip="true" />
<el-table-column prop="applicantName" label="申请人" />
<el-table-column prop="applicantName" label="申请人" :show-overflow-tooltip="true" />
<el-table-column prop="applicantDeptName" label="申请部门" min-width="120px" :show-overflow-tooltip="true" /> <el-table-column prop="applicantDeptName" label="申请部门" min-width="120px" :show-overflow-tooltip="true" />
<el-table-column prop="createTime" label="创建时间" width="150px"> <el-table-column prop="createTime" label="创建时间" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
@ -175,7 +175,7 @@
<el-table-column prop="capitaltypename" label="资产类型" min-width="100px" /> <el-table-column prop="capitaltypename" label="资产类型" min-width="100px" />
<el-table-column prop="departmentname" label="所属部门" min-width="100px" :show-overflow-tooltip="true" /> <el-table-column prop="departmentname" label="所属部门" min-width="100px" :show-overflow-tooltip="true" />
<!-- <el-table-column prop="resourcename" label="使用人" min-width="100px" /> --> <!-- <el-table-column prop="resourcename" label="使用人" min-width="100px" /> -->
<el-table-column prop="glrname" label="管理人" min-width="100px" />
<el-table-column prop="glrname" label="管理人" min-width="100px" :show-overflow-tooltip="true" />
<el-table-column prop="operatorName" label="操作人" min-width="100px"> <el-table-column prop="operatorName" label="操作人" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.operatorName">{{ scope.row.operatorName }}</span> <span v-if="scope.row.operatorName">{{ scope.row.operatorName }}</span>

4
src/views/assetManage/inventory/index-tag.vue
View File

@ -136,7 +136,7 @@
<li><span>资产名称：</span>{{ selectedAsset && selectedAsset.name }}</li> <li><span>资产名称：</span>{{ selectedAsset && selectedAsset.name }}</li>
<li><span>资产类型：</span>{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}</li> <li><span>资产类型：</span>{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}</li>
<li><span>规格型号：</span>{{ selectedAsset && selectedAsset.capitalspec || '——' }}</li> <li><span>规格型号：</span>{{ selectedAsset && selectedAsset.capitalspec || '——' }}</li>
<li><span>设备用途：</span>{{ selectedAsset && selectedAsset.sbyt || '——' }}</li>
<!-- <li><span>设备用途：</span>{{ selectedAsset && selectedAsset.sbyt || '——' }}</li> -->
<li><span>价值类型：</span>{{ selectedAsset && selectedAsset.jzlx || '——' }}</li> <li><span>价值类型：</span>{{ selectedAsset && selectedAsset.jzlx || '——' }}</li>
<li><span>价值：</span>{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}</li> <li><span>价值：</span>{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}</li>
<li><span>数量：</span>{{ selectedAsset && selectedAsset.capitalnum }}</li> <li><span>数量：</span>{{ selectedAsset && selectedAsset.capitalnum }}</li>
@ -150,7 +150,7 @@
<li><span>存放地：</span>{{ selectedAsset && selectedAsset.cfd }}</li> <li><span>存放地：</span>{{ selectedAsset && selectedAsset.cfd }}</li>
<li><span>供应商：</span>{{ selectedAsset && selectedAsset.gys }}</li> <li><span>供应商：</span>{{ selectedAsset && selectedAsset.gys }}</li>
<li><span>项目名称：</span>{{ selectedAsset && selectedAsset.xmmc }}</li> <li><span>项目名称：</span>{{ selectedAsset && selectedAsset.xmmc }}</li>
<li><span>无线电设备用途：</span>{{ selectedAsset && selectedAsset.wxdsbyt }}</li>
<!-- <li><span>无线电设备用途：</span>{{ selectedAsset && selectedAsset.wxdsbyt }}</li> -->
<li><span>领用日期：</span>{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}</li> <li><span>领用日期：</span>{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}</li>
<!-- <li><span>购置日期：</span>{{ selectedAsset &&selectedAsset.gzrq | parseTime }}</li> --> <!-- <li><span>购置日期：</span>{{ selectedAsset &&selectedAsset.gzrq | parseTime }}</li> -->
<li><span>投入使用日期：</span>{{ selectedAsset && selectedAsset.trsyrq | parseTime }}</li> <li><span>投入使用日期：</span>{{ selectedAsset && selectedAsset.trsyrq | parseTime }}</li>

85
src/views/assetManage/inventory/index.vue
View File

@ -99,12 +99,12 @@
<!-- v-if="tabIndex===0" --> <!-- v-if="tabIndex===0" -->
<div class="detail-check"> <div class="detail-check">
<div style="flex:1"> <div style="flex:1">
<ul class="book-detail">
<ul class="book-detail" style="max-height: 680px; overflow: auto;">
<li><span>资产编号：</span>{{ selectedAsset && selectedAsset.mark }}</li> <li><span>资产编号：</span>{{ selectedAsset && selectedAsset.mark }}</li>
<li><span>资产名称：</span>{{ selectedAsset && selectedAsset.name }}</li> <li><span>资产名称：</span>{{ selectedAsset && selectedAsset.name }}</li>
<li><span>资产类型：</span>{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}</li> <li><span>资产类型：</span>{{ selectedAsset && selectedAsset.capitaltyepname || '——' }}</li>
<li><span>规格型号：</span>{{ selectedAsset && selectedAsset.capitalspec || '——' }}</li> <li><span>规格型号：</span>{{ selectedAsset && selectedAsset.capitalspec || '——' }}</li>
<li><span>设备用途：</span>{{ selectedAsset && selectedAsset.sbyt || '——' }}</li>
<!-- <li><span>设备用途：</span>{{ selectedAsset && selectedAsset.sbyt || '——' }}</li> -->
<li><span>价值类型：</span>{{ selectedAsset && selectedAsset.jzlx || '——' }}</li> <li><span>价值类型：</span>{{ selectedAsset && selectedAsset.jzlx || '——' }}</li>
<li><span>价值：</span>{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}</li> <li><span>价值：</span>{{ selectedAsset ? formatMoney(selectedAsset?.startprice) : '——' }}</li>
<li><span>数量：</span>{{ selectedAsset && selectedAsset.capitalnum }}</li> <li><span>数量：</span>{{ selectedAsset && selectedAsset.capitalnum }}</li>
@ -118,7 +118,7 @@
<li><span>存放地：</span>{{ selectedAsset && selectedAsset.cfdname }}</li> <li><span>存放地：</span>{{ selectedAsset && selectedAsset.cfdname }}</li>
<li><span>供应商：</span>{{ selectedAsset && selectedAsset.gys }}</li> <li><span>供应商：</span>{{ selectedAsset && selectedAsset.gys }}</li>
<li><span>项目名称：</span>{{ selectedAsset && selectedAsset.xmmc }}</li> <li><span>项目名称：</span>{{ selectedAsset && selectedAsset.xmmc }}</li>
<li><span>无线电设备用途：</span>{{ selectedAsset && selectedAsset.wxdsbyt }}</li>
<!-- <li><span>无线电设备用途：</span>{{ selectedAsset && selectedAsset.wxdsbyt }}</li> -->
<li><span>领用日期：</span>{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}</li> <li><span>领用日期：</span>{{ selectedAsset && selectedAsset.deprestartdate | parseTime }}</li>
<!-- <li><span>购置日期：</span>{{ selectedAsset &&selectedAsset.gzrq | parseTime }}</li> --> <!-- <li><span>购置日期：</span>{{ selectedAsset &&selectedAsset.gzrq | parseTime }}</li> -->
<li><span>投入使用日期：</span>{{ selectedAsset && selectedAsset.trsyrq | parseTime }}</li> <li><span>投入使用日期：</span>{{ selectedAsset && selectedAsset.trsyrq | parseTime }}</li>
@ -127,11 +127,18 @@
<!-- <li v-if="selectedAsset && selectedAsset.rzrq !== null"><span>更新时间：</span>{{ selectedAsset &&selectedAsset.rzrq | parseTime }}</li> <!-- <li v-if="selectedAsset && selectedAsset.rzrq !== null"><span>更新时间：</span>{{ selectedAsset &&selectedAsset.rzrq | parseTime }}</li>
<li v-else><span>更新时间：</span>——</li> --> <li v-else><span>更新时间：</span>——</li> -->
</ul> </ul>
<ul v-if="selectedAsset && selectedAsset.is_whitelist" class="book-detail white-detail">
<li class="white-item"><span>加入时间：</span>{{ selectedAsset && selectedAsset.whiteCreateTime | parseTime }}</li>
<li class="white-item"><span>操作人：</span>{{ selectedAsset && selectedAsset.whiteLastname || '——' }}</li>
<li class="white-item"><span>备注：</span>{{ selectedAsset && selectedAsset.whiteRemark || '——' }}</li>
</ul>
<div v-if="selectedAsset && selectedAsset.is_whitelist" class="book-detail white-detail">
<div class="white-title">
<span class="small-line" />
<p>已加入白名单</p>
<span class="big-line" />
</div>
<ul>
<li class="white-item"><span>加入时间：</span>{{ selectedAsset && selectedAsset.whiteCreateTime | parseTime }}</li>
<li class="white-item"><span>操作人：</span>{{ selectedAsset && selectedAsset.whiteLastname || '——' }}</li>
<li class="white-item"><span>备注：</span>{{ selectedAsset && selectedAsset.whiteRemark || '——' }}</li>
</ul>
</div>
</div> </div>
<!-- <img src="http://192.168.99.72:15000/api/minio/getImg?bucket=2&fileName=2b532fd6792f4dbe91d6a1dbf15e4738.jpg" alt="资产图片"> --> <!-- <img src="http://192.168.99.72:15000/api/minio/getImg?bucket=2&fileName=2b532fd6792f4dbe91d6a1dbf15e4738.jpg" alt="资产图片"> -->
<!-- <div :class="selectedAsset && selectedAsset.imageUrl ? 'asset-image asset-img' : 'asset-image default-img'"> <!-- <div :class="selectedAsset && selectedAsset.imageUrl ? 'asset-image asset-img' : 'asset-image default-img'">
@ -163,7 +170,6 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -302,26 +308,12 @@ export default {
// 构建表单数据 // 构建表单数据
const formData = new FormData() const formData = new FormData()
formData.append('file', this.selectedFile) formData.append('file', this.selectedFile)
// setTimeout(() => {
// this.syncLoading = false
// this.syncComplete = true
// // 模拟后端返回的结果
// this.newCount = Math.floor(Math.random() * 10) + 1
// this.updateCount = Math.floor(Math.random() * 10) + 1
// this.syncResultText = `已完成同步，新增${this.newCount}条，更新${this.updateCount}条`
// // this.$message({ message: this.syncResultText, type: 'success', offset: 8 })
// // 刷新表格数据
// this.crud.refresh()
// }, 2000)
// 注意：upload是隐藏了token这块的，如果后续需要，需要在upload.js中放开headers // 注意：upload是隐藏了token这块的，如果后续需要，需要在upload.js中放开headers
upload(this.baseApi + '/api/asset/importTextInfo', this.selectedFile).then(res => { upload(this.baseApi + '/api/asset/importTextInfo', this.selectedFile).then(res => {
console.log(res) console.log(res)
if (res.data.code === 200) { if (res.data.code === 200) {
this.syncLoading = false this.syncLoading = false
this.syncComplete = true this.syncComplete = true
// 从后端返回数据中获取新增和更新数量
// this.newCount = res.data.data.newCount || Math.floor(Math.random() * 10) + 1
// this.updateCount = res.data.data.updateCount || Math.floor(Math.random() * 10) + 1
this.syncResultText = res.data.data this.syncResultText = res.data.data
// 刷新表格数据 // 刷新表格数据
this.crud.refresh() this.crud.refresh()
@ -347,23 +339,11 @@ export default {
this.selectedAsset = {} this.selectedAsset = {}
this.assetImageList = [] this.assetImageList = []
const params = { mark: row.mark } const params = { mark: row.mark }
// FetchAssetInfoDetailsByMark(params).then(res => {
// console.log('获取资产详情成功', res)
// this.selectedAsset = res || row
// const photoList = res.assetInfoPhoto || []
// // 拼接完整图片地址
// this.assetImageList = photoList.map(item => {
// return this.baseApi + '/api/minio/getImg?bucket=2&fileName=' + item.photoUrl
// })
// console.log(' this.assetImageList', this.assetImageList)
// }).catch(() => {
// this.$message({ message: '获取资产详情失败', type: 'error', offset: 8 })
// })
FetchAssetInfoDetailsByMark(params).then(res => { FetchAssetInfoDetailsByMark(params).then(res => {
this.selectedAsset = { this.selectedAsset = {
...(res || {}), ...(res || {}),
capitaltyepname: row.capitaltyepname,
resourcename: row.resourcename,
is_whitelist: row.is_whitelist, is_whitelist: row.is_whitelist,
whiteCreateTime: row.whiteCreateTime, whiteCreateTime: row.whiteCreateTime,
whiteLastname: row.whiteLastname, whiteLastname: row.whiteLastname,
@ -609,6 +589,14 @@ export default {
width: 1000px !important; width: 1000px !important;
.el-dialog__body{ .el-dialog__body{
padding: 0 0 30px 0; padding: 0 0 30px 0;
::-webkit-scrollbar{
width: 5px !important;
height: 5px !important;
}
::-webkit-scrollbar-thumb{
background-color: #f5f7fa !important;
}
} }
} }
.detail-check{ .detail-check{
@ -650,6 +638,29 @@ export default {
border-radius: 4px; border-radius: 4px;
background-color: #EEF5FE; background-color: #EEF5FE;
margin-top: 4px; margin-top: 4px;
& .white-title{
display: flex;
justify-content: flex-start;
align-items: center;
font-size: 12px;
color: #606266;
padding: 6px;
p{
padding: 0 10px;
}
.small-line{
display: inline-block;
width: 40px;
border-bottom: 1px solid #a9aeb8;
}
.big-line{
display: inline-block;
flex: 1;
// height: 1px;
border-bottom: 1px solid #a9aeb8;
// background-color: #a9aeb8;
}
}
} }
} }
::v-deep .dialog-footer{ ::v-deep .dialog-footer{

Write Preview
Loading…
Cancel
Save