Skip to content

A
assets
Commit d78bb9f2 authored by 罗超's avatar 罗超
Browse files
Options

解决冲突

parents dd116cf9 18af801c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1278 additions and 290 deletions
src/assets/css/common.css
View file @ d78bb9f2
...@@ -220,15 +220,23 @@ ...@@ -220,15 +220,23 @@
border-radius: 0 0 20px 0; border-radius: 0 0 20px 0;
} }
.borderTable tbody tr:first-child td:first-child {
border-radius: 0!important;
}
.borderTable tbody tr:first-child td:last-child {
border-radius: 0!important;
}
/* 合并无圆角 */ /* 合并无圆角 */
.noHoverTable tbody tr:first-child td:first-child { .noHoverTable tbody tr:first-child td:first-child {
border-radius: 0!important; /* border-radius:0!important; */
} }
.noHoverTable tbody tr:first-child td:last-child { .noHoverTable tbody tr:first-child td:last-child {
border-radius: 0!important; /* border-radius:0!important; */
} }
.noHoverTable tbody tr:last-child td:first-child { .noHoverTable tbody tr:last-child td:first-child {
...@@ -563,6 +571,10 @@ ...@@ -563,6 +571,10 @@
cursor: pointer; cursor: pointer;
} }
.borderTable tr:nth-child(even) {
/* background:#F6F9FB!important; */
}
/* .borderTable .trNobottom{ /* .borderTable .trNobottom{
border-top: 4px solid #F8FAFB!important; border-top: 4px solid #F8FAFB!important;
...@@ -625,4 +637,13 @@ ...@@ -625,4 +637,13 @@
.tableMoreUl li:last-child { .tableMoreUl li:last-child {
border-bottom: none; border-bottom: none;
}
.el-textarea__inner {
border: none!important;
outline: none!important;
}
.myTable tbody .noData td {
border-radius: 0!important;
} }
\ No newline at end of file
src/assets/css/reset.css
View file @ d78bb9f2
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
.vue-treeselect__control { .vue-treeselect__control {
border: none!important; border: none!important;
height: 28px; height: 28px!important;
} }
.vue-treeselect__menu { .vue-treeselect__menu {
......
src/assets/css/vxetable.css
View file @ d78bb9f2
...@@ -136,4 +136,10 @@ ...@@ -136,4 +136,10 @@
.vxe-table .vxe-footer--column, .vxe-table .vxe-footer--column,
.vxe-table .vxe-header--column { .vxe-table .vxe-header--column {
line-height: inherit!important; line-height: inherit!important;
}
.vxe-table .vxe-table--body-wrapper{
border-radius: 15px!important;
}
.EditTable .vxe-edit-icon{
display: none!important;
} }
\ No newline at end of file
src/components/Materialman/Archivesmaterials.vue
View file @ d78bb9f2
...@@ -35,63 +35,40 @@ ...@@ -35,63 +35,40 @@
</ul> </ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> <vxe-table stripe style="margin-top:15px" :loading="loading"
<thead> :data="tableData">
<th>档案编码</th> <vxe-table-column field="SuppliesNum" title="档案编码"></vxe-table-column>
<th>物料档案名称</th> <vxe-table-column field="Name" title="档案名称"></vxe-table-column>
<th>分类名称</th> <vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<th>品牌名</th> <vxe-table-column field="BrandName" title="品牌"></vxe-table-column>
<th>成本价</th> <vxe-table-column field="Money" title="成本价"></vxe-table-column>
<th>供应商名称</th> <vxe-table-column field="SupplierName" title="供应商"></vxe-table-column>
<th>条形码号</th> <vxe-table-column field="Barcode" title="条形码号"></vxe-table-column>
<th>库存</th> <vxe-table-column field="UpdateDate" title="库存">
<th>型号</th> <template v-slot="{ row }">
<th>操作人/时间</th> <p>预警库存：{{row.ReservedStock}}</p>
<th>备注</th> <p>安全库存：{{row.SafetyStock}}</p>
<th>操作</th> </template>
</thead> </vxe-table-column>
<tbody> <vxe-table-column field="UpdateDate" title="型号"></vxe-table-column>
<tr v-for="(item,index) in tableData" :key="index"> <vxe-table-column field="Mobile" title="操作人/时间">
<td> <template v-slot="{ row }">
<span class="commonStyle hoverSpan1"></span> <p>{{row.UpdateBy}}</p>
{{item.SuppliesNum}} <p>{{row.UpdateDate}}</p>
</td> </template>
<td>{{item.Name}}</td> </vxe-table-column>
<td>{{item.CategoryName}}</td> <vxe-table-column field="UpdateDate" title="备注"></vxe-table-column>
<td>{{item.BrandName}}</td> <vxe-table-column field="address" title="操作">
<td>{{item.Money}}</td> <template v-slot="{ row }">
<td>{{item.SupplierName}}</td> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
<td>{{item.Barcode}}</td> <img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<td>
<div>预警库存：{{item.ReservedStock}}</div>
<div>安全库存：{{item.SafetyStock}}</div>
</td>
<td>{{item.SuppliesModel}}</td>
<!-- <td>
<img v-for="(subItem,index) in item.ImageList" :key="index" :src="subItem" alt="">
</td> -->
<td>
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td>{{item.Remark}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip> </el-tooltip>
<span class="commonStyle hoverSpan2"></span> </template>
</td> </vxe-table-column>
</vxe-table>
</tr>
<tr v-if="tableData.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
background background
...@@ -216,7 +193,7 @@ export default { ...@@ -216,7 +193,7 @@ export default {
total:0, total:0,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:15,
Name:'', Name:'',
SuppliesNum:"", SuppliesNum:"",
BrandName:'', BrandName:'',
......
src/components/Materialman/ConsumRecipients.vue
View file @ d78bb9f2
...@@ -134,7 +134,7 @@ export default { ...@@ -134,7 +134,7 @@ export default {
total:0, total:0,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:8, pageSize:15,
EmployeeId:'', EmployeeId:'',
SuppliesId:'', SuppliesId:'',
StartTime:'', StartTime:'',
......
src/components/Materialman/Materialwarehouse.vue
View file @ d78bb9f2
...@@ -19,36 +19,22 @@ ...@@ -19,36 +19,22 @@
<el-input class="w200" size="small" v-model="msg.Name" placeholder="仓库名称"></el-input> <el-input class="w200" size="small" v-model="msg.Name" placeholder="仓库名称"></el-input>
</li> </li>
</ul> </ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> <vxe-table stripe style="margin-top:15px" :loading="loading"
<thead> :data="tableData">
<th>仓库名称</th> <vxe-table-column field="Name" title="仓库名称"></vxe-table-column>
<th>操作人</th> <vxe-table-column field="UpdateBy" title="操作人"></vxe-table-column>
<th>操作时间</th> <vxe-table-column field="UpdateDate" title="操作时间"></vxe-table-column>
<th width="200">操作</th> <vxe-table-column field="address" title="操作">
</thead> <template v-slot="{ row }">
<tbody> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
<tr v-for="(item,index) in tableData" :key="index"> <img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<td>
<span class="commonStyle hoverSpan1"></span>
{{item.Name}}
</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip> </el-tooltip>
<span class="commonStyle hoverSpan2"></span> </template>
</td> </vxe-table-column>
</tr> </vxe-table>
<tr v-if="tableData.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
background background
...@@ -89,7 +75,7 @@ export default { ...@@ -89,7 +75,7 @@ export default {
total:0, total:0,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:15,
Name:'', Name:'',
}, },
addMsg:{ addMsg:{
......
src/components/Materialman/SpotQuery.vue
View file @ d78bb9f2
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
total:0, total:0,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:8, pageSize:15,
WarehouseId:'', WarehouseId:'',
SuppliesId:'', SuppliesId:'',
}, },
......
src/components/Systemman/AssetsClassification.vue
View file @ d78bb9f2
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
dataList:[], dataList:[],
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:15,
Name:'', Name:'',
Tier:'', Tier:'',
ParentId:'', ParentId:'',
......
src/components/Systemman/MaterialClassification.vue
View file @ d78bb9f2
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
dataList:[], dataList:[],
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:15,
Name:'', Name:'',
Tier:'', Tier:'',
ParentId:'', ParentId:'',
......
src/components/Systemman/Supplierman.vue
View file @ d78bb9f2
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
total:0, total:0,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:8, pageSize:15,
Name:'', Name:'',
Contact:'', Contact:'',
Mobile:'', Mobile:'',
......
src/components/approval/ConsumApplication.vue
View file @ d78bb9f2
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span> <span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
<!-- <span @click="chongzhi" style="margin-left:20px" class="addSpan">重置</span> --> <!-- <span @click="chongzhi" style="margin-left:20px" class="addSpan">重置</span> -->
<span @click="addSupplier" style="margin-left:20px" class="addSpan">申请</span> <span @click="addSupplier" style="margin-left:20px" class="addSpan">申请</span>
<span @click="goMyPurchase('MyPurchaseRequisition')" style="margin-left:20px" class="addSpan">
新增请购单</span>
</div> </div>
<div class="padContent"> <div class="padContent">
<ul v-show="morequery" class="queryul"> <ul v-show="morequery" class="queryul">
...@@ -355,6 +357,14 @@ export default { ...@@ -355,6 +357,14 @@ export default {
}, },
methods:{ methods:{
goMyPurchase(path){
this.$router.push({
path: "/" + path,
query: {
type:2,
}
});
},
changeNUmber(item,index){ changeNUmber(item,index){
this.$forceUpdate() this.$forceUpdate()
}, },
......
src/components/approval/ListAssets.vue
View file @ d78bb9f2
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<span @click="getList" style="margin-left:20px" class="chaxunSpan" <span @click="getList" style="margin-left:20px" class="chaxunSpan"
>查询</span> >查询</span>
<span @click="Export" style="margin-left:20px" class="addSpan">导出</span> <span @click="Export" style="margin-left:20px" class="addSpan">导出</span>
<span @click="LYExport" style="margin-left:20px" class="addSpan">领用导出</span>
</div> </div>
...@@ -161,8 +162,7 @@ ...@@ -161,8 +162,7 @@
<vxe-table-column field="Name" width="140" title="使用信息"> <vxe-table-column field="Name" width="140" title="使用信息">
<template v-slot="{ row }"> <template v-slot="{ row }">
<p>{{ row.EmName }}</p> <p>{{ row.EmName }}</p>
<p v-if="row.GetTime!=''" style="padding:2px 0">使用时间:{{ row.GetTime }}</p> <p v-if="row.GetTime!=''">使用时间:{{ row.GetTime }}</p>
<p v-if="row.BackTime!=''">归还时间:{{ row.BackTime }}</p>
</template> </template>
</vxe-table-column> </vxe-table-column>
</vxe-table> </vxe-table>
...@@ -257,6 +257,14 @@ export default { ...@@ -257,6 +257,14 @@ export default {
this.getPropertyStatus(); this.getPropertyStatus();
}, },
methods: { methods: {
LYExport(){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/property/GetPropertyUseListStatisticsToExcel",
msg,
"领用资产.xls"
);
},
Export(){ Export(){
let msg = JSON.parse(JSON.stringify(this.msg)); let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile( this.JavaGetLocalFile(
......
src/components/approval/MyPurchaseRequisition.vue 0 → 100644
View file @ d78bb9f2
This diff is collapsed.
src/components/approval/Myapplication.vue
View file @ d78bb9f2
...@@ -260,6 +260,7 @@ ...@@ -260,6 +260,7 @@
</div> </div>
<el-dialog <el-dialog
:close-on-click-modal="false"
title="派发单" title="派发单"
:visible.sync="dialogState" :visible.sync="dialogState"
top="0" top="0"
...@@ -340,6 +341,7 @@ ...@@ -340,6 +341,7 @@
<el-dialog <el-dialog
title="退库单" title="退库单"
:close-on-click-modal="false"
:visible.sync="dialogState1" :visible.sync="dialogState1"
top="0" top="0"
width="815px"> width="815px">
...@@ -419,6 +421,7 @@ ...@@ -419,6 +421,7 @@
<!-- 选择资产 --> <!-- 选择资产 -->
<el-dialog <el-dialog
title="选择资产" title="选择资产"
:close-on-click-modal="false"
:visible.sync="wuliaodig" :visible.sync="wuliaodig"
top="0" top="0"
width="750px"> width="750px">
......
src/components/approval/PurchaseRequisition.vue 0 → 100644
View file @ d78bb9f2
This diff is collapsed.
src/components/approval/approvalMan.vue
View file @ d78bb9f2
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
</el-pagination> </el-pagination>
</div> </div>
<el-dialog <el-dialog :close-on-click-modal="false"
title="转交" title="转交"
:visible.sync="dialogState" :visible.sync="dialogState"
width="530px"> width="530px">
......
src/components/approval/assetsApply.vue
View file @ d78bb9f2
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
申请</span> 申请</span>
<span @click="goMyapply('Myapplication')" style="margin-left:20px" class="addSpan"> <span @click="goMyapply('Myapplication')" style="margin-left:20px" class="addSpan">
我的申请</span> 我的申请</span>
<span @click="goMyPurchase('MyPurchaseRequisition')" style="margin-left:20px" class="addSpan">
新增请购单</span>
</div> </div>
<div class="padContent"> <div class="padContent">
<ul v-show="morequery" class="queryul"> <ul v-show="morequery" class="queryul">
...@@ -195,8 +197,8 @@ ...@@ -195,8 +197,8 @@
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
<tr v-if="tableData.length == 0"> <tr class="noData" v-if="tableData.length == 0">
<td colspan="14" align="center">暂无数据</td> <td colspan="16" align="center">暂无数据</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -210,7 +212,7 @@ ...@@ -210,7 +212,7 @@
</el-pagination> </el-pagination>
</div> </div>
<el-dialog <el-dialog :close-on-click-modal="false"
:title="dialogtitle" :title="dialogtitle"
:visible.sync="dialogState" :visible.sync="dialogState"
top="0" top="0"
...@@ -360,6 +362,14 @@ export default { ...@@ -360,6 +362,14 @@ export default {
this.getPropertyStatus(); this.getPropertyStatus();
}, },
methods: { methods: {
goMyPurchase(path){
this.$router.push({
path: "/" + path,
query: {
type:1,
}
});
},
goMyapply(path){ goMyapply(path){
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
......
src/components/approval/myAssets.vue
View file @ d78bb9f2
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
<el-dialog <el-dialog
:close-on-click-modal="false"
:title="dialogtitle" :title="dialogtitle"
:visible.sync="dialogState" :visible.sync="dialogState"
top="0" top="0"
......
src/components/assetsman/AssetDepreciation.vue
View file @ d78bb9f2
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
total2:0, total2:0,
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:15,
CategoryId:null, CategoryId:null,
Name:'', Name:'',
Type:'', Type:'',
......
src/components/assetsman/BulkImport.vue
View file @ d78bb9f2
...@@ -13,9 +13,8 @@ ...@@ -13,9 +13,8 @@
<span @click="ImportSee" style="margin-left:20px" class="addSpan">提交</span> <span @click="ImportSee" style="margin-left:20px" class="addSpan">提交</span>
</div> </div>
<div class="padContent"> <div class="padContent">
<vxe-table <vxe-table class="EditTable"
ref="xTable" ref="xTable"
resizable
show-overflow show-overflow
:data="tableData" :data="tableData"
:edit-config="{trigger: 'manual', mode: 'row'}"> :edit-config="{trigger: 'manual', mode: 'row'}">
...@@ -85,7 +84,7 @@ ...@@ -85,7 +84,7 @@
</vxe-table-column> </vxe-table-column>
</vxe-table> </vxe-table>
</div> </div>
<el-dialog top="0" width="600px" title="导入" :visible.sync="outerVisible" center> <el-dialog :close-on-click-modal="false" top="0" width="600px" title="导入" :visible.sync="outerVisible" center>
<el-upload :show-file-list="false" style="text-align: center;margin:20px 0" drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess" <el-upload :show-file-list="false" style="text-align: center;margin:20px 0" drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"> :before-upload="beforeAvatarUpload">
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
...@@ -93,6 +92,17 @@ ...@@ -93,6 +92,17 @@
<!-- <div slot="tip" class="el-upload__tip">只能上传Excel文件</div> --> <!-- <div slot="tip" class="el-upload__tip">只能上传Excel文件</div> -->
</el-upload> </el-upload>
</el-dialog> </el-dialog>
<el-dialog :close-on-click-modal="false" top="0" width="600px" title="错误信息" :visible.sync="ErrorState" center>
<div class="MyEditForm">
<div style="margin:15px 0;color:#E95252">
{{ErrorMassage}}
</div>
<div class="btnformItem">
<span class="exitBtn" type="primary" @click="ErrorState=false">确定</span>
</div>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -118,6 +128,8 @@ export default { ...@@ -118,6 +128,8 @@ export default {
baseformItem:false, baseformItem:false,
importFileUrl2:"", importFileUrl2:"",
msg:{}, msg:{},
ErrorMassage:'',
ErrorState:false,
}; };
}, },
created(){ created(){
...@@ -139,7 +151,9 @@ export default { ...@@ -139,7 +151,9 @@ export default {
this.tableData=[]; this.tableData=[];
this.Success(res.data.message); this.Success(res.data.message);
} else { } else {
this.Error(res.data.message); this.ErrorMassage=res.data.message;
this.ErrorState=true;
// this.Error(res.data.message);
} }
}, },
null null
...@@ -150,11 +164,19 @@ export default { ...@@ -150,11 +164,19 @@ export default {
}, },
saveRowEvent (row) { saveRowEvent (row) {
this.$refs.xTable.clearActived().then(() => { this.$refs.xTable.clearActived().then(() => {
console.log("this.tableData",this.tableData)
}) })
}, },
Delete(rowIndex){ Delete(rowIndex){
this.tableData.splice(rowIndex, 1) this.$confirm("确认删除，删除后不可恢复？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.tableData.splice(rowIndex, 1)
}).catch(() => {
});
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
return; return;
......
src/components/assetsman/PaiTui.vue
View file @ d78bb9f2
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</tr> </tr>
</template> </template>
<tr v-show="tableData.length==0"> <tr v-if="tableData.length==0">
<td colspan="12" align="center">暂无数据</td> <td colspan="12" align="center">暂无数据</td>
</tr> </tr>
</tbody> </tbody>
......
src/components/assetsman/assetsList.vue
View file @ d78bb9f2
...@@ -117,132 +117,65 @@ ...@@ -117,132 +117,65 @@
</el-date-picker> </el-date-picker>
</li> </li>
</ul> </ul>
<table <vxe-table stripe style="margin-top:15px" :loading="loading"
style="margin-top:10px" :data="tableData">
class="myTable" <vxe-table-column field="Name" title="资产状态">
v-loading="loading" <template v-slot="{ row }">
border="0"
cellspacing="0"
cellpadding="0"
>
<thead>
<th>资产状态</th>
<th>资产编码</th>
<th>资产名称</th>
<th>分类名称</th>
<th>品牌名称</th>
<th>金额</th>
<th>购置日期</th>
<th>使用状态</th>
<th>型号</th>
<th>使用信息</th>
<th>操作</th>
</thead>
<tbody>
<tr v-for="(item, index) in tableData" :key="index">
<td>
<span class="commonStyle hoverSpan1"></span> <span class="commonStyle hoverSpan1"></span>
<span class="ColorSpan huangSpan" v-if="item.PropertyStatus == 1" <span class="ColorSpan huangSpan" v-if="row.PropertyStatus == 1">空</span>
>空</span <span class="ColorSpan greenSpan" v-if="row.PropertyStatus == 2">领</span>
> <span class="ColorSpan redSpan" v-if="row.PropertyStatus == 3">借</span>
<span class="ColorSpan greenSpan" v-if="item.PropertyStatus == 2" <span class="ColorSpan buleSpan" v-if="row.PropertyStatus == 4">调</span>
>领</span <span class="ColorSpan redSpan" v-if="row.PropertyStatus == 10">处</span>
>
<span class="ColorSpan redSpan" v-if="item.PropertyStatus == 3"
>借</span
>
<span class="ColorSpan buleSpan" v-if="item.PropertyStatus == 4"
>调</span>
<span class="ColorSpan redSpan" v-if="item.PropertyStatus == 10"
>处</span>
<span <span
class="ColorSpan purpleSpan" class="ColorSpan purpleSpan"
v-if=" v-if="
item.PropertyStatus == 5 || row.PropertyStatus == 5 ||
item.PropertyStatus == 7 || row.PropertyStatus == 7 ||
item.PropertyStatus == 9 || row.PropertyStatus == 9 ||
item.PropertyStatus == 6 || row.PropertyStatus == 6 ||
item.PropertyStatus == 8 row.PropertyStatus == 8
" "
>待</span >待</span
> >
{{ item.PropertyStatusName }} {{ row.PropertyStatusName }}
</td> </template>
<td><span @click="getCheckDes(item)" class="underline">{{ item.PropertyNum }}</span></td> </vxe-table-column>
<td>{{ item.Name }}</td> <vxe-table-column field="Name" title="资产编码">
<td>{{ item.CategoryName }}</td> <template v-slot="{ row }">
<td>{{ item.BrandName }}</td> <span @click="getCheckDes(row)" class="underline">{{ row.PropertyNum }}</span>
<td>{{ item.Money }}</td> </template>
<td>{{ item.BuyDate }}</td> </vxe-table-column>
<td>{{ item.UseStatusName }}</td> <vxe-table-column field="Name" title="资产名称"></vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<td>{{ item.PropertyModel }}</td> <vxe-table-column field="BrandName" title="品牌名称"></vxe-table-column>
<td> <vxe-table-column field="Money" title="金额"></vxe-table-column>
<p>{{ item.EmName }}</p> <vxe-table-column field="BuyDate" title="购置日期"></vxe-table-column>
<p style="padding:2px 0">{{ item.GetTime }}</p> <vxe-table-column field="UseStatusName" title="使用状态"></vxe-table-column>
</td> <vxe-table-column field="PropertyModel" title="型号"></vxe-table-column>
<td> <vxe-table-column field="Mobile" title="使用信息">
<el-tooltip <template v-slot="{ row }">
class="item" <p>{{ row.EmName }}</p>
effect="dark" <p>{{ row.GetTime }}</p>
content="编辑" </template>
placement="top" </vxe-table-column>
> <vxe-table-column field="address" title="操作">
<img <template v-slot="{ row }">
@click="Edit(item)" <el-tooltip class="item" effect="dark" content="编辑" placement="top" >
style="width:24px;height:24px" <img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="" />
src="../../assets/img/edit.png" </el-tooltip>
alt="" <el-tooltip class="item" effect="dark" content="删除" placement="top" >
/> <img v-if="row.PropertyStatus == 1" @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip class="item" effect="dark" content="操作日志" placement="top" >
class="item" <img @click="Operation(row)" style="width:24px;height:24px" src="../../assets/img/czrz.png" alt=""/>
effect="dark" </el-tooltip>
content="删除" <el-tooltip class="item" effect="dark" content="变更领用人" placement="top" >
placement="top" <img v-if="row.PropertyStatus == 2" @click="ChnagePeople(row)" style="width:24px;height:24px" src="../../assets/img/shbh.png" alt=""/>
> </el-tooltip>
<img v-if="item.PropertyStatus == 1" </template>
@click="Delete(item)" </vxe-table-column>
style="width:24px;height:24px" </vxe-table>
src="../../assets/img/delete.png"
alt=""
/>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="操作日志"
placement="top"
>
<img
@click="Operation(item)"
style="width:24px;height:24px"
src="../../assets/img/czrz.png"
alt=""
/>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="变更领用人"
placement="top"
>
<img v-if="item.PropertyStatus==2"
@click="ChnagePeople(item)"
style="width:24px;height:24px"
src="../../assets/img/shbh.png"
alt=""
/>
</el-tooltip>
<span class="commonStyle hoverSpan2"></span>
</td>
</tr>
<tr v-if="tableData.length == 0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
background background
...@@ -696,7 +629,7 @@ export default { ...@@ -696,7 +629,7 @@ export default {
total: 0, total: 0,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 15,
Name: "", Name: "",
PropertyNum: "", PropertyNum: "",
SerialNumber: "", SerialNumber: "",
......
src/components/report/AssetsRecord.vue
View file @ d78bb9f2
...@@ -298,7 +298,7 @@ export default { ...@@ -298,7 +298,7 @@ export default {
total: 0, total: 0,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 15,
Name: "", Name: "",
PropertyNum: "", PropertyNum: "",
LogType: "", LogType: "",
......
src/components/report/Assetstatistics.vue
View file @ d78bb9f2
...@@ -209,7 +209,7 @@ export default { ...@@ -209,7 +209,7 @@ export default {
total: 0, total: 0,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 15,
Name: "", Name: "",
PropertyNum: "", PropertyNum: "",
SerialNumber: "", SerialNumber: "",
......
src/components/report/StayBack.vue
View file @ d78bb9f2
...@@ -84,76 +84,49 @@ ...@@ -84,76 +84,49 @@
</el-date-picker> </el-date-picker>
</li> </li>
</ul> </ul>
<table <vxe-table stripe style="margin-top:15px" :loading="loading"
style="margin-top:10px" :data="tableData">
class="myTable" <vxe-table-column field="Name" title="资产状态">
v-loading="loading" <template v-slot="{ row }">
border="0"
cellspacing="0"
cellpadding="0"
>
<thead>
<th>资产状态</th>
<th>借用信息</th>
<th>资产编码</th>
<th>资产名称</th>
<th>分类名称</th>
<th>品牌名称</th>
<th>金额</th>
<th>使用状态</th>
<th>型号</th>
</thead>
<tbody>
<tr v-for="(item, index) in tableData" :key="index">
<td>
<span class="commonStyle hoverSpan1"></span> <span class="commonStyle hoverSpan1"></span>
<span class="ColorSpan huangSpan" v-if="item.PropertyStatus == 1" <span class="ColorSpan huangSpan" v-if="row.PropertyStatus == 1">空</span>
>空</span <span class="ColorSpan greenSpan" v-if="row.PropertyStatus == 2">领</span>
> <span class="ColorSpan redSpan" v-if="row.PropertyStatus == 3">借</span>
<span class="ColorSpan greenSpan" v-if="item.PropertyStatus == 2" <span class="ColorSpan buleSpan" v-if="row.PropertyStatus == 4">调</span>
>领</span <span class="ColorSpan redSpan" v-if="row.PropertyStatus == 10">处</span>
>
<span class="ColorSpan redSpan" v-if="item.PropertyStatus == 3"
>借</span
>
<span class="ColorSpan buleSpan" v-if="item.PropertyStatus == 4"
>调</span
>
<span <span
class="ColorSpan purpleSpan" class="ColorSpan purpleSpan"
v-if=" v-if="
item.PropertyStatus == 5 || row.PropertyStatus == 5 ||
item.PropertyStatus == 7 || row.PropertyStatus == 7 ||
item.PropertyStatus == 9 || row.PropertyStatus == 9 ||
item.PropertyStatus == 6 || row.PropertyStatus == 6 ||
item.PropertyStatus == 8 row.PropertyStatus == 8
" "
>待</span >待</span
> >
{{ item.PropertyStatusName }} {{ row.PropertyStatusName }}
</td> </template>
<td> </vxe-table-column>
<p v-if="item.EmName!=''">借用人:{{ item.EmName }}</p> <vxe-table-column field="Name" title="借用信息">
<p style="padding:2px 0">借用日期：{{ item.GetTime }}</p> <template v-slot="{ row }">
<p>归还日期：{{ item.BackTime }}</p> <p v-if="row.EmName!=''">借用人:{{ row.EmName }}</p>
</td> <p style="padding:2px 0">借用日期：{{ row.GetTime }}</p>
<td><span @click="getCheckDes(item)" class="underline">{{ item.PropertyNum }}</span></td> <p>归还日期：{{ row.BackTime }}</p>
<td>{{ item.Name }}</td> </template>
<td>{{ item.CategoryName }}</td> </vxe-table-column>
<td>{{ item.BrandName }}</td> <vxe-table-column field="Name" title="资产编码">
<td>{{ item.Money }}</td> <template v-slot="{ row }">
<td>{{ item.UseStatusName }}</td> <span @click="getCheckDes(row)" class="underline">{{ row.PropertyNum }}</span>
</template>
<td>{{ item.PropertyModel }}</td> </vxe-table-column>
<vxe-table-column field="Name" title="资产名称"></vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
</tr> <vxe-table-column field="BrandName" title="品牌名称"></vxe-table-column>
<tr v-if="tableData.length == 0"> <vxe-table-column field="Money" title="金额"></vxe-table-column>
<td colspan="12" align="center">暂无数据</td> <vxe-table-column field="UseStatusName" title="使用状态"></vxe-table-column>
</tr> <vxe-table-column field="PropertyModel" title="型号"></vxe-table-column>
</tbody> </vxe-table>
</table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
background background
......
src/router/config.js
View file @ d78bb9f2
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,7 @@ export default {
component: resolve => require(['@/components/assetsman/LendReturn'], resolve), component: resolve => require(['@/components/assetsman/LendReturn'], resolve),
}, },
// 调拨管理 // 调拨管理
{ {
path: '/allocatingMan', path: '/allocatingMan',
...@@ -239,6 +240,18 @@ export default { ...@@ -239,6 +240,18 @@ export default {
name: 'ConsumApplication', name: 'ConsumApplication',
component: resolve => require(['@/components/approval/ConsumApplication'], resolve), component: resolve => require(['@/components/approval/ConsumApplication'], resolve),
}, },
// 请购单
{
path: '/PurchaseRequisition',
name: 'PurchaseRequisition',
component: resolve => require(['@/components/approval/PurchaseRequisition'], resolve),
},
// 我的请购单
{
path: '/MyPurchaseRequisition',
name: 'MyPurchaseRequisition',
component: resolve => require(['@/components/approval/MyPurchaseRequisition'], resolve),
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment