|
|
@@ -23,7 +23,14 @@
|
|
|
<div class="batchcollection-search-li">
|
|
|
<label>备注:</label>
|
|
|
<el-input size="small" style="width: 300px" placeholder="请输入备注"
|
|
|
- v-model="BatchRequestinfo.remark"></el-input>
|
|
|
+ v-model="BatchRequestinfo.remark"></el-input>
|
|
|
+ </div>
|
|
|
+ <div class="batchcollection-search-li" style="display: flex;margin-top: 10px;">
|
|
|
+ <label>是否归还:</label>
|
|
|
+ <div style="width: 300px;margin-left: 6px;">
|
|
|
+ <el-radio v-model="BatchRequestinfo.isReplace" :label=true>是</el-radio>
|
|
|
+ <el-radio v-model="BatchRequestinfo.isReplace" :label=false>否</el-radio>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="batchcollection-table">
|
|
|
@@ -563,6 +570,12 @@
|
|
|
<el-form-item label="领用原因" prop="reason">
|
|
|
<el-input size="small" placeholder="请输入领用原因" v-model="ClaimsruleForm.reason"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="是否归还">
|
|
|
+ <el-radio-group v-model="ClaimsruleForm.isReplace">
|
|
|
+ <el-radio :label=true>是</el-radio>
|
|
|
+ <el-radio :label=false>否</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input size="small" placeholder="请输入备注" v-model="ClaimsruleForm.remark"></el-input>
|
|
|
@@ -842,6 +855,7 @@ export default {
|
|
|
quantity:0,
|
|
|
reason:'',
|
|
|
remark:'',
|
|
|
+ isReplace:false
|
|
|
},
|
|
|
Claimrules:{
|
|
|
groupId: [
|
|
|
@@ -917,6 +931,7 @@ export default {
|
|
|
BatchRequestinfo:{
|
|
|
id:0,
|
|
|
groupId:'',
|
|
|
+ isReplace:false,
|
|
|
reason:'',
|
|
|
remark:'',
|
|
|
},
|
|
|
@@ -1694,6 +1709,7 @@ export default {
|
|
|
quantity:that.ClaimsruleForm.quantity,
|
|
|
reason:that.ClaimsruleForm.reason,
|
|
|
remark:that.ClaimsruleForm.remark,
|
|
|
+ isReplace:that.ClaimsruleForm.isReplace,
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
if (res.data.code == 200) {
|
|
|
@@ -1718,6 +1734,7 @@ export default {
|
|
|
quantity:0,
|
|
|
reason:'',
|
|
|
remark:'',
|
|
|
+ isReplace:false,
|
|
|
}
|
|
|
},
|
|
|
//编辑领用
|
|
|
@@ -1917,6 +1934,7 @@ export default {
|
|
|
id:0,
|
|
|
groupId:'',
|
|
|
reason:'',
|
|
|
+ isReplace:false,
|
|
|
remark:'',
|
|
|
}
|
|
|
this.BatchRequestParameters=[
|
|
|
@@ -1945,7 +1963,8 @@ export default {
|
|
|
that.BatchRequestinfo.id=GoodsReceiveBatchInfos.id;
|
|
|
that.BatchRequestinfo.groupId=GoodsReceiveBatchInfos.groupId;
|
|
|
that.BatchRequestinfo.reason=GoodsReceiveBatchInfos.reason;
|
|
|
- that.BatchRequestinfo.remark=GoodsReceiveBatchInfos.remark;
|
|
|
+ that.BatchRequestinfo.reason=GoodsReceiveBatchInfos.reason;
|
|
|
+ that.BatchRequestinfo.isReplace=GoodsReceiveBatchInfos.isReplace;
|
|
|
that.BatchRequestParameters=GoodsReceiveBatchInfos.receiveDetails;
|
|
|
that.activeIndex='1';
|
|
|
}else{
|
|
|
@@ -1980,6 +1999,7 @@ export default {
|
|
|
groupId: that.BatchRequestinfo.groupId,
|
|
|
receiveDetails: that.BatchRequestParameters,
|
|
|
reason: that.BatchRequestinfo.reason,
|
|
|
+ isReplace: that.BatchRequestinfo.isReplace,
|
|
|
remark:that.BatchRequestinfo.remark,
|
|
|
currUserId:that.Userid,
|
|
|
}
|
|
|
@@ -2217,6 +2237,7 @@ export default {
|
|
|
.batchcollection-search{
|
|
|
margin-bottom: 15px;
|
|
|
display: flex;
|
|
|
+ flex-wrap: wrap;
|
|
|
justify-content: space-between;
|
|
|
}
|
|
|
.batchcollectiondialog .el-dialog__body{
|
