Skip to content

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

update

parent 85240dac
Hide whitespace changes
Inline Side-by-side
Showing with 424 additions and 161 deletions
src/assets/css/common.css
View file @ 1932f2da
......@@ -346,4 +346,83 @@
display: inline-block;
margin-left:15px;
cursor: pointer;
}
.vue-treeselect__placeholder{
color:#111111!important;
}
/* borderTable */
.borderTable{
width: 100%;
font-size: 12px;
border-collapse: collapse;
font-family: "宋体"!important;
}
.borderTable thead th{
color:#A6C6C6;
padding-left: 20px;
height: 50px;
line-height: 50px;
font-weight:bold;
text-align: left;
}
.borderTable thead tr{
background:transparent!important;
}
.borderTable .hoverSpan1{
left: -20px;
}
.borderTable .hoverSpan2{
right: -20px;
}
.borderTable .commonStyle{
height:100%;
background:#fff;
position: absolute;
width: 20px;
top:0;
display: none;
}
.myTborderTableable tr{
background:#fff;
border-bottom: 4px solid #F8FAFB;
cursor: pointer;
}
/* .borderTable .trNobottom{
border-top: 4px solid #F8FAFB!important;
border-bottom:none!important;
} */
.borderTable tbody tr:hover{
box-shadow:0px 0 20px 0px rgba(176,176,176,0.2);
transition: transform .5s ease;
/* transform: scaleX(1.02); */
}
.borderTable tbody tr:hover .commonStyle{
display: block;
transition: transform .5s ease;
box-shadow:0px 0px 0px 0px rgba(176,176,176,0.2);
}
.borderTable tbody tr:hover td{
border-radius:0!important;
}
.borderTable tbody tr:first-child td:first-child{
border-radius:20px 0 0 0;
}
.borderTable tbody tr:first-child td:last-child{
border-radius:0 20px 0 0;
}
.borderTable tbody tr:last-child td:first-child{
border-radius:0 0 0 20px;
}
.borderTable tbody tr:last-child td:last-child{
border-radius:0 0 20px 0;
}
.borderTable tr td{
position: relative;
padding:11px 0 11px 20px;
border:1px solid #eee;
}
\ No newline at end of file
src/components/Home.vue
View file @ 1932f2da
<template>
<div class="Home">
<div class="Home" v-loading="Allload">
<div class="banner" ref="banner">
<ul ref="scrollUl">
<li class="liItem" @click="goUrl('SignMan')">
......@@ -16,34 +16,35 @@
<p style="margin-top:10px">待我审核</p>
</div>
</li>
<li class="liItem" @click="goUrl('MaturingAssets')">
<li class="liItem" @click="goUrl('approvalMan',3,'3')">
<img src="../assets/img/b3.png" alt="">
<div>
<p class="f22">{{TaskObj.MaturityCount}}</p>
<p style="margin-top:10px">资产到期</p>
<p class="f22">{{TaskObj.RejectCount}}</p>
<p style="margin-top:10px">审批驳回</p>
</div>
</li>
<li class="liItem" @click="goUrl('SpotQuery')">
<img src="../assets/img/b2.png" alt="">
<li class="liItem" @click="goUrl('myAssets')">
<img src="../assets/img/b4.png" alt="">
<div>
<p class="f22">{{TaskObj.MaturityCount}}</p>
<p style="margin-top:10px">耗材预警</p>
<p class="f22">{{TaskObj.MyProperty}}</p>
<p style="margin-top:10px">我的资产</p>
</div>
</li>
<!-- <li class="liItem">
<img src="../assets/img/b3.png" alt="">
<li class="liItem" @click="goUrl('MaturingAssets')">
<img src="../assets/img/b5.png" alt="">
<div>
<p class="f22">5</p>
<p style="margin-top:10px">离职待交接任务</p>
<p class="f22">{{TaskObj.MaturityCount}}</p>
<p style="margin-top:10px">资产到期</p>
</div>
</li>
<li class="liItem">
<img src="../assets/img/b3.png" alt="">
<li class="liItem" @click="goUrl('SpotQuery')">
<img src="../assets/img/b6.png" alt="">
<div>
<p class="f22">5</p>
<p style="margin-top:10px">离职待交接任务</p>
<p class="f22">{{TaskObj.MaturityCount}}</p>
<p style="margin-top:10px">耗材预警</p>
</div>
</li> -->
</li>
</ul>
<div v-if="stepTask" class="navDiv">
<span @click="goScroll(1)" :class="tabActive==1?'active':''"></span>
......@@ -112,23 +113,23 @@
</el-select>
</el-col>
</el-row>
<div id="chartsMap" class="bgDiv" style="height:320px;width:100%;margin-top:10px"></div>
<div v-loading="loading" id="chartsMap" class="bgDiv" style="height:320px;width:100%;margin-top:10px"></div>
</div>
<div class="firstDiv" style="height:360px;margin-top:30px">
<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 class="f12 c11" :span="12" style="text-align:right;cursor: pointer">
<span @click="SetTimeType(1,2)" :class="IntimesuppleType==1?'Active':''">最近一年</span>
<span @click="SetTimeType(2,2)" :class="IntimesuppleType==2?'Active':''">最近半年</span>
<span @click="SetTimeType(3,2)" :class="IntimesuppleType==3?'Active':''">最近三月</span>
<el-select @change="getSuppliesInStock" v-model="InStockMsg.LogType" placeholder="请选择">
<el-select @change="getSuppliesInStock" v-model="InStockSuppleMsg.LogType" placeholder="请选择">
<el-option key="1" label="入库" :value="1"> </el-option>
<el-option key="2" label="出库" :value="2"> </el-option>
</el-select>
</el-col>
</el-row>
<div id="chartsMap1" class="bgDiv" style="height:310px;width:100%;margin-top:10px"></div>
<div v-loading="loading1" id="chartsMap1" class="bgDiv" style="height:310px;width:100%;margin-top:10px"></div>
</div>
</div>
</div>
......@@ -141,6 +142,7 @@ export default {
name: 'Home',
data () {
return {
Allload:false,
datedata1:[1,2,50,60,50,40,70],
datedata:[4,7,90,50,55,77,88],
......@@ -174,6 +176,8 @@ export default {
StockMonth1:[],
Stocklegend1:{},
SituationInfo:{},
loading:true,
loading1:false,
}
},
......@@ -184,7 +188,7 @@ export default {
mounted(){
this.width=this.$refs.banner.clientWidth;
let num= this.width /340;
if(num>4){
if(num>7){
this.stepTask=false;
}
this.getTask();
......@@ -218,18 +222,29 @@ export default {
}
},
goUrl(path){
this.$router.push({
path: "/" + path,
query: {
}
});
goUrl(path,showTable,AuditStatus){
if(showTable){
this.$router.push({
path: "/" + path,
query: {
showTable:showTable,
AuditStatus:AuditStatus
}
});
}else{
this.$router.push({
path: "/" + path,
query: {
}
});
}
},
goScroll(num){
let Width=this.width-700;
this.tabActive=num;
if(num==2){
console.log("2131");
// this.$refs.scrollUl.style.left="-1000px";
this.animate(this.$refs.scrollUl,-1000)
......@@ -260,8 +275,10 @@ export default {
},
getPropertyInStock(){
let that=this;
this.loading=true;
that.apiJavaPost("/api/property/GetPropertyIndexPropertyInStock",this.InStockMsg,
res => {
this.loading=false;
if (res.data.resultCode === 1) {
let data=res.data.data;
this.InStockData=[];
......@@ -360,8 +377,8 @@ export default {
},
position: function (point, params, dom, rect, size) {
      return [point[0]-50, point[1]-dom.offsetHeight -10];
  },
        formatter: function(params) {
},
      formatter: function(params) {
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;
......@@ -425,15 +442,26 @@ export default {
}
}
},
series:that.InStockData
series:that.InStockData,
};
// myChart.setOption(option);
myChart.setOption(option,true);
//echarts点击事件
myChart.on('legendselectchanged', function (params) {
var legend_option = this.getOption();
//手动改变legend的selected状态:
// legend_option.legend[0].selected[name] = false;
// //切换tooltips的高度
});
},
getSuppliesInStock(){
let that=this;
this.loading1=true;
that.apiJavaPost("/api/property/GetPropertyIndexSuppliesInStock",this.InStockSuppleMsg,
res => {
this.loading1=false;
if (res.data.resultCode === 1) {
let data=res.data.data;
this.InStockData1=[];
......@@ -488,6 +516,7 @@ export default {
);
},
LineChart1(){
var that = this;
var myChart = this.$echarts.init(document.getElementById('chartsMap1'));
......@@ -506,7 +535,6 @@ export default {
      return [point[0]-50, point[1]-dom.offsetHeight];
  },
formatter: function(params) {
// console.log("params",params)
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;
......@@ -581,8 +609,10 @@ export default {
myChart.setOption(option,true);
},
getTask(){
this.Allload=true;
this.apiJavaPost("/api/property/GetPropertyIndexTask",{},
res => {
this.Allload=false;
if (res.data.resultCode === 1) {
this.TaskObj=res.data.data;
} else {
......
src/components/Materialman/Archivesmaterials.vue
View file @ 1932f2da
......@@ -15,7 +15,7 @@
</div>
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.Name" placeholder="仓库名称"></el-input>
<el-input class="w200" size="small" v-model="msg.Name" placeholder="档案名称"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="物料编码"></el-input>
......@@ -32,8 +32,7 @@
<th>条形码号</th>
<th>库存</th>
<th>型号</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作人/时间</th>
<th>备注</th>
<th>操作</th>
</thead>
......@@ -58,8 +57,10 @@
<!-- <td>
<img v-for="(subItem,index) in item.ImageList" :key="index" :src="subItem" alt="">
</td> -->
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td>{{item.Remark}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
......@@ -234,10 +235,12 @@ export default {
],
},
nodemsg:{
ParentId:-1,
Tier:'',
pageIndex:1,
pageSize:10,
Name:'',
Type:1,
Tier:'',
ParentId:'',
Type:2,
},
treedata: [],
defaultProps: {
......
src/components/Materialman/ConsumRecipients.vue
View file @ 1932f2da
......@@ -7,8 +7,9 @@
<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="">
</span>
<span @click="Export('GetRecipientsQueryPageListToExcel','领用')" style="margin-left:20px" class="addSpan">导出</span>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
<span @click="Export('GetRecipientsQueryPageListToExcel','领用')" style="margin-left:20px" class="addSpan">导出</span>
<!-- <span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> -->
......@@ -40,8 +41,8 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="领取开始日期"
end-placeholder="领取结束日期">
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</li>
<li>
......
src/components/Materialman/SpotQuery.vue
View file @ 1932f2da
......@@ -7,12 +7,13 @@
<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="">
</span>
<span @click="Export('GetInventoryPageListToExcel','库存')" style="margin-left:20px" class="addSpan">导出</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">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span> -->
<span @click="Export('GetInventoryPageListToExcel','库存')" style="margin-left:20px" class="addSpan">导出</span>
</div>
<ul v-show="morequery" class="queryul">
<li>
......@@ -51,7 +52,7 @@
<vxe-table-column field="UnitPrice" 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-if="row.Number < row.SafetyStock" style="color:red;font-weight:700">{{row.Number}}</span>
<span v-else>{{row.Number}}</span>
</template>
</vxe-table-column>
......@@ -109,7 +110,7 @@
</td>
</tr>
<tr v-show="OperationList.length == 0">
<td colspan="4" align="center">暂无数据</td>
<td colspan="6" align="center">暂无数据</td>
</tr>
</tbody>
</table>
......@@ -185,7 +186,6 @@ export default {
},
methods:{
Operation(item) {
console.log("item",item)
this.OperationInfo = item;
this.caozuoState = true;
this.msg1.WarehouseId = item.WarehouseId;
......
src/components/Materialman/chukudan.vue
View file @ 1932f2da
......@@ -8,14 +8,15 @@
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
<span @click="Export" style="margin-left:20px" class="addSpan">导出</span>
<span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
<span @click="Export" style="margin-left:20px" class="addSpan">导出</span>
</div>
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.StockInNum" placeholder="入库单编码"></el-input>
<el-input class="w200" size="small" v-model="msg.StockOutNum" placeholder="编码"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="耗材编码"></el-input>
......@@ -23,9 +24,6 @@
<li>
<el-input class="w200" size="small" v-model="msg.SuppliesName" placeholder="耗材名称"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商"></el-input>
</li>
<li>
<el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库">
<el-option
......@@ -53,8 +51,8 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="购置开始日期"
end-placeholder="购置结束日期">
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</li>
</ul>
......@@ -62,17 +60,18 @@
<div class="overflowY">
<table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>出库状态</th>
<th width="75">出库状态</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>
</thead>
<tbody>
......@@ -85,23 +84,26 @@
<span class="ColorSpan purpleSpan" v-if="item.StockOutState==3">待</span>
{{item.StockOutStateStr}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<!-- <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td> -->
<td>{{delist.CategoryName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutDate}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<td>{{delist.SuppliesName}}</td>
<td>{{delist.SuppliesNum}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td>
<td>{{delist.InventoryNum}}</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">
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">
<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="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
<img v-if="item.StockOutState==2" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消出库单" placement="top">
<img v-show="item.StockOutState==1" @click="Quxiao(item)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
......
src/components/Materialman/rukudan.vue
View file @ 1932f2da
......@@ -8,14 +8,15 @@
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
</span>
<span @click="getList" style="margin-left:20px" class="chaxunSpan">查询</span>
<span @click="Export" style="margin-left:20px" class="addSpan">导出</span>
<span @click="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</span>
<span @click="Export" style="margin-left:20px" class="addSpan">导出</span>
</div>
<ul v-show="morequery" class="queryul">
<li>
<el-input class="w200" size="small" v-model="msg.StockInNum" placeholder="入库单编码"></el-input>
<el-input class="w200" size="small" v-model="msg.StockInNum" placeholder="编码"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="耗材编码"></el-input>
......@@ -42,8 +43,8 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="购置开始日期"
end-placeholder="购置结束日期">
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</li>
</ul>
......@@ -51,17 +52,19 @@
<div class="overflowY">
<table v-loading="loading" style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>入库状态</th>
<th width="75">入库状态</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>
</thead>
<tbody>
......@@ -73,23 +76,28 @@
<span class="ColorSpan greenSpan" v-if="item.StockInState==1">已</span>
{{item.StockInStateStr}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td>
<td>{{delist.SuppliesName}}</td>
<td>{{delist.SuppliesNum}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.SuppliesName}}</td>
<td>{{delist.BrandName}}</td>
<td>{{delist.UnitPrice}}</td>
<td>{{delist.Money}}</td>
<td>{{delist.Money}}</td>
<td>{{delist.Number}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}</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">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<img v-if="item.StockInState!=1" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
<img v-if="item.StockInState!=1" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消入库单" placement="top">
<img v-show="item.StockInState==1" @click="Quxiao(item)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
......
src/components/Systemman/AssetsClassification.vue
View file @ 1932f2da
......@@ -35,8 +35,7 @@
<th>名称</th>
<th>父级名称</th>
<th>层级</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作人/时间</th>
<th>操作</th>
</tr>
......@@ -47,8 +46,10 @@
<td>{{item.Name}}</td>
<td>{{item.ParentName}}</td>
<td>{{item.Tier}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
......
src/components/Systemman/MaterialClassification.vue
View file @ 1932f2da
......@@ -35,8 +35,7 @@
<th>名称</th>
<th>父级名称</th>
<th>层级</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作人/时间</th>
<th>操作</th>
</tr>
......@@ -47,8 +46,10 @@
<td>{{item.Name}}</td>
<td>{{item.ParentName}}</td>
<td>{{item.Tier}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
......
src/components/Systemman/Supplierman.vue
View file @ 1932f2da
<template>
<div class="Supplierman">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">资产列表</span>
<span class="pageTitle">供应商管理</span>
<span @click="morequery=!morequery" style="display:inline-flex;align-items:center;cursor: pointer;" class="f12 cd6">
<span style="margin-right:5px">高级查询</span>
<img v-show="!morequery" style="width:12px;height:12px" src="../../assets/img/more.png" alt="">
......@@ -29,8 +29,13 @@
<vxe-table-column field="Name" title="供应商名称"></vxe-table-column>
<vxe-table-column field="Contact" title="联系人"></vxe-table-column>
<vxe-table-column field="Mobile" title="联系电话"></vxe-table-column>
<vxe-table-column field="UpdateBy" title="操作人"></vxe-table-column>
<vxe-table-column field="UpdateDate" title="操作时间"></vxe-table-column>
<vxe-table-column field="UpdateBy" title="操作人/时间">
<template v-slot="{ row }">
<p>{{row.UpdateBy}}</p>
<p>{{row.UpdateDate}}</p>
</template>
</vxe-table-column>
<vxe-table-column field="address" title="操作">
<template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
......
src/components/approval/Sign.vue
View file @ 1932f2da
......@@ -116,8 +116,7 @@ export default {
},
//提交签名
commit() {
this.imgUrl=this.$refs.canvasF.toDataURL();
console.log(this.$refs.canvasF.toDataURL()) //签名img回传后台
this.imgUrl=this.$refs.canvasF.toDataURL(); //签名img回传后台
},
//mobile
......
src/components/approval/SignMan.vue
View file @ 1932f2da
<template>
<div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">审批管理</span>
<span class="pageTitle">签名管理</span>
<span class="ChangeTable">
<span @click="showTable=1,getList()" :class="showTable==1?'spanActive':''">待签字</span>
<span @click="showTable=2,getList()" :class="showTable==2?'spanActive':''">已签字</span>
......@@ -68,8 +68,8 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="派发开始时间"
end-placeholder="派发结束日期">
start-placeholder="开始时间"
end-placeholder="结束日期">
</el-date-picker>
</li>
</ul>
......@@ -83,7 +83,7 @@
<th>资产名称</th>
<th>资产编号</th>
<th>品牌名称</th>
<th>操作人</th>
<th>操作人/时间</th>
<th width="150px">操作</th>
</thead>
<tbody>
......@@ -97,7 +97,7 @@
<span class="ColorSpan greenSpan" v-if="item.AuditStatus==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.AuditStatus==3">驳</span>
<span class="ColorSpan buleSpan" v-if="item.AuditStatus==4">签</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">撤</span>
</div>
<div style="display:inline-block;margin-left:5px">
<P>{{item.AuditDescription}}</P>
......@@ -120,7 +120,10 @@
<td>{{delist.PropertyName}}</td>
<td><span @click="getCheckDes(delist)" class="underline">{{delist.PropertyNum}}</span></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">
<el-tooltip class="item" effect="dark" content="流程查看" placement="top">
<img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','approvalMan','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
......
src/components/approval/approvalDetails.vue
View file @ 1932f2da
......@@ -56,6 +56,11 @@
</span>
</el-col>
<el-col v-if="GetDetail.ChangePerson && GetDetail.ChangePerson!=''" :span="12">
<span>原领用人 :</span>
<span>{{GetDetail.ChangePerson}}</span>
</el-col>
<el-col :span="12">
<span>备注 :</span>
<span>{{GetDetail.Remark}}</span>
......@@ -491,7 +496,6 @@ export default {
},
showImg(obj, type){
this.images=[];
console.log("obj",obj)
if(obj.ImageList && obj.ImageList.length>0){
this.images=obj.ImageList;
}
......@@ -1075,7 +1079,7 @@ export default {
}
.approvalDetails .HeaderDiv .underline{
display: block;
width:101px;
width:135px;
height:2px;
position: absolute;
bottom: 0;
......
src/components/approval/approvalMan.vue
View file @ 1932f2da
......@@ -69,8 +69,8 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="派发开始时间"
end-placeholder="派发结束日期">
start-placeholder="开始时间"
end-placeholder="结束日期">
</el-date-picker>
</li>
</ul>
......@@ -84,7 +84,7 @@
<th>资产名称</th>
<th>分类名称</th>
<th>品牌名称</th>
<th>操作人</th>
<th>操作人/时间</th>
<th width="150px">操作</th>
</thead>
<tbody>
......@@ -98,7 +98,7 @@
<span class="ColorSpan greenSpan" v-if="item.AuditStatus==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.AuditStatus==3">驳</span>
<span class="ColorSpan buleSpan" v-if="item.AuditStatus==4">签</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">撤</span>
</div>
<div style="display:inline-block;margin-left:5px">
<P>{{item.AuditDescription}}</P>
......@@ -121,7 +121,10 @@
<td>{{delist.PropertyName}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.UpdateBy}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">
<el-tooltip class="item" effect="dark" content="流程查看" placement="top">
<img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','approvalMan','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
......@@ -132,7 +135,9 @@
<el-tooltip class="item" effect="dark" content="转交" placement="top">
<img v-show="showTable==1" @click="ZhuanJiao(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="处理" placement="top">
<img v-show="showTable==3 && EmployeeId==item.CreateBy && item.AuditStatus==3" @click="goUrl('Myapplication')" style="width:24px;height:24px" src="../../assets/img/sz.png" alt="">
</el-tooltip>
<!-- <span class="commonStyle hoverSpan2"></span> -->
</td>
......@@ -260,12 +265,15 @@ export default {
},
dateList:[],
EmName:'',
PropertyId:''
PropertyId:'',
EmployeeId:'',
}
},
created(){
this.showTable=this.$route.query.showTable?this.$route.query.showTable:1;
this.msg.AuditStatus=this.$route.query.AuditStatus?this.$route.query.AuditStatus:'';
},
mounted(){
......@@ -275,8 +283,17 @@ export default {
this.getStateEnum();
let userInfo = this.getLocalStorage();
this.addMsg.TransferEmpId=userInfo.EmployeeId;
this.EmployeeId=userInfo.EmployeeId;
},
methods:{
goUrl(path){
this.$router.push({
path: "/" + path,
query: {
}
});
},
getCheckDes(item){
this.PropertyId=item.PropertyId;
this.CheckDetailState=true;
......
src/components/approval/approvalset.vue
View file @ 1932f2da
<template>
<div class="spotquery">
<div style="text-align:right;border-bottom:1px solid #E2E4EB;padding-bottom:10px">
<span class="pageTitle">审批</span>
<span class="pageTitle">流程设置</span>
<span class="ChangeTable">
<span @click="showTable=1" :class="showTable==1?'spanActive':''">审批</span>
<span @click="showTable=2" :class="showTable==2?'spanActive':''">签字</span>
......
src/components/assetsman/LendReturn.vue
View file @ 1932f2da
......@@ -11,12 +11,13 @@
<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="">
</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="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</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>
</div>
<!-- 派发 -->
<div v-show="showTable==1">
......@@ -92,7 +93,7 @@
<span class="ColorSpan greenSpan" v-if="item.AuditStatus==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.AuditStatus==3">驳</span>
<span class="ColorSpan buleSpan" v-if="item.AuditStatus==4">签</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">撤</span>
{{item.AuditStatusName}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
......@@ -119,7 +120,7 @@
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img v-if="(item.AuditStatus==3 || item.AuditStatus==5) && item.CreateBy==EmployeeId" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="终止" placement="top">
<!-- <el-tooltip class="item" effect="dark" content="撤回" placement="top">
<img v-if="item.AuditStatus==2 && item.CreateBy==EmployeeId" @click="End(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="流程查看" placement="top">
......@@ -165,7 +166,7 @@
<li>
<el-select size="small" clearable v-model="tuimsg.AuditStatus" placeholder="状态">
<el-option
v-for="item in getWareHouseList"
v-for="item in StateEnumList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
......@@ -217,7 +218,7 @@
<span class="ColorSpan greenSpan" v-if="item.AuditStatus==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.AuditStatus==3">驳</span>
<span class="ColorSpan buleSpan" v-if="item.AuditStatus==4">签</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">撤</span>
{{item.AuditStatusName}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
......@@ -239,7 +240,7 @@
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img v-if="item.AuditStatus==3 || item.AuditStatus==5" @click="DeleteTuiku(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="终止" placement="top">
<!-- <el-tooltip class="item" effect="dark" content="撤回" placement="top">
<img v-if="item.AuditStatus==2" @click="EndTuiku(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="流程查看" placement="top">
......@@ -1139,7 +1140,7 @@ export default {
},
EndTuiku(item){
let Id=item.Id;
this.$confirm("确认终止？","提示", {
this.$confirm("确认撤回？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
......@@ -1161,7 +1162,7 @@ export default {
},
End(item){
let Id=item.Id;
this.$confirm("确认终止？","提示", {
this.$confirm("确认撤回？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
......
src/components/assetsman/PaiTui.vue
View file @ 1932f2da
......@@ -11,12 +11,13 @@
<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="">
</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="addSupplier" style="margin-left:20px" class="addSpan">
<img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="">
新增</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>
</div>
<!-- 派发 -->
<div v-show="showTable==1">
......@@ -27,7 +28,7 @@
:normalizer="normalizer" />
</li>
<li>
<el-input class="w200" size="small" v-model="msg.OrderCode" placeholder="派发单编号"></el-input>
<el-input class="w200" size="small" v-model="msg.OrderCode" placeholder="编号"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.PropertyNum" placeholder="资产编码"></el-input>
......@@ -71,7 +72,7 @@
<div class="overflowY">
<table style="margin-top:10px" class="myTable noHoverTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead>
<th width="75">状态</th>
<th>状态</th>
<th>单号</th>
<th width="65">领用公司</th>
<th>领用部门</th>
......@@ -92,7 +93,7 @@
<span class="ColorSpan greenSpan" v-if="item.AuditStatus==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.AuditStatus==3">驳</span>
<span class="ColorSpan buleSpan" v-if="item.AuditStatus==4">签</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">撤</span>
{{item.AuditStatusName}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
......@@ -110,12 +111,12 @@
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img v-if="item.AuditStatus==3 && item.CreateBy==EmployeeId" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<img v-if="(item.AuditStatus==3 || item.AuditStatus==5) && item.CreateBy==EmployeeId" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img v-if="(item.AuditStatus==3 || item.AuditStatus==5) && item.CreateBy==EmployeeId" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="终止" placement="top">
<el-tooltip class="item" effect="dark" content="撤回" placement="top">
<img v-if="item.AuditStatus==2 && item.CreateBy==EmployeeId" @click="End(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="流程查看" placement="top">
......@@ -150,7 +151,7 @@
:normalizer="normalizer" />
</li>
<li>
<el-input class="w200" size="small" v-model="tuimsg.OrderCode" placeholder="派发单编号"></el-input>
<el-input class="w200" size="small" v-model="tuimsg.OrderCode" placeholder="编号"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="tuimsg.PropertyNum" placeholder="资产编码"></el-input>
......@@ -196,15 +197,15 @@
<thead>
<th>状态</th>
<th>单号</th>
<th>退库时间</th>
<th width="65">退库时间</th>
<th>备注</th>
<th>资产编号</th>
<th width="65">资产编号</th>
<th>资产名称</th>
<th>分类名称</th>
<th>品牌名称</th>
<th>退库前使用人</th>
<th>操作信息</th>
<th width="150px">操作</th>
<th>操作人/时间</th>
<th>操作</th>
</thead>
<tbody>
<template v-for="item in tableData2">
......@@ -214,7 +215,7 @@
<span class="ColorSpan greenSpan" v-if="item.AuditStatus==1">已</span>
<span class="ColorSpan purpleSpan" v-if="item.AuditStatus==3">驳</span>
<span class="ColorSpan buleSpan" v-if="item.AuditStatus==4">签</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
<span class="ColorSpan redSpan" v-if="item.AuditStatus==5">撤</span>
{{item.AuditStatusName}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>
......@@ -226,17 +227,17 @@
<td>{{delist.BrandName}}</td>
<td>{{delist.CancelStockEmployeeName}}</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>
<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">
<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.AuditStatus==5) && item.CreateBy==EmployeeId" @click="Edit1(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img v-if="item.AuditStatus==3 || item.AuditStatus==5" @click="DeleteTuiku(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="终止" placement="top">
<!-- <el-tooltip class="item" effect="dark" content="撤回" placement="top">
<img v-if="item.AuditStatus==2" @click="EndTuiku(item)" style="width:24px;height:24px" src="../../assets/img/jinyong.png" alt="">
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="流程查看" placement="top">
......@@ -1134,7 +1135,7 @@ export default {
},
EndTuiku(item){
let Id=item.Id;
this.$confirm("确认终止？","提示", {
this.$confirm("确认撤回？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
......@@ -1156,7 +1157,7 @@ export default {
},
End(item){
let Id=item.Id;
this.$confirm("确认终止？","提示", {
this.$confirm("确认撤回？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
type: 'warning'
......
src/components/assetsman/assetsList.vue
View file @ 1932f2da
......@@ -27,9 +27,6 @@
<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">
<img
style="width:10px;height:10px;margin-right:6px"
......@@ -113,8 +110,8 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="购置开始日期"
end-placeholder="购置结束日期"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</li>
......@@ -203,7 +200,7 @@
content="删除"
placement="top"
>
<img
<img v-if="item.PropertyStatus == 1"
@click="Delete(item)"
style="width:24px;height:24px"
src="../../assets/img/delete.png"
......@@ -223,6 +220,20 @@
alt=""
/>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="变更领用人"
placement="top"
>
<img v-if="item.PropertyStatus==2"
@click="ChnagePeople(item)"
style="width:24px;height:24px"
src="../../assets/img/shbh.png"
alt=""
/>
</el-tooltip>
<span class="commonStyle hoverSpan2"></span>
</td>
</tr>
......@@ -268,6 +279,7 @@
placeholder="请输入姓名"
:filter-method="getEmployee2"
>
<el-option label="无" :value="0"></el-option>
<el-option
v-for="item in EmployeeList2"
:key="item.EmployeeId"
......@@ -550,6 +562,59 @@
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails>
</el-dialog>
<!-- biangeng -->
<el-dialog title="变更领用人" :visible.sync="changeState" width="780px">
<el-form class="MyEditForm"
:model="changeMsg"
:rules="changeMsgrules"
ref="changeMsg"
label-width="0px">
<el-form-item label="">
<span class="label">领用人</span>
<el-select
size="mini"
filterable
v-model="changeMsg.EmployeeId"
placeholder="请输入姓名"
:filter-method="getEmployee3"
>
<el-option
v-for="item in EmployeeList3"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="Time">
<p class="label" style="padding-top:4px">领取时间</p>
<el-date-picker
size="mini"
v-model="changeMsg.Time"
type="date"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
<el-form-item label="">
<span class="label">备注</span>
<el-input
size="mini"
v-model="changeMsg.Remark"
placeholder="请输入"
></el-input>
</el-form-item>
<div class="btnformItem">
<span v-loading="queryLoad" class="submitBtn" type="primary" @click="ChangesubmitForm('changeMsg')"
>确定</span
>
<span class="exitBtn" @click="changeState = false">取消</span>
</div>
</el-form>
</el-dialog>
</div>
</template>
......@@ -565,6 +630,26 @@ export default {
},
data() {
return {
changeState:false,
changeMsg:{
EmployeeId:'',
Time:'',
Remark:'',
PropertyId:'',
},
changeMsgrules: {
EmployeeId: [
{ required: true, message: "请选择领用人", trigger: "change" }
],
Time: [
{
type: "string",
required: true,
message: "请选择日期",
trigger: "change"
}
]
},
queryLoad:false,
CheckDetailState: false,
total1: 0,
......@@ -677,6 +762,7 @@ export default {
OperationLoad: false,
EmployeeList1: [],
EmployeeList2: [],
EmployeeList3: [],
EmName: "",
PropertyId:'',
baseformItem:false,
......@@ -692,6 +778,34 @@ export default {
this.getPropertyStatus();
},
methods: {
ChangesubmitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
this.queryLoad=true;
this.apiJavaPost(
"/api/property/SetPropertyChangePersonReceive",
this.changeMsg,
res => {
this.queryLoad=false;
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message);
this.changeState = false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
ChnagePeople(item){
this.changeMsg.PropertyId = item.Id;
this.changeState=true;
},
getCheckDes(item){
this.PropertyId=item.Id;
this.CheckDetailState=true;
......@@ -729,22 +843,6 @@ export default {
DeleteImg(item, index) {
this.addMsg.ImageList.splice(index, 1);
},
chongzhi() {
this.msg = {
pageIndex: 1,
pageSize: 10,
Name: "",
PropertyNum: "",
SerialNumber: "",
CategoryId: "",
PropertyStatus: "",
EmployeeId: "",
SupplierId: "",
StartTime: "",
EndTime: ""
};
this.getList();
},
uploadFileBtn(file) {
//上传
if (file.file.size > 1024 * 1024 * 10) {
......@@ -956,6 +1054,12 @@ export default {
this.getEmployee(2);
}
},
getEmployee3(val) {
if (val != "") {
this.EmName = val;
this.getEmployee(3);
}
},
getEmployee(num) {
this.apiJavaPost(
"/api/User/GetEmployeeList",
......@@ -964,9 +1068,13 @@ export default {
if (res.data.resultCode === 1) {
if (num == 1) {
this.EmployeeList1 = res.data.data;
} else {
}
else if (num == 2) {
this.EmployeeList2 = res.data.data;
}
else if (num == 3) {
this.EmployeeList3 = res.data.data;
}
} else {
this.Error(res.data.message);
}
......
src/components/global/index.vue
View file @ 1932f2da
......@@ -7,10 +7,10 @@
<div class="appContent">
<!-- 头部 -->
<div class="HeadDiv" style="padding-top:20px">
<div class="searchDiv">
<!-- <div class="searchDiv">
<img style="width:20px;height:20px" src="../../assets/img/search.png" alt="">
<input type="text" placeholder="请输入关键词搜索">
</div>
</div> -->
<div class="personDiv">
<img style="width:18px;height:22px" src="../../assets/img/news.png" alt="">
<el-popover
......
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