Commit d094fad6 authored by Mac's avatar Mac

入库审核

parent f8be751f
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
<p class="c11 f14" style="padding-top:12px">{{GetDetail.TemplateName}}</p> <p class="c11 f14" style="padding-top:12px">{{GetDetail.TemplateName}}</p>
</el-col> </el-col>
<el-col class="StateCol" :span="12" style="text-align:right;padding-top:15px"> <el-col class="StateCol" :span="12" style="text-align:right;padding-top:15px">
<span v-if="GetDetail.AuditStatus==1" class="spz">{{GetDetail.StockInStateStr}}</span> <span v-if="GetDetail.StockInState==1" class="spz">{{GetDetail.StockInStateStr}}</span>
<span v-if="GetDetail.AuditStatus==2 || GetDetail.AuditStatus==4" class="ytg">{{GetDetail.StockInStateStr}}</span> <span v-if="GetDetail.StockInState==2 || GetDetail.StockInState==4" class="ytg">{{GetDetail.StockInStateStr}}</span>
<span v-if="GetDetail.AuditStatus==3 || GetDetail.AuditStatus==5" class="wtg">{{GetDetail.StockInStateStr}}</span> <span v-if="GetDetail.StockInState==3 || GetDetail.StockInState==5" class="wtg">{{GetDetail.StockInStateStr}}</span>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<span>金额:</span> <span>金额:</span>
<span>{{GetDetail.Money}}</span> <span>{{GetDetail.Money}}</span>
</el-col> </el-col>
<el-col :span="12" v-if="GetDetail.FinanceId!=null&& GetDetail.FinanceId!=''"> <el-col :span="12" v-if="GetDetail.FinanceId!=null&& GetDetail.FinanceId!=''">
<span>采购单据:</span> <span>采购单据:</span>
...@@ -65,19 +65,28 @@ ...@@ -65,19 +65,28 @@
<p class="f12 c11" style="margin-top:25px">物料清单</p> <p class="f12 c11" style="margin-top:25px">物料清单</p>
<table style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th>物料编号</th> <th>耗材编码</th>
<th>物料名称</th> <th>耗材名称</th>
<th>品牌名称</th> <th>规格</th>
<th>分类名称</th> <th>分类名称</th>
<th>型号</th> <th>品牌名称</th>
<th>单价</th>
<th>金额</th>
<th>数量</th>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(item,index) in GetDetail.DetailList" :key="index"> <tr v-for="(item,index) in GetDetail.DetailList" :key="index">
<td><span @click="getCheckDes(item)" style="text-decoration: underline;cursor: pointer;">{{item.PropertyNum}}</span></td> <td><span @click="getCheckDes(item)" style="text-decoration: underline;cursor: pointer;">{{item.SuppliesNum}}</span></td>
<td>{{item.PropertyName}}</td> <td>{{item.SuppliesName}}</td>
<td>{{item.BrandName}}</td> <td>
<p v-for="(x,y) in item.GoodsSpecificationList" :key="y">{{x}}{{y+1==item.GoodsSpecificationList.length?'':','}}</p>
</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.PropertyModel}}</td> <td>{{item.BrandName}}</td>
<td>{{item.UnitPrice}}</td>
<td>{{item.Money}}</td>
<td>{{item.Number}}</td>
</tr> </tr>
<tr v-show="GetDetail.DetailList.length==0"> <tr v-show="GetDetail.DetailList.length==0">
...@@ -378,7 +387,7 @@ ...@@ -378,7 +387,7 @@
</div> </div>
</div> </div>
<el-dialog title="物料详情" top="0" :visible.sync="CheckDetailState" width="1150px"> <el-dialog title="物料详情" top="0" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <wlDetails ref="mychild"></wlDetails>
</el-dialog> </el-dialog>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer"> <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src"> <img v-for="src in images" :src="src" :key="src">
...@@ -387,11 +396,11 @@ ...@@ -387,11 +396,11 @@
</template> </template>
<script> <script>
import CheckDetails from "@/components/global/CheckDetails.vue"; import wlDetails from "@/components/global/wlDetails.vue";
export default { export default {
name: 'rukuDetails', name: 'rukuDetails',
components: { components: {
CheckDetails wlDetails
}, },
data(){ data(){
return{ return{
...@@ -412,7 +421,7 @@ ...@@ -412,7 +421,7 @@
addMsg:{ addMsg:{
AuditDescription:'', AuditDescription:'',
ImageList:[], ImageList:[],
UseReceiveId:'', Id:'',
AuditType:'', AuditType:'',
SignImage:'', SignImage:'',
}, },
...@@ -423,7 +432,7 @@ ...@@ -423,7 +432,7 @@
pageIndex:1, pageIndex:1,
pageSize:20, pageSize:20,
ResourceId:'', ResourceId:'',
Type:1, Type:2,
}, },
imgSrc:'', imgSrc:'',
...@@ -458,7 +467,7 @@ ...@@ -458,7 +467,7 @@
this.showTable=this.$route.query.showTable?this.$route.query.showTable:''; this.showTable=this.$route.query.showTable?this.$route.query.showTable:'';
if(this.$route.query.Id){ if(this.$route.query.Id){
this.addMsg.UseReceiveId=this.$route.query.Id; this.addMsg.Id=this.$route.query.Id;
this.danjuMsg.ResourceId=this.$route.query.Id; this.danjuMsg.ResourceId=this.$route.query.Id;
} }
this.getDetail(); this.getDetail();
...@@ -486,7 +495,7 @@ ...@@ -486,7 +495,7 @@
this.$viewer.show() this.$viewer.show()
}, },
getCheckDes(item){ getCheckDes(item){
this.PropertyId=item.PropertyId; this.PropertyId=item.SuppliesId;
this.CheckDetailState=true; this.CheckDetailState=true;
setTimeout(()=>{ setTimeout(()=>{
this.$refs.mychild.InitData(this.PropertyId); this.$refs.mychild.InitData(this.PropertyId);
...@@ -703,7 +712,7 @@ ...@@ -703,7 +712,7 @@
} }
this.addMsg.AuditType=num; this.addMsg.AuditType=num;
this.addMsg.ImageList=this.uploadImgList; this.addMsg.ImageList=this.uploadImgList;
this.apiJavaPost("/api/property/AuditOrRefund",this.addMsg, this.apiJavaPost("/api/Supplies/AuditOrRefund",this.addMsg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getDetail(); this.getDetail();
...@@ -711,7 +720,7 @@ ...@@ -711,7 +720,7 @@
this.addMsg={ this.addMsg={
AuditDescription:'', AuditDescription:'',
ImageList:[], ImageList:[],
UseReceiveId:'', Id:'',
AuditType:'', AuditType:'',
SignImage:'', SignImage:'',
} }
...@@ -759,7 +768,7 @@ ...@@ -759,7 +768,7 @@
}, },
getDetail(){ getDetail(){
this.pageLoad=true; this.pageLoad=true;
this.apiJavaPost("/api/Supplies/GetStockInAuditDetail",{StockInId:this.addMsg.UseReceiveId}, this.apiJavaPost("/api/Supplies/GetStockInAuditDetail",{StockInId:this.addMsg.Id},
res => { res => {
this.pageLoad=false; this.pageLoad=false;
......
<template> <template>
<div class="rukuExamine"> <div class="rukuExamine">
<div class="routerTitle"> <div class="routerTitle">
<span class="pageTitle">审批管理</span> <span class="pageTitle">入库审核</span>
<span class="ChangeTable"> <span class="ChangeTable">
<span @click="showTable=1,getList()" :class="showTable==1?'spanActive':''">待审核</span> <span @click="showTable=1,getList()" :class="showTable==1?'spanActive':''">待审核</span>
<span @click="showTable=2,getList()" :class="showTable==2?'spanActive':''">已审核</span> <span @click="showTable=2,getList()" :class="showTable==2?'spanActive':''">已审核</span>
...@@ -234,6 +234,10 @@ ...@@ -234,6 +234,10 @@
} }
}); });
}, },
currentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
} }
} }
</script> </script>
......
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