|
|
@@ -1,5 +1,87 @@
|
|
|
<template>
|
|
|
<div class="SuppliesInventory-all">
|
|
|
+ <el-dialog top="10vh" class="Approval-dialog" width="1100px" title="领用审核" :visible.sync="ApprovalVisible">
|
|
|
+ <div class="Approval-table">
|
|
|
+ <el-table
|
|
|
+ :data="ApprovalData"
|
|
|
+ border
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ prop="goodsName"
|
|
|
+ label="物品名称"
|
|
|
+ width="180">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="quantity"
|
|
|
+ label="数量"
|
|
|
+ width="50">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="createTime"
|
|
|
+ label="申请时间"
|
|
|
+ width="150">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="createUserName"
|
|
|
+ label="申请人"
|
|
|
+ width="70">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="reason"
|
|
|
+ label="申请原因"
|
|
|
+ width="80">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-popover
|
|
|
+ placement="top"
|
|
|
+ width="300"
|
|
|
+ trigger="hover">
|
|
|
+ {{scope.row.reason}}
|
|
|
+ <span style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;cursor: pointer;color: #48a2ff;" slot="reference">{{scope.row.reason}}</span>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="remark"
|
|
|
+ label="备注">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-popover
|
|
|
+ placement="top"
|
|
|
+ width="300"
|
|
|
+ trigger="hover">
|
|
|
+ {{scope.row.remark}}
|
|
|
+ <span style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;cursor: pointer;color: #48a2ff;" slot="reference">{{scope.row.remark}}</span>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="auditStatusText"
|
|
|
+ label="审核状态"
|
|
|
+ width="100">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ width="250">
|
|
|
+ <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="Deleteintolibraryreceive(scope.row)">删除</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <div v-if="Approvalcount>Approvalpagesize" class="block">
|
|
|
+ <el-pagination
|
|
|
+ @size-change="ApprovalhandleSizeChange"
|
|
|
+ @current-change="ApprovalhandleCurrentChange"
|
|
|
+ :current-page="ApprovalcurrentPage"
|
|
|
+ :page-sizes="[6, 10, 15, 40]"
|
|
|
+ :page-size="Approvalpagesize"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="Approvalcount">
|
|
|
+ </el-pagination>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
<el-dialog top="10vh" width="1200px" title="入库物品" :visible.sync="warehousingsVisible">
|
|
|
<el-form :model="warehousingsruleForm" :rules="warehousingsrules" ref="warehousingsruleForm" label-width="100px" class="demo-ruleForm">
|
|
|
<div class="warehousingsrule-input">
|
|
|
@@ -7,7 +89,7 @@
|
|
|
<el-input-number @blur="Sumup" size="small" :precision="2" :controls="false" v-model="warehousingsruleForm.quantity"></el-input-number>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="物品单价" prop="unitPrice">
|
|
|
- <el-input-number @blur="Sumup" size="small" :precision="2" :controls="false" v-model="warehousingsruleForm.unitPrice"></el-input-number>
|
|
|
+ <el-input-number @blur="Sumup" size="small" :precision="1" :controls="false" v-model="warehousingsruleForm.unitPrice"></el-input-number>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="物品总价" prop="totalPrice">
|
|
|
<el-input-number size="small" :precision="2" :controls="false" v-model="warehousingsruleForm.totalPrice"></el-input-number>
|
|
|
@@ -210,7 +292,7 @@
|
|
|
<el-button @click="GoodsOP" type="primary">保存</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="领用物品" :visible.sync="ClaimitemVisible">
|
|
|
+ <el-dialog title="领用物品" width="1000px" :visible.sync="ClaimitemVisible">
|
|
|
<el-form :model="ClaimsruleForm" :rules="Claimrules" ref="ClaimsruleForm" label-width="100px" class="demo-ruleForm">
|
|
|
<div class="Claimitem-input">
|
|
|
<el-form-item label="关联团组" prop="groupId">
|
|
|
@@ -351,6 +433,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div>
|
|
|
+ <el-button @click="GoodsReceiveLists" type="primary">审核</el-button>
|
|
|
<el-button @click="addbtnclick" type="primary">新增物品</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -458,6 +541,9 @@ export default {
|
|
|
ClaimitemcurrentPage:1,
|
|
|
Claimitempagesize:6,
|
|
|
Claimitemcount:0,
|
|
|
+ ApprovalcurrentPage:1,
|
|
|
+ Approvalpagesize:6,
|
|
|
+ Approvalcount:0,
|
|
|
//新增物品参数
|
|
|
AddMaterialType:"",
|
|
|
AddMaterialTypearr:[],
|
|
|
@@ -539,7 +625,10 @@ export default {
|
|
|
remark: [
|
|
|
{ required: true, message: '请输入', trigger: 'blur' },
|
|
|
],
|
|
|
- }
|
|
|
+ },
|
|
|
+ //审核参数
|
|
|
+ ApprovalVisible:false,
|
|
|
+ ApprovalData:[],
|
|
|
}
|
|
|
},
|
|
|
methods:{
|
|
|
@@ -666,6 +755,15 @@ export default {
|
|
|
this.ClaimitemcurrentPage=val;
|
|
|
this.GoodsReceiveList({'id':this.ID});
|
|
|
},
|
|
|
+ ApprovalhandleSizeChange(val) {
|
|
|
+ this.ApprovalcurrentPage=1;
|
|
|
+ this.Approvalpagesize=val;
|
|
|
+ this.GoodsReceiveLists();
|
|
|
+ },
|
|
|
+ ApprovalhandleCurrentChange(val) {
|
|
|
+ this.ApprovalcurrentPage=val;
|
|
|
+ this.GoodsReceiveLists();
|
|
|
+ },
|
|
|
//新增按钮
|
|
|
addbtnclick(){
|
|
|
this.ID=0;
|
|
|
@@ -964,9 +1062,40 @@ export default {
|
|
|
this.ClaimsruleForm.id=0;
|
|
|
this.$refs[formName].resetFields();
|
|
|
},
|
|
|
+ //领用审核列表
|
|
|
+ GoodsReceiveLists(){
|
|
|
+ this.ApprovalData=[];
|
|
|
+ this.ApprovalVisible=true
|
|
|
+ var url = "/api/PersonnelModule/GoodsReceiveList"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'POST',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' +that.token
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ portType:1,
|
|
|
+ pageIndex:that.ApprovalcurrentPage,
|
|
|
+ pageSize:that.Approvalpagesize,
|
|
|
+ goodsId:0,
|
|
|
+ currUserId:that.Userid,
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ that.ApprovalData=res.data.data;
|
|
|
+ that.Approvalcount=res.data.count;
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ }).catch(function (error) {
|
|
|
+ that.$message.error("操作错误，联系信息部!");
|
|
|
+ });
|
|
|
+ },
|
|
|
//领用列表
|
|
|
GoodsReceiveList(row){
|
|
|
this.bjcsh();
|
|
|
+ this.ClaimitemData=[];
|
|
|
this.ID=row.id;
|
|
|
this.ClaimitemVisible=true;
|
|
|
var url = "/api/PersonnelModule/GoodsReceiveList"
|
|
|
@@ -1099,7 +1228,36 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
+ //审核领用
|
|
|
+ GoodsReceiveAudit(row,val){
|
|
|
+ var url = "/api/PersonnelModule/GoodsReceiveAudit"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' +that.token
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ label:row+'',
|
|
|
+ auditEnum:val,
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ that.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: res.data.msg
|
|
|
+ });
|
|
|
+ that.GoodsReceiveLists();
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ }).catch(function (error) {
|
|
|
+ that.$message.error("操作错误，联系信息部!");
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
+
|
|
|
mounted(){
|
|
|
this.Userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
|
|
|
this.token=JSON.parse(localStorage.getItem('userinif')).token;
|
|
|
@@ -1207,4 +1365,15 @@ export default {
|
|
|
text-align: center;
|
|
|
margin-top: 10px;
|
|
|
}
|
|
|
+.Approval-table .el-table th.el-table__cell>.cell{
|
|
|
+ text-align: center;
|
|
|
+ font-size: 12px;
|
|
|
+}
|
|
|
+.Approval-table .el-table td.el-table__cell div{
|
|
|
+ font-size: 12px;
|
|
|
+}
|
|
|
+.Approval-table .block{
|
|
|
+ text-align: center;
|
|
|
+ margin-top: 10px;
|
|
|
+}
|
|
|
</style>
|
