Skip to content

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

update

parent 5148b22b
Show whitespace changes
Inline Side-by-side
Showing with 330 additions and 239 deletions
src/assets/css/common.css
View file @ ad0e4a65
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
display: none; display: none;
} }
.myTable tr{ .myTable tr{
height:50px;
background:#fff; background:#fff;
border-bottom: 4px solid #F8FAFB; border-bottom: 4px solid #F8FAFB;
cursor: pointer; cursor: pointer;
...@@ -123,8 +122,8 @@ ...@@ -123,8 +122,8 @@
border-radius:0 0 20px 0; border-radius:0 0 20px 0;
} }
.myTable tr td{ .myTable tr td{
padding-left: 20px;
position: relative; position: relative;
padding:11px 0 11px 20px;
} }
.f12{ .f12{
font-size: 12px; font-size: 12px;
...@@ -228,3 +227,14 @@ ...@@ -228,3 +227,14 @@
background: #FFD6D5; background: #FFD6D5;
color: #FF7874; color: #FF7874;
} }
.dialogI{
width:4px;
height:4px;
background:rgba(255,164,117,1);
border-radius:50%;
display: inline-block;
margin-right: 8px;
position: relative;
top: -2px;
}
src/components/approval/approvalDetails.vue
View file @ ad0e4a65
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<span class="underline"></span> <span class="underline"></span>
<el-col :span="12" style="position:relative;padding-left:50px"> <el-col :span="12" style="position:relative;padding-left:50px">
<span class="titleSpan"> <span class="titleSpan">
<span>派</span> <span>{{GetDetail.FirstStr}}</span>
</span> </span>
<p class="c11 f14" style="padding-top:12px">{{GetDetail.TemplateName}}</p> <p class="c11 f14" style="padding-top:12px">{{GetDetail.TemplateName}}</p>
</el-col> </el-col>
...@@ -23,15 +23,15 @@ ...@@ -23,15 +23,15 @@
<span>来源 :</span> <span>来源 :</span>
<span>{{GetDetail.SourceName}}</span> <span>{{GetDetail.SourceName}}</span>
</el-col> </el-col>
<el-col :span="12"> <el-col v-if="GetDetail.Source!=2" :span="12">
<span>申请人 :</span> <span>申请人 :</span>
<span>{{GetDetail.EmName}}</span> <span>{{GetDetail.EmName}}</span>
</el-col> </el-col>
<el-col :span="12"> <el-col v-if="GetDetail.Source!=2" :span="12">
<span>公司 :</span> <span>公司 :</span>
<span>{{GetDetail.BranchName}}</span> <span>{{GetDetail.BranchName}}</span>
</el-col> </el-col>
<el-col :span="12"> <el-col v-if="GetDetail.Source!=2" :span="12">
<span>部门 :</span> <span>部门 :</span>
<span>{{GetDetail.DepartmentName}}</span> <span>{{GetDetail.DepartmentName}}</span>
</el-col> </el-col>
...@@ -41,27 +41,31 @@ ...@@ -41,27 +41,31 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<span>时间 :</span> <span>时间 :</span>
<span>{{GetDetail.Time}}</span> <span v-if="GetDetail.Time!=''">{{GetDetail.Time}}</span>
<span v-if="GetDetail.BackTime!=''">{{GetDetail.BackTime}}</span>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<span>备注 :</span> <span>备注 :</span>
<span>{{GetDetail.Remark}}</span> <span>{{GetDetail.Remark}}</span>
</el-col> </el-col>
</el-row> </el-row>
<p class="f12 c11" style="margin-top:25px">派发清单</p> <p class="f12 c11" style="margin-top:25px">资产清单</p>
<table style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th>资产编号</th>
<th>资产名称</th> <th>资产名称</th>
<th>品牌名称</th> <th>品牌名称</th>
<th>资产编号</th>
<th>分类名称</th> <th>分类名称</th>
<th>型号</th>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(item,index) in GetDetail.DetailList" :key="index"> <tr v-for="(item,index) in GetDetail.DetailList" :key="index">
<td>{{item.PropertyNum}}</td>
<td>{{item.PropertyName}}</td> <td>{{item.PropertyName}}</td>
<td>{{item.BrandName}}</td> <td>{{item.BrandName}}</td>
<td>{{item.PropertyNum}}</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.PropertyModel}}</td>
</tr> </tr>
<tr v-show="GetDetail.DetailList.length==0"> <tr v-show="GetDetail.DetailList.length==0">
...@@ -85,42 +89,26 @@ ...@@ -85,42 +89,26 @@
</div> </div>
</li> </li>
<!-- <li>
<div>
<span class="line"></span>
<span class="circle">
<img src="../../assets/img/step2.png" alt="">
</span>
<span style="display:inline-block;position:relative;top:20px">
<div>张小芳</div>
<div style="margin-top:10px">审批中</div>
</span>
</div>
</li>
<li>
<div>
<span class="line"></span>
<span class="circle">
<span class="circleSpan"></span>
</span>
<span style="display:inline-block;position:relative;top:20px">
<div>张小芳</div>
<div style="margin-top:10px">未审批</div>
</span>
</div>
</li> -->
<el-popover <el-popover
popper-class="approvalDetailspopover" popper-class="detailsIT_Journal"
placement="left" width="250"
trigger="click"> trigger="click">
<el-table size="mini" :data="danjuList" style="font-size:12px"> <div class="InfoChangeLog" >
<el-table-column width="100" property="UpdateBy" label="操作人"></el-table-column> <div class="changLog">
<el-table-column width="150" property="Content" label="内容"></el-table-column> <p class="_log_t">流程日志</p>
<el-table-column width="100" property="UpdateDate" label="操作时间"></el-table-column> <ul class="changLogList" v-if="danjuList.length>0">
</el-table> <li class="changLogList_l" v-for="(log,li) in danjuList">
<span slot="reference" class="rizhi">单据操作日志</span> <span style="background-color: #47BF8C" class="_radius_green"></span>
<p> <span class="_color_blue">{{log.UpdateBy}}</span> <span style="float:right" class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.Content}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
<span slot="reference" style="text-decoration: underline;cursor: pointer;" class="rizhi">单据操作日志</span>
</el-popover> </el-popover>
</ul> </ul>
...@@ -279,7 +267,7 @@ ...@@ -279,7 +267,7 @@
</div> </div>
</div> </div>
</div> </div>
<textarea v-if="item.NextStep==1 && compType=='shenpi'" class="_textareaNew" v-model="addMsg.Description" placeholder="请输入..."></textarea> <textarea v-if="item.NextStep==1 && compType=='shenpi'" class="_textareaNew" v-model="addMsg.AuditDescription" placeholder="请输入..."></textarea>
</div> </div>
</template> </template>
...@@ -366,7 +354,11 @@ export default { ...@@ -366,7 +354,11 @@ export default {
this.apiJavaPost("/api/property/GetAuditChangeLogPageList",this.danjuMsg, this.apiJavaPost("/api/property/GetAuditChangeLogPageList",this.danjuMsg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.danjuList=res.data.data.pageData; let data=res.data.data.pageData;
data.forEach(x=>{
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.danjuList=data;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -385,7 +377,8 @@ export default { ...@@ -385,7 +377,8 @@ export default {
this.apiJavaPost("/api/property/AuditOrRefund",this.addMsg, this.apiJavaPost("/api/property/AuditOrRefund",this.addMsg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.success(res.data.message); this.getDetail();
this.Success(res.data.message);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -424,9 +417,7 @@ export default { ...@@ -424,9 +417,7 @@ export default {
let path = "/Upload/Temporary/" let path = "/Upload/Temporary/"
this.$message.info('上传中...') this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let obj = { let obj = this.domainManager().ViittoFileUrl + x.data.FilePath
src: this.domainManager().ViittoFileUrl + x.data.FilePath
}
this.uploadImgList.push(obj) this.uploadImgList.push(obj)
this.$message.success('上传成功') this.$message.success('上传成功')
}, 1); }, 1);
...@@ -444,6 +435,7 @@ export default { ...@@ -444,6 +435,7 @@ export default {
break; break;
} }
} }
this.GetDetail.FirstStr=this.GetDetail.SourceName.slice(0,1)
this.GetDetail.AuditSteps = list; this.GetDetail.AuditSteps = list;
} else { } else {
...@@ -459,17 +451,13 @@ export default { ...@@ -459,17 +451,13 @@ export default {
</script> </script>
<style> <style>
.approvalDetailspopover .el-table td, .approvalDetailspopover .el-table th.is-leaf{ .detailsIT_Journal .InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
border:none; .detailsIT_Journal .changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
} .detailsIT_Journal .changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
.approvalDetailspopover{ .detailsIT_Journal ._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
padding:0; .detailsIT_Journal .changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
}
.popoverTable .vxe-table table{
width:100%!important;
}
.approvalDetails ._textareaNew{ .approvalDetails ._textareaNew{
width: 100%; width: 80%;
height: 50px; height: 50px;
background-color: white; background-color: white;
border-radius: 4px; border-radius: 4px;
...@@ -483,9 +471,12 @@ export default { ...@@ -483,9 +471,12 @@ export default {
.approvalDetails ._upload_tips{font-size: 12px;position: absolute;top: 71%;width: 100%;left: 0;text-align: center;color: #949494;} .approvalDetails ._upload_tips{font-size: 12px;position: absolute;top: 71%;width: 100%;left: 0;text-align: center;color: #949494;}
.approvalDetails ._pb_son:last-child{ .approvalDetails ._pb_son:last-child{
padding-bottom: 5px!important; padding-bottom: 0px!important;
} }
.approvalDetails ._pb_son:last-child::after{
display: none;
}
.approvalDetails .avatar-uploader-icon { .approvalDetails .avatar-uploader-icon {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
...@@ -550,8 +541,8 @@ export default { ...@@ -550,8 +541,8 @@ export default {
.approvalDetails ._right_content ._name ._m{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #E95252;margin-left: 5px;border-radius: 4px;} .approvalDetails ._right_content ._name ._m{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #E95252;margin-left: 5px;border-radius: 4px;}
.approvalDetails ._right_content ._name ._sm{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #FF9600;margin-left: 5px;border-radius: 4px;font-weight: 100;} .approvalDetails ._right_content ._name ._sm{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #FF9600;margin-left: 5px;border-radius: 4px;font-weight: 100;}
.approvalDetails ._right_content ._name ._sn{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #00D2D6;margin-left: 5px;border-radius: 4px;} .approvalDetails ._right_content ._name ._sn{color: #FFFFFF;font-size: 12px;display: inline-block;padding: 2px 5px;background-color: #00D2D6;margin-left: 5px;border-radius: 4px;}
.approvalDetails ._right_content ._time,._time{font-size: 12px;color: #666666;padding-top: 5px;} .approvalDetails ._right_content ._time,.approvalDetails ._time{font-size: 12px;color: #666666;padding-top: 5px;}
.approvalDetails ._right_content ._pp_info,._textarea{border-radius: 10px; background:rgba(245,245,245,1);font-size: 12px;color: #333333;padding: 12px 14px;margin-top: 13px;position: relative;} .approvalDetails ._right_content ._pp_info,.approvalDetails ._textarea{border-radius: 10px; background:rgba(245,245,245,1);font-size: 12px;color: #333333;padding: 12px 14px;margin-top: 13px;position: relative;width:80%}
.approvalDetails ._right_content ._pp_info:before{display:block;content:'';border-width:8px 8px 8px 8px;border-style:solid;border-color: transparent transparent rgba(245,245,245,1) transparent;position:absolute;left:10px;top:-16px;} .approvalDetails ._right_content ._pp_info:before{display:block;content:'';border-width:8px 8px 8px 8px;border-style:solid;border-color: transparent transparent rgba(245,245,245,1) transparent;position:absolute;left:10px;top:-16px;}
.approvalDetails ._mgt_15{margin-top: 15px;} .approvalDetails ._mgt_15{margin-top: 15px;}
.approvalDetails ._more ._right_content .iconfont{color: #AAAAAA} .approvalDetails ._more ._right_content .iconfont{color: #AAAAAA}
......
src/components/approval/approvalMan.vue
View file @ ad0e4a65
...@@ -77,10 +77,9 @@ ...@@ -77,10 +77,9 @@
<table v-loading="loading" style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th>状态</th> <th>状态</th>
<th>领用公司</th> <th>类型</th>
<th>领用部门</th> <th>单号</th>
<th>领用人</th> <th>使用人/时间</th>
<th>领用时间</th>
<th>分类名称</th> <th>分类名称</th>
<th>资产名称</th> <th>资产名称</th>
<th>资产编号</th> <th>资产编号</th>
...@@ -100,10 +99,14 @@ ...@@ -100,10 +99,14 @@
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span> <span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
{{item.AuditStatusName}} {{item.AuditStatusName}}
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.BranchName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.DepartmentName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.EmName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">
<p>{{item.EmName}}</p>
<p>{{item.Time}}</p>
</td>
<td :rowspan="item.DetailList.length" v-if="index==0"></td>
<td>{{delist.CategoryName}}</td> <td>{{delist.CategoryName}}</td>
<td>{{delist.PropertyName}}</td> <td>{{delist.PropertyName}}</td>
<td>{{delist.PropertyNum}}</td> <td>{{delist.PropertyNum}}</td>
......
src/components/assetsman/PaiTui.vue
View file @ ad0e4a65
...@@ -71,13 +71,14 @@ ...@@ -71,13 +71,14 @@
<table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th>状态</th> <th>状态</th>
<th>单号</th>
<th>领用公司</th> <th>领用公司</th>
<th>领用部门</th> <th>领用部门</th>
<th>领用人</th> <th>领用人</th>
<th>领用时间</th>
<th>分类名称</th>
<th>资产名称</th>
<th>资产编号</th> <th>资产编号</th>
<th>资产名称</th>
<th>分类名称</th>
<th>领用时间</th>
<th>品牌名称</th> <th>品牌名称</th>
<th>操作人</th> <th>操作人</th>
<th width="150px">操作</th> <th width="150px">操作</th>
...@@ -93,21 +94,28 @@ ...@@ -93,21 +94,28 @@
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span> <span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
{{item.AuditStatusName}} {{item.AuditStatusName}}
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.BranchName}}</td> <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.DepartmentName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.EmName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.EmName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.PropertyName}}</td>
<td>{{delist.PropertyNum}}</td> <td>{{delist.PropertyNum}}</td>
<td>{{delist.PropertyName}}</td>
<td>{{delist.CategoryName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td>
<td>{{delist.BrandName}}</td> <td>{{delist.BrandName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{delist.UpdateBy}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.UpdateBy}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0"> <td :rowspan="item.DetailList.length" v-if="index==0">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</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 v-if="(item.AuditStatus==3 || item.AuditStatus==5) && item.CreateBy==EmployeeId" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.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="End(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt=""> <img v-if="item.AuditStatus==2 && item.CreateBy==EmployeeId" @click="End(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<img v-if="item.TempleteId==0" @click="See(item,'approvalDetails','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
</el-tooltip> </el-tooltip>
</td> </td>
...@@ -183,12 +191,13 @@ ...@@ -183,12 +191,13 @@
<table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th>状态</th> <th>状态</th>
<th>退库时间</th> <th>单号</th>
<th>分类名称</th>
<th>资产名称</th>
<th>资产编号</th> <th>资产编号</th>
<th>资产名称</th>
<th>分类名称</th>
<th>品牌名称</th> <th>品牌名称</th>
<th>使用人</th> <th>使用人</th>
<th>退库时间</th>
<th width="150px">操作</th> <th width="150px">操作</th>
</thead> </thead>
<tbody> <tbody>
...@@ -202,18 +211,19 @@ ...@@ -202,18 +211,19 @@
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span> <span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
{{item.AuditStatusName}} {{item.AuditStatusName}}
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.PropertyName}}</td>
<td>{{delist.PropertyNum}}</td> <td>{{delist.PropertyNum}}</td>
<td>{{delist.PropertyName}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td> <td>{{delist.BrandName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{delist.CancelStockEmployeeName}}</td> <td>{{delist.CancelStockEmployeeName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0"> <td :rowspan="item.DetailList.length" v-if="index==0">
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="DeleteTuiku(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt=""> <img v-if="item.AuditStatus==3 || item.AuditStatus==5" @click="DeleteTuiku(item)" style="width:24px;height:24px" src="../../assets/img/delete.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="EndTuiku(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt=""> <img v-if="item.AuditStatus==2" @click="EndTuiku(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</el-tooltip> </el-tooltip>
</td> </td>
...@@ -484,6 +494,7 @@ export default { ...@@ -484,6 +494,7 @@ export default {
}, },
data(){ data(){
return{ return{
EmployeeId:'',
StateEnumList:[], StateEnumList:[],
showTable:1, showTable:1,
morequery:false, morequery:false,
...@@ -620,6 +631,8 @@ export default { ...@@ -620,6 +631,8 @@ export default {
}, },
created(){ created(){
// this.tableHeight=document.body.clientHeight-40-66-87; // this.tableHeight=document.body.clientHeight-40-66-87;
let userInfo = this.getLocalStorage();
this.EmployeeId=userInfo.EmployeeId;
}, },
mounted(){ mounted(){
this.getList(); this.getList();
...@@ -628,7 +641,34 @@ export default { ...@@ -628,7 +641,34 @@ export default {
}, },
methods:{ methods:{
// 编辑
Edit(item){
console.log("item",item)
this.addMsg.EmployeeId=item.EmployeeId;
this.addMsg.Time=item.Time;
this.addMsg.Remark=item.Remark;
this.addMsg.DetailList=[];
this.wlItemList=[];
item.DetailList.forEach(item=>{
item.Name=item.PropertyName;
this.wlItemList.push(item);
})
this.EmName=item.EmName;
this.getEmployee(2);
this.dialogState=true;
},
See(item,path,type){
let shenpistr=type;
this.$router.push({
path: "/" + path,
query: {
Id:item.Id,
compType:shenpistr,
}
});
},
getNode(){ getNode(){
this.apiJavaPost("/api/property/CateporyGetTreeList",this.nodemsg, this.apiJavaPost("/api/property/CateporyGetTreeList",this.nodemsg,
res => { res => {
...@@ -974,6 +1014,11 @@ export default { ...@@ -974,6 +1014,11 @@ export default {
}, },
EndTuiku(item){ EndTuiku(item){
let Id=item.Id; let Id=item.Id;
this.$confirm("确认终止？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/property/CancelPropertyCancellingStocks",{ReceiveId:Id}, this.apiJavaPost("/api/property/CancelPropertyCancellingStocks",{ReceiveId:Id},
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
...@@ -985,9 +1030,17 @@ export default { ...@@ -985,9 +1030,17 @@ export default {
}, },
null null
); );
}).catch(() => {
});
}, },
End(item){ End(item){
let Id=item.Id; let Id=item.Id;
this.$confirm("确认终止？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
}).then(() => {
this.apiJavaPost("/api/property/CancelPropertyReceive",{ReceiveId:Id}, this.apiJavaPost("/api/property/CancelPropertyReceive",{ReceiveId:Id},
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
...@@ -999,6 +1052,9 @@ export default { ...@@ -999,6 +1052,9 @@ export default {
}, },
null null
); );
}).catch(() => {
});
}, },
DeleteTuiku(item){ DeleteTuiku(item){
...@@ -1020,7 +1076,6 @@ export default { ...@@ -1020,7 +1076,6 @@ export default {
null null
); );
}).catch(() => { }).catch(() => {
this.$message.info('已取消删除！')
}); });
}, },
Delete(item){ Delete(item){
...@@ -1043,7 +1098,6 @@ export default { ...@@ -1043,7 +1098,6 @@ export default {
); );
}).catch(() => { }).catch(() => {
this.$message.info('已取消删除！')
}); });
}, },
Quxiao(item){ Quxiao(item){
...@@ -1066,7 +1120,6 @@ export default { ...@@ -1066,7 +1120,6 @@ export default {
); );
}).catch(() => { }).catch(() => {
this.$message.info('已取消删除！')
}); });
}, },
......
src/components/assetsman/assetsList.vue
View file @ ad0e4a65
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
<td>{{item.PropertyModel}}</td> <td>{{item.PropertyModel}}</td>
<td> <td>
<p>使用人名称：{{item.EmName}}</p> <p v-if="item.EmName!=''">使用人名称：{{item.EmName}}</p>
<p style="padding:2px 0">使用时间：{{item.GetTime}}</p> <p v-if="item.GetTime!=''" style="padding:2px 0">使用时间：{{item.GetTime}}</p>
<!-- <p>归还时间：{{item.BackTime}}</p> --> <!-- <p>归还时间：{{item.BackTime}}</p> -->
</td> </td>
<td> <td>
...@@ -138,6 +138,35 @@ ...@@ -138,6 +138,35 @@
width="975px"> width="975px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix"> <div class="basefix">
<div>
<p style="margin-bottom:15px;" class="f12"><i class="dialogI"></i>使用信息</p>
<div class="basefix">
<el-form-item label="">
<span class="label">使用人</span>
<el-select size="mini" filterable v-model="addMsg.EmployeeId" placeholder="请选择" :filter-method="getEmployee2">
<el-option
v-for="item in EmployeeList2"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<p class="label">领取时间</p>
<el-date-picker
size="mini"
v-model="addMsg.GetTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</div>
</div>
<p style="margin-bottom:15px;" class="f12"><i class="dialogI"></i>基本信息</p>
<div class="baseform">
<el-form-item label="" prop="Name"> <el-form-item label="" prop="Name">
<span class="label">资产名称</span> <span class="label">资产名称</span>
<el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input> <el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input>
...@@ -217,17 +246,7 @@ ...@@ -217,17 +246,7 @@
<span class="label">备注</span> <span class="label">备注</span>
<el-input size="mini" v-model="addMsg.Remark" placeholder="请输入"></el-input> <el-input size="mini" v-model="addMsg.Remark" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="">
<span class="label">使用人</span>
<el-select size="mini" filterable v-model="addMsg.EmployeeId" placeholder="请选择" :filter-method="getEmployee2">
<el-option
v-for="item in EmployeeList2"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="SupplierId"> <el-form-item label="" prop="SupplierId">
<span class="label">供应商</span> <span class="label">供应商</span>
<el-select size="mini" v-model="addMsg.SupplierId" placeholder="请选择"> <el-select size="mini" v-model="addMsg.SupplierId" placeholder="请选择">
...@@ -239,16 +258,9 @@ ...@@ -239,16 +258,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> </div>
<p class="label">领取时间</p>
<el-date-picker
size="mini"
v-model="addMsg.GetTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</div> </div>
<div class="_addUpload_box"> <div class="_addUpload_box">
<ul class="uploadUl"> <ul class="uploadUl">
...@@ -731,7 +743,7 @@ export default { ...@@ -731,7 +743,7 @@ export default {
</script> </script>
<style> <style>
.assetsList .MyEditForm .el-form-item:nth-child(4n){ .assetsList .MyEditForm .baseform .el-form-item:nth-child(4n){
margin-right:0; margin-right:0;
} }
.assetsList .zczt1{ .assetsList .zczt1{
......
src/components/global/Nav.vue
View file @ ad0e4a65
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:default-active="defaulActive" :default-active="defaulActive"
class="el-menu-vertical-demo"> class="el-menu-vertical-demo">
<el-menu-item index="0" route="/home"> <el-menu-item index="0" route="/home">
<div class="menuDiv"> <div @click="goHome" class="menuDiv">
<i class="iconfont icon-shouye"></i> <i class="iconfont icon-shouye"></i>
<span slot="title">首页</span> <span slot="title">首页</span>
</div> </div>
...@@ -122,9 +122,14 @@ export default { ...@@ -122,9 +122,14 @@ export default {
}, },
menuList:[],
} }
}, },
created(){ created(){
if(!this.getLocalStorage()){
this.$router.push({path: 'login'})
return;
}
this.$bus.on('once',(path,key) =>{//处理传过来的值 this.$bus.on('once',(path,key) =>{//处理传过来的值
if(key){ if(key){
this.defaulActive=key; this.defaulActive=key;
...@@ -133,6 +138,9 @@ export default { ...@@ -133,6 +138,9 @@ export default {
this.getMenu(); this.getMenu();
}, },
methods:{ methods:{
goHome(){
this.$router.push({path: '/Home'})
},
goUrl(child){ goUrl(child){
this.$router.push({path: child.MenuUrl}) this.$router.push({path: child.MenuUrl})
}, },
......
src/components/global/index.vue
View file @ ad0e4a65
...@@ -62,6 +62,10 @@ export default { ...@@ -62,6 +62,10 @@ export default {
}, },
created(){ created(){
this.minHeight=document.body.clientHeight-70; this.minHeight=document.body.clientHeight-70;
if(!this.getLocalStorage()){
this.$router.push({path: 'login'})
return;
}
let zcuserInfo = this.getLocalStorage(); let zcuserInfo = this.getLocalStorage();
this.zcuserInfo=zcuserInfo; this.zcuserInfo=zcuserInfo;
if (this.$route.name === 'index') { if (this.$route.name === 'index') {
......
src/main.js
View file @ ad0e4a65
...@@ -16,6 +16,7 @@ Vue.prototype.$echarts = echarts ...@@ -16,6 +16,7 @@ Vue.prototype.$echarts = echarts
import 'xe-utils' import 'xe-utils'
import VXETable from 'vxe-table' import VXETable from 'vxe-table'
import 'vxe-table/lib/index.css' import 'vxe-table/lib/index.css'
import commonUtils from './assets/utils/commonUtils'
Vue.use(VXETable) Vue.use(VXETable)
Vue.use(ElementUI); Vue.use(ElementUI);
...@@ -27,6 +28,9 @@ import VueBus from 'vue-bus'; ...@@ -27,6 +28,9 @@ import VueBus from 'vue-bus';
Vue.use(VueBus); Vue.use(VueBus);
Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
Vue.filter("YMD", function (date) { Vue.filter("YMD", function (date) {
return moment(date).format("YYYY-MM-DD"); return moment(date).format("YYYY-MM-DD");
......
src/router/config.js
View file @ ad0e4a65
...@@ -114,6 +114,12 @@ export default { ...@@ -114,6 +114,12 @@ export default {
name: 'approvalDetails', name: 'approvalDetails',
component: resolve => require(['@/components/approval/approvalDetails'], resolve), component: resolve => require(['@/components/approval/approvalDetails'], resolve),
}, },
// 签字
{
path: '/Sign',
name: 'Sign',
component: resolve => require(['@/components/approval/Sign'], 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