|
|
@@ -1,5 +1,22 @@
|
|
|
<template>
|
|
|
- <div class="app-container">
|
|
|
+ <div>
|
|
|
+ <el-breadcrumb separator="/">
|
|
|
+ <el-breadcrumb-item
|
|
|
+ ><span style="font-weight: 700">入库</span></el-breadcrumb-item
|
|
|
+ >
|
|
|
+ <el-breadcrumb-item
|
|
|
+ ><span style="font-weight: 700">入库详情页</span></el-breadcrumb-item
|
|
|
+ >
|
|
|
+ </el-breadcrumb>
|
|
|
+ <br />
|
|
|
+ <div>
|
|
|
+ <el-popconfirm title="是否确认离开此页面？" @confirm="changeShow">
|
|
|
+ <el-button slot="reference" size="mini" icon="el-icon-arrow-left"
|
|
|
+ >返回列表</el-button
|
|
|
+ >
|
|
|
+ </el-popconfirm>
|
|
|
+ </div>
|
|
|
+ <br />
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
@@ -755,17 +772,22 @@
|
|
|
@click="printZyd"
|
|
|
>作业单
|
|
|
</el-button>
|
|
|
- <el-button size="small" :disabled="browseStatus"
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ @click="discharge"
|
|
|
>叫车进场</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
size="small"
|
|
|
:disabled="dataListSelection.length <= 0 || browseStatus"
|
|
|
+ @click="creditClick"
|
|
|
>入库确认
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
size="small"
|
|
|
:disabled="dataWithdrawList.length <= 0 || browseStatus"
|
|
|
+ @click.prevent="withdrawClick"
|
|
|
>撤回入库
|
|
|
</el-button>
|
|
|
<el-dropdown @command="handleCommand" style="margin-left: 10px">
|
|
|
@@ -783,7 +805,6 @@
|
|
|
</el-dropdown>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- {{detailList}}
|
|
|
<el-table
|
|
|
:data="detailList"
|
|
|
tooltip-effect="dark"
|
|
|
@@ -972,7 +993,20 @@
|
|
|
scope.row.fBillstatus === 30 ||
|
|
|
scope.row.fBillstatus === 40
|
|
|
"
|
|
|
- @click.native.prevent="wDeleteRow(scope.$index, dataList)"
|
|
|
+ type="text"
|
|
|
+ @click.native.prevent="fixRow(scope.row, scope.$index)"
|
|
|
+ size="small"
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ :disabled="
|
|
|
+ browseStatus ||
|
|
|
+ scope.row.fBillstatus === 20 ||
|
|
|
+ scope.row.fBillstatus === 30 ||
|
|
|
+ scope.row.fBillstatus === 40
|
|
|
+ "
|
|
|
+ type="text"
|
|
|
+ @click.native.prevent="wDeleteRow(scope.$index, detailList)"
|
|
|
size="small"
|
|
|
>移除</el-button
|
|
|
>
|
|
|
@@ -1010,7 +1044,7 @@
|
|
|
</el-collapse-item>
|
|
|
</el-collapse>
|
|
|
<el-dialog
|
|
|
- title="入库明细"
|
|
|
+ :title="title"
|
|
|
:visible.sync="weightList"
|
|
|
width="80%"
|
|
|
:close-on-click-modal="false"
|
|
|
@@ -1245,7 +1279,12 @@
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button type="info" @click="imporTable">导入库存明细</el-button>
|
|
|
+ <el-button v-if="fixdetaiNum == null" type="info" @click="imporTable"
|
|
|
+ >导入库存明细</el-button
|
|
|
+ >
|
|
|
+ <el-button v-else type="info" @click="fiximporTable"
|
|
|
+ >确认修改</el-button
|
|
|
+ >
|
|
|
<el-button @click="weightList = false">取 消</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
@@ -1348,6 +1387,187 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
|
+ :visible.sync="print_shd"
|
|
|
+ width="70%"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :modal="false"
|
|
|
+ >
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
+ <div
|
|
|
+ class="print-title"
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ font-size: 24px;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ "
|
|
|
+ >
|
|
|
+ {{ company }}有限公司收货单
|
|
|
+ </div>
|
|
|
+ <div class="print_table" style="display: flex">
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
+ <tr>
|
|
|
+ <td>车号</td>
|
|
|
+ <td>{{ fTruckno }}</td>
|
|
|
+ <td>日期</td>
|
|
|
+ <td>{{ fBsdate }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
+ <td>货物品名</td>
|
|
|
+ <td>{{ item.fGoodsids }}</td>
|
|
|
+ <td>件数</td>
|
|
|
+ <td>{{ item.fQty }}件</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>备注</td>
|
|
|
+ <td colspan="3"></td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>司机签字</td>
|
|
|
+ <td></td>
|
|
|
+ <td>司机电话</td>
|
|
|
+ <td>{{ fDriverTel }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>制单人</td>
|
|
|
+ <td>{{ form.createBy }}</td>
|
|
|
+ <td>收货人</td>
|
|
|
+ <td>{{ form.fContacts }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>地址</td>
|
|
|
+ <td>{{ stockaddr }}</td>
|
|
|
+ <td>电话</td>
|
|
|
+ <td>{{ form.fTel }}</td>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" :disabled="browseStatus" @click="addprint"
|
|
|
+ >打印
|
|
|
+ </el-button>
|
|
|
+ <el-button @click="print_shd = false">取消 </el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="print_rkd"
|
|
|
+ width="70%"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :modal="false"
|
|
|
+ >
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
+ <div
|
|
|
+ class="print-title"
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ font-size: 24px;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ "
|
|
|
+ >
|
|
|
+ {{ company }}有限公司进仓单
|
|
|
+ </div>
|
|
|
+ <div class="print_table" style="display: flex">
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
+ <tr>
|
|
|
+ <td>货权方</td>
|
|
|
+ <td>{{ form.fCorpidName }}</td>
|
|
|
+ <td>仓库</td>
|
|
|
+ <td>{{ form.fWarehouseids }}</td>
|
|
|
+ <td>地址</td>
|
|
|
+ <td colspan="2">{{ stockaddr }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>保管方</td>
|
|
|
+ <td width="200">{{ company }}有限公司</td>
|
|
|
+ <td>联系人</td>
|
|
|
+ <td>{{ form.fContacts }}</td>
|
|
|
+ <td>电话</td>
|
|
|
+ <td colspan="2">{{ form.fTel }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>提单号</td>
|
|
|
+ <td>品名</td>
|
|
|
+ <td>箱型</td>
|
|
|
+ <td>品牌</td>
|
|
|
+ <td>件数</td>
|
|
|
+ <td>重量</td>
|
|
|
+ <td>包装规格</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>序号</td>
|
|
|
+ <td>入货日期</td>
|
|
|
+ <td>箱量(20GP)</td>
|
|
|
+ <td>重量</td>
|
|
|
+ <td>件数</td>
|
|
|
+ <td>入库重量</td>
|
|
|
+ <td>入库件数</td>
|
|
|
+ </tr>
|
|
|
+ <tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
+ <td>{{ index + 1 }}</td>
|
|
|
+ <td>{{ item.fBsdate }}</td>
|
|
|
+ <td>{{ item.fCntqty }}</td>
|
|
|
+ <td v-if="item.fGrossweight">
|
|
|
+ {{ (item.fGrossweight / 1000).toFixed(2) }}
|
|
|
+ </td>
|
|
|
+ <td v-else></td>
|
|
|
+ <td>{{ item.fPlanqty }}</td>
|
|
|
+ <td v-if="item.fNetweight">
|
|
|
+ {{ (item.fNetweight / 1000).toFixed(2) }}
|
|
|
+ </td>
|
|
|
+ <td v-else></td>
|
|
|
+ <td>{{ item.fQty }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td colspan="2">合计</td>
|
|
|
+ <td>{{ allfCntqty }}</td>
|
|
|
+ <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
|
|
|
+ <td>{{ allfPlanqty }}</td>
|
|
|
+ <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
|
|
|
+ <td>{{ allfQty }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>备注</td>
|
|
|
+ <td colspan="6"></td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td colspan="7">
|
|
|
+ 本进仓单经仓管员签字并经保管方盖章后即专项作为货物所有人的货权证明，本单据不得转让。
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
+ >
|
|
|
+ <div>开单员：</div>
|
|
|
+ <div style="width: 150px">仓管员：</div>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
+ >
|
|
|
+ <div>开单时间：</div>
|
|
|
+ <div style="width: 150px">(盖章)</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" :disabled="browseStatus" @click="addprint"
|
|
|
+ >打印
|
|
|
+ </el-button>
|
|
|
+ <el-button @click="print_rkd = false">取消 </el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog
|
|
|
:visible.sync="print_lhd"
|
|
|
width="70%"
|
|
|
:close-on-click-modal="false"
|
|
|
@@ -1428,7 +1648,7 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td colspan="2">合计：</td>
|
|
|
- <td>{{ allFqty }}</td>
|
|
|
+ <td>{{ allfQty }}</td>
|
|
|
<td></td>
|
|
|
<td></td>
|
|
|
<td></td>
|
|
|
@@ -1510,7 +1730,7 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td colspan="5">合计：</td>
|
|
|
- <td>{{ allFqty }}</td>
|
|
|
+ <td>{{ allfQty }}</td>
|
|
|
<td>{{ allfGrossweight }}</td>
|
|
|
<td>{{ allfNetweight }}</td>
|
|
|
<td></td>
|
|
|
@@ -1559,9 +1779,7 @@
|
|
|
>
|
|
|
<div>入 库 单</div>
|
|
|
</div>
|
|
|
- <div
|
|
|
- style="display: flex; justify-content: flex-end; margin-bottom: 5px"
|
|
|
- >
|
|
|
+ <div style="display: flex; margin-bottom: 5px">
|
|
|
<div>
|
|
|
<div>报关单号：{{ form.fCustomno }}</div>
|
|
|
<div>存货地点：</div>
|
|
|
@@ -1675,7 +1893,7 @@
|
|
|
<td>总毛重</td>
|
|
|
<td colspan="2">{{ form.fPlangrossweight }}</td>
|
|
|
<td>本垛件数</td>
|
|
|
- <td colspan="2">{{ allFqty }}</td>
|
|
|
+ <td colspan="2">{{ allfQty }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>本垛净重</td>
|
|
|
@@ -1759,6 +1977,12 @@ import Cookies from "js-cookie";
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
export default {
|
|
|
name: "inStock",
|
|
|
+ props: {
|
|
|
+ chiId: {
|
|
|
+ type: Number,
|
|
|
+ required: null,
|
|
|
+ },
|
|
|
+ },
|
|
|
components: {
|
|
|
UploadFile,
|
|
|
},
|
|
|
@@ -1806,6 +2030,7 @@ export default {
|
|
|
fDriverName: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fDriverTel: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fDriverIdCar: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ fCntrno: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
},
|
|
|
browseStatus: false,
|
|
|
formBrowseStatus: false,
|
|
|
@@ -1830,33 +2055,9 @@ export default {
|
|
|
fSbuOptions: [],
|
|
|
Pledgebank: [],
|
|
|
collapselist: ["1"],
|
|
|
- dataListSelection: [],
|
|
|
- dataWithdrawList: [],
|
|
|
fStorageTypeOptions: [],
|
|
|
weightList: false,
|
|
|
- importList: {
|
|
|
- fBillstatus: null,
|
|
|
- fMblno: null,
|
|
|
- fQty: null,
|
|
|
- fNetweight: null,
|
|
|
- fGrossweight: null,
|
|
|
- fBsdate: null,
|
|
|
- fGoodsid: null,
|
|
|
- fBusinessType: null,
|
|
|
- fMarks: null,
|
|
|
- fWarehouseInformation: null,
|
|
|
- fCntrtype: null,
|
|
|
- fCntqty: null,
|
|
|
- fPackagespecs: null,
|
|
|
- fTruckno: null,
|
|
|
- fDriverName: null,
|
|
|
- fDriverTel: null,
|
|
|
- fDriverIdCar: null,
|
|
|
- fSerialNumber: null,
|
|
|
- fCntrno: null,
|
|
|
- fGoodsval: null,
|
|
|
- remark: null,
|
|
|
- },
|
|
|
+ importList: {},
|
|
|
headers: {
|
|
|
Authorization: "Bearer " + getToken(),
|
|
|
},
|
|
|
@@ -1873,18 +2074,22 @@ export default {
|
|
|
print_dpxx: false,
|
|
|
company: "",
|
|
|
Printinglist: [],
|
|
|
- //垛位
|
|
|
- allFqty: "",
|
|
|
- //本垛毛重
|
|
|
- allfNetweight: "",
|
|
|
- //本垛净重
|
|
|
- allfGrossweight: "",
|
|
|
//库位
|
|
|
stockName: "",
|
|
|
//库位地址
|
|
|
stockaddr: "",
|
|
|
Collectionoptionss: [],
|
|
|
fDriverTel: "",
|
|
|
+ fBsdate: "",
|
|
|
+ fTruckno: "",
|
|
|
+ allfCntqty: 0,
|
|
|
+ allfGrossweight: 0,
|
|
|
+ allfPlanqty: 0,
|
|
|
+ allfNetweight: 0,
|
|
|
+ allfQty: 0,
|
|
|
+ fixdetaiNum: null,
|
|
|
+ dataListSelection: [],
|
|
|
+ dataWithdrawList: [],
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -1919,13 +2124,6 @@ export default {
|
|
|
});
|
|
|
this.company = localStorage.getItem("companyName");
|
|
|
this.queryUser();
|
|
|
- if(this.$route.query.id){
|
|
|
- this.getForm();
|
|
|
- }else{
|
|
|
- this.resetForm("form");
|
|
|
- this.resetForm("importList");
|
|
|
- this.detailList=[]
|
|
|
- }
|
|
|
},
|
|
|
filters: {
|
|
|
fStorageFormat(row) {
|
|
|
@@ -1948,22 +2146,167 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
- // 收款选
|
|
|
- Collectionoptions(selection) {
|
|
|
- this.Collectionoptionss = selection;
|
|
|
- for (let lest in this.fWbuOptions) {
|
|
|
- for (let li in this.Collectionoptionss) {
|
|
|
+ init() {
|
|
|
+ this.resetForm("form");
|
|
|
+ this.resetForm("importList");
|
|
|
+ this.detailList = [];
|
|
|
+ this.getForm();
|
|
|
+ },
|
|
|
+ reset() {
|
|
|
+ this.importList = {
|
|
|
+ fBillstatus: null,
|
|
|
+ fMblno: null,
|
|
|
+ fQty: null,
|
|
|
+ fNetweight: null,
|
|
|
+ fGrossweight: null,
|
|
|
+ fBsdate: null,
|
|
|
+ fGoodsid: null,
|
|
|
+ fBusinessType: null,
|
|
|
+ fMarks: null,
|
|
|
+ fWarehouseInformation: null,
|
|
|
+ fCntrtype: null,
|
|
|
+ fCntqty: null,
|
|
|
+ fPackagespecs: null,
|
|
|
+ fTruckno: null,
|
|
|
+ fDriverName: null,
|
|
|
+ fDriverTel: null,
|
|
|
+ fDriverIdCar: null,
|
|
|
+ fSerialNumber: null,
|
|
|
+ fCntrno: null,
|
|
|
+ fGoodsval: null,
|
|
|
+ remark: null,
|
|
|
+ title:""
|
|
|
+ };
|
|
|
+ },
|
|
|
+ discharge() {
|
|
|
+ if (this.Printinglist.length > 0) {
|
|
|
+ for (let item in this.Printinglist) {
|
|
|
+ if (this.Printinglist[item].fBillstatus === 10) {
|
|
|
+ return this.$message.error("请先打印作业单");
|
|
|
+ }
|
|
|
+ if (this.Printinglist[item].fBillstatus >= 30) {
|
|
|
+ return this.$message.error("请勿重复卸货");
|
|
|
+ }
|
|
|
if (
|
|
|
- this.fWbuOptions[lest].fId === this.Collectionoptionss[li].fFeeid
|
|
|
+ this.Printinglist[item].ifCntrno == 1 &&
|
|
|
+ !this.Printinglist[item].fCntrno
|
|
|
) {
|
|
|
- this.$set(
|
|
|
- this.Collectionoptionss[li],
|
|
|
- "fFeeids",
|
|
|
- this.fWbuOptions[lest].fName
|
|
|
+ return this.$message.error(
|
|
|
+ "请输入第" + (Number(item) + 1) + "行的箱号"
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsitems",
|
|
|
+ JSON.stringify(this.Printinglist)
|
|
|
+ );
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+ disChargelist(formData).then((response) => {
|
|
|
+ if ((response.code = 200)) {
|
|
|
+ this.detailList.map((e, index) => {
|
|
|
+ response.data.warehousebillsitems.map((item) => {
|
|
|
+ if (e.fId == item.fId) {
|
|
|
+ e = item;
|
|
|
+ this.$set(this.detailList, index, e);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ this.msgSuccess("卸货成功");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.$message.error("请选择需要卸货的明细!");
|
|
|
+ }
|
|
|
+ },
|
|
|
+ creditClick() {
|
|
|
+ for (let item in this.Printinglist) {
|
|
|
+ if (!this.Printinglist[item].fId) {
|
|
|
+ return this.$message.error("请存在未保存的数据");
|
|
|
+ }
|
|
|
+ if (this.Printinglist[item].fBillstatus == 10) {
|
|
|
+ return this.$message.error("请存在未打印的作业单");
|
|
|
+ }
|
|
|
+ if (this.Printinglist[item].fBillstatus == 20) {
|
|
|
+ return this.$message.error("请存在未卸货的数据");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(this.Printinglist));
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ formData.append("whgenleg", JSON.stringify(this.relevantAttachments));
|
|
|
+ addWhgenleg(formData).then((response) => {
|
|
|
+ if ((response.code = 200)) {
|
|
|
+ this.detailList.map((e, index) => {
|
|
|
+ response.data.warehousebillsitems.map((item) => {
|
|
|
+ if (e.fId == item.fId) {
|
|
|
+ e = item;
|
|
|
+ this.$set(this.detailList, index, e);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ this.msgSuccess("入库成功");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 撤回入账
|
|
|
+ withdrawClick() {
|
|
|
+ for (let item in this.Printinglist) {
|
|
|
+ if (!this.Printinglist[item].fId) {
|
|
|
+ return this.$message.error("请存在未保存的数据");
|
|
|
+ }
|
|
|
+ if (this.Printinglist[item].fBillstatus == 10) {
|
|
|
+ return this.$message.error("请存在未打印的作业单");
|
|
|
+ }
|
|
|
+ if (this.Printinglist[item].fBillstatus == 20) {
|
|
|
+ return this.$message.error("请存在未卸货的数据");
|
|
|
+ }
|
|
|
+ if (this.Printinglist[item].fBillstatus == 30) {
|
|
|
+ return this.$message.error("请存在未入库的数据");
|
|
|
+ }
|
|
|
}
|
|
|
+ // 撤回入库
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(this.Printinglist));
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ updateCredit(formData).then((response) => {
|
|
|
+ this.detailList.map((e, index) => {
|
|
|
+ response.data.warehousebillsitems.map((item) => {
|
|
|
+ if (e.fId == item.fId) {
|
|
|
+ e = item;
|
|
|
+ this.$set(this.detailList, index, e);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ this.msgSuccess("撤回成功");
|
|
|
+ });
|
|
|
},
|
|
|
fStorageTypeFormat(row) {
|
|
|
let fStorageType;
|
|
|
@@ -1992,7 +2335,7 @@ export default {
|
|
|
return timeFormat;
|
|
|
},
|
|
|
getForm() {
|
|
|
- getWarehousebills(this.$route.query.id).then((response) => {
|
|
|
+ getWarehousebills(this.chiId).then((response) => {
|
|
|
this.form = response.data.warehousebills;
|
|
|
this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
|
|
|
@@ -2067,8 +2410,8 @@ export default {
|
|
|
});
|
|
|
} else {
|
|
|
this.mblnoStatus = "";
|
|
|
- this.form=response.data.warehouseBills
|
|
|
- this.detailList=response.data.warehousebillsitems
|
|
|
+ this.form = response.data.warehouseBills;
|
|
|
+ this.detailList = response.data.warehousebillsitems;
|
|
|
this.msgSuccess("保存成功");
|
|
|
}
|
|
|
});
|
|
|
@@ -2109,38 +2452,24 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+
|
|
|
+ fiximporTable() {
|
|
|
+ this.detailList[this.fixdetaiNum] = this.importList;
|
|
|
+ this.weightList = false;
|
|
|
+ },
|
|
|
// 库存明细多选
|
|
|
Selectinventory(selection) {
|
|
|
this.Printinglist = selection;
|
|
|
+ //允许确认入库list
|
|
|
this.dataListSelection = [];
|
|
|
+ this.dataListSelection = selection.filter((e) => e.fBillstatus == 30);
|
|
|
+ //允许撤销入库list
|
|
|
this.dataWithdrawList = [];
|
|
|
- if (!selection || selection.length === 0) {
|
|
|
- return false;
|
|
|
- } else {
|
|
|
- for (let se in selection) {
|
|
|
- if (!selection[se].fBillstatus || selection[se].fBillstatus !== 40) {
|
|
|
- this.dataListSelection.push(selection[se]);
|
|
|
- } else if (
|
|
|
- selection[se].fBillstatus &&
|
|
|
- selection[se].fBillstatus === 40
|
|
|
- ) {
|
|
|
- this.dataWithdrawList.push(selection[se]);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- // 打印回显仓库
|
|
|
- for (let corp in this.warehouseOptions) {
|
|
|
- this.fAddr = this.warehouseOptions[corp].fAddr;
|
|
|
- }
|
|
|
- // 合计
|
|
|
- this.allFqty = 0;
|
|
|
- this.allfGrossweight = 0;
|
|
|
- this.allfNetweight = 0;
|
|
|
- for (let corp in this.Printinglist) {
|
|
|
- this.allFqty += this.Printinglist[corp].fQty;
|
|
|
- this.allfGrossweight += this.Printinglist[corp].fGrossweight;
|
|
|
- this.allfNetweight += this.Printinglist[corp].fNetweight;
|
|
|
- }
|
|
|
+ this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 40);
|
|
|
+ console.log("ruku");
|
|
|
+ console.log(this.dataListSelection);
|
|
|
+ console.log("chexiao");
|
|
|
+ console.log(this.dataWithdrawList);
|
|
|
},
|
|
|
// 合计
|
|
|
getSummaries(param) {
|
|
|
@@ -2169,25 +2498,11 @@ export default {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
const value = Number(curr);
|
|
|
if (!isNaN(value)) {
|
|
|
- if (column.property === "fGrossweight") {
|
|
|
- this.fGrossweight = prev + curr;
|
|
|
- }
|
|
|
- if (column.property === "fNetweight") {
|
|
|
- this.fNetweight = prev + curr;
|
|
|
- }
|
|
|
if (column.property === "fQty") {
|
|
|
- this.fQty = prev + curr;
|
|
|
this.sumMum = prev + curr;
|
|
|
}
|
|
|
- if (column.property === "fCntqty") {
|
|
|
- this.fCntqty = prev + curr;
|
|
|
- }
|
|
|
return prev + curr;
|
|
|
} else {
|
|
|
- if (column.property === "fQty") {
|
|
|
- this.fQty = prev;
|
|
|
- this.mum = prev;
|
|
|
- }
|
|
|
return prev;
|
|
|
}
|
|
|
}, 0);
|
|
|
@@ -2225,7 +2540,9 @@ export default {
|
|
|
addRelevant() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- this.resetForm("importList");
|
|
|
+ this.title="新增"
|
|
|
+ this.reset();
|
|
|
+ this.fixdetaiNum = null;
|
|
|
if (
|
|
|
!this.form.fPlannetweight ||
|
|
|
!this.form.fPlangrossweight ||
|
|
|
@@ -2263,40 +2580,76 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
printZyd() {
|
|
|
- for (let item in this.Printinglist) {
|
|
|
- if (!this.Printinglist[item].fId) {
|
|
|
- return this.$message.error("请先保存!");
|
|
|
+ if (this.Printinglist.length > 0) {
|
|
|
+ for (let item in this.Printinglist) {
|
|
|
+ if (!this.Printinglist[item].fId) {
|
|
|
+ return this.$message.error("请先保存!");
|
|
|
+ }
|
|
|
+ if (
|
|
|
+ this.Printinglist[item].fTruckno !== this.Printinglist[0].fTruckno
|
|
|
+ ) {
|
|
|
+ return this.$message.error("请选择车相同车号");
|
|
|
+ }
|
|
|
}
|
|
|
+ this.print_zyd = true;
|
|
|
+ this.warehouseOptions.map((e) => {
|
|
|
+ if (e.fId == this.form.fWarehouseid) {
|
|
|
+ this.stockaddr = e.fAddr;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.fDriverTel = this.Printinglist[0].fDriverTel;
|
|
|
+ } else {
|
|
|
+ this.$message.error("请选择需要打印的明细!");
|
|
|
}
|
|
|
- this.print_zyd = true;
|
|
|
- this.warehouseOptions.map((e) => {
|
|
|
- if (e.fId == this.form.fWarehouseid) {
|
|
|
- this.stockaddr = e.fAddr;
|
|
|
- }
|
|
|
- });
|
|
|
- this.fDriverTel = this.Printinglist[0].fDriverTel;
|
|
|
},
|
|
|
handleCommand(command) {
|
|
|
- for (let corp in this.fMblnoOptions) {
|
|
|
- if (this.form.fCorpid === this.fMblnoOptions[corp].fId) {
|
|
|
- this.$set(this.form, "fCorpidName", this.fMblnoOptions[corp].fName);
|
|
|
- }
|
|
|
- }
|
|
|
- this.warehouseOptions.map((e) => {
|
|
|
- if (e.fId == this.form.fWarehouseid) {
|
|
|
- this.stockName = e.fName;
|
|
|
- this.stockaddr = e.fAddr;
|
|
|
- }
|
|
|
- });
|
|
|
- this.fDriverTel = this.Printinglist[0].fDriverTel;
|
|
|
- console.log(this.fDriverTel);
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
+ for (let corp in this.fMblnoOptions) {
|
|
|
+ if (this.form.fCorpid === this.fMblnoOptions[corp].fId) {
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fCorpidName",
|
|
|
+ this.fMblnoOptions[corp].fName
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.warehouseOptions.map((e) => {
|
|
|
+ if (e.fId == this.form.fWarehouseid) {
|
|
|
+ this.stockName = e.fName;
|
|
|
+ this.stockaddr = e.fAddr;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.fDriverTel = this.Printinglist[0].fDriverTel;
|
|
|
+ this.fBsdate = this.Printinglist[0].fBsdate;
|
|
|
+ this.fTruckno = this.Printinglist[0].fTruckno;
|
|
|
+ this.allfCntqty = 0;
|
|
|
+ this.allfGrossweight = 0;
|
|
|
+ this.allfPlanqty = 0;
|
|
|
+ this.allfNetweight = 0;
|
|
|
+ this.allfQty = 0;
|
|
|
+ this.Printinglist.map((e) => {
|
|
|
+ if (e.fCntqty) {
|
|
|
+ this.allfCntqty += e.fCntqty;
|
|
|
+ }
|
|
|
+ if (e.fGrossweight) {
|
|
|
+ this.allfGrossweight += e.fGrossweight;
|
|
|
+ }
|
|
|
+ if (e.fPlanqty) {
|
|
|
+ this.allfPlanqty += e.fPlanqty;
|
|
|
+ }
|
|
|
+ if (e.fNetweight) {
|
|
|
+ this.allfNetweight += e.fNetweight;
|
|
|
+ }
|
|
|
+ if (e.fQty) {
|
|
|
+ this.allfQty += e.fQty;
|
|
|
+ }
|
|
|
+ });
|
|
|
if (command == "a") {
|
|
|
- this.showEditDialog_ss();
|
|
|
+ this.print_shd = true;
|
|
|
} else if (command == "b") {
|
|
|
- this.showEditDialog_s();
|
|
|
+ this.print_rkd = true;
|
|
|
} else if (command == "c") {
|
|
|
this.print_lhd = true;
|
|
|
} else if (command == "d") {
|
|
|
@@ -2320,9 +2673,27 @@ export default {
|
|
|
var obj = {};
|
|
|
this.CntrTable.push(obj);
|
|
|
},
|
|
|
+ fixRow(row, index) {
|
|
|
+ this.title="修改"
|
|
|
+ this.reset();
|
|
|
+ this.fixdetaiNum=null;
|
|
|
+ this.fixdetaiNum = index;
|
|
|
+ row.fBsdate = new Date(row.fBsdate).getTime();
|
|
|
+ this.importList = row;
|
|
|
+ this.weightList = true;
|
|
|
+ },
|
|
|
deleteRow(index, rows) {
|
|
|
rows.splice(index, 1);
|
|
|
},
|
|
|
+ wDeleteRow(index, rows) {
|
|
|
+ rows.splice(index, 1);
|
|
|
+ this.sumMum = 0;
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ if (e.fQty) {
|
|
|
+ this.sumMum += e.fQty;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
//获取登陆人
|
|
|
queryUser() {
|
|
|
queryUserVal().then((response) => {
|
|
|
@@ -2461,7 +2832,10 @@ export default {
|
|
|
if (status == "zyd") {
|
|
|
let formData = new window.FormData();
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
- formData.append("warehousebillsitems", JSON.stringify(this.detailList));
|
|
|
+ formData.append(
|
|
|
+ "warehousebillsitems",
|
|
|
+ JSON.stringify(this.Printinglist)
|
|
|
+ );
|
|
|
formData.append(
|
|
|
"warehousebillsfeesDr",
|
|
|
JSON.stringify(this.warehouseDrList)
|
|
|
@@ -2472,7 +2846,14 @@ export default {
|
|
|
);
|
|
|
formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
addJoblist(formData).then((response) => {
|
|
|
- console.log(response);
|
|
|
+ this.detailList.map((e, index) => {
|
|
|
+ response.data.warehousebillsitems.map((item) => {
|
|
|
+ if (e.fId == item.fId) {
|
|
|
+ e = item;
|
|
|
+ this.$set(this.detailList, index, e);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
});
|
|
|
}
|
|
|
const style =
|
|
|
@@ -2485,82 +2866,15 @@ export default {
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
},
|
|
|
- // // 打印作业单
|
|
|
- // addList() {
|
|
|
- // this.$refs["form"].validate((valid) => {
|
|
|
- // if (valid) {
|
|
|
- // let dataList = [];
|
|
|
- // for (let se in this.dataListSelection) {
|
|
|
- // if (Number(this.dataListSelection[se].fBillstatus) <= 10) {
|
|
|
- // dataList.push(this.dataListSelection[se]);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // if (dataList.length !== 0) {
|
|
|
- // let formData = new window.FormData();
|
|
|
- // formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
- // formData.append("warehousebillsitems", JSON.stringify(dataList));
|
|
|
- // formData.append(
|
|
|
- // "warehousebillsfeesDr",
|
|
|
- // JSON.stringify(this.warehouseDrList)
|
|
|
- // );
|
|
|
- // formData.append(
|
|
|
- // "warehousebillsfeesCr",
|
|
|
- // JSON.stringify(this.warehouseCrList)
|
|
|
- // );
|
|
|
- // formData.append(
|
|
|
- // "tEnclosure",
|
|
|
- // JSON.stringify(this.relevantAttachments)
|
|
|
- // );
|
|
|
-
|
|
|
- // addJoblist(formData).then((response) => {
|
|
|
- // if (response.code == 200) {
|
|
|
- // for (let li in response.data.warehousebillsitems) {
|
|
|
- // for (let item in this.Printinglist) {
|
|
|
- // // if (this.Printinglist[item].fId == response.data.warehousebillsitems[li].fId) {
|
|
|
- // // this.Printinglist[item] = response.data.warehousebillsitems[li]
|
|
|
- // // }
|
|
|
- // if (!this.Printinglist[0].fSerialNumber) {
|
|
|
- // this.fSerialNumber =
|
|
|
- // response.data.warehousebillsitems[0].fSerialNumber;
|
|
|
- // } else {
|
|
|
- // this.fSerialNumber = this.Printinglist[0].fSerialNumber;
|
|
|
- // }
|
|
|
- // }
|
|
|
- // for (let index in this.dataList) {
|
|
|
- // if (
|
|
|
- // response.data.warehousebillsitems[li].fId ==
|
|
|
- // this.dataList[index].fId
|
|
|
- // ) {
|
|
|
- // this.dataList[index].fSerialNumber =
|
|
|
- // response.data.warehousebillsitems[li].fSerialNumber;
|
|
|
- // this.dataList[index].fBillstatus =
|
|
|
- // response.data.warehousebillsitems[li].fBillstatus;
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
- // this.print_zyd = false;
|
|
|
-
|
|
|
- // setTimeout(function () {
|
|
|
- // const style =
|
|
|
- // "@media print { .print-div{ border:none;padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center;border:1px solid #000}}";
|
|
|
- // print({
|
|
|
- // printable: "print_area1",
|
|
|
- // type: "html",
|
|
|
- // style: style, // 亦可使用引入的外部css;
|
|
|
- // scanStyles: false,
|
|
|
- // });
|
|
|
- // this.print_zyd = false;
|
|
|
- // }, 100);
|
|
|
- // } else {
|
|
|
- // return;
|
|
|
- // }
|
|
|
- // });
|
|
|
- // } else {
|
|
|
- // this.printSomething2();
|
|
|
- // }
|
|
|
- // }
|
|
|
- // });
|
|
|
- // },
|
|
|
+ changeShow(status) {
|
|
|
+ if (status == "save") {
|
|
|
+ this.saveForm();
|
|
|
+ }
|
|
|
+ this.resetForm("form");
|
|
|
+ this.resetForm("importList");
|
|
|
+ this.detailList = [];
|
|
|
+ this.$emit("changeShow", "true");
|
|
|
+ },
|
|
|
},
|
|
|
watch: {
|
|
|
// 监听 addOrUpdateVisible 改变
|
qukaidi