|
|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<div class="SuppliesInventory-all">
|
|
|
- <el-dialog top="10vh" width="1500px" title="领用记录" :visible.sync="ReceiptRecord">
|
|
|
+ <el-dialog top="10vh" width="1740px" title="领用记录" :visible.sync="ReceiptRecord">
|
|
|
<div class="ReceiptRecord-search">
|
|
|
<div class="ReceiptRecord-search-li">
|
|
|
<label style="margin-left: 0px;">关联团组:</label>
|
|
|
@@ -13,6 +13,17 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
+ <div class="ReceiptRecord-search-li">
|
|
|
+ <label>物品类型:</label>
|
|
|
+ <el-select multiple collapse-tags filterable style="width: 180px;" size="small" v-model="RSAuditTypes" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in RSAuditTypearr"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
<div class="ReceiptRecord-search-li">
|
|
|
<label>领用人员:</label>
|
|
|
<el-select multiple collapse-tags filterable style="width: 180px;" size="small" v-model="personnelID" placeholder="请选择">
|
|
|
@@ -54,17 +65,18 @@
|
|
|
:picker-options="pickerOptionss">
|
|
|
</el-date-picker>
|
|
|
</div>
|
|
|
- <el-button style="margin-left: 10px;" @click="inquireRecords" size="small" type="primary">查询</el-button>
|
|
|
+ <el-button style="margin-left: 10px;" @click="RecordsGoodsReceiveList" size="small" type="primary">查询</el-button>
|
|
|
</div>
|
|
|
<div class="ReceiptRecord-table">
|
|
|
<el-table
|
|
|
- :data="ApprovalData"
|
|
|
+ height="530px"
|
|
|
+ :data="RSAuditData"
|
|
|
border
|
|
|
style="width: 100%">
|
|
|
<el-table-column
|
|
|
prop="goodsName"
|
|
|
label="物品名称"
|
|
|
- width="180">
|
|
|
+ width="200">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="quantity"
|
|
|
@@ -84,7 +96,7 @@
|
|
|
<el-table-column
|
|
|
prop="reason"
|
|
|
label="申请原因"
|
|
|
- width="80">
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-popover
|
|
|
placement="top"
|
|
|
@@ -109,21 +121,38 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="auditStatusText"
|
|
|
- label="审核状态"
|
|
|
+ prop="auditUserName"
|
|
|
+ label="审核人"
|
|
|
width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.auditStatus==0?"":scope.row.auditUserName }}
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- label="操作"
|
|
|
- width="250">
|
|
|
+ prop="auditTime"
|
|
|
+ label="审核时间"
|
|
|
+ width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button v-if="scope.row.auditStatus==0||scope.row.auditStatus==2" size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row.id,1)" >通过</el-button>
|
|
|
- <el-button v-if="scope.row.auditStatus==0" size="mini" type="info" title="不通过" @click="GoodsReceiveAudit(scope.row.id,2)">不通过</el-button>
|
|
|
- <el-button v-if="scope.row.auditStatus==1" size="mini" type="warning" title="取消通过" @click="GoodsReceiveAudit(scope.row.id,0)">取消通过</el-button>
|
|
|
- <el-button size="mini" title="删除" type="danger" @click="Deleteintolibraryreceives(scope.row)">删除</el-button>
|
|
|
+ {{ scope.row.auditStatus==0?"":scope.row.auditTime }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="auditStatusText"
|
|
|
+ label="审核状态"
|
|
|
+ width="100">
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
+ <div v-if="RSAuditcount>RSAuditpagesize" class="block">
|
|
|
+ <el-pagination
|
|
|
+ @size-change="RSAuditSizeChange"
|
|
|
+ @current-change="RSAuditCurrentChange"
|
|
|
+ :current-page="RSAuditcurrentPage"
|
|
|
+ :page-sizes="[10, 15, 20, 40]"
|
|
|
+ :page-size="RSAuditpagesize"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="RSAuditcount">
|
|
|
+ </el-pagination>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<el-dialog top="10vh" class="Approval-dialog" width="1100px" title="领用审核" :visible.sync="ApprovalVisible">
|
|
|
@@ -569,6 +598,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div>
|
|
|
+ <el-button v-if="Auditauthority" @click="inquireRecords" type="primary">领用记录</el-button>
|
|
|
<el-button v-if="Auditauthority" @click="GoodsReceiveLists" type="primary">审核</el-button>
|
|
|
<el-button v-if="Addpermission" @click="addbtnclick" type="primary">新增物品</el-button>
|
|
|
</div>
|
|
|
@@ -818,15 +848,20 @@ export default {
|
|
|
Addpermission:false,
|
|
|
Deletepermission:false,
|
|
|
//领用记录
|
|
|
- ReceiptRecord:true,
|
|
|
+ ReceiptRecord:false,
|
|
|
groupID:[],
|
|
|
groupIDarr:[],
|
|
|
personnelID:[],
|
|
|
personnelIDarr:[],
|
|
|
RSAuditStatus:'',
|
|
|
RSAuditname:'',
|
|
|
- RSAudittime:''
|
|
|
-
|
|
|
+ RSAudittime:'',
|
|
|
+ RSAuditTypes:[],
|
|
|
+ RSAuditTypearr:[],
|
|
|
+ RSAuditData:[],
|
|
|
+ RSAuditcurrentPage:1,
|
|
|
+ RSAuditpagesize:10,
|
|
|
+ RSAuditcount:0,
|
|
|
}
|
|
|
},
|
|
|
methods:{
|
|
|
@@ -844,7 +879,7 @@ export default {
|
|
|
var s=date.getHours()>=10?date.getHours():'0'+(date.getHours()).toString();
|
|
|
var f=date.getMinutes()>=10?date.getMinutes():'0'+(date.getMinutes()).toString();
|
|
|
var mm=date.getSeconds()>=10?date.getSeconds():'0'+(date.getSeconds()).toString();
|
|
|
- return y+'-'+m+'-'+d+' '+s+':'+f+':'+mm
|
|
|
+ return y+'-'+m+'-'+d
|
|
|
},
|
|
|
//获取
|
|
|
GoodsInitDataSource() {
|
|
|
@@ -864,6 +899,11 @@ export default {
|
|
|
that.groupNameData=res.data.data.groupNameData;
|
|
|
that.MaterialType=that.MaterialTypearr[0].id;
|
|
|
that.MaterialTypechange();
|
|
|
+ for (let k = 0; k < that.MaterialTypearr.length; k++) {
|
|
|
+ for (let l = 0; l < that.MaterialTypearr[k].subTypeItems.length; l++) {
|
|
|
+ that.RSAuditTypearr.push(that.MaterialTypearr[k].subTypeItems[l])
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
that.$message.error(res.data.msg);
|
|
|
}
|
|
|
@@ -965,6 +1005,15 @@ export default {
|
|
|
this.ApprovalcurrentPage=val;
|
|
|
this.GoodsReceiveLists();
|
|
|
},
|
|
|
+ RSAuditSizeChange(val) {
|
|
|
+ this.RSAuditcurrentPage=1;
|
|
|
+ this.RSAuditpagesize=val;
|
|
|
+ this.RecordsGoodsReceiveList();
|
|
|
+ },
|
|
|
+ RSAuditCurrentChange(val) {
|
|
|
+ this.RSAuditcurrentPage=val;
|
|
|
+ this.RecordsGoodsReceiveList();
|
|
|
+ },
|
|
|
//新增按钮
|
|
|
addbtnclick(){
|
|
|
this.ID=0;
|
|
|
@@ -1307,22 +1356,26 @@ export default {
|
|
|
},
|
|
|
//查询领用记录
|
|
|
inquireRecords(){
|
|
|
+ this.ReceiptRecord=true;
|
|
|
+ this.RecordsGoodsReceiveList();
|
|
|
+ },
|
|
|
+ //领用记录
|
|
|
+ RecordsGoodsReceiveList(){
|
|
|
+ let groupID="";
|
|
|
for(let g=0;g<this.groupID.length;g++){
|
|
|
- this.groupID+=this.groupID[g]+','
|
|
|
+ groupID+=this.groupID[g]+',';
|
|
|
}
|
|
|
- // this.groupID=this.groupID.substring(0, this.groupID.length - 1);
|
|
|
+ groupID=groupID.substring(0, groupID.length - 1);
|
|
|
+ let personnelID="";
|
|
|
for (let p = 0; p < this.personnelID.length; p++) {
|
|
|
- this.personnelID += this.personnelID[p]+',';
|
|
|
+ personnelID += this.personnelID[p]+',';
|
|
|
}
|
|
|
- // this.personnelID=this.personnelID.substring(0, this.personnelID.length - 1);
|
|
|
- console.log(this.groupID);
|
|
|
- console.log(this.personnelID);
|
|
|
- console.log(this.RSAuditStatus);
|
|
|
- console.log(this.RSAuditname);
|
|
|
- console.log(this.RSAudittime);
|
|
|
- },
|
|
|
- //领用记录
|
|
|
- RecordsGoodsReceiveList(){
|
|
|
+ personnelID=personnelID.substring(0, personnelID.length - 1);
|
|
|
+ let RSAuditTypes="";
|
|
|
+ for (let r = 0; r < this.RSAuditTypes.length; r++) {
|
|
|
+ RSAuditTypes += this.RSAuditTypes[r]+",";
|
|
|
+ }
|
|
|
+ RSAuditTypes=RSAuditTypes.substring(0, RSAuditTypes.length - 1);
|
|
|
var url = "/api/PersonnelModule/GoodsReceiveList"
|
|
|
var that = this
|
|
|
this.$axios({
|
|
|
@@ -1333,21 +1386,22 @@ export default {
|
|
|
},
|
|
|
data:{
|
|
|
portType:1,
|
|
|
- pageIndex:1,
|
|
|
- pageSize:10,
|
|
|
+ pageIndex:that.RSAuditcurrentPage,
|
|
|
+ pageSize:that.RSAuditpagesize,
|
|
|
goodsId:0,
|
|
|
- userLabel:that.Userid+'',
|
|
|
- goodsName:'',
|
|
|
- beginDt:'',
|
|
|
- endDt:'',
|
|
|
- groupLabel:'',
|
|
|
- typeLabel:'',
|
|
|
- auditLabel:'',
|
|
|
+ userLabel:personnelID,
|
|
|
+ goodsName:that.RSAuditname,
|
|
|
+ beginDt:that.RSAudittime?that.datetime(that.RSAudittime[0]):'',
|
|
|
+ endDt:that.RSAudittime?that.datetime(that.RSAudittime[1]):'',
|
|
|
+ groupLabel:groupID,
|
|
|
+ typeLabel:RSAuditTypes,
|
|
|
+ auditLabel:that.RSAuditStatus+"",
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
if (res.data.code == 200) {
|
|
|
- that.ClaimitemData=res.data.data;
|
|
|
- that.Claimitemcount=res.data.count;
|
|
|
+ let Datalist=res.data;
|
|
|
+ that.RSAuditData=Datalist.data;
|
|
|
+ that.RSAuditcount=Datalist.count;
|
|
|
}else{
|
|
|
that.$message.error(res.data.msg);
|
|
|
}
|
