|
@@ -742,17 +742,15 @@
|
|
|
</el-form>
|
|
|
|
|
|
<div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
|
|
|
-
|
|
|
+
|
|
|
<div>
|
|
|
<el-button type="primary" :disabled="browseStatus" @click.prevent="addRelevant()"
|
|
|
>新行
|
|
|
</el-button>
|
|
|
- <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()"
|
|
|
+ <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick"
|
|
|
>入库确认
|
|
|
</el-button>
|
|
|
- <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRoww(warehouseDrList)"
|
|
|
- >删除
|
|
|
- </el-button> -->
|
|
|
+ <el-button :disabled="dataWithdrawList.length <= 0" @click.prevent="withdrawClick">撤回入库</el-button>
|
|
|
<el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
</div>
|
|
|
<div>
|
|
@@ -1479,7 +1477,7 @@
|
|
|
<!-- <el-button type="warning">仓储费协议</el-button> -->
|
|
|
<el-button type="danger">作业费协议</el-button></div>
|
|
|
<div style="font-size:18px">付款信息</div>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="warehouseCrList"
|
|
@@ -2104,6 +2102,7 @@
|
|
|
import print from "print-js";
|
|
|
import {
|
|
|
addWhgenleg,
|
|
|
+ updateCredit,
|
|
|
listWarehousebills,
|
|
|
getWarehousebills,
|
|
|
delWarehousebills,
|
|
@@ -2196,6 +2195,8 @@ export default {
|
|
|
whgenlegTotal: 0,
|
|
|
// 库存明细入账数组
|
|
|
dataListSelection: [],
|
|
|
+ // 库存明细撤回入账数组
|
|
|
+ dataWithdrawList: [],
|
|
|
fSbuOptions: [],
|
|
|
// 操作员
|
|
|
userOptions: [],
|
|
@@ -2664,11 +2665,13 @@ export default {
|
|
|
for (let se in selection) {
|
|
|
if (!selection[se].fBillstatus || selection[se].fBillstatus !== '6') {
|
|
|
this.dataListSelection.push(selection[se]);
|
|
|
+ } else if (selection[se].fBillstatus && selection[se].fBillstatus === '6') {
|
|
|
+ this.dataWithdrawList.push(selection[se])
|
|
|
}
|
|
|
}
|
|
|
if (this.dataListSelection.length > 0) {
|
|
|
this.fTruckno = selection[0].fTruckno;
|
|
|
- this.fCntrtype = selection[0].fCntrtype;
|
|
|
+ this.fCntrtype = selection[0].fCntrtype;
|
|
|
this.fGoodsids = selection[0].fGoodsids;
|
|
|
var date = new Date(selection[0].fBsdate)
|
|
|
var Y = date.getFullYear() + '-'
|
|
@@ -2777,11 +2780,6 @@ export default {
|
|
|
this.title = "修改仓入库";
|
|
|
});
|
|
|
},
|
|
|
- // 库存明细多选框结果
|
|
|
- dataListChange (row) {
|
|
|
- console.log(JSON.stringify(row))
|
|
|
- this.dataListSelection = row
|
|
|
- },
|
|
|
// 库存总账多选框
|
|
|
whgenlegSelectionChange(selection) {
|
|
|
this.dialogWhgenlegList = selection;
|
|
@@ -2908,13 +2906,6 @@ export default {
|
|
|
}
|
|
|
this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
|
|
|
},
|
|
|
- changefBsdate(row) {
|
|
|
- if (this.dataList.length > 0) {
|
|
|
- for (var i = 0; i < this.dataList.length; i++) {
|
|
|
- this.$set(this.dataList[i], "fBsdate", row);
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
changefCorpid(row) {
|
|
|
this.$set(row, "fSbu", row.fCorpid);
|
|
|
},
|
|
@@ -2998,6 +2989,32 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 撤回入账
|
|
|
+ withdrawClick() {
|
|
|
+ // 撤回入库
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form))
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(this.dataWithdrawList))
|
|
|
+ updateCredit(formData).then((response) => {
|
|
|
+ this.fid = response.data;
|
|
|
+ this.formBrowseStatus = false
|
|
|
+ this.msgSuccess("撤销入账成功");
|
|
|
+ this.$refs.table.clearSelection();
|
|
|
+ for (let li in this.dataWithdrawList) {
|
|
|
+ for (let i in this.dataList) {
|
|
|
+ let fQty = this.dataList[i].fQty === this.dataWithdrawList[li].fQty;
|
|
|
+ let fBsdate = this.dataList[i].fBsdate === this.dataWithdrawList[li].fBsdate;
|
|
|
+ let fGoodsid = this.dataList[i].fGoodsid === this.dataWithdrawList[li].fGoodsid;
|
|
|
+ let fcntrtype = this.dataList[i].fcntrtype === this.dataWithdrawList[li].fcntrtype;
|
|
|
+ let fNetweight = this.dataList[i].fNetweight === this.dataWithdrawList[li].fNetweight;
|
|
|
+ let fGrossweight = this.dataList[i].fGrossweight === this.dataWithdrawList[li].fGrossweight;
|
|
|
+ if (fBsdate && fGoodsid && fcntrtype && fGrossweight && fNetweight && fQty) {
|
|
|
+ this.$set(this.dataList[i], 'fBillstatus', '1')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
/** 提交按钮 */
|
|
|
submitForm(status) {
|
|
|
this.$refs["form"].validate((valid) => {
|