|
|
@@ -43,7 +43,8 @@
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
- @keyup.enter.native="handleQuery">
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ >
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
@@ -696,8 +697,10 @@
|
|
|
border
|
|
|
stripe
|
|
|
:summary-method="getSummaries"
|
|
|
+ @selection-change="Selectinventory"
|
|
|
show-summary
|
|
|
>
|
|
|
+ <el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="序号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1314,7 +1317,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.remarks"
|
|
|
+ v-model="scope.row.Remarks"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="备注"
|
|
|
show-word-limit
|
|
|
@@ -1578,6 +1581,13 @@
|
|
|
@click="showEditDialog_s"
|
|
|
>入库单
|
|
|
</el-button>
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ size="mini"
|
|
|
+ prop="打印"
|
|
|
+ @click="showEditDialog_sss"
|
|
|
+ >作业单
|
|
|
+ </el-button>
|
|
|
<el-button type="primary" @click="submitForm(2)">暂 存</el-button>
|
|
|
<el-button type="primary" @click="submitForm(6)">提 交</el-button>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
@@ -1602,7 +1612,7 @@
|
|
|
class="zzss"
|
|
|
style="font-size: 28px; font-weight: bold; border: none"
|
|
|
>
|
|
|
- 青岛大木进进仓单
|
|
|
+ 青岛大木进仓单
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
@@ -1616,17 +1626,17 @@
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td width="450" colspan="2" class="zzss">货权方：某某有限公司</td>
|
|
|
- <td width="450" colspan="2" class="zzss">仓库：某某3号大仓</td>
|
|
|
+ <td width="450" colspan="2" class="zzss">货权方：{{form.fCorpid}}</td>
|
|
|
+ <td width="450" colspan="2" class="zzss">仓库：{{form.fWarehouseid}}</td>
|
|
|
<td width="450" colspan="3" class="zzss">
|
|
|
地址：青岛市市北区郑州路1344号
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td width="200" colspan="2" class="zzss">保管方：某某有限公司</td>
|
|
|
- <td width="200" colspan="2" class="zzss">联系人：张三</td>
|
|
|
+ <td width="200" colspan="2" class="zzss">保管方：大木有限公司</td>
|
|
|
+ <td width="200" colspan="2" class="zzss">联系人：{{form.fContacts}}</td>
|
|
|
<td width="200" colspan="3" class="zzss">
|
|
|
- 电话：0532-561651561-546
|
|
|
+ 电话：{{form.fTel}}
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
@@ -1639,9 +1649,9 @@
|
|
|
<td width="100">包装规格</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td width="100">56165654555</td>
|
|
|
- <td width="100">某某商品</td>
|
|
|
- <td width="100">20GP</td>
|
|
|
+ <td width="100">{{form.fMblno}}</td>
|
|
|
+ <td width="100">{{fGoodsids}}</td>
|
|
|
+ <td width="100">{{fCntrtype}}</td>
|
|
|
<td width="100">某某</td>
|
|
|
<td width="100">包</td>
|
|
|
<td width="100">吨</td>
|
|
|
@@ -1656,76 +1666,22 @@
|
|
|
<td width="100">入库重量</td>
|
|
|
<td width="100">入库件数</td>
|
|
|
</tr>
|
|
|
- <tr>
|
|
|
+ <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
<td width="100">1</td>
|
|
|
- <td width="100">2020-11-20</td>
|
|
|
- <td width="100">10</td>
|
|
|
- <td width="100">100</td>
|
|
|
- <td width="100">10000</td>
|
|
|
- <td width="100">20</td>
|
|
|
- <td width="100">3000</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td width="100">2</td>
|
|
|
- <td width="100">2020-11-20</td>
|
|
|
- <td width="100">10</td>
|
|
|
- <td width="100">100</td>
|
|
|
- <td width="100">10000</td>
|
|
|
- <td width="100">20</td>
|
|
|
- <td width="100">3000</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td width="100">3</td>
|
|
|
- <td width="100">2020-11-20</td>
|
|
|
- <td width="100">10</td>
|
|
|
- <td width="100">100</td>
|
|
|
- <td width="100">10000</td>
|
|
|
- <td width="100">20</td>
|
|
|
- <td width="100">3000</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td width="100">4</td>
|
|
|
- <td width="100">2020-11-20</td>
|
|
|
- <td width="100">10</td>
|
|
|
- <td width="100">100</td>
|
|
|
- <td width="100">10000</td>
|
|
|
- <td width="100">20</td>
|
|
|
- <td width="100">3000</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td width="100">5</td>
|
|
|
- <td width="100">2020-11-20</td>
|
|
|
- <td width="100">10</td>
|
|
|
- <td width="100">100</td>
|
|
|
- <td width="100">10000</td>
|
|
|
- <td width="100">20</td>
|
|
|
- <td width="100">3000</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td width="100">6</td>
|
|
|
- <td width="100">2020-11-20</td>
|
|
|
- <td width="100">10</td>
|
|
|
- <td width="100">100</td>
|
|
|
- <td width="100">10000</td>
|
|
|
- <td width="100">20</td>
|
|
|
- <td width="100">3000</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td width="100">7</td>
|
|
|
- <td width="100">2020-11-20</td>
|
|
|
- <td width="100">10</td>
|
|
|
- <td width="100">100</td>
|
|
|
- <td width="100">10000</td>
|
|
|
- <td width="100">20</td>
|
|
|
- <td width="100">3000</td>
|
|
|
+ <td width="100">{{item.fBsdate}}</td>
|
|
|
+ <td width="100">{{item.fCntqty}}</td>
|
|
|
+ <td width="100">{{item.fGrossweight}}</td>
|
|
|
+ <td width="100">{{item.fPlanqty}}</td>
|
|
|
+ <td width="100">{{item.fNetweight}}</td>
|
|
|
+ <td width="100">{{item.fQty}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="100" colspan="2">合计：</td>
|
|
|
- <td width="100">10</td>
|
|
|
- <td width="100">100</td>
|
|
|
- <td width="100">10000</td>
|
|
|
- <td width="100">20</td>
|
|
|
- <td width="100">3000</td>
|
|
|
+ <td width="100">{{fCntqty}}</td>
|
|
|
+ <td width="100">{{fGrossweight}}</td>
|
|
|
+ <td width="100">{{fPlanqty}}</td>
|
|
|
+ <td width="100">{{fNetweight}}</td>
|
|
|
+ <td width="100">{{fQty}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="100">备注：</td>
|
|
|
@@ -1768,6 +1724,92 @@
|
|
|
id="print_area"
|
|
|
class="biaoge zzss"
|
|
|
border="1"
|
|
|
+ style="border-collapse: collapse; border: none;margin-top;100px;"
|
|
|
+ >
|
|
|
+ <tr>
|
|
|
+ <td
|
|
|
+ width="1400"
|
|
|
+ colspan="6"
|
|
|
+ class="zzss"
|
|
|
+ style="font-size: 26px; font-weight: bold; border: none"
|
|
|
+ >
|
|
|
+ 大木国际物流(青岛)有限公司收货单
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <!-- <div v-for="{{}}" :key="index"> -->
|
|
|
+ <tr>
|
|
|
+ <td width="400">车号:</td>
|
|
|
+ <td width="400">{{fTruckno}}</td>
|
|
|
+ <td
|
|
|
+ width="500"
|
|
|
+ colspan="2"
|
|
|
+ style="padding-bottom: 0px; font-weight: bold; border: none"
|
|
|
+ class="zzss"
|
|
|
+ >
|
|
|
+ 日期：
|
|
|
+ </td>
|
|
|
+ <td
|
|
|
+ width="500"
|
|
|
+ colspan="2"
|
|
|
+ style="padding-bottom: 0px; font-weight: bold; border: none"
|
|
|
+ class="zzss"
|
|
|
+ >
|
|
|
+ {{fBsdate}}
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
+ <td width="250">货物品名:</td>
|
|
|
+ <td width="250">{{item.fGoodsids}}</td>
|
|
|
+ <td width="250">白色聚吕</td>
|
|
|
+ <!-- <td width="200" colspan="2">件数: 161件</td> -->
|
|
|
+ <!-- <td width="200"></td> -->
|
|
|
+ <td width="200" colspan="4" class="zzss">件数: {{item.fQty}}件</td>
|
|
|
+ </tr>
|
|
|
+ <!-- <tr>
|
|
|
+ <td width="1400" colspan="6"> </td>
|
|
|
+ </tr> -->
|
|
|
+ <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
+ <td>备注:</td>
|
|
|
+ <td colspan="5">{{item.remark}}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>司机签字:</td>
|
|
|
+ <td></td>
|
|
|
+ <td colspan="2">司机电话:</td>
|
|
|
+ <td colspan="2">{{form.fTel}}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>制单人:</td>
|
|
|
+ <td>{{form.createBy}}</td>
|
|
|
+ <td colspan="2">收货人:</td>
|
|
|
+ <td colspan="2">{{form.fContacts}}</td>
|
|
|
+ </tr>
|
|
|
+ <!-- <tr>
|
|
|
+ <td colspan="6" class="zzss"> </td>
|
|
|
+ </tr> -->
|
|
|
+ <tr>
|
|
|
+ <td width="280" class="zzss"></td>
|
|
|
+ <td width="280" class="zzss"></td>
|
|
|
+ <td width="280" class="zzss"></td>
|
|
|
+ <td width="280" class="zzss"></td>
|
|
|
+ <td width="290" class="zzss">地址：淮河东路96号</td>
|
|
|
+ <td width="290" class="zzss">电话：{{form.fTel}}</td>
|
|
|
+ </tr>
|
|
|
+ <!-- </div> -->
|
|
|
+ </table>
|
|
|
+ <button @click="printSomething">打印</button>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ title="收货单打印"
|
|
|
+ style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
|
|
|
+ :visible.sync="editDialogVisible_sss"
|
|
|
+ width="70%"
|
|
|
+ :modal="false"
|
|
|
+ >
|
|
|
+ <table
|
|
|
+ id="print_area"
|
|
|
+ class="biaoge zzss"
|
|
|
+ border="1"
|
|
|
style="border-collapse: collapse; border: none"
|
|
|
>
|
|
|
<tr>
|
|
|
@@ -1777,7 +1819,7 @@
|
|
|
class="zzss"
|
|
|
style="font-size: 28px; font-weight: bold; border: none"
|
|
|
>
|
|
|
- 大木国际物流(青岛)有限公司收货单
|
|
|
+ 大木国际物流(青岛)有限公司作业单
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
@@ -1883,6 +1925,10 @@ export default {
|
|
|
// 修改查看状态
|
|
|
browseStatus: false,
|
|
|
detailsHidden: false,
|
|
|
+ fTruckno: '',
|
|
|
+ fBsdate: '',
|
|
|
+ fCntrtype: '',
|
|
|
+ fGoodsids: '',
|
|
|
fPlangrossweight: "",
|
|
|
fPlannetweight: "",
|
|
|
fPlanvolumn: "",
|
|
|
@@ -1898,6 +1944,7 @@ export default {
|
|
|
loading: true,
|
|
|
// 选中数组
|
|
|
ids: [],
|
|
|
+ Printinglist: [],
|
|
|
userVal: {
|
|
|
userName: null,
|
|
|
nickName: null,
|
|
|
@@ -1907,6 +1954,7 @@ export default {
|
|
|
// 添加用户对话框
|
|
|
editDialogVisible_s: false,
|
|
|
editDialogVisible_ss: false,
|
|
|
+ editDialogVisible_sss: false,
|
|
|
editDialogClosed_ss: false,
|
|
|
dataList: [],
|
|
|
warehouseCrList: [],
|
|
|
@@ -2142,11 +2190,15 @@ export default {
|
|
|
},
|
|
|
// 收货单打印界面
|
|
|
showEditDialog_s() {
|
|
|
+ console.log(this.form)
|
|
|
this.editDialogVisible_s = true;
|
|
|
},
|
|
|
showEditDialog_ss() {
|
|
|
this.editDialogVisible_ss = true;
|
|
|
},
|
|
|
+ showEditDialog_sss() {
|
|
|
+ this.editDialogVisible_sss = true;
|
|
|
+ },
|
|
|
// 收款信息
|
|
|
addCollection() {
|
|
|
this.warehouseDrList.push({
|
|
|
@@ -2289,15 +2341,15 @@ export default {
|
|
|
fCntrtype: null,
|
|
|
fCntqty: null,
|
|
|
};
|
|
|
- this.fMblnoOptions = []
|
|
|
- this.userOptions = []
|
|
|
- this.warehouseOptions = []
|
|
|
- this.fSbuOptions = []
|
|
|
- this.goodsOptions = []
|
|
|
- this.kqhouseOptions = []
|
|
|
- this.relevantAttachments = []
|
|
|
- this.KHblnoOptions = []
|
|
|
- this.fWbuOptions = []
|
|
|
+ this.fMblnoOptions = [];
|
|
|
+ this.userOptions = [];
|
|
|
+ this.warehouseOptions = [];
|
|
|
+ this.fSbuOptions = [];
|
|
|
+ this.goodsOptions = [];
|
|
|
+ this.kqhouseOptions = [];
|
|
|
+ this.relevantAttachments = [];
|
|
|
+ this.KHblnoOptions = [];
|
|
|
+ this.fWbuOptions = [];
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
@@ -2312,10 +2364,23 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
+ console.log(selection);
|
|
|
this.ids = selection.map((item) => item.fId);
|
|
|
this.single = selection.length !== 1;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
+ // 库存明细多选
|
|
|
+ Selectinventory(selection) {
|
|
|
+ console.log(selection);
|
|
|
+ this.Printinglist = selection;
|
|
|
+ if (this.Printinglist.length > 0) {
|
|
|
+ this.fTruckno = selection[0].fTruckno;
|
|
|
+ this.fBsdate = selection[0].fBsdate;
|
|
|
+ this.fCntrtype = selection[0].fCntrtype;
|
|
|
+ this.fGoodsids = selection[0].fGoodsids;
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd(status) {
|
|
|
this.browseStatus = status;
|
|
|
@@ -2330,31 +2395,31 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
- console.log(status)
|
|
|
+ console.log(status);
|
|
|
this.browseStatus = status;
|
|
|
this.reset();
|
|
|
const fId = row.fId || this.ids;
|
|
|
getWarehousebills(fId).then((response) => {
|
|
|
- if(response.data.warehousebills){
|
|
|
+ if (response.data.warehousebills) {
|
|
|
this.form = response.data.warehousebills;
|
|
|
}
|
|
|
- if(response.data.corps){
|
|
|
+ if (response.data.corps) {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
this.KHblnoOptions = response.data.corps;
|
|
|
this.fSbuOptions = response.data.corps;
|
|
|
- }
|
|
|
- if(response.data.feesList){
|
|
|
- this.fWbuOptions = response.data.feesList;
|
|
|
- }
|
|
|
- if(response.data.warehouse){
|
|
|
- this.warehouseOptions = response.data.warehouse;
|
|
|
- }
|
|
|
- if(response.data.warehouseBillsItem) {
|
|
|
- this.dataList = response.data.warehouseBillsItem;
|
|
|
- }
|
|
|
- if(response.data.enclosures) {
|
|
|
- this.relevantAttachments = response.data.enclosures;
|
|
|
- }
|
|
|
+ }
|
|
|
+ if (response.data.feesList) {
|
|
|
+ this.fWbuOptions = response.data.feesList;
|
|
|
+ }
|
|
|
+ if (response.data.warehouse) {
|
|
|
+ this.warehouseOptions = response.data.warehouse;
|
|
|
+ }
|
|
|
+ if (response.data.warehouseBillsItem) {
|
|
|
+ this.dataList = response.data.warehouseBillsItem;
|
|
|
+ }
|
|
|
+ if (response.data.enclosures) {
|
|
|
+ this.relevantAttachments = response.data.enclosures;
|
|
|
+ }
|
|
|
this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
|
|
|
this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
this.$set(this.form, "createTime", Date.parse(this.form.createTime));
|
|
|
@@ -2551,154 +2616,151 @@ export default {
|
|
|
/** 提交按钮 */
|
|
|
submitForm(status) {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
- if(status === 2) {
|
|
|
- console.log("@@")
|
|
|
- console.log(this.form)
|
|
|
- console.log(this.dataList)
|
|
|
- console.log(this.warehouseCrList)
|
|
|
- console.log(this.warehouseDrList)
|
|
|
+ if (status === 2) {
|
|
|
+ console.log("@@");
|
|
|
+ console.log(this.form);
|
|
|
+ console.log(this.dataList);
|
|
|
+ console.log(this.warehouseCrList);
|
|
|
+ console.log(this.warehouseDrList);
|
|
|
if (valid) {
|
|
|
- this.form.fBillstatus = status;
|
|
|
- this.form.fNetweight = this.fNetweight;
|
|
|
- this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
- this.form.fPlannetweight = this.fPlannetweight;
|
|
|
- this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
- this.form.fPlanqty = this.fPlanqty;
|
|
|
- this.form.fGrossweight = this.fGrossweight;
|
|
|
- this.form.fQty = this.fQty;
|
|
|
- let formData = new window.FormData();
|
|
|
- // 附件数据
|
|
|
- formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
- // 库存明细
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsitems",
|
|
|
- JSON.stringify(this.dataList)
|
|
|
- );
|
|
|
- // 附件数据
|
|
|
- formData.append(
|
|
|
- "tWhgenleg",
|
|
|
- JSON.stringify(this.relevantAttachments)
|
|
|
- );
|
|
|
- // 费用明细付款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesCr",
|
|
|
- JSON.stringify(this.warehouseCrList)
|
|
|
- );
|
|
|
- // 收款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesDr",
|
|
|
- JSON.stringify(this.warehouseDrList)
|
|
|
- );
|
|
|
- addWarehousebills(formData).then((response) => {
|
|
|
- this.msgSuccess("提交成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- }else {
|
|
|
- if (this.dataList.length === 0) {
|
|
|
- this.$message.error("请添加库存明细!");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (this.relevantAttachments.length === 0) {
|
|
|
- this.$message.error("请添加附件上传!");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (this.warehouseDrList.length === 0) {
|
|
|
- this.$message.error("请添加收款信息!");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (this.warehouseCrList.length === 0) {
|
|
|
- this.$message.error("请添加付款信息!");
|
|
|
- return false;
|
|
|
- }
|
|
|
- for (let list in this.dataList) {
|
|
|
- if (!this.dataList[list].fGoodsid) {
|
|
|
- this.$message.error("请输入品名!");
|
|
|
- return false;
|
|
|
+ this.form.fBillstatus = status;
|
|
|
+ this.form.fNetweight = this.fNetweight;
|
|
|
+ this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
+ this.form.fPlannetweight = this.fPlannetweight;
|
|
|
+ this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
+ this.form.fPlanqty = this.fPlanqty;
|
|
|
+ this.form.fGrossweight = this.fGrossweight;
|
|
|
+ this.form.fQty = this.fQty;
|
|
|
+ let formData = new window.FormData();
|
|
|
+ // 附件数据
|
|
|
+ formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
+ // 库存明细
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsitems",
|
|
|
+ JSON.stringify(this.dataList)
|
|
|
+ );
|
|
|
+ // 附件数据
|
|
|
+ formData.append(
|
|
|
+ "tWhgenleg",
|
|
|
+ JSON.stringify(this.relevantAttachments)
|
|
|
+ );
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+ // 收款
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ addWarehousebills(formData).then((response) => {
|
|
|
+ this.msgSuccess("提交成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
}
|
|
|
- if (!this.dataList[list].fWarehouselocid) {
|
|
|
- this.$message.error("请输入库区!");
|
|
|
+ } else {
|
|
|
+ if (this.dataList.length === 0) {
|
|
|
+ this.$message.error("请添加库存明细!");
|
|
|
return false;
|
|
|
}
|
|
|
- }
|
|
|
- for (let relevant in this.relevantAttachments) {
|
|
|
- if (!this.relevantAttachments[relevant].fName) {
|
|
|
- this.$message.error("请输入附件名称!");
|
|
|
+ if (this.relevantAttachments.length === 0) {
|
|
|
+ this.$message.error("请添加附件上传!");
|
|
|
return false;
|
|
|
}
|
|
|
- }
|
|
|
- for (let warehouseDr in this.warehouseDrList) {
|
|
|
- if (!this.warehouseDrList[warehouseDr].fCorpid) {
|
|
|
- this.$message.error("请选择客户名称");
|
|
|
+ if (this.warehouseDrList.length === 0) {
|
|
|
+ this.$message.error("请添加收款信息!");
|
|
|
return false;
|
|
|
}
|
|
|
- if (!this.warehouseDrList[warehouseDr].fFeeid) {
|
|
|
- this.$message.error("请选择费用名称");
|
|
|
+ if (this.warehouseCrList.length === 0) {
|
|
|
+ this.$message.error("请添加付款信息!");
|
|
|
return false;
|
|
|
}
|
|
|
- if (!this.warehouseDrList[warehouseDr]) {
|
|
|
- this.$message.error("请选择收款计费单位");
|
|
|
- return false;
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ if (!this.dataList[list].fGoodsid) {
|
|
|
+ this.$message.error("请输入品名!");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.dataList[list].fWarehouselocid) {
|
|
|
+ this.$message.error("请输入库区!");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- for (let warehouseCr in this.warehouseCrList) {
|
|
|
- if (!this.warehouseCrList[warehouseCr].fCorpid) {
|
|
|
- this.$message.error("请选择客户名称");
|
|
|
- return false;
|
|
|
+ for (let relevant in this.relevantAttachments) {
|
|
|
+ if (!this.relevantAttachments[relevant].fName) {
|
|
|
+ this.$message.error("请输入附件名称!");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|
|
|
- if (!this.warehouseCrList[warehouseCr].fFeeid) {
|
|
|
- this.$message.error("请选择费用名称");
|
|
|
- return false;
|
|
|
+ for (let warehouseDr in this.warehouseDrList) {
|
|
|
+ if (!this.warehouseDrList[warehouseDr].fCorpid) {
|
|
|
+ this.$message.error("请选择客户名称");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.warehouseDrList[warehouseDr].fFeeid) {
|
|
|
+ this.$message.error("请选择费用名称");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.warehouseDrList[warehouseDr]) {
|
|
|
+ this.$message.error("请选择收款计费单位");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|
|
|
- if (!this.warehouseCrList[warehouseCr].fFeeUnitid) {
|
|
|
- this.$message.error("请选择付款计费单位");
|
|
|
- return false;
|
|
|
+ for (let warehouseCr in this.warehouseCrList) {
|
|
|
+ if (!this.warehouseCrList[warehouseCr].fCorpid) {
|
|
|
+ this.$message.error("请选择客户名称");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.warehouseCrList[warehouseCr].fFeeid) {
|
|
|
+ this.$message.error("请选择费用名称");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.warehouseCrList[warehouseCr].fFeeUnitid) {
|
|
|
+ this.$message.error("请选择付款计费单位");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (valid) {
|
|
|
+ this.form.fBillstatus = status;
|
|
|
+ this.form.fNetweight = this.fNetweight;
|
|
|
+ this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
+ this.form.fPlannetweight = this.fPlannetweight;
|
|
|
+ this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
+ this.form.fPlanqty = this.fPlanqty;
|
|
|
+ this.form.fGrossweight = this.fGrossweight;
|
|
|
+ this.form.fQty = this.fQty;
|
|
|
+ console.log(this.amt);
|
|
|
+ let formData = new window.FormData();
|
|
|
+ // 附件数据
|
|
|
+ formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
+ // 库存明细
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsitems",
|
|
|
+ JSON.stringify(this.dataList)
|
|
|
+ );
|
|
|
+ // 附件数据
|
|
|
+ formData.append(
|
|
|
+ "tWhgenleg",
|
|
|
+ JSON.stringify(this.relevantAttachments)
|
|
|
+ );
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsfeesCr",
|
|
|
+ JSON.stringify(this.warehouseCrList)
|
|
|
+ );
|
|
|
+ // 收款
|
|
|
+ formData.append(
|
|
|
+ "tWarehousebillsfeesDr",
|
|
|
+ JSON.stringify(this.warehouseDrList)
|
|
|
+ );
|
|
|
+ addWarehousebills(formData).then((response) => {
|
|
|
+ this.msgSuccess("提交成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
- if (valid) {
|
|
|
- this.form.fBillstatus = status;
|
|
|
- this.form.fNetweight = this.fNetweight;
|
|
|
- this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
- this.form.fPlannetweight = this.fPlannetweight;
|
|
|
- this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
- this.form.fPlanqty = this.fPlanqty;
|
|
|
- this.form.fGrossweight = this.fGrossweight;
|
|
|
- this.form.fQty = this.fQty;
|
|
|
- console.log(this.amt);
|
|
|
- let formData = new window.FormData();
|
|
|
- // 附件数据
|
|
|
- formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
- // 库存明细
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsitems",
|
|
|
- JSON.stringify(this.dataList)
|
|
|
- );
|
|
|
- // 附件数据
|
|
|
- formData.append(
|
|
|
- "tWhgenleg",
|
|
|
- JSON.stringify(this.relevantAttachments)
|
|
|
- );
|
|
|
- // 费用明细付款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesCr",
|
|
|
- JSON.stringify(this.warehouseCrList)
|
|
|
- );
|
|
|
- // 收款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesDr",
|
|
|
- JSON.stringify(this.warehouseDrList)
|
|
|
- );
|
|
|
- addWarehousebills(formData).then((response) => {
|
|
|
- this.msgSuccess("提交成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
});
|
|
|
},
|
|
|
/** 删除按钮操作 */
|
|
|
@@ -2828,7 +2890,7 @@ export default {
|
|
|
text-align: center;
|
|
|
}
|
|
|
.biaoge > tr > td {
|
|
|
- height: 30px;
|
|
|
+ height: 50px;
|
|
|
text-align: center;
|
|
|
border-right: 1px solid #dfe6ec !important;
|
|
|
order-bottom: 1px solid #dfe6ec !important;
|
tong