Skip to content

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

update

parent 54a7ff56
Hide whitespace changes
Inline Side-by-side
Showing with 1013 additions and 403 deletions
src/assets/css/common.css
View file @ 85240dac
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
font-family: "宋体"; font-family: "宋体";
box-sizing: border-box;
} }
.pageTitle{ .pageTitle{
...@@ -47,6 +48,22 @@ ...@@ -47,6 +48,22 @@
.roatImg{ .roatImg{
transform: rotate(180deg); transform: rotate(180deg);
} }
/* chexkbox */
.myTable input[type="checkbox"]{
width:15px;height:15px;
display: inline-block;text-align: center;vertical-align: middle; line-height: 15px;position: relative;
}
.myTable input[type="checkbox"]::before{
content: "";position: absolute;top: 0;left: 0;
background: #fff;width: 100%;height: 100%;border: 1px solid #B9ECED
}
.myTable input[type="checkbox"]:checked::before{
content: "\2713";background-color: #fff;
position: absolute;top: 0;left: 0;
width:100%;border: 1px solid #00D2D6;color:#00D2D6;
font-size: 18px;font-weight: bold;
}
/* myTable */ /* myTable */
.myTable{ .myTable{
width: 100%; width: 100%;
...@@ -214,10 +231,6 @@ ...@@ -214,10 +231,6 @@
background: #BEEFF0; background: #BEEFF0;
color: #28CACC; color: #28CACC;
} }
.greenSpan{
background: #BEEFF0;
color: #28CACC;
}
.purpleSpan{ .purpleSpan{
background: #D7D6FF; background: #D7D6FF;
color: #7B78FF; color: #7B78FF;
...@@ -294,4 +307,43 @@ ...@@ -294,4 +307,43 @@
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 4; -webkit-line-clamp: 4;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
}
.backTo{
width:80px;
height:34px;
line-height:34px;
background:rgba(0,210,214,1);
border-radius:17px;
text-align: center;
color: #fff;
font-size: 12px;
font-family: "宋体";
display: inline-block;
margin-left:15px;
cursor: pointer;
}
/* 日志 */
.detailsIT_Journal .InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.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;}
.detailsIT_Journal ._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.detailsIT_Journal .changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
.zcSpanQuery{
position: absolute;
right: 50px;
top: -60px;
display: inline-block;
width:75px;
height:32px;
line-height:32px;
background:rgba(0,210,214,1);
border-radius:17px;
text-align: center;
color: #fff;
font-size: 12px;
font-family: "宋体";
display: inline-block;
margin-left:15px;
cursor: pointer;
} }
\ No newline at end of file
src/assets/css/reset.css
View file @ 85240dac
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
.el-input{ .el-input{
display: inline-block; display: inline-block;
} }
.el-input.is-disabled .el-input__inner{
background-color: #fff;
border-color: #fff;
}
.queryul { .queryul {
margin-top: 20px; margin-top: 20px;
} }
...@@ -89,6 +93,10 @@ ...@@ -89,6 +93,10 @@
.queryul li span>em{display: inline-block; min-width: 80px; text-align: right; font-style: normal; margin:0 15px 0 0;} .queryul li span>em{display: inline-block; min-width: 80px; text-align: right; font-style: normal; margin:0 15px 0 0;}
/* dialog */ /* dialog */
.el-dialog__wrapper{
display: flex;
align-items: center;
}
.el-dialog__body{ .el-dialog__body{
padding:0 20px 15px 20px; padding:0 20px 15px 20px;
} }
...@@ -196,7 +204,7 @@ ...@@ -196,7 +204,7 @@
} }
.MyEditForm .btnformItem span{ .MyEditForm .btnformItem span{
display: inline-block; display: inline-block;
width:120px; width:100px;
height:40px; height:40px;
line-height:40px; line-height:40px;
border-radius:22px; border-radius:22px;
...@@ -336,4 +344,35 @@ ...@@ -336,4 +344,35 @@
} }
.el-tooltip{ .el-tooltip{
cursor: pointer; cursor: pointer;
}
/* 修改树节点 */
/*树节点前面的图标修改*/
.el-tree .el-tree-node__expand-icon.expanded
{
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
.el-tree .el-icon-caret-right:before
{
background: url("../img/treejia.png") no-repeat center center;
content: '';
display: block;
width: 20px;
height: 20px;
font-size: 18px;
}
.el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before
{
background: url("../img/treejian.png") no-repeat center center;
content: '';
display: block;
width: 20px;
height: 20px;
font-size: 18px;
}
.el-tree-node__expand-icon.is-leaf::before
{
display: none;
} }
\ No newline at end of file
src/assets/css/vxetable.css
View file @ 85240dac
...@@ -81,3 +81,10 @@ ...@@ -81,3 +81,10 @@
.vxe-table table{ .vxe-table table{
overflow: hidden; overflow: hidden;
} }
.vxe-checkbox.is--indeterminate>input:not(:checked)+.vxe-checkbox--icon{
background-color: #28CACC;
border-color: #28CACC;
}
.vxe-toolbar.is--loading:before{
background-color: rgba(0,0,0,0);
}
src/components/Home.vue
View file @ 85240dac
...@@ -2,35 +2,35 @@ ...@@ -2,35 +2,35 @@
<div class="Home"> <div class="Home">
<div class="banner" ref="banner"> <div class="banner" ref="banner">
<ul ref="scrollUl"> <ul ref="scrollUl">
<li class="liItem" @click="goUrl('assetsList','1-1')"> <li class="liItem" @click="goUrl('SignMan')">
<img src="../assets/img/b1.png" alt=""> <img src="../assets/img/b1.png" alt="">
<div> <div>
<p class="f22">1</p> <p class="f22">{{TaskObj.SignCount}}</p>
<p style="margin-top:10px">派发待确认任务</p> <p style="margin-top:10px">待我签名</p>
</div> </div>
</li> </li>
<li class="liItem"> <li class="liItem" @click="goUrl('approvalMan')">
<img src="../assets/img/b2.png" alt=""> <img src="../assets/img/b2.png" alt="">
<div> <div>
<p class="f22">1</p> <p class="f22">{{TaskObj.WaitCount}}</p>
<p style="margin-top:10px">当前报修任务</p> <p style="margin-top:10px">待我审核</p>
</div> </div>
</li> </li>
<li class="liItem"> <li class="liItem" @click="goUrl('MaturingAssets')">
<img src="../assets/img/b3.png" alt=""> <img src="../assets/img/b3.png" alt="">
<div> <div>
<p class="f22">5</p> <p class="f22">{{TaskObj.MaturityCount}}</p>
<p style="margin-top:10px">离职待交接任务</p> <p style="margin-top:10px">资产到期</p>
</div> </div>
</li> </li>
<li class="liItem"> <li class="liItem" @click="goUrl('SpotQuery')">
<img src="../assets/img/b2.png" alt=""> <img src="../assets/img/b2.png" alt="">
<div> <div>
<p class="f22">1</p> <p class="f22">{{TaskObj.MaturityCount}}</p>
<p style="margin-top:10px">当前报修任务</p> <p style="margin-top:10px">耗材预警</p>
</div> </div>
</li> </li>
<li class="liItem"> <!-- <li class="liItem">
<img src="../assets/img/b3.png" alt=""> <img src="../assets/img/b3.png" alt="">
<div> <div>
<p class="f22">5</p> <p class="f22">5</p>
...@@ -43,68 +43,92 @@ ...@@ -43,68 +43,92 @@
<p class="f22">5</p> <p class="f22">5</p>
<p style="margin-top:10px">离职待交接任务</p> <p style="margin-top:10px">离职待交接任务</p>
</div> </div>
</li> </li> -->
</ul> </ul>
<div class="navDiv"> <div v-if="stepTask" class="navDiv">
<span @click="goScroll(1)" :class="tabActive==1?'active':''"></span> <span @click="goScroll(1)" :class="tabActive==1?'active':''"></span>
<span @click="goScroll(2)" :class="tabActive==2?'active':''"></span> <span @click="goScroll(2)" :class="tabActive==2?'active':''"></span>
</div> </div>
</div> </div>
<div class="homeContent" style="background:#F8FAFB"> <div class="homeContent basefix" style="background:#F8FAFB">
<div class="left"> <div class="left">
<div> <div>
<img style="width:100%;" src="../assets/img/banner.png" alt=""> <img style="width:100%;" src="../assets/img/banner.png" alt="">
</div> </div>
<div class="zcState"> <div class="zcState">
<p style="padding-left:25px;" class="c11 f14 bold">资产状态占比</p> <p style="padding-left:25px;padding-top:20px;" class="c11 f14 bold">资产状态占比</p>
<el-row class="ziItem"> <el-row v-for="(item,index) in StatusList" :key="index" class="ziItem">
<el-col :span="14"> <el-col :span="14">
<p>资产领用情况</p> <p>资产{{item.Name}}</p>
<p style="margin-top:6px"><span class="sl">数量</span> 4</p> <p style="margin-top:6px"><span class="sl">数量</span> {{item.Count}}</p>
</el-col> </el-col>
<el-col :span="10" style="text-align:right"> <el-col :span="10" style="text-align:right">
<el-progress class="progressDiv" type="circle" :percentage="25" color="#00D2D6" :stroke-width="12" :width="86"></el-progress> <el-progress class="progressDiv" type="circle" :percentage="item.percent" color="#00D2D6" :stroke-width="12" :width="86"></el-progress>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="ziItem"> </div>
<el-col :span="14"> </div>
<p>资产领用情况</p> <div class="right">
<p style="margin-top:6px"><span class="sl">数量</span> 4</p> <div class="firstDiv assetsgk" style="padding:20px 0">
<p class="f12" style="padding-left:30px;">资产概况</p>
<el-row style="margin-top:20px">
<el-col :span="12">
<div style="text-align:center">
<el-progress class="progressDiv" type="circle" :percentage="SituationInfo.Norpercent" color="#00D2D6" :stroke-width="18" :width="150"></el-progress>
</div>
<div class="f12 c11" style="padding-left:10%;margin-top:20px;border-right:1px solid #00D2D6">
<span style="color:#A6C6C6">在用：</span>
<span class="Circle" style="background:#00D2D6"></span>
<span>金额 ￥{{SituationInfo.NorMoney}}</span>
<span class="Circle" style="background:#BEEFF0"></span>
<span>数量 {{SituationInfo.NorCount}}</span>
</div>
</el-col> </el-col>
<el-col :span="10" style="text-align:right"> <el-col :span="12">
<el-progress class="progressDiv" type="circle" :percentage="25" color="#00D2D6" :stroke-width="12" :width="86"></el-progress> <div style="text-align:center">
<el-progress class="progressDiv" type="circle" :percentage="SituationInfo.Idlepercent" color="#FFA475" :stroke-width="18" :width="150"></el-progress>
</div>
<div class="f12 c11" style="padding-left:10%;margin-top:20px;">
<span style="color:#A6C6C6">闲置：</span>
<span class="Circle" style="background:#FFA475"></span>
<span>金额 ￥{{SituationInfo.IdleMoney}}</span>
<span class="Circle" style="background:#FFE4D5"></span>
<span>数量 {{SituationInfo.IdleCount}}</span>
</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</div> <div class="firstDiv" style="height:370px;margin-top:30px">
<div class="right">
<div class="firstDiv" style="height:370px">
<el-row class="chartTitle"> <el-row class="chartTitle">
<el-col :span="12" class="f14 c11">资产入库领用情况<span style="color:#969696;margin-left:14px">固定资产</span></el-col> <el-col :span="12" class="f14 c11">资产入库领用情况<span style="color:#969696;margin-left:14px">固定资产</span></el-col>
<el-col :span="12" style="text-align:right"> <el-col class="f12 c11" :span="12" style="text-align:right;cursor: pointer">
<span><span class="circle"></span>入库</span> <span @click="SetTimeType(1,1)" :class="IntimeType==1?'Active':''">最近一年</span>
<span><span class="circle" style="background:#FFA475"></span>领用</span> <span @click="SetTimeType(2,1)" :class="IntimeType==2?'Active':''">最近半年</span>
<el-select v-model="value" placeholder="请选择"> <span @click="SetTimeType(3,1)" :class="IntimeType==3?'Active':''">最近三月</span>
<el-option key="1" label="固定资产" value="1"> </el-option> <el-select @change="getPropertyInStock" v-model="InStockMsg.LogType" placeholder="请选择">
<el-option key="1" label="入库" :value="1"> </el-option>
<el-option key="2" label="领用" :value="2"> </el-option>
</el-select> </el-select>
</el-col> </el-col>
</el-row> </el-row>
<div id="chartsMap" class="bgDiv" style="height:320px;width:100%;"></div> <div id="chartsMap" class="bgDiv" style="height:320px;width:100%;margin-top:10px"></div>
</div> </div>
<div class="firstDiv" style="height:370px;margin-top:30px"> <div class="firstDiv" style="height:360px;margin-top:30px">
<el-row class="chartTitle"> <el-row class="chartTitle">
<el-col :span="12" class="f14 c11">资产入库领用情况<span style="color:#969696;margin-left:14px">固定资产</span></el-col> <el-col :span="12" class="f14 c11">耗材入库领用情况<span style="color:#969696;margin-left:14px">固定资产</span></el-col>
<el-col :span="12" style="text-align:right"> <el-col class="f12 c11" :span="12" style="text-align:right;cursor: pointer">
<span><span class="circle"></span>入库</span> <span @click="SetTimeType(1,2)" :class="IntimesuppleType==1?'Active':''">最近一年</span>
<span><span class="circle" style="background:#FFA475"></span>领用</span> <span @click="SetTimeType(2,2)" :class="IntimesuppleType==2?'Active':''">最近半年</span>
<el-select v-model="value" placeholder="请选择"> <span @click="SetTimeType(3,2)" :class="IntimesuppleType==3?'Active':''">最近三月</span>
<el-option key="1" label="固定资产" value="1"> </el-option> <el-select @change="getSuppliesInStock" v-model="InStockMsg.LogType" placeholder="请选择">
<el-option key="1" label="入库" :value="1"> </el-option>
<el-option key="2" label="出库" :value="2"> </el-option>
</el-select> </el-select>
</el-col> </el-col>
</el-row> </el-row>
<div id="chartsMap1" class="bgDiv" style="height:320px;width:100%;"></div> <div id="chartsMap1" class="bgDiv" style="height:310px;width:100%;margin-top:10px"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -112,33 +136,89 @@ ...@@ -112,33 +136,89 @@
</template> </template>
<script> <script>
import moment from 'moment'
export default { export default {
name: 'Home', name: 'Home',
data () { data () {
return { return {
datedata1:[1,2,50,60,50,40,70], datedata1:[1,2,50,60,50,40,70],
datedata:[4,7,90,50,55,77,88], datedata:[4,7,90,50,55,77,88],
Month:['2019-06','2019-06','2019-06','2019-06','2019-06','2019-06'],
value:1, value:[],
zcuserInfo:{}, zcuserInfo:{},
tabActive:1, tabActive:1,
width:0, width:0,
TaskObj:{},
stepTask:true,
StatusList:[],
InStockMsg:{
LogType:1,
StartTime:moment().subtract(3, "month").format("YYYY-MM"),
EndTime:moment().format("YYYY-MM"),
},
InStockSuppleMsg:{
LogType:1,
StartTime:moment().subtract(3, "month").format("YYYY-MM"),
EndTime:moment().format("YYYY-MM"),
},
IntimeType:3,
IntimesuppleType:3,
InStockData:[],
CategoryNameList:[],
colorList:['#00D2D6','#FFA171','#72b8ff','#ff9cc6','#7b78ff','#28cc90','#ee8fff','#5cf2ff','#ff9a00','#4fc4f7','#738eff','#b0edff'],
StockMonth:[],
Stocklegend:{},
InStockData1:[],
SuppliesNameList:[],
StockMonth1:[],
Stocklegend1:{},
SituationInfo:{},
} }
}, },
created(){ created(){
}, },
mounted(){ mounted(){
this.width=this.$refs.banner.clientWidth; this.width=this.$refs.banner.clientWidth;
console.log("width",this.width) let num= this.width /340;
this.LineChart(); if(num>4){
this.LineChart1(); this.stepTask=false;
}
this.getTask();
this.getStatus();
this.getPropertyInStock();
this.getSuppliesInStock();
this.getSituation();
}, },
methods:{ methods:{
goUrl(path,key){ SetTimeType(type,num){
this.$bus.emit('once',path,key); let start="";
if(type==1){
start=moment().subtract(12, "month").format("YYYY-MM")
}
if(type==2){
start=moment().subtract(6, "month").format("YYYY-MM")
}
if(type==3){
start=moment().subtract(3, "month").format("YYYY-MM")
}
if(num==1){
this.IntimeType=type;
this.InStockMsg.StartTime=start;
this.getPropertyInStock();
}
if(num==2){
this.IntimesuppleType=type;
this.InStockSuppleMsg.StartTime=start;
this.getSuppliesInStock();
}
},
goUrl(path){
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
...@@ -178,12 +258,95 @@ export default { ...@@ -178,12 +258,95 @@ export default {
} }
}, 10); }, 10);
}, },
getPropertyInStock(){
let that=this;
that.apiJavaPost("/api/property/GetPropertyIndexPropertyInStock",this.InStockMsg,
res => {
if (res.data.resultCode === 1) {
let data=res.data.data;
this.InStockData=[];
this.CategoryNameList=[];
this.StockMonth=[];
let Newobj={};
data.forEach((item,index1) => {
this.CategoryNameList.push(item.CategoryName)
if(index1>4){
let name=item.CategoryName;
Newobj[name]=false;
}
this.Stocklegend=Newobj;
item.List.forEach((list,index) => {
if(index1==0){
this.StockMonth.push(list.Month)
}
});
});
data.forEach((item,index1)=> {
let arr=[];
let obj={
name:item.CategoryName,
data: [],
type: 'line',
smooth: true,
areaStyle:{
normal: {
color: '#D6F8F8' //改变区域颜色
}
},
symbolSize: 10,
itemStyle : {
normal : {
borderWidth:0,
borderColor:"transparent",
lineStyle:{
color:that.colorList[index1], //改变折线颜色
width:5
}
}
},
emphasis:{
itemStyle:{
borderWidth:5,
borderColor:that.colorList[index1],
}
},
};
// if(index1==0){
// obj.areaStyle={
// normal: {
// color: '#D6F8F8' //改变区域颜色
// }
// }
// }
item.List.forEach(list=> {
this.StockMonth.forEach((month,index3)=> {
if(list.Month==month){
arr.push(list.Number)
}
obj.data=arr;
});
});
this.InStockData.push(obj)
});
setTimeout(()=>{
that.LineChart();
},1000)
} else {
this.Error(res.data.message);
}
},
null
);
},
LineChart(){ LineChart(){
var that = this; var that = this;
var myChart = this.$echarts.init(document.getElementById('chartsMap')); var myChart = this.$echarts.init(document.getElementById('chartsMap'));
var option={ var option={
color: ['#00D2D6','#FFA171'], color: that.colorList,
tooltip : { tooltip : {
trigger: 'item', trigger: 'item',
...@@ -196,12 +359,11 @@ export default { ...@@ -196,12 +359,11 @@ export default {
} }
}, },
position: function (point, params, dom, rect, size) { position: function (point, params, dom, rect, size) {
      return [point[0]-60, point[1]-dom.offsetHeight -10];       return [point[0]-50, point[1]-dom.offsetHeight -10];
  },   },
        formatter: function(params) {         formatter: function(params) {
// console.log("params",params)
var res = `<div style="background:${params.color};position:relative;padding:6px 10px;border-radius:8px;"> var res = `<div style="background:${params.color};position:relative;padding:6px 10px;border-radius:8px;">
栏目栏目栏目栏目栏目 ${params.seriesName}:${params.data}
<div style="position: absolute;bottom: -8px;left: 35%;width:0; <div style="position: absolute;bottom: -8px;left: 35%;width:0;
height:0; height:0;
border-left:8px solid transparent; border-left:8px solid transparent;
...@@ -212,6 +374,13 @@ export default { ...@@ -212,6 +374,13 @@ export default {
          return res;           return res;
} }
}, },
legend: {
x:'right',
type:'scroll',
data:that.CategoryNameList,
// data:["邮件营销","联盟广告"],
selected:this.Stocklegend
},
grid:{ grid:{
left: 75, // 默认10%，给24就挺合适的。 left: 75, // 默认10%，给24就挺合适的。
top: 50, // 默认60 top: 50, // 默认60
...@@ -222,7 +391,7 @@ export default { ...@@ -222,7 +391,7 @@ export default {
xAxis: { xAxis: {
type: 'category', type: 'category',
boundaryGap: false, boundaryGap: false,
data: this.Month, data: this.StockMonth,
axisLine: { axisLine: {
lineStyle: { lineStyle: {
// 设置x轴颜色 // 设置x轴颜色
...@@ -256,67 +425,74 @@ export default { ...@@ -256,67 +425,74 @@ export default {
} }
} }
}, },
series: [ series:that.InStockData
{ };
data: that.datedata, // myChart.setOption(option);
type: 'line', myChart.setOption(option,true);
smooth: true, },
areaStyle: { getSuppliesInStock(){
normal: { let that=this;
color: '#D6F8F8' //改变区域颜色 that.apiJavaPost("/api/property/GetPropertyIndexSuppliesInStock",this.InStockSuppleMsg,
}, res => {
}, if (res.data.resultCode === 1) {
symbolSize: 10, let data=res.data.data;
itemStyle : { this.InStockData1=[];
normal : { this.SuppliesNameList=[];
borderWidth:0, this.StockMonth1=[];
borderColor:"transparent", let Newobj={};
lineStyle:{ data.forEach((item,index1) => {
color:'#47D2D4', //改变折线颜色 this.SuppliesNameList.push(item.SuppliesName)
width:5 if(index1>4){
} let name=item.SuppliesName;
} Newobj[name]=false;
}, }
emphasis:{ this.Stocklegend1=Newobj;
itemStyle:{ item.List.forEach((list,index) => {
borderWidth:5, if(index1==0){
borderColor:"#47D2D4", this.StockMonth1.push(list.Month)
} }
},
}, });
{ });
data: that.datedata1, data.forEach((item,index1)=> {
type: 'line', let arr=[];
smooth: true, let obj={
symbolSize: 10, name:item.SuppliesName,
// showSymbol:false, type:'bar',
itemStyle : {
normal : {
borderWidth:7,
borderColor:"transparent",
lineStyle:{
color:'#FFA475', //改变折线颜色
width:5
}
}
},
emphasis:{
itemStyle:{ itemStyle:{
borderWidth:5, barBorderRadius: 15,
borderColor:"#FFA475", },
} barWidth : 15,
}, data:[],
}, };
] item.List.forEach(list=> {
}; this.StockMonth1.forEach((month,index3)=> {
myChart.setOption(option); if(list.Month==month){
arr.push(list.Number)
}
obj.data=arr;
});
});
this.InStockData1.push(obj)
});
setTimeout(()=>{
that.LineChart1();
},1000)
} else {
this.Error(res.data.message);
}
},
null
);
}, },
LineChart1(){ LineChart1(){
var that = this; var that = this;
var myChart = this.$echarts.init(document.getElementById('chartsMap1')); var myChart = this.$echarts.init(document.getElementById('chartsMap1'));
var option={ var option={
color: ['#00D2D6','#FFA171'], color:that.colorList,
tooltip : { tooltip : {
backgroundColor:'transparent', backgroundColor:'transparent',
trigger: 'item', trigger: 'item',
...@@ -327,12 +503,12 @@ export default { ...@@ -327,12 +503,12 @@ export default {
} }
}, },
position: function (point, params, dom, rect, size) { position: function (point, params, dom, rect, size) {
      return [point[0]-60, point[1]-dom.offsetHeight];       return [point[0]-50, point[1]-dom.offsetHeight];
  },   },
formatter: function(params) { formatter: function(params) {
// console.log("params",params) // console.log("params",params)
var res = `<div style="background:${params.color};position:relative;padding:6px 10px;border-radius:8px;"> var res = `<div style="background:${params.color};position:relative;padding:6px 10px;border-radius:8px;">
栏目栏目栏目栏目栏目 ${params.seriesName}:${params.data}
<div style="position: absolute;bottom: -8px;left: 35%;width:0; <div style="position: absolute;bottom: -8px;left: 35%;width:0;
height:0; height:0;
border-left:8px solid transparent; border-left:8px solid transparent;
...@@ -343,6 +519,13 @@ export default { ...@@ -343,6 +519,13 @@ export default {
          return res;           return res;
} }
}, },
legend: {
x:'right',
type:'scroll',
data:that.SuppliesNameList,
selected:this.Stocklegend1
},
grid: { grid: {
left: 75, // 默认10%，给24就挺合适的。 left: 75, // 默认10%，给24就挺合适的。
top: 50, // 默认60 top: 50, // 默认60
...@@ -353,7 +536,7 @@ export default { ...@@ -353,7 +536,7 @@ export default {
xAxis : [ xAxis : [
{ {
type : 'category', type : 'category',
data : ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], data :this.StockMonth1,
axisLine: { axisLine: {
lineStyle: { lineStyle: {
// 设置x轴颜色 // 设置x轴颜色
...@@ -392,29 +575,58 @@ export default { ...@@ -392,29 +575,58 @@ export default {
} }
} }
], ],
series : [ series:that.InStockData1
{
name:'直接访问',
type:'bar',
itemStyle:{
barBorderRadius: 15,
},
barWidth : 15,
data:[10, 52, 200, 334, 390, 330, 220],
},
{
name:'ceshi',
type:'bar',
itemStyle:{
barBorderRadius: 15,
},
barWidth : 15,
data:[12, 55, 220, 330, 399, 366, 223]
}
]
}; };
myChart.setOption(option); myChart.setOption(option,true);
},
getTask(){
this.apiJavaPost("/api/property/GetPropertyIndexTask",{},
res => {
if (res.data.resultCode === 1) {
this.TaskObj=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getStatus(){
this.apiJavaPost("/api/property/GetPropertyIndexPropertyStatusRatio",{},
res => {
if (res.data.resultCode === 1) {
let total=0;
let data=res.data.data;
data.forEach(item=>{
total+=item.Count;
})
data.forEach(item=>{
item.percent=Number((( item.Count / total) *100).toFixed(2));
})
this.StatusList=data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getSituation(){
this.apiJavaPost("/api/property/GetPropertyIndexGeneralSituation",{},
res => {
if (res.data.resultCode === 1) {
let data=res.data.data;
data.Norpercent=Number(((data.NorCount / data.TotalCount) * 100).toFixed(2));
data.Idlepercent=Number(((data.IdleCount / data.TotalCount) * 100).toFixed(2));
this.SituationInfo=data;
} else {
this.Error(res.data.message);
}
},
null
);
}, },
}, },
} }
...@@ -422,6 +634,19 @@ export default { ...@@ -422,6 +634,19 @@ export default {
<!-- Add "scoped" attribute to limit CSS to this component only --> <!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped> <style scoped>
.homeContent .assetsgk .Circle{
display: inline-block;
width:14px;
height:14px;
border-radius:50%;
margin-left:25px;
position: relative;
top:4px;
}
.homeContent .Active{
color:rgb(0, 210, 214);
}
.navDiv .active{ .navDiv .active{
width:35px!important; width:35px!important;
...@@ -453,11 +678,11 @@ export default { ...@@ -453,11 +678,11 @@ export default {
.chartTitle .el-select{ .chartTitle .el-select{
width:102px; width:102px;
height:24px; height:24px;
line-height:24px;
background:rgba(17,17,17,1); background:rgba(17,17,17,1);
border-radius:12px; border-radius:12px;
margin-left:30px; margin-left:30px;
position: relative; position: relative;
top: -3px;
} }
.chartTitle{ .chartTitle{
padding: 25px 30px 0 30px; padding: 25px 30px 0 30px;
...@@ -491,14 +716,15 @@ export default { ...@@ -491,14 +716,15 @@ export default {
} }
.homeContent .left{ .homeContent .left{
width: 316px; width: 316px;
position: absolute; /* position: absolute; */
left: 30px; left: 30px;
top: 30px; top: 30px;
} }
.homeContent .right{ .homeContent .right{
width: 100%; width: calc(100% - 346px);
padding-left: 346px; /* padding-left: 346px; */
box-sizing: border-box; box-sizing: border-box;
margin-left:26px;
} }
.homeContent .right .firstDiv{ .homeContent .right .firstDiv{
...@@ -507,7 +733,7 @@ export default { ...@@ -507,7 +733,7 @@ export default {
} }
.homeContent>div{ .homeContent>div{
display: inline-block; float: left;
} }
.homeContent{ .homeContent{
width: 100%; width: 100%;
...@@ -530,6 +756,7 @@ export default { ...@@ -530,6 +756,7 @@ export default {
height: 210px; height: 210px;
display: inline-block; display: inline-block;
margin-left: -15px; margin-left: -15px;
cursor: pointer;
} }
.banner .liItem img{ .banner .liItem img{
width: 100%; width: 100%;
......
src/components/Materialman/Archivesmaterials.vue
View file @ 85240dac
...@@ -93,15 +93,15 @@ ...@@ -93,15 +93,15 @@
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item prop="Name"> <el-form-item prop="Name">
<span class="label">档案名称</span> <span class="label">档案名称</span>
<el-input size="small" v-model="addMsg.Name"></el-input> <el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">档案编码</span> <span class="label">档案编码</span>
<el-input size="small" v-model="addMsg.SuppliesNum"></el-input> <el-input size="small" v-model="addMsg.SuppliesNum" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="BrandName"> <el-form-item prop="BrandName">
<span class="label">品牌名称</span> <span class="label">品牌名称</span>
<el-input size="small" v-model="addMsg.BrandName"></el-input> <el-input size="small" v-model="addMsg.BrandName" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="treeItem" style="float:left;"> <el-form-item class="treeItem" style="float:left;">
<span class="label">分类</span> <span class="label">分类</span>
...@@ -110,43 +110,35 @@ ...@@ -110,43 +110,35 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">供应商名称</span> <span class="label">供应商名称</span>
<el-input size="small" v-model="addMsg.SupplierName"></el-input> <el-input size="small" v-model="addMsg.SupplierName" placeholder="请输入"></el-input>
<!-- <el-select size="mini" v-model="addMsg.SupplierName" placeholder="请选择">
<el-option
v-for="item in supplierList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select> -->
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">安全库存</span> <span class="label">安全库存</span>
<el-input size="small" v-model="addMsg.SafetyStock"></el-input> <el-input size="small" v-model="addMsg.SafetyStock" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">预警预存</span> <span class="label">预警预存</span>
<el-input size="small" v-model="addMsg.ReservedStock"></el-input> <el-input size="small" v-model="addMsg.ReservedStock" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">型号</span> <span class="label">型号</span>
<el-input size="small" v-model="addMsg.SuppliesModel"></el-input> <el-input size="small" v-model="addMsg.SuppliesModel" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">单位</span> <span class="label">单位</span>
<el-input size="small" v-model="addMsg.Units"></el-input> <el-input size="small" v-model="addMsg.Units" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="Money"> <el-form-item prop="Money">
<span class="label">成本价</span> <span class="label">成本价</span>
<el-input size="small" v-model="addMsg.Money"></el-input> <el-input size="small" v-model="addMsg.Money" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">条形码号</span> <span class="label">条形码号</span>
<el-input size="small" v-model="addMsg.Barcode"></el-input> <el-input size="small" v-model="addMsg.Barcode" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="label">备注</span> <span class="label">备注</span>
<el-input size="small" v-model="addMsg.Remark"></el-input> <el-input size="small" v-model="addMsg.Remark" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<div class="_addUpload_box"> <div class="_addUpload_box">
<ul class="uploadUl"> <ul class="uploadUl">
......
src/components/Materialman/ConsumRecipients.vue
View file @ 85240dac
...@@ -7,15 +7,15 @@ ...@@ -7,15 +7,15 @@
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span> </span>
<span @click="Export('GetRecipientsQueryPageListToExcel','领用')" style="margin-left:20px" class="addSpan">导出</span>
<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="addSupplier" style="margin-left:20px" class="addSpan"> <!-- <span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> --> 新增</span> -->
</div> </div>
<ul v-show="morequery" class="queryul"> <ul v-show="morequery" class="queryul">
<li> <li>
<el-select size="small" v-model="msg.SuppliesId" placeholder="物料"> <el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料">
<el-option <el-option
v-for="item in wulaioList" v-for="item in wulaioList"
:key="item.Id" :key="item.Id"
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select size="small" filterable v-model="msg.EmployeeId" placeholder="使用人" :filter-method="getEmployee"> <el-select size="small" filterable clearable v-model="msg.EmployeeId" placeholder="使用人" :filter-method="getEmployee">
<el-option <el-option
v-for="item in EmployeeList" v-for="item in EmployeeList"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -60,15 +60,15 @@ ...@@ -60,15 +60,15 @@
:normalizer="normalizer"/> :normalizer="normalizer"/>
</li> </li>
</ul> </ul>
<vxe-grid :loading="loading" <!-- <vxe-grid :loading="loading"
:columns="tableColumn" :columns="tableColumn"
:toolbar="tableToolbar" :toolbar="tableToolbar"
:data="tableData" :data="tableData"
show-footer show-footer
:footer-method="footerMethod" :footer-method="footerMethod"
:edit-config="{trigger: 'click', mode: 'row', showStatus: true}"></vxe-grid> :edit-config="{trigger: 'click', mode: 'row', showStatus: true}"></vxe-grid> -->
<!-- --> <!-- -->
<!-- <vxe-table style="margin-top:15px" <vxe-table style="margin-top:15px"
:data="tableData"> :data="tableData">
<vxe-table-column field="BranchName" title="公司名称"></vxe-table-column> <vxe-table-column field="BranchName" title="公司名称"></vxe-table-column>
<vxe-table-column field="DepartmentName" title="部门名称"></vxe-table-column> <vxe-table-column field="DepartmentName" title="部门名称"></vxe-table-column>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column> <vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="StockOutNum" title="领取单号"></vxe-table-column> <vxe-table-column field="StockOutNum" title="领取单号"></vxe-table-column>
<vxe-table-column field="StockOutDate" title="领取日期"></vxe-table-column> <vxe-table-column field="StockOutDate" title="领取日期"></vxe-table-column>
</vxe-table> --> </vxe-table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
background background
...@@ -173,7 +173,15 @@ export default { ...@@ -173,7 +173,15 @@ export default {
this.getDepartment(); this.getDepartment();
}, },
methods:{ methods:{
footerMethod ({ columns, data }) { Export(url,name){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
`/api/Supplies/${url}`,
msg,
`${name}报表.xls`
);
},
footerMethod ({ columns, data }) {
return [ return [
columns.map((column, columnIndex) => { columns.map((column, columnIndex) => {
if (columnIndex === 0) { if (columnIndex === 0) {
...@@ -228,7 +236,6 @@ export default { ...@@ -228,7 +236,6 @@ export default {
getEmployee(val){ getEmployee(val){
this.apiJavaPost("/api/User/GetEmployeeList",{EmName:val}, this.apiJavaPost("/api/User/GetEmployeeList",{EmName:val},
res => { res => {
this.loading=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.EmployeeList=res.data.data; this.EmployeeList=res.data.data;
} else { } else {
......
src/components/Materialman/Materialwarehouse.vue
View file @ 85240dac
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item prop="Name" style="margin-left:60px;"> <el-form-item prop="Name" style="margin-left:60px;">
<span class="label">仓库名称</span> <span class="label">仓库名称</span>
<el-input v-model="addMsg.Name"></el-input> <el-input v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span> <span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
......
src/components/Materialman/SpotQuery.vue
View file @ 85240dac
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span> </span>
<span @click="Export('GetInventoryPageListToExcel','库存')" style="margin-left:20px" class="addSpan">导出</span>
<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 @click="addSupplier" style="margin-left:20px" class="addSpan">
...@@ -15,7 +16,7 @@ ...@@ -15,7 +16,7 @@
</div> </div>
<ul v-show="morequery" class="queryul"> <ul v-show="morequery" class="queryul">
<li> <li>
<el-select size="small" v-model="msg.WarehouseId" placeholder="仓库"> <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -26,7 +27,7 @@ ...@@ -26,7 +27,7 @@
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.SuppliesId" placeholder="物料"> <el-select size="small" filterable clearable v-model="msg.SuppliesId" placeholder="物料">
<el-option <el-option
v-for="item in wulaioList" v-for="item in wulaioList"
:key="item.Id" :key="item.Id"
...@@ -48,18 +49,19 @@ ...@@ -48,18 +49,19 @@
<vxe-table-column field="SafetyStock" title="安全库存"></vxe-table-column> <vxe-table-column field="SafetyStock" title="安全库存"></vxe-table-column>
<vxe-table-column field="ReservedStock" title="预留库存"></vxe-table-column> <vxe-table-column field="ReservedStock" title="预留库存"></vxe-table-column>
<vxe-table-column field="UnitPrice" title="单价"></vxe-table-column> <vxe-table-column field="UnitPrice" title="单价"></vxe-table-column>
<vxe-table-column field="Number" title="库存数量"></vxe-table-column> <vxe-table-column field="Number" title="库存数量">
<!-- <template v-slot="{ row }">
<span v-if="row.Number < row.SafetyStock" style="color:red">{{row.Number}}</span>
<span v-else>{{row.Number}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="address" title="操作"> <vxe-table-column field="address" title="操作">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="编辑" placement="top"> <el-tooltip class="item" effect="dark" content="日志" placement="top">
<img @click="Edit(row)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <img @click="Operation(row)" style="width:24px;height:24px" src="../../assets/img/czrz.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(row)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
</template> </template>
</vxe-table-column> --> </vxe-table-column>
</vxe-table> </vxe-table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
...@@ -68,7 +70,58 @@ ...@@ -68,7 +70,58 @@
layout="prev, pager, next" layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
<!-- 操作日志 -->
<el-dialog
title="操作日志"
:visible.sync="caozuoState"
top="3%"
width="650px"
>
<div class="f12">
<span>名称：{{ OperationInfo.SuppliesName }}</span>
<span style="margin:0 20px"
>编码：{{ OperationInfo.SuppliesNum }}</span
>
</div>
<table
class="myTable miniTable"
v-loading="loading"
border="0"
cellspacing="0"
cellpadding="0"
>
<thead>
<th>类型</th>
<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.Number }}</td>
<td>{{ item.Money }}</td>
<td>{{ item.Description }}</td>
<td>
<p>{{ item.UpdateBy }}</p>
<p>{{ item.UpdateDate }}</p>
</td>
</tr>
<tr v-show="OperationList.length == 0">
<td colspan="4" align="center">暂无数据</td>
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange1"
background
:page-size="msg1.pageSize"
layout="prev, pager, next"
:total="total1"
>
</el-pagination>
</el-dialog>
</div> </div>
</template> </template>
...@@ -79,6 +132,7 @@ export default { ...@@ -79,6 +132,7 @@ export default {
name: 'Supplierman', name: 'Supplierman',
data(){ data(){
return{ return{
caozuoState: false,
morequery:false, morequery:false,
currentPage:1, currentPage:1,
tableData: [], tableData: [],
...@@ -110,6 +164,18 @@ export default { ...@@ -110,6 +164,18 @@ export default {
SupplierName:'' SupplierName:''
}, },
wulaioList:[], wulaioList:[],
OperationLoad:false,
OperationList:[],
total1:0,
msg1:{
pageIndex:1,
pageSize:6,
WarehouseId:0,
SuppliesId:0,
},
OperationInfo:{},
} }
}, },
mounted(){ mounted(){
...@@ -118,6 +184,43 @@ export default { ...@@ -118,6 +184,43 @@ export default {
this.getwuliaoList(); this.getwuliaoList();
}, },
methods:{ methods:{
Operation(item) {
console.log("item",item)
this.OperationInfo = item;
this.caozuoState = true;
this.msg1.WarehouseId = item.WarehouseId;
this.msg1.SuppliesId = item.SuppliesId;
this.getOperation();
},
currentChange1(val) {
this.msg1.pageIndex = val;
this.getOperation();
},
getOperation() {
this.OperationLoad = true;
this.apiJavaPost(
"/api/Supplies/GetInventoryDetailPageList",
this.msg1,
res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
this.OperationList = res.data.data.pageData;
this.total1 = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
Export(url,name){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
`/api/Supplies/${url}`,
msg,
`${name}报表.xls`
);
},
// 仓库列表 // 仓库列表
getWareHouse(){ getWareHouse(){
this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''}, this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
......
src/components/Materialman/chukudan.vue
View file @ 85240dac
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span> </span>
<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="Export" style="margin-left:20px" class="addSpan">导出</span>
<span @click="addSupplier" style="margin-left:20px" class="addSpan"> <span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input> <el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.WarehouseId" placeholder="仓库"> <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1"> <el-select filterable clearable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
<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>
...@@ -81,6 +82,7 @@ ...@@ -81,6 +82,7 @@
<!-- <span class="commonStyle hoverSpan1"></span> --> <!-- <span class="commonStyle hoverSpan1"></span> -->
<span class="ColorSpan redSpan" v-if="item.StockOutState==2">取</span> <span class="ColorSpan redSpan" v-if="item.StockOutState==2">取</span>
<span class="ColorSpan greenSpan" v-if="item.StockOutState==1">已</span> <span class="ColorSpan greenSpan" v-if="item.StockOutState==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.StockOutState==3">待</span>
{{item.StockOutStateStr}} {{item.StockOutStateStr}}
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td>
...@@ -92,12 +94,12 @@ ...@@ -92,12 +94,12 @@
<td>{{delist.BrandName}}</td> <td>{{delist.BrandName}}</td>
<td>{{delist.InventoryNum}}</td> <td>{{delist.InventoryNum}}</td>
<td>{{delist.Number}}</td> <td>{{delist.Number}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.EmName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutDate}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutDate}}</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 v-if="item.StockOutState==3" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<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(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip> </el-tooltip>
...@@ -147,7 +149,7 @@ ...@@ -147,7 +149,7 @@
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<span class="label">领取人</span> <span class="label">领取人</span>
<el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="使用人" :filter-method="getEmployee2"> <el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="请输入名字" :filter-method="getEmployee2">
<el-option <el-option
v-for="item in EmployeeList2" v-for="item in EmployeeList2"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -231,6 +233,7 @@ ...@@ -231,6 +233,7 @@
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>档案编码</th>
<th>物料名称</th> <th>物料名称</th>
<th><span class="cred">库存</span></th> <th><span class="cred">库存</span></th>
<th>分类名称</th> <th>分类名称</th>
...@@ -239,7 +242,6 @@ ...@@ -239,7 +242,6 @@
<th>供应商名称</th> <th>供应商名称</th>
<th>条形码号</th> <th>条形码号</th>
<th>型号</th> <th>型号</th>
<th>档案编码</th>
<th>操作人</th> <th>操作人</th>
<th>备注</th> <th>备注</th>
</thead> </thead>
...@@ -248,6 +250,7 @@ ...@@ -248,6 +250,7 @@
<td> <td>
<input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne"> <input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne">
</td> </td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
<td class="cred">{{item.InventoryNum}}</td> <td class="cred">{{item.InventoryNum}}</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
...@@ -256,7 +259,6 @@ ...@@ -256,7 +259,6 @@
<td>{{item.SupplierName}}</td> <td>{{item.SupplierName}}</td>
<td>{{item.Barcode}}</td> <td>{{item.Barcode}}</td>
<td>{{item.SuppliesModel}}</td> <td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.UpdateBy}}</td> <td>{{item.UpdateBy}}</td>
<td>{{item.Remark}}</td> <td>{{item.Remark}}</td>
...@@ -308,6 +310,7 @@ export default { ...@@ -308,6 +310,7 @@ export default {
addMsg:{ addMsg:{
Id:0, Id:0,
WarehouseId:'', WarehouseId:'',
EmployeeId:'',
StockOutDate:'', StockOutDate:'',
Remark:'', Remark:'',
DetailList:[], DetailList:[],
...@@ -359,6 +362,14 @@ export default { ...@@ -359,6 +362,14 @@ export default {
}, },
methods:{ methods:{
Export(){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/Supplies/GetStockOutPageListToExcel",
msg,
"出库单.xls"
);
},
changeNUmber(item,index){ changeNUmber(item,index){
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -422,6 +433,7 @@ export default { ...@@ -422,6 +433,7 @@ export default {
}) })
} }
}, },
// 移出物料
ycwuitemList(){ ycwuitemList(){
if(this.ItemCheckList.length==0){ if(this.ItemCheckList.length==0){
return; return;
...@@ -431,13 +443,9 @@ export default { ...@@ -431,13 +443,9 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
var set=this.ItemCheckList.map(item=>item.Id) var set=this.ItemCheckList.map(item=>item.SuppliesId)
var resArr=this.wlItemList.filter(item=>!set.includes(item.SuppliesId)) var resArr=this.wlItemList.filter(item=>!set.includes(item.SuppliesId))
this.wlItemList=resArr; this.wlItemList=resArr;
this.addMsg.Money=0;
this.wlItemList.forEach(x=>{
this.addMsg.Money+=Number(x.Money)
})
}).catch(() => { }).catch(() => {
}); });
...@@ -488,6 +496,7 @@ export default { ...@@ -488,6 +496,7 @@ export default {
this.getWuliao(); this.getWuliao();
}, },
getWuliao(){ getWuliao(){
this.wlcheckList=[];
this.wuliaomsg.WareHouseId=this.addMsg.WarehouseId; this.wuliaomsg.WareHouseId=this.addMsg.WarehouseId;
this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg, this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg,
res => { res => {
...@@ -499,6 +508,7 @@ export default { ...@@ -499,6 +508,7 @@ export default {
item.Number=''; item.Number='';
item.Remark=''; item.Remark='';
item.SuppliesId=item.Id; item.SuppliesId=item.Id;
item.SuppliesName=item.Name;
}) })
this.wlcheckAllList=data; this.wlcheckAllList=data;
...@@ -527,6 +537,7 @@ export default { ...@@ -527,6 +537,7 @@ export default {
Id:0, Id:0,
WarehouseId:'', WarehouseId:'',
StockOutDate:'', StockOutDate:'',
EmployeeId:'',
Remark:'', Remark:'',
DetailList:[], DetailList:[],
} }
...@@ -598,24 +609,20 @@ export default { ...@@ -598,24 +609,20 @@ export default {
null null
); );
}, },
// Edit(item){ Edit(item){
// if(item.StockInState==1){ this.dialogState=true;
// this.Error("入库单已完成，无法修改！") this.addMsg={
// return; Id:item.Id,
// } WarehouseId:item.WarehouseId,
// this.dialogState=true; Remark:item.Remark,
// this.addMsg={ EmployeeId:item.EmployeeId,
// Id:item.Id, StockOutDate:item.StockOutDate,
// WarehouseId:item.WarehouseId, DetailList:[],
// Remark:item.Remark, }
// StockOutDate:item.StockOutDate, this.wlItemList=item.DetailList;
// Money:item.Money, this.EmName=item.EmName;
// SupplierName:item.SupplierName, this.getEmployee(2);
// SuppliesId:item.SuppliesId, },
// DetailList:[],
// }
// this.wlItemList=item.DetailList;
// },
Delete(item){ Delete(item){
let Id=item.Id; let Id=item.Id;
this.$confirm("确认删除？","提示", { this.$confirm("确认删除？","提示", {
......
src/components/Materialman/rukudan.vue
View file @ 85240dac
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span> </span>
<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="Export" style="margin-left:20px" class="addSpan">导出</span>
<span @click="addSupplier" style="margin-left:20px" class="addSpan"> <span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input> <el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.WarehouseId" placeholder="仓库"> <el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -220,6 +220,7 @@ ...@@ -220,6 +220,7 @@
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>档案编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>分类名称</th> <th>分类名称</th>
<th>品牌名</th> <th>品牌名</th>
...@@ -228,7 +229,6 @@ ...@@ -228,7 +229,6 @@
<th>条形码号</th> <th>条形码号</th>
<th>库存</th> <th>库存</th>
<th>型号</th> <th>型号</th>
<th>档案编码</th>
<th>操作人</th> <th>操作人</th>
<th>备注</th> <th>备注</th>
</thead> </thead>
...@@ -237,6 +237,7 @@ ...@@ -237,6 +237,7 @@
<td> <td>
<input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne"> <input class="color-input-red" type="checkbox" v-model="wlcheckList" :value="item" @change="wlcheckOne">
</td> </td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td> <td>{{item.BrandName}}</td>
...@@ -245,7 +246,6 @@ ...@@ -245,7 +246,6 @@
<td>{{item.Barcode}}</td> <td>{{item.Barcode}}</td>
<td>{{item.SuppliesModel}}</td> <td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesModel}}</td> <td>{{item.SuppliesModel}}</td>
<td>{{item.SuppliesNum}}</td>
<td>{{item.UpdateBy}}</td> <td>{{item.UpdateBy}}</td>
<td>{{item.Remark}}</td> <td>{{item.Remark}}</td>
...@@ -335,6 +335,11 @@ export default { ...@@ -335,6 +335,11 @@ export default {
ItemisCkedAll:false, ItemisCkedAll:false,
ItemCheckList:[], ItemCheckList:[],
tableHeight:0, tableHeight:0,
pickerOptions: {
　　disabledDate(time) {
　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
},
} }
}, },
created(){ created(){
...@@ -348,6 +353,14 @@ export default { ...@@ -348,6 +353,14 @@ export default {
}, },
methods:{ methods:{
Export(){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/Supplies/GetStockInPageListToExcel",
msg,
"入库单.xls"
);
},
Huifu(item){ Huifu(item){
this.apiJavaPost("/api/Supplies/RecoverStockInInfo",{StockInId:item.Id}, this.apiJavaPost("/api/Supplies/RecoverStockInInfo",{StockInId:item.Id},
res => { res => {
...@@ -458,6 +471,7 @@ export default { ...@@ -458,6 +471,7 @@ export default {
this.getWuliao(); this.getWuliao();
}, },
getWuliao(){ getWuliao(){
this.wlcheckList=[];
this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg, this.apiJavaPost("/api/Supplies/GetMaterialPageList",this.wuliaomsg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
......
src/components/Systemman/AssetsClassification.vue
View file @ 85240dac
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
:props="defaultProps" :props="defaultProps"
:data="data" :data="data"
node-key="id" node-key="id"
default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="TreeSpan" slot-scope="{ node, data }"> <span class="TreeSpan" slot-scope="{ node, data }">
<span>{{ node.label}}</span> <span>{{ node.label}}</span>
......
src/components/Systemman/MaterialClassification.vue
View file @ 85240dac
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
:props="defaultProps" :props="defaultProps"
:data="data" :data="data"
node-key="id" node-key="id"
default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="TreeSpan" slot-scope="{ node, data }"> <span class="TreeSpan" slot-scope="{ node, data }">
<span>{{ node.label}}</span> <span>{{ node.label}}</span>
......
src/components/Systemman/Supplierman.vue
View file @ 85240dac
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<el-dialog <el-dialog
:title="dialogtitle" :title="dialogtitle"
:visible.sync="dialogState" :visible.sync="dialogState"
top="0"
width="530px"> width="530px">
<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">
......
src/components/approval/SignMan.vue
View file @ 85240dac
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input> <el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.AuditStatus" placeholder="状态"> <el-select size="small" filterable clearable v-model="msg.AuditStatus" placeholder="状态">
<el-option <el-option
v-for="item in StateEnumList" v-for="item in StateEnumList"
:key="item.Id" :key="item.Id"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1"> <el-select filterable clearable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.Source" placeholder="来源"> <el-select filterable clearable size="small" v-model="msg.Source" placeholder="来源">
<el-option <el-option
v-for="item in SourceList" v-for="item in SourceList"
:key="item.Id" :key="item.Id"
......
src/components/approval/approvalDetails.vue
View file @ 85240dac
...@@ -19,43 +19,60 @@ ...@@ -19,43 +19,60 @@
<span v-if="GetDetail.AuditStatus==3 || GetDetail.AuditStatus==5" class="wtg">{{GetDetail.AuditStatusName}}</span> <span v-if="GetDetail.AuditStatus==3 || GetDetail.AuditStatus==5" class="wtg">{{GetDetail.AuditStatusName}}</span>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="zcInfo"> <el-row>
<el-col :span="12"> <el-col :span="18">
<span>来源 :</span> <el-row class="zcInfo">
<span>{{GetDetail.SourceName}}</span> <el-col :span="12">
</el-col> <span>来源 :</span>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12"> <span>{{GetDetail.SourceName}}</span>
<span>申请人 :</span> </el-col>
<span>{{GetDetail.EmName}}</span> <el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5 && GetDetail.Source!=6" :span="12">
</el-col> <span>申请人 :</span>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12"> <span>{{GetDetail.EmName}}</span>
<span>公司 :</span> </el-col>
<span>{{GetDetail.BranchName}}</span> <el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5 && GetDetail.Source!=6" :span="12">
</el-col> <span>公司 :</span>
<el-col v-if="GetDetail.Source==5" :span="12"> <span>{{GetDetail.BranchName}}</span>
<span>调入公司 :</span> </el-col>
<span>{{GetDetail.InBranchName}}</span> <el-col v-if="GetDetail.Source==5" :span="12">
</el-col> <span>调入公司 :</span>
<span>{{GetDetail.InBranchName}}</span>
<el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5" :span="12"> </el-col>
<span>部门 :</span>
<span>{{GetDetail.DepartmentName}}</span> <el-col v-if="GetDetail.Source!=2 && GetDetail.Source!=4 && GetDetail.Source!=5 && GetDetail.Source!=6" :span="12">
</el-col> <span>部门 :</span>
<el-col :span="12"> <span>{{GetDetail.DepartmentName}}</span>
<span>单号 :</span> </el-col>
<span>{{GetDetail.OrderCode}}</span> <el-col :span="12">
</el-col> <span>单号 :</span>
<el-col :span="12"> <span>{{GetDetail.OrderCode}}</span>
<span>时间 :</span> </el-col>
<span v-if="GetDetail.Time!=''">{{GetDetail.Time}}</span> <el-col :span="12">
<span v-if="GetDetail.BackTime!=''">{{GetDetail.BackTime}}</span> <span>时间 :</span>
<span v-if="GetDetail.Time!=''">{{GetDetail.Time}}</span>
<span v-if="GetDetail.BackTime!=''">
<a v-if="GetDetail.Time!='' && GetDetail.BackTime!=''">~</a>
{{GetDetail.BackTime}}
</span>
</el-col>
<el-col :span="12">
<span>备注 :</span>
<span>{{GetDetail.Remark}}</span>
</el-col>
</el-row>
</el-col> </el-col>
<el-col :span="12"> <!--图片 -->
<span>备注 :</span> <el-col v-if="GetDetail.ImageList && GetDetail.ImageList.length>0" :span="6" style="padding-top:20px">
<span>{{GetDetail.Remark}}</span> <el-carousel height="150px" trigger="click" :interval="20000">
<el-carousel-item style="text-align:center;line-height:150px" v-for="item in GetDetail.ImageList" :key="item">
<img @click="showImg(GetDetail)" style="max-width:100%;max-height:100%" :src="item" alt="">
</el-carousel-item>
</el-carousel>
</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>
...@@ -880,25 +897,6 @@ export default { ...@@ -880,25 +897,6 @@ export default {
width: 80px; width: 80px;
font-size: 14px; font-size: 14px;
} }
.approvalDetails .backTo{
width:80px;
height:34px;
line-height:34px;
background:rgba(0,210,214,1);
border-radius:17px;
text-align: center;
color: #fff;
font-size: 12px;
font-family: "宋体";
display: inline-block;
margin-left:15px;
cursor: pointer;
}
.detailsIT_Journal .InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.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;}
.detailsIT_Journal ._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.detailsIT_Journal .changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
.approvalDetails ._textareaNew{ .approvalDetails ._textareaNew{
width: 80%; width: 80%;
height: 50px; height: 50px;
......
src/components/approval/approvalMan.vue
View file @ 85240dac
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input> <el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.AuditStatus" placeholder="状态"> <el-select size="small" filterable clearable v-model="msg.AuditStatus" placeholder="状态">
<el-option <el-option
v-for="item in StateEnumList" v-for="item in StateEnumList"
:key="item.Id" :key="item.Id"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1"> <el-select filterable clearable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.Source" placeholder="来源"> <el-select filterable clearable size="small" v-model="msg.Source" placeholder="来源">
<el-option <el-option
v-for="item in SourceList" v-for="item in SourceList"
:key="item.Id" :key="item.Id"
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<td colspan="12" align="center">暂无数据</td> <td colspan="12" align="center">暂无数据</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<el-pagination <el-pagination
@current-change="currentChange" @current-change="currentChange"
......
src/components/assetsman/LendReturn.vue
View file @ 85240dac
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span> </span>
<span v-show="showTable==1" @click="Export" style="margin-left:20px" class="addSpan">导出</span>
<span v-show="showTable==2" @click="Export1" style="margin-left:20px" class="addSpan">导出</span>
<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="addSupplier" style="margin-left:20px" class="addSpan"> <span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
...@@ -72,15 +73,15 @@ ...@@ -72,15 +73,15 @@
<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>操作人/时间</th>
<th width="150px">操作</th> <th width="150px">操作</th>
</thead> </thead>
<tbody> <tbody>
...@@ -98,15 +99,19 @@ ...@@ -98,15 +99,19 @@
<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><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"> <td :rowspan="item.DetailList.length" v-if="index==0">
<p>领用时间：{{item.Time}}</p> <p>借用时间：{{item.Time}}</p>
<p v-if="item.BackTime!=''">预计归还：{{item.BackTime}}</p> <p v-if="item.BackTime!=''">预计归还：{{item.BackTime}}</p>
</td> </td>
<td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></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">{{item.UpdateBy}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</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 v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <img v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
...@@ -158,7 +163,7 @@ ...@@ -158,7 +163,7 @@
<el-input class="w200" size="small" v-model="tuimsg.PropertyName" placeholder="资产名称"></el-input> <el-input class="w200" size="small" v-model="tuimsg.PropertyName" placeholder="资产名称"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="tuimsg.AuditStatus" placeholder="状态"> <el-select size="small" clearable v-model="tuimsg.AuditStatus" placeholder="状态">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in getWareHouseList"
:key="item.Id" :key="item.Id"
...@@ -168,7 +173,7 @@ ...@@ -168,7 +173,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="tuimsg.EmployeeId" placeholder="领取人" :filter-method="getEmployee3"> <el-select filterable size="small" clearable v-model="tuimsg.EmployeeId" placeholder="领取人" :filter-method="getEmployee3">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -195,12 +200,13 @@ ...@@ -195,12 +200,13 @@
<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 width="150px">操作</th> <th width="150px">操作</th>
</thead> </thead>
<tbody> <tbody>
...@@ -215,12 +221,17 @@ ...@@ -215,12 +221,17 @@
{{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.OrderCode}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td>
<td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td> <td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td>
<td>{{delist.PropertyName}}</td> <td>{{delist.PropertyName}}</td>
<td>{{delist.CategoryName}}</td> <td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td> <td>{{delist.BrandName}}</td>
<td>{{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">
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</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 v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit1(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <img v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit1(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
...@@ -264,7 +275,7 @@ ...@@ -264,7 +275,7 @@
<el-form-item label="" prop="EmployeeId"> <el-form-item label="" prop="EmployeeId">
<span class="label">借用人</span> <span class="label">借用人</span>
<el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="领取人" :filter-method="getEmployee2"> <el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="请输入姓名" :filter-method="getEmployee2">
<el-option <el-option
v-for="item in EmployeeList2" v-for="item in EmployeeList2"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -276,7 +287,8 @@ ...@@ -276,7 +287,8 @@
<el-form-item label="" prop="Time"> <el-form-item label="" prop="Time">
<span class="label">借用时间</span> <span class="label">借用时间</span>
<el-date-picker <el-date-picker
size="mini" size="mini"
:picker-options="pickerOptions"
v-model="addMsg.Time" v-model="addMsg.Time"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -349,7 +361,7 @@ ...@@ -349,7 +361,7 @@
</div> </div>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span> <span v-loading="queryLoad" class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span> <span class="exitBtn" @click="dialogState=false">取消</span>
</div> </div>
</el-form> </el-form>
...@@ -365,7 +377,8 @@ ...@@ -365,7 +377,8 @@
<el-form-item label="" prop="BackTime"> <el-form-item label="" prop="BackTime">
<span class="label">归还时间</span> <span class="label">归还时间</span>
<el-date-picker <el-date-picker
size="mini" size="mini"
:picker-options="pickerOptions"
v-model="addMsg1.BackTime" v-model="addMsg1.BackTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -427,7 +440,7 @@ ...@@ -427,7 +440,7 @@
</div> </div>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm1('addMsg1')">确定</span> <span v-loading="queryLoad1" class="submitBtn" type="primary" @click="submitForm1('addMsg1')">确定</span>
<span class="exitBtn" @click="dialogState1=false">取消</span> <span class="exitBtn" @click="dialogState1=false">取消</span>
</div> </div>
</el-form> </el-form>
...@@ -438,7 +451,8 @@ ...@@ -438,7 +451,8 @@
:visible.sync="wuliaodig" :visible.sync="wuliaodig"
top="3%" top="3%"
width="750px"> width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px"> <el-form style="position:relative" class="MyEditForm" :model="addMsg" label-width="0px">
<span class="zcSpanQuery" @click="getWuliao">查询</span>
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<ul class="dialogul"> <ul class="dialogul">
<li> <li>
...@@ -537,6 +551,13 @@ export default { ...@@ -537,6 +551,13 @@ export default {
}, },
data(){ data(){
return{ return{
queryLoad:false,
queryLoad1:false,
pickerOptions: {
　　disabledDate(time) {
　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
},
CheckDetailState:false, CheckDetailState:false,
EmployeeId:'', EmployeeId:'',
StateEnumList:[], StateEnumList:[],
...@@ -582,17 +603,10 @@ export default { ...@@ -582,17 +603,10 @@ export default {
{ type: 'string', required: true, message: '请选择日期', trigger: 'change' } { type: 'string', required: true, message: '请选择日期', trigger: 'change' }
], ],
EmployeeId: [ EmployeeId: [
{ required: true, message: '请选择领取人', trigger: 'change' } { required: true, message: '请选择借用人', trigger: 'change' }
],
},
rules1:{
Time: [
{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }
],
EmployeeId: [
{ required: true, message: '请选择领取人', trigger: 'change' }
], ],
}, },
rules2:{ rules2:{
BackTime: [ BackTime: [
{ type: 'string', required: true, message: '请选择日期', trigger: 'change' } { type: 'string', required: true, message: '请选择日期', trigger: 'change' }
...@@ -691,6 +705,22 @@ export default { ...@@ -691,6 +705,22 @@ export default {
}, },
methods:{ methods:{
Export(){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/property/GetPropertyBorrowPageListToExcel",
msg,
"资产借出.xls"
);
},
Export1(){
let msg = JSON.parse(JSON.stringify(this.tuimsg));
this.JavaGetLocalFile(
"/api/property/GetPropertyGiveBackPageListToExcel",
msg,
"资产归还.xls"
);
},
getBranch(){ getBranch(){
this.apiJavaPost("/api/User/GetBranchList",{}, this.apiJavaPost("/api/User/GetBranchList",{},
res => { res => {
...@@ -922,6 +952,7 @@ export default { ...@@ -922,6 +952,7 @@ export default {
this.getWuliao(); this.getWuliao();
}, },
getWuliao(){ getWuliao(){
this.wlcheckList=[];
if(this.showTable==1){ if(this.showTable==1){
this.zichanmsg.PropertyStatus=1; this.zichanmsg.PropertyStatus=1;
} }
...@@ -988,8 +1019,10 @@ export default { ...@@ -988,8 +1019,10 @@ export default {
}; };
this.addMsg1.DetailList.push(obj); this.addMsg1.DetailList.push(obj);
} }
this.queryLoad1=true;
this.apiJavaPost("/api/property/SetPropertyGiveBack",this.addMsg1, this.apiJavaPost("/api/property/SetPropertyGiveBack",this.addMsg1,
res => { res => {
this.queryLoad1=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
this.Success(res.data.message) this.Success(res.data.message)
...@@ -1021,8 +1054,10 @@ export default { ...@@ -1021,8 +1054,10 @@ export default {
}; };
this.addMsg.DetailList.push(obj); this.addMsg.DetailList.push(obj);
} }
this.queryLoad=true;
this.apiJavaPost("/api/property/SetPropertyBorrow",this.addMsg, this.apiJavaPost("/api/property/SetPropertyBorrow",this.addMsg,
res => { res => {
this.queryLoad=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
this.Success(res.data.message) this.Success(res.data.message)
...@@ -1252,9 +1287,6 @@ export default { ...@@ -1252,9 +1287,6 @@ export default {
width:100%; width:100%;
height:100%; height:100%;
} }
.chukudan .MyEditForm .el-form-item:nth-child(3n){
margin-right:0;
}
.chukudan::-webkit-scrollbar{ .chukudan::-webkit-scrollbar{
width: 4px; width: 4px;
height: 5px; height: 5px;
......
src/components/assetsman/PaiTui.vue
View file @ 85240dac
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt=""> <img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span> </span>
<span v-show="showTable==1" @click="Export" style="margin-left:20px" class="addSpan">导出</span>
<span v-show="showTable==2" @click="Export1" style="margin-left:20px" class="addSpan">导出</span>
<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="addSupplier" style="margin-left:20px" class="addSpan"> <span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt=""> <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> 新增</span>
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
<el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input> <el-input class="w200" size="small" v-model="msg.PropertyName" placeholder="资产名称"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.AuditStatus" placeholder="状态"> <el-select size="small" clearable v-model="msg.AuditStatus" placeholder="状态">
<el-option <el-option
v-for="item in StateEnumList" v-for="item in StateEnumList"
:key="item.Id" :key="item.Id"
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1"> <el-select filterable size="small" clearable v-model="msg.EmployeeId" placeholder="领取人" :filter-method="getEmployee1">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -70,17 +71,17 @@ ...@@ -70,17 +71,17 @@
<div class="overflowY"> <div class="overflowY">
<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 width="75">状态</th>
<th>单号</th> <th>单号</th>
<th>领用公司</th> <th width="65">领用公司</th>
<th>领用部门</th> <th>领用部门</th>
<th>领用人</th> <th>领用人</th>
<th width="65">领用时间</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>
...@@ -97,13 +98,16 @@ ...@@ -97,13 +98,16 @@
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</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><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td> <td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td>
<td>{{delist.PropertyName}}</td> <td>{{delist.PropertyName}}</td>
<td>{{delist.CategoryName}}</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">{{item.UpdateBy}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</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 v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <img v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
...@@ -155,9 +159,9 @@ ...@@ -155,9 +159,9 @@
<el-input class="w200" size="small" v-model="tuimsg.PropertyName" placeholder="资产名称"></el-input> <el-input class="w200" size="small" v-model="tuimsg.PropertyName" placeholder="资产名称"></el-input>
</li> </li>
<li> <li>
<el-select size="small" v-model="tuimsg.AuditStatus" placeholder="状态"> <el-select filterable clearable size="small" v-model="tuimsg.AuditStatus" placeholder="状态">
<el-option <el-option
v-for="item in getWareHouseList" v-for="item in StateEnumList"
:key="item.Id" :key="item.Id"
:label="item.Name" :label="item.Name"
:value="item.Id"> :value="item.Id">
...@@ -165,7 +169,7 @@ ...@@ -165,7 +169,7 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select filterable size="small" v-model="tuimsg.EmployeeId" placeholder="领取人" :filter-method="getEmployee3"> <el-select filterable clearable size="small" v-model="tuimsg.EmployeeId" placeholder="领取人" :filter-method="getEmployee3">
<el-option <el-option
v-for="item in EmployeeList1" v-for="item in EmployeeList1"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -192,12 +196,14 @@ ...@@ -192,12 +196,14 @@
<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 width="150px">操作</th> <th width="150px">操作</th>
</thead> </thead>
<tbody> <tbody>
...@@ -212,12 +218,17 @@ ...@@ -212,12 +218,17 @@
{{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.OrderCode}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.Remark}}</td>
<td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td> <td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></td>
<td>{{delist.PropertyName}}</td> <td>{{delist.PropertyName}}</td>
<td>{{delist.CategoryName}}</td> <td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td> <td>{{delist.BrandName}}</td>
<td>{{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">
<p v-if="item.UpdateBy!=''">操作人：{{item.UpdateBy}}</p>
<p v-if="item.UpdateDate!=''">操作时间{{item.UpdateDate}}</p>
</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 v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit1(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt=""> <img v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit1(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
...@@ -254,14 +265,14 @@ ...@@ -254,14 +265,14 @@
<el-dialog <el-dialog
title="派发单" title="派发单"
:visible.sync="dialogState" :visible.sync="dialogState"
top="2%" top="0"
width="815px"> width="815px">
<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">
<el-form-item label="" prop="EmployeeId"> <el-form-item label="" prop="EmployeeId">
<span class="label">领取人</span> <span class="label">领取人</span>
<el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="领取人" :filter-method="getEmployee2"> <el-select filterable size="small" v-model="addMsg.EmployeeId" placeholder="请输入名字" :filter-method="getEmployee2">
<el-option <el-option
v-for="item in EmployeeList2" v-for="item in EmployeeList2"
:key="item.EmployeeId" :key="item.EmployeeId"
...@@ -273,7 +284,8 @@ ...@@ -273,7 +284,8 @@
<el-form-item label="" prop="Time"> <el-form-item label="" prop="Time">
<span class="label">领用时间</span> <span class="label">领用时间</span>
<el-date-picker <el-date-picker
size="mini" size="mini"
:picker-options="pickerOptions"
v-model="addMsg.Time" v-model="addMsg.Time"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -335,7 +347,7 @@ ...@@ -335,7 +347,7 @@
</div> </div>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span> <span v-loading="queryLoad" class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span> <span class="exitBtn" @click="dialogState=false">取消</span>
</div> </div>
</el-form> </el-form>
...@@ -344,26 +356,15 @@ ...@@ -344,26 +356,15 @@
<el-dialog <el-dialog
title="退库单" title="退库单"
:visible.sync="dialogState1" :visible.sync="dialogState1"
top="2%" top="0"
width="815px"> width="815px">
<el-form class="MyEditForm" :model="addMsg1" :rules="rules2" ref="addMsg1" label-width="0px"> <el-form class="MyEditForm" :model="addMsg1" :rules="rules2" ref="addMsg1" label-width="0px">
<div class="basefix"> <div class="basefix">
<!-- <el-form-item label="" prop="EmployeeId">
<span class="label">领取人</span>
<el-select filterable size="small" v-model="addMsg1.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="BackTime"> <el-form-item label="" prop="BackTime">
<span class="label">退库时间</span> <span class="label">退库时间</span>
<el-date-picker <el-date-picker
size="mini" size="mini"
:picker-options="pickerOptions"
v-model="addMsg1.BackTime" v-model="addMsg1.BackTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -425,7 +426,7 @@ ...@@ -425,7 +426,7 @@
</div> </div>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm1('addMsg1')">确定</span> <span v-loading="queryLoad1" class="submitBtn" type="primary" @click="submitForm1('addMsg1')">确定</span>
<span class="exitBtn" @click="dialogState1=false">取消</span> <span class="exitBtn" @click="dialogState1=false">取消</span>
</div> </div>
</el-form> </el-form>
...@@ -436,7 +437,8 @@ ...@@ -436,7 +437,8 @@
:visible.sync="wuliaodig" :visible.sync="wuliaodig"
top="3%" top="3%"
width="750px"> width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px"> <el-form style="position:relative" class="MyEditForm" :model="addMsg" label-width="0px">
<span class="zcSpanQuery" @click="getWuliao">查询</span>
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<ul class="dialogul"> <ul class="dialogul">
<li> <li>
...@@ -535,6 +537,13 @@ export default { ...@@ -535,6 +537,13 @@ export default {
}, },
data(){ data(){
return{ return{
queryLoad1:false,
queryLoad:false,
pickerOptions: {
　　disabledDate(time) {
　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
},
CheckDetailState:false, CheckDetailState:false,
EmployeeId:'', EmployeeId:'',
StateEnumList:[], StateEnumList:[],
...@@ -689,6 +698,22 @@ export default { ...@@ -689,6 +698,22 @@ export default {
}, },
methods:{ methods:{
Export(){
let msg = JSON.parse(JSON.stringify(this.msg));
this.JavaGetLocalFile(
"/api/property/GetPropertyReceivePageListToExcel",
msg,
"派发.xls"
);
},
Export1(){
let msg = JSON.parse(JSON.stringify(this.tuimsg));
this.JavaGetLocalFile(
"/api/property/GetPropertyCancellingStocksPageListToExcel",
msg,
"退库.xls"
);
},
getBranch(){ getBranch(){
this.apiJavaPost("/api/User/GetBranchList",{}, this.apiJavaPost("/api/User/GetBranchList",{},
res => { res => {
...@@ -923,6 +948,7 @@ export default { ...@@ -923,6 +948,7 @@ export default {
this.getWuliao(); this.getWuliao();
}, },
getWuliao(){ getWuliao(){
this.wlcheckList=[];
if(this.showTable==1){ if(this.showTable==1){
this.zichanmsg.PropertyStatus=1; this.zichanmsg.PropertyStatus=1;
} }
...@@ -988,8 +1014,10 @@ export default { ...@@ -988,8 +1014,10 @@ export default {
}; };
this.addMsg1.DetailList.push(obj); this.addMsg1.DetailList.push(obj);
} }
this.queryLoad1=true;
this.apiJavaPost("/api/property/SetPropertyCancellingStocks",this.addMsg1, this.apiJavaPost("/api/property/SetPropertyCancellingStocks",this.addMsg1,
res => { res => {
this.queryLoad1=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
this.Success(res.data.message) this.Success(res.data.message)
...@@ -1021,8 +1049,10 @@ export default { ...@@ -1021,8 +1049,10 @@ export default {
}; };
this.addMsg.DetailList.push(obj); this.addMsg.DetailList.push(obj);
} }
this.queryLoad=true;
this.apiJavaPost("/api/property/SetPropertyReceive",this.addMsg, this.apiJavaPost("/api/property/SetPropertyReceive",this.addMsg,
res => { res => {
this.queryLoad=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
this.Success(res.data.message) this.Success(res.data.message)
...@@ -1252,9 +1282,6 @@ export default { ...@@ -1252,9 +1282,6 @@ export default {
width:100%; width:100%;
height:100%; height:100%;
} }
.chukudan .MyEditForm .el-form-item:nth-child(3n){
margin-right:0;
}
.chukudan::-webkit-scrollbar{ .chukudan::-webkit-scrollbar{
width: 4px; width: 4px;
height: 5px; height: 5px;
......
src/components/assetsman/assetsList.vue
View file @ 85240dac
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<el-select <el-select
size="small" size="small"
v-model="msg.PropertyStatus" v-model="msg.PropertyStatus"
placeholder="资产状态" placeholder="资产状态" clearable filterable
> >
<el-option <el-option
v-for="item in PropertyStatusList" v-for="item in PropertyStatusList"
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
</li> </li>
<li> <li>
<el-select <el-select
size="small" size="small"
filterable filterable clearable
v-model="msg.EmployeeId" v-model="msg.EmployeeId"
placeholder="使用人" placeholder="使用人"
:filter-method="getEmployee1" :filter-method="getEmployee1"
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<el-select size="small" v-model="msg.SupplierId" placeholder="供应商"> <el-select clearable size="small" v-model="msg.SupplierId" placeholder="供应商">
<el-option <el-option
v-for="item in supplierList" v-for="item in supplierList"
:key="item.Id" :key="item.Id"
:label="item.Name" :label="item.Name"
...@@ -154,8 +154,9 @@ ...@@ -154,8 +154,9 @@
>借</span >借</span
> >
<span class="ColorSpan buleSpan" v-if="item.PropertyStatus == 4" <span class="ColorSpan buleSpan" v-if="item.PropertyStatus == 4"
>调</span >调</span>
> <span class="ColorSpan redSpan" v-if="item.PropertyStatus == 10"
>处</span>
<span <span
class="ColorSpan purpleSpan" class="ColorSpan purpleSpan"
v-if=" v-if="
...@@ -218,14 +219,14 @@ ...@@ -218,14 +219,14 @@
<img <img
@click="Operation(item)" @click="Operation(item)"
style="width:24px;height:24px" style="width:24px;height:24px"
src="../../assets/img/qx.png" src="../../assets/img/czrz.png"
alt="" alt=""
/> />
</el-tooltip> </el-tooltip>
<span class="commonStyle hoverSpan2"></span> <span class="commonStyle hoverSpan2"></span>
</td> </td>
</tr> </tr>
<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>
...@@ -242,7 +243,7 @@ ...@@ -242,7 +243,7 @@
<el-dialog <el-dialog
:title="dialogtitle" :title="dialogtitle"
:visible.sync="dialogState" :visible.sync="dialogState"
top="2%" top="0"
width="975px" width="975px"
> >
<el-form <el-form
...@@ -260,11 +261,11 @@ ...@@ -260,11 +261,11 @@
<div class="basefix"> <div class="basefix">
<el-form-item label=""> <el-form-item label="">
<span class="label">使用人</span> <span class="label">使用人</span>
<el-select <el-select :disabled="baseformItem"
size="mini" size="mini"
filterable filterable
v-model="addMsg.EmployeeId" v-model="addMsg.EmployeeId"
placeholder="请选择" placeholder="请输入姓名"
:filter-method="getEmployee2" :filter-method="getEmployee2"
> >
<el-option <el-option
...@@ -277,11 +278,12 @@ ...@@ -277,11 +278,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<p class="label">领取时间</p> <p class="label" style="padding-top:4px">领取时间</p>
<el-date-picker <el-date-picker :disabled="baseformItem"
size="mini" size="mini"
v-model="addMsg.GetTime" v-model="addMsg.GetTime"
type="date" type="date"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期" placeholder="选择日期"
> >
...@@ -382,7 +384,7 @@ ...@@ -382,7 +384,7 @@
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<span class="label">使用年份期限</span> <span class="label">使用月份期限</span>
<el-input <el-input
size="mini" size="mini"
v-model="addMsg.UseMonths" v-model="addMsg.UseMonths"
...@@ -479,7 +481,7 @@ ...@@ -479,7 +481,7 @@
</div> </div>
</div> </div>
<div class="btnformItem"> <div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')" <span v-loading="queryLoad" class="submitBtn" type="primary" @click="submitForm('addMsg')"
>确定</span >确定</span
> >
<span class="exitBtn" @click="dialogState = false">取消</span> <span class="exitBtn" @click="dialogState = false">取消</span>
...@@ -563,6 +565,7 @@ export default { ...@@ -563,6 +565,7 @@ export default {
}, },
data() { data() {
return { return {
queryLoad:false,
CheckDetailState: false, CheckDetailState: false,
total1: 0, total1: 0,
caozuoState: false, caozuoState: false,
...@@ -615,7 +618,11 @@ export default { ...@@ -615,7 +618,11 @@ export default {
StartTime: "", StartTime: "",
EndTime: "" EndTime: ""
}, },
pickerOptions: {
　　disabledDate(time) {
　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
},
dialogtitle: "新增资产", dialogtitle: "新增资产",
dialogState: false, dialogState: false,
rules: { rules: {
...@@ -672,6 +679,7 @@ export default { ...@@ -672,6 +679,7 @@ export default {
EmployeeList2: [], EmployeeList2: [],
EmName: "", EmName: "",
PropertyId:'', PropertyId:'',
baseformItem:false,
}; };
}, },
mounted() { mounted() {
...@@ -812,6 +820,7 @@ export default { ...@@ -812,6 +820,7 @@ export default {
}; };
this.dialogtitle = "新增资产"; this.dialogtitle = "新增资产";
this.dialogState = true; this.dialogState = true;
this.baseformItem=false;
}, },
Edit(item) { Edit(item) {
this.dialogtitle = "编辑资产"; this.dialogtitle = "编辑资产";
...@@ -821,6 +830,7 @@ export default { ...@@ -821,6 +830,7 @@ export default {
this.addMsg.UseStatus = this.addMsg.UseStatus + ""; this.addMsg.UseStatus = this.addMsg.UseStatus + "";
this.EmName = item.EmName; this.EmName = item.EmName;
this.getEmployee(2); this.getEmployee(2);
this.baseformItem=true;
if (!this.addMsg.ImageList) { if (!this.addMsg.ImageList) {
this.addMsg.ImageList = []; this.addMsg.ImageList = [];
} }
...@@ -856,10 +866,12 @@ export default { ...@@ -856,10 +866,12 @@ export default {
if (valid) { if (valid) {
delete this.addMsg.UpdateBy; delete this.addMsg.UpdateBy;
delete this.addMsg.UpdateDate; delete this.addMsg.UpdateDate;
this.queryLoad=true;
this.apiJavaPost( this.apiJavaPost(
"/api/property/SetPropertyInfo", "/api/property/SetPropertyInfo",
this.addMsg, this.addMsg,
res => { res => {
this.queryLoad=false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
this.Success(res.data.message); this.Success(res.data.message);
...@@ -911,7 +923,6 @@ export default { ...@@ -911,7 +923,6 @@ export default {
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.PropertyStatusList = res.data.data; this.PropertyStatusList = res.data.data;
console.log("this.PropertyStatusList",this.PropertyStatusList)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/global/CheckDetails.vue
View file @ 85240dac
...@@ -19,13 +19,19 @@ ...@@ -19,13 +19,19 @@
</div> </div>
<div class="desItem"> <div class="desItem">
<p>领取时间</p> <p>领取时间</p>
<p>{{datainfo.GetTime}}</p> <p>
<span v-if="datainfo.GetTime && datainfo.GetTime!=''">{{datainfo.GetTime}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="baseTitle f12">基本信息</div> <div class="baseTitle f12">基本信息</div>
<div class="baseDiv"> <div class="baseDiv">
<div class="desItem"> <div class="desItem">
<p>资产名称</p> <p>资产名称</p>
<p>{{datainfo.Name}}</p> <p>
<span v-if="datainfo.Name && datainfo.Name!=''">{{datainfo.Name}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>资产分类</p> <p>资产分类</p>
...@@ -36,7 +42,10 @@ ...@@ -36,7 +42,10 @@
</div> </div>
<div class="desItem"> <div class="desItem">
<p>品牌</p> <p>品牌</p>
<p>{{datainfo.BrandName}}</p> <p>
<span v-if="datainfo.BrandName && datainfo.BrandName!=''">{{datainfo.BrandName}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>型号</p> <p>型号</p>
...@@ -61,11 +70,17 @@ ...@@ -61,11 +70,17 @@
</div> </div>
<div class="desItem"> <div class="desItem">
<p>购置日期</p> <p>购置日期</p>
<p>{{datainfo.BuyDate}}</p> <p>
<span v-if="datainfo.BuyDate && datainfo.BuyDate!=''">{{datainfo.BuyDate}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>购置方式</p> <p>购置方式</p>
<p>{{datainfo.BuyTypeName}}</p> <p>
<span v-if="datainfo.BuyTypeName && datainfo.BuyTypeName!=''">{{datainfo.BuyTypeName}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>金额</p> <p>金额</p>
...@@ -76,7 +91,10 @@ ...@@ -76,7 +91,10 @@
</div> </div>
<div class="desItem"> <div class="desItem">
<p>使用类型</p> <p>使用类型</p>
<p>{{datainfo.UseStatusName}}</p> <p>
<span v-if="datainfo.UseStatusName && datainfo.UseStatusName!=''">{{datainfo.UseStatusName}}</span>
<span v-else>无</span>
</p>
</div> </div>
<div class="desItem"> <div class="desItem">
<p>公司</p> <p>公司</p>
...@@ -101,7 +119,7 @@ ...@@ -101,7 +119,7 @@
</div> </div>
</div> </div>
<div class="baseTitle f12">操作记录</div> <div class="baseTitle f12">操作记录</div>
<table class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" > <table v-loading="detailLoad" class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" >
<thead> <thead>
<th>类型</th> <th>类型</th>
<th>内容</th> <th>内容</th>
...@@ -161,6 +179,7 @@ export default { ...@@ -161,6 +179,7 @@ export default {
ImageList:[], ImageList:[],
}, },
PropertyId:'', PropertyId:'',
detailLoad:false,
} }
}, },
created(){ created(){
...@@ -181,11 +200,12 @@ export default { ...@@ -181,11 +200,12 @@ export default {
this.getOperation(); this.getOperation();
}, },
getOperation() { getOperation() {
this.detailLoad = true;
this.apiJavaPost( this.apiJavaPost(
"/api/property/GetPropertyLogPageList", "/api/property/GetPropertyLogPageList",
this.msg, this.msg,
res => { res => {
this.OperationLoad = false; this.detailLoad = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.OperationList = res.data.data.pageData; this.OperationList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
......
src/components/global/Nav.vue
View file @ 85240dac
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
</div> </div>
</template> </template>
<el-menu-item-group class="itemgroup"> <el-menu-item-group class="itemgroup">
<el-menu-item @click="goUrl(child)" v-for="(child,childIndex) in item.ChildMenu" :key="childIndex" :index="String(index+1)+'-'+String(childIndex+1)"><span>{{child.MenuName}}</span></el-menu-item> <!-- :index="String(index+1)+'-'+String(childIndex+1)" -->
<el-menu-item @click="goUrl(child)" v-for="(child,childIndex) in item.ChildMenu" :key="childIndex" :index="child.MenuUrl"><span>{{child.MenuName}}</span></el-menu-item>
</el-menu-item-group> </el-menu-item-group>
</el-submenu> </el-submenu>
...@@ -130,12 +131,14 @@ export default { ...@@ -130,12 +131,14 @@ export default {
this.$router.push({path: 'login'}) this.$router.push({path: 'login'})
return; return;
} }
this.$bus.on('once',(path,key) =>{//处理传过来的值
if(key){
this.defaulActive=key;
}
});
this.getMenu(); this.getMenu();
},
watch:{
$route(){
this.defaulActive=this.$route.path
},
}, },
methods:{ methods:{
goHome(){ goHome(){
...@@ -210,10 +213,10 @@ export default { ...@@ -210,10 +213,10 @@ export default {
.HeadNav .el-menu-item, .HeadNav .el-submenu__title{ .HeadNav .el-menu-item, .HeadNav .el-submenu__title{
height:34px; height:34px;
line-height:34px; line-height:34px;
margin-bottom:20px; margin-bottom:15px;
} }
.HeadNav .itemgroup{ .HeadNav .itemgroup{
margin-top: -30px; margin-top: -20px;
} }
.HeadNav .itemgroup .el-menu-item.is-active{ .HeadNav .itemgroup .el-menu-item.is-active{
color:#111111!important; color:#111111!important;
......
src/plugins/index.js
View file @ 85240dac
...@@ -13,10 +13,10 @@ export default { ...@@ -13,10 +13,10 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
// var domainUrl = "http://test_reborn.oytour.com";//主域名 // var domainUrl = "http://test_reborn.oytour.com";//主域名
// var domainUrl = "http://reborn.oytour.com"; //主域名 // var domainUrl = "http://reborn.oytour.com"; //主域名
var domainUrl = "http://192.168.2.18:8083"; //主域名 var domainUrl = "http://192.168.2.17:8087"; //主域名
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo=""; let javaUrldo="";
javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.16:8087"; javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.17:8087";
if (this.isOnline()) { if (this.isOnline()) {
if (window.location.host.indexOf('testb2b.oytour.com') != -1) if (window.location.host.indexOf('testb2b.oytour.com') != -1)
domainUrl = "http://testapi.oytour.com" domainUrl = "http://testapi.oytour.com"
......
src/router/config.js
View file @ 85240dac
...@@ -90,13 +90,57 @@ export default { ...@@ -90,13 +90,57 @@ export default {
name: 'AssetDepreciation', name: 'AssetDepreciation',
component: resolve => require(['@/components/assetsman/AssetDepreciation'], resolve), component: resolve => require(['@/components/assetsman/AssetDepreciation'], resolve),
}, },
// 盘点管理
{
path: '/InventoryMan',
name: 'InventoryMan',
component: resolve => require(['@/components/assetsman/InventoryMan'], resolve),
},
// 盘点管理详情
{
path: '/InventoryDetails',
name: 'InventoryDetails',
component: resolve => require(['@/components/assetsman/InventoryDetails'], resolve),
},
// 盘点管理详情
{
path: '/disposalDetails',
name: 'disposalDetails',
component: resolve => require(['@/components/assetsman/disposalDetails'], resolve),
},
// 资产折旧报表 // 资产折旧报表
{ {
path: '/Assetstatistics', path: '/Assetstatistics',
name: 'Assetstatistics', name: 'Assetstatistics',
component: resolve => require(['@/components/assetsman/Assetstatistics'], resolve), component: resolve => require(['@/components/report/Assetstatistics'], resolve),
},
// 资产汇总查询
{
path: '/assetSummary',
name: 'assetSummary',
component: resolve => require(['@/components/report/assetSummary'], resolve),
},
// 资产履历
{
path: '/AssetsRecord',
name: 'AssetsRecord',
component: resolve => require(['@/components/report/AssetsRecord'], resolve),
},
// 待归还
{
path: '/StayBack',
name: 'StayBack',
component: resolve => require(['@/components/report/StayBack'], resolve),
},
// 到期资产
{
path: '/MaturingAssets',
name: 'MaturingAssets',
component: resolve => require(['@/components/report/MaturingAssets'], resolve),
}, },
// 物料仓库 // 物料仓库
{ {
path: '/Materialwarehouse', path: '/Materialwarehouse',
...@@ -157,8 +201,36 @@ export default { ...@@ -157,8 +201,36 @@ export default {
name: 'SignMan', name: 'SignMan',
component: resolve => require(['@/components/approval/SignMan'], resolve), component: resolve => require(['@/components/approval/SignMan'], resolve),
}, },
// 资产申请
{
path: '/assetsApply',
name: 'assetsApply',
component: resolve => require(['@/components/approval/assetsApply'], resolve),
},
// 我的资产
{
path: '/myAssets',
name: 'myAssets',
component: resolve => require(['@/components/approval/myAssets'], resolve),
},
// 资产清单
{
path: '/ListAssets',
name: 'ListAssets',
component: resolve => require(['@/components/approval/ListAssets'], resolve),
},
// 我的申请
{
path: '/Myapplication',
name: 'Myapplication',
component: resolve => require(['@/components/approval/Myapplication'], resolve),
},
// 耗材申请
{
path: '/ConsumApplication',
name: 'ConsumApplication',
component: resolve => require(['@/components/approval/ConsumApplication'], 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