Skip to content

A
assets
Commit ee9279ec authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 38272837
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3104 additions and 824 deletions
src/assets/css/common.css
View file @ ee9279ec
......@@ -57,8 +57,8 @@
.myTable thead th{
color:#A6C6C6;
padding-left: 20px;
height: 60px;
line-height: 60px;
height: 50px;
line-height: 50px;
font-weight:bold;
text-align: left;
}
......@@ -80,6 +80,9 @@
top:0;
display: none;
}
.miniTable tr td{
padding:6px 0 6px 20px!important;
}
.myTable tr{
background:#fff;
border-bottom: 4px solid #F8FAFB;
......@@ -238,3 +241,7 @@
position: relative;
top: -2px;
}
.underline{
text-decoration: underline;
cursor: pointer;
}
src/assets/css/vxetable.css
View file @ ee9279ec
......@@ -30,9 +30,9 @@
}
.vxe-table .vxe-body--row:hover{
box-shadow:0px 0px 20px 0px rgba(176,176,176,0.2);
transition: transform .4s ease;
transition: transform .2s ease;
cursor: pointer;
transform: scaleX(1.005);
transform: scale(1.005);
/* zoom:1.02; */
}
.vxe-table .vxe-cell{
......
src/components/Systemman/AssetsClassification.vue
View file @ ee9279ec
......@@ -396,7 +396,7 @@ export default {
width: 220px;
position: absolute;
left: 0px;
z-index: 10;
z-index: 1;
height:100%;
padding: 20px 10px;
box-sizing: border-box;
......
src/components/Systemman/MaterialClassification.vue
View file @ ee9279ec
......@@ -395,7 +395,7 @@ export default {
width: 220px;
position: absolute;
left: 0px;
z-index: 10;
z-index: 1;
height:100%;
padding: 20px 10px;
box-sizing: border-box;
......
src/components/approval/SignMan.vue 0 → 100644
View file @ ee9279ec
This diff is collapsed.
src/components/approval/approvalDetails.vue
View file @ ee9279ec
This diff is collapsed.
src/components/approval/approvalMan.vue
View file @ ee9279ec
......@@ -80,9 +80,9 @@
<th>类型</th>
<th>单号</th>
<th>使用人/时间</th>
<th>分类名称</th>
<th>资产名称</th>
<th>资产编号</th>
<th>资产名称</th>
<th>分类名称</th>
<th>品牌名称</th>
<th>操作人</th>
<th width="150px">操作</th>
......@@ -92,16 +92,24 @@
<tr :class="index==0?'trNobottom':''" v-for="(delist,index) in item.DetailList" :key="delist.Id">
<td :rowspan="item.DetailList.length" v-if="index==0">
<div style="display:flex;align-items:center">
<div style="display:inline-block">
<span class="ColorSpan huangSpan" v-if="item.AuditStatus==2">审</span>
<span class="ColorSpan greenSpan" v-if="item.AuditStatus==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.AuditStatus==3">驳</span>
<span class="ColorSpan buleSpan" v-if="item.AuditStatus==4">签</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
{{item.AuditStatusName}}
</div>
<div style="display:inline-block;margin-left:5px">
<P>{{item.AuditDescription}}</P>
<p>{{item.AuditStatusName}}</p>
</div>
</div>
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">
<span v-if="item.TempleteId>0" style="text-decoration: underline;" @click="See(item,'approvalDetails','approvalMan','chakan')">{{item.OrderCode}}</span>
<span class="underline" v-if="item.TempleteId>0" @click="See(item,'approvalDetails','approvalMan','chakan')">{{item.OrderCode}}</span>
<span v-else>{{item.OrderCode}}</span>
</td>
......@@ -109,9 +117,9 @@
<p>{{item.EmName}}</p>
<p>{{item.Time}}</p>
</td>
<td>{{delist.CategoryName}}</td>
<td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td>
<td>{{delist.PropertyName}}</td>
<td>{{delist.PropertyNum}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.UpdateBy}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">
......@@ -119,7 +127,7 @@
<img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','approvalMan','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="审批" placement="top">
<img v-show="showTable==1" @click="See(item,'approvalDetails','approvalMan','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
<img v-show="showTable==1 && item.Is_AuditSelf!=1" @click="See(item,'approvalDetails','approvalMan','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="转交" placement="top">
<img v-show="showTable==1" @click="ZhuanJiao(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
......@@ -175,19 +183,25 @@
</div>
</el-form>
</el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1050px">
<CheckDetails ref="mychild"></CheckDetails>
</el-dialog>
</div>
</template>
<script>
import CheckDetails from "@/components/global/CheckDetails.vue";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: 'Supplierman',
components: {
Treeselect
Treeselect,
CheckDetails
},
data(){
return{
CheckDetailState:false,
EmployeeList1:[],
EmployeeList2:[],
......@@ -246,6 +260,7 @@ export default {
},
dateList:[],
EmName:'',
PropertyId:''
}
},
......@@ -262,6 +277,13 @@ export default {
this.addMsg.TransferEmpId=userInfo.EmployeeId;
},
methods:{
getCheckDes(item){
this.PropertyId=item.PropertyId;
this.CheckDetailState=true;
setTimeout(()=>{
this.$refs.mychild.InitData(this.PropertyId);
},10)
},
submitForm(formName) {
let arr=[];
arr.push(this.addMsg);
......
src/components/assetsman/LendReturn.vue 0 → 100644
View file @ ee9279ec
This diff is collapsed.
src/components/assetsman/PaiTui.vue
View file @ ee9279ec
......@@ -98,7 +98,7 @@
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.BranchName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.DepartmentName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.EmName}}</td>
<td>{{delist.PropertyNum}}</td>
<td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td>
<td>{{delist.PropertyName}}</td>
<td>{{delist.CategoryName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td>
......@@ -212,7 +212,7 @@
{{item.AuditStatusName}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
<td>{{delist.PropertyNum}}</td>
<td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td>
<td>{{delist.PropertyName}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td>
......@@ -488,19 +488,25 @@
</div>
</el-form>
</el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1050px">
<CheckDetails ref="mychild"></CheckDetails>
</el-dialog>
</div>
</template>
<script>
import CheckDetails from "@/components/global/CheckDetails.vue";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: 'Supplierman',
components: {
Treeselect
Treeselect,
CheckDetails
},
data(){
return{
CheckDetailState:false,
EmployeeId:'',
StateEnumList:[],
showTable:1,
......@@ -633,6 +639,7 @@ export default {
BackSTime:'',
BackETime:'',
},
PropertyId:'',
}
},
......@@ -649,6 +656,13 @@ export default {
},
methods:{
getCheckDes(item){
this.PropertyId=item.PropertyId;
this.CheckDetailState=true;
setTimeout(()=>{
this.$refs.mychild.InitData(this.PropertyId);
},10)
},
// 退库单编辑
Edit1(item){
this.addMsg1.Id=item.Id;
......
src/components/assetsman/assetsList.vue
View file @ ee9279ec
This diff is collapsed.
src/components/global/CheckDetails.vue 0 → 100644
View file @ ee9279ec
<template>
<div class="CheckDetails basefix">
<div class="left">
<el-carousel v-if="datainfo.ImageList.length>0" height="500px">
<el-carousel-item style="display:flex;align-items:center" v-for="(item,index) in datainfo.ImageList" :key="index">
<img style="width:100%;" :src="item" alt="">
</el-carousel-item>
</el-carousel>
<img v-else style="width:100%;height:500px" src="../../assets/img/noimg.png" alt="">
</div>
<div class="right overflowY" style="height:500px">
<div class="baseTitle f12">使用信息</div>
<div class="desItem">
<p>使用人</p>
<p>{{datainfo.EmName}}</p>
</div>
<div class="desItem">
<p>领取时间</p>
<p>{{datainfo.GetTime}}</p>
</div>
<div class="baseTitle f12">基本信息</div>
<div class="baseDiv">
<div class="desItem">
<p>资产名称</p>
<p>{{datainfo.Name}}</p>
</div>
<div class="desItem">
<p>资产分类</p>
<p>{{datainfo.CategoryName}}</p>
</div>
<div class="desItem">
<p>品牌</p>
<p>{{datainfo.BrandName}}</p>
</div>
<div class="desItem">
<p>型号</p>
<p>
<span v-if="datainfo.PropertyModel && datainfo.PropertyModel!=''">{{datainfo.PropertyModel}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>单位</p>
<p>{{datainfo.Units}}</p>
</div>
<div class="desItem">
<p>序列号</p>
<p>{{datainfo.SerialNumber}}</p>
</div>
<div class="desItem">
<p>购置日期</p>
<p>{{datainfo.BuyDate}}</p>
</div>
<div class="desItem">
<p>购置方式</p>
<p>{{datainfo.BuyTypeName}}</p>
</div>
<div class="desItem">
<p>金额</p>
<p>{{datainfo.Money}}</p>
</div>
<div class="desItem">
<p>使用类型</p>
<p>{{datainfo.UseStatusName}}</p>
</div>
<div class="desItem">
<p>公司</p>
<p>
<span v-if="datainfo.BranchName && datainfo.BranchName!=''">{{datainfo.BranchName}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>备注</p>
<p>
<span v-if="datainfo.Remark && datainfo.Remark!=''">{{datainfo.Remark}}</span>
<span v-else>无</span>
</p>
</div>
<div class="desItem">
<p>供应商</p>
<p>{{datainfo.SupplierName}}</p>
</div>
</div>
<div class="baseTitle f12">操作记录</div>
<table class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" >
<thead>
<th>类型</th>
<th>内容</th>
<th>签名图片</th>
<th>操作人/时间</th>
</thead>
<tbody>
<tr v-for="(item, index) in OperationList" :key="index">
<td>{{ item.TypeName }}</td>
<td>{{ item.Content }}</td>
<td>
<img
v-if="item.SignImage && item.SignImage != ''"
style="height: 45px;width: 55px;"
:src="item.SignImage"
alt=""
/>
<span class="c99" v-else>-</span>
</td>
<td>
<p>{{ item.CreateBy }}</p>
<p>{{ item.CreateDate }}</p>
</td>
</tr>
<tr v-show="OperationList.length == 0">
<td colspan="4" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total"
>
</el-pagination>
</div>
</div>
</template>
<script>
export default {
name: '',
data(){
return{
msg: {
pageIndex: 1,
pageSize: 5,
PropertyId: ""
},
OperationList:[],
total:0,
datainfo:{
ImageList:[],
},
PropertyId:'',
}
},
created(){
},
mounted(){
},
methods:{
InitData(id){
this.PropertyId=id;
this.msg.PropertyId=id;
this.getOperation();
this.getDataInfo();
},
currentChange(val) {
this.msg.pageIndex = val;
this.getOperation();
},
getOperation() {
this.apiJavaPost(
"/api/property/GetPropertyLogPageList",
this.msg,
res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
this.OperationList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
getDataInfo(){
this.apiJavaPost(
"/api/property/GetPropertyInfo",
{Id:this.PropertyId},
res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
this.datainfo = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
},
}
</script>
<style>
.CheckDetails .baseDiv .desItem:nth-child(3n){
margin-right:0;
}
.CheckDetails .desItem p:first-child{
margin-bottom: 4px;
}
.CheckDetails .desItem{
display: inline-block;
background: #fff;
box-sizing: border-box;
border-radius: 10px;
width: 200px;
margin:10px 10px 10px 0;
padding:6px 10px;
}
.CheckDetails .baseTitle{
padding:5px 0;
border-bottom: 1px dashed #ccc;
margin-bottom:10px
}
.CheckDetails>div{
float: left;
font-size: 12px;
}
.CheckDetails .left{
border: 1px solid #ccc;
width:340px;
box-sizing: border-box;
}
.CheckDetails .right{
width: 660px;
padding:0 10px 0 15px;
box-sizing: border-box;
}
</style>
src/components/global/Login.vue
View file @ ee9279ec
......@@ -12,7 +12,7 @@
<div>
<p>
<img style="width:16px;height:14px;margin-right:4px" src="../../assets/img/passwd.png" alt="">密码</p>
<el-input v-model="userInfo.EmPassword" placeholder="请输入内容"></el-input>
<el-input type="password" v-model="userInfo.EmPassword" placeholder="请输入内容"></el-input>
</div>
<div class="loginDiv">
......
src/components/global/Nav.vue
View file @ ee9279ec
......@@ -219,7 +219,7 @@ export default {
color:#111111!important;
}
.HeadNav .itemgroup .el-menu-item{
margin-bottom: 12px!important;
margin-bottom: 5px!important;
color: rgba(164, 188, 188, 1);
}
.HeadNav .itemgroup .el-menu-item span{
......
src/components/global/index.vue
View file @ ee9279ec
......@@ -108,7 +108,7 @@ export default {
position: fixed;
width: calc(100% - 214px);
top: 0;
z-index: 1;
z-index: 2;
background: #fff;
padding:20px 0;
}
......
src/plugins/index.js
View file @ ee9279ec
......@@ -29,7 +29,7 @@ export default {
// javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
// javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000",
javaUrl: "http://192.168.2.18:8087",
javaUrl: "http://192.168.2.16:8087",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
// UploadUrl: "http://uploadfile.oytour.com",
......
src/router/config.js
View file @ ee9279ec
......@@ -59,6 +59,12 @@ export default {
name: 'PaiTui',
component: resolve => require(['@/components/assetsman/PaiTui'], resolve),
},
// 借出&归还
{
path: '/LendReturn',
name: 'LendReturn',
component: resolve => require(['@/components/assetsman/LendReturn'], resolve),
},
// 物料仓库
{
......@@ -114,11 +120,11 @@ export default {
name: 'approvalDetails',
component: resolve => require(['@/components/approval/approvalDetails'], resolve),
},
// 签字
// 签名管理
{
path: '/Sign',
name: 'Sign',
component: resolve => require(['@/components/approval/Sign'], resolve),
path: '/SignMan',
name: 'SignMan',
component: resolve => require(['@/components/approval/SignMan'], resolve),
},
......@@ -127,18 +133,5 @@ export default {
]
},
// {
// path: '/supplierIndex', //供应商首页
// name: 'supplierIndex',
// component: supplierIndex,
// children: [
// {
// path: '/leaderPrint',
// name: 'leaderPrint',
// component: resolve => require(['@/components/leaderPrint'], resolve),
// },
// ]
// },
]
}
\ No newline at end of file
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