|
|
@@ -71,7 +71,7 @@
|
|
|
<el-table-column
|
|
|
prop="quantity"
|
|
|
label="物品数量"
|
|
|
- width="80">
|
|
|
+ width="70">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="totalPrice"
|
|
|
@@ -83,8 +83,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="supplierName"
|
|
|
- label="供应商名称"
|
|
|
- width="180">
|
|
|
+ label="供应商名称">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="supplierTel"
|
|
|
@@ -98,6 +97,14 @@
|
|
|
prop="supplierSource"
|
|
|
label="供应商来源">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="storageTime"
|
|
|
+ label="入库时间">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="storageUserName"
|
|
|
+ label="入库人">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
width="155">
|
|
|
@@ -169,7 +176,13 @@
|
|
|
<el-form :model="ClaimsruleForm" :rules="Claimrules" ref="ClaimsruleForm" label-width="100px" class="demo-ruleForm">
|
|
|
<div class="Claimitem-input">
|
|
|
<el-form-item label="关联团组" prop="groupId">
|
|
|
- <el-input-number size="small" :precision="2" :controls="false" v-model="ClaimsruleForm.groupId"></el-input-number>
|
|
|
+ <el-select size="small" v-model="ClaimsruleForm.groupId" clearable filterable
|
|
|
+ placeholder="请选择">
|
|
|
+ <el-option v-for="item in groupNameData" :key="item.id" :label="item.groupName"
|
|
|
+ :value="item.id">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ <!-- <el-input-number size="small" :precision="2" :controls="false" v-model="ClaimsruleForm.groupId"></el-input-number> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="领用数量" prop="quantity">
|
|
|
<el-input-number size="small" :precision="2" :controls="false" v-model="ClaimsruleForm.quantity"></el-input-number>
|
|
|
@@ -186,6 +199,85 @@
|
|
|
<el-button size="small" type="primary" @click="ClaimsubmitForm('ClaimsruleForm')">保存</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
+ <div class="claimitem-table">
|
|
|
+ <el-table
|
|
|
+ height="400"
|
|
|
+ :data="ClaimitemData"
|
|
|
+ border
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ prop="goodsName"
|
|
|
+ label="物品名称"
|
|
|
+ width="180">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="quantity"
|
|
|
+ label="数量"
|
|
|
+ width="45">
|
|
|
+ </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: 3; 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="80">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ width="200">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button size="mini" title="编辑" @click="Editentryreceive(scope.row)">编辑</el-button>
|
|
|
+ <el-button size="mini" title="删除" type="danger" @click="Deleteintolibraryreceive(scope.row)">删除</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <div v-if="Claimitemcount>Claimitempagesize" class="block">
|
|
|
+ <el-pagination
|
|
|
+ @size-change="ClaimitemhandleSizeChange"
|
|
|
+ @current-change="ClaimitemhandleCurrentChange"
|
|
|
+ :current-page="ClaimitemcurrentPage"
|
|
|
+ :page-sizes="[6, 10, 15, 40]"
|
|
|
+ :page-size="Claimitempagesize"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="Claimitemcount">
|
|
|
+ </el-pagination>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</el-dialog>
|
|
|
<div class="SuppliesInventory-head">
|
|
|
<div class="SuppliesInventory-head-ul">
|
|
|
@@ -325,6 +417,9 @@ export default {
|
|
|
WScurrentPage:1,
|
|
|
WSpagesize:6,
|
|
|
WScount:0,
|
|
|
+ ClaimitemcurrentPage:1,
|
|
|
+ Claimitempagesize:6,
|
|
|
+ Claimitemcount:0,
|
|
|
//新增物品参数
|
|
|
AddMaterialType:"",
|
|
|
AddMaterialTypearr:[],
|
|
|
@@ -385,6 +480,7 @@ export default {
|
|
|
},
|
|
|
//领用参数
|
|
|
ClaimitemVisible:false,
|
|
|
+ ClaimitemData:[],
|
|
|
ClaimsruleForm:{
|
|
|
id:0,
|
|
|
groupId:'',
|
|
|
@@ -440,6 +536,7 @@ export default {
|
|
|
that.MaterialTypearr=res.data.data.goodsTypeData;
|
|
|
that.AddMaterialTypearr=res.data.data.goodsTypeData;
|
|
|
that.userNameData=res.data.data.userNameData;
|
|
|
+ that.groupNameData=res.data.data.groupNameData;
|
|
|
that.MaterialType=that.MaterialTypearr[0].id;
|
|
|
that.MaterialTypechange();
|
|
|
} else {
|
|
|
@@ -522,6 +619,15 @@ export default {
|
|
|
this.WScurrentPage=val;
|
|
|
this.instorage({'id':this.ID});
|
|
|
},
|
|
|
+ ClaimitemhandleSizeChange(val) {
|
|
|
+ this.ClaimitemcurrentPage=1;
|
|
|
+ this.Claimitempagesize=val;
|
|
|
+ this.GoodsReceiveList({'id':this.ID});
|
|
|
+ },
|
|
|
+ ClaimitemhandleCurrentChange(val) {
|
|
|
+ this.ClaimitemcurrentPage=val;
|
|
|
+ this.GoodsReceiveList({'id':this.ID});
|
|
|
+ },
|
|
|
//新增按钮
|
|
|
addbtnclick(){
|
|
|
this.ID=0;
|
|
|
@@ -637,8 +743,25 @@ export default {
|
|
|
that.$message.error("操作错误，联系信息部！");
|
|
|
});
|
|
|
},
|
|
|
+ //入库数据初始化
|
|
|
+ rkcsh(){
|
|
|
+ this.warehousingsruleForm={
|
|
|
+ id:0,
|
|
|
+ quantity: 0,
|
|
|
+ unitPrice: 0,
|
|
|
+ totalPrice: 0,
|
|
|
+ supplierName: '',
|
|
|
+ supplierTel: '',
|
|
|
+ supplierAddress: '',
|
|
|
+ supplierSource: '',
|
|
|
+ storageUserId:'',
|
|
|
+ storageTime:'',
|
|
|
+ remark: ''
|
|
|
+ }
|
|
|
+ },
|
|
|
//入库列表
|
|
|
instorage(row){
|
|
|
+ this.rkcsh();
|
|
|
this.ID=row.id;
|
|
|
this.warehousingsVisible=true;
|
|
|
var url = "/api/PersonnelModule/GoodsStorageList"
|
|
|
@@ -791,20 +914,23 @@ export default {
|
|
|
ClaimsubmitForm(formName) {
|
|
|
this.$refs[formName].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- console.log('嗷嗷');
|
|
|
+ this.GoodsReceiveOP();
|
|
|
} else {
|
|
|
console.log('error submit!!');
|
|
|
return false;
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+
|
|
|
ClaimresetForm(formName) {
|
|
|
this.ClaimsruleForm.id=0;
|
|
|
this.$refs[formName].resetFields();
|
|
|
},
|
|
|
//领用列表
|
|
|
GoodsReceiveList(row){
|
|
|
+ this.bjcsh();
|
|
|
this.ID=row.id;
|
|
|
+ this.ClaimitemVisible=true;
|
|
|
var url = "/api/PersonnelModule/GoodsReceiveList"
|
|
|
var that = this
|
|
|
this.$axios({
|
|
|
@@ -815,14 +941,15 @@ export default {
|
|
|
},
|
|
|
data:{
|
|
|
portType:1,
|
|
|
- pageIndex:1,
|
|
|
- pageSize:10,
|
|
|
+ pageIndex:that.ClaimitemcurrentPage,
|
|
|
+ pageSize:that.Claimitempagesize,
|
|
|
goodsId:row.id,
|
|
|
currUserId:that.Userid,
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
if (res.data.code == 200) {
|
|
|
-
|
|
|
+ that.ClaimitemData=res.data.data;
|
|
|
+ that.Claimitemcount=res.data.count;
|
|
|
}else{
|
|
|
that.$message.error(res.data.msg);
|
|
|
}
|
|
|
@@ -830,6 +957,110 @@ export default {
|
|
|
that.$message.error("操作错误，联系信息部!");
|
|
|
});
|
|
|
},
|
|
|
+ //领用api
|
|
|
+ GoodsReceiveOP(){
|
|
|
+ var url = "/api/PersonnelModule/GoodsReceiveOP"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'POST',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' +that.token
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ id:that.ClaimsruleForm.id,
|
|
|
+ groupId:that.ClaimsruleForm.groupId,
|
|
|
+ goodsId:that.ID,
|
|
|
+ quantity:that.ClaimsruleForm.quantity,
|
|
|
+ reason:that.ClaimsruleForm.reason,
|
|
|
+ remark:that.ClaimsruleForm.remark,
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ that.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: res.data.msg
|
|
|
+ });
|
|
|
+ that.ClaimresetForm("ClaimsruleForm");
|
|
|
+ that.GoodsReceiveList({'id':that.ID});
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ }).catch(function (error) {
|
|
|
+ that.$message.error("操作错误，联系信息部!");
|
|
|
+ });
|
|
|
+ },
|
|
|
+ //编辑初始化
|
|
|
+ bjcsh(){
|
|
|
+ this.ClaimsruleForm={
|
|
|
+ id:0,
|
|
|
+ groupId:'',
|
|
|
+ quantity:0,
|
|
|
+ reason:'',
|
|
|
+ remark:'',
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //编辑领用
|
|
|
+ Editentryreceive(val){
|
|
|
+ var url = "/api/PersonnelModule/GoodsReceiveInfo/"+val.id+"?portType=1"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'get',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' +that.token
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ var datainfo=res.data.data;
|
|
|
+ that.ClaimsruleForm.id=datainfo.id;
|
|
|
+ that.ClaimsruleForm.groupId=datainfo.groupId;
|
|
|
+ that.ClaimsruleForm.quantity=datainfo.quantity;
|
|
|
+ that.ClaimsruleForm.reason=datainfo.reason;
|
|
|
+ that.ClaimsruleForm.remark=datainfo.remark;
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ }).catch(function (error) {
|
|
|
+ that.$message.error("操作错误，联系信息部!");
|
|
|
+ });
|
|
|
+ },
|
|
|
+ //删除领用
|
|
|
+ Deleteintolibraryreceive(row){
|
|
|
+ this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ var url = "/api/PersonnelModule/GoodsReceiveDel/"+row.id
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'delete',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' +that.token
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ that.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: res.data.msg
|
|
|
+ });
|
|
|
+ that.GoodsReceiveList({'id':that.ID});
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ }).catch(function (error) {
|
|
|
+ that.$message.error("操作错误，联系信息部!");
|
|
|
+ });
|
|
|
+
|
|
|
+ }).catch(() => {
|
|
|
+ this.$message({
|
|
|
+ type: 'info',
|
|
|
+ message: '已取消删除'
|
|
|
+ });
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
mounted(){
|
|
|
this.Userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
|
|
|
@@ -891,7 +1122,7 @@ export default {
|
|
|
.warehousingsrule-input .el-select{
|
|
|
width: 100%;
|
|
|
}
|
|
|
-.warehousingsrule-table .all-box .el-table th.el-table__cell>.cell{
|
|
|
+.warehousingsrule-table .el-table th.el-table__cell>.cell{
|
|
|
text-align: center;
|
|
|
font-size: 12px;
|
|
|
}
|
|
|
@@ -927,4 +1158,15 @@ export default {
|
|
|
.Claimitem-input .el-form-item__error{
|
|
|
top: 82%;
|
|
|
}
|
|
|
+.claimitem-table .el-table th.el-table__cell>.cell{
|
|
|
+ text-align: center;
|
|
|
+ font-size: 12px;
|
|
|
+}
|
|
|
+.claimitem-table .el-table td.el-table__cell div{
|
|
|
+ font-size: 12px;
|
|
|
+}
|
|
|
+.claimitem-table .block{
|
|
|
+ text-align: center;
|
|
|
+ margin-top: 10px;
|
|
|
+}
|
|
|
</style>
|
