|
|
@@ -820,13 +820,28 @@
|
|
|
prop="fCntqty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- label="箱量"
|
|
|
+ label="计划毛重"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
- v-model="scope.row.fCntqty"
|
|
|
- placeholder="箱量"
|
|
|
+ v-model="scope.row.fPlangrossweight"
|
|
|
+ placeholder="计划毛重"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fplannetweight"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="计划净重"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
+ v-model="scope.row.fplannetweight"
|
|
|
+ placeholder="计划净重"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -865,13 +880,28 @@
|
|
|
prop="Fqty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- label="件数"
|
|
|
+ label="入库毛重"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.Fqty"
|
|
|
- :disabled="browseStatus"
|
|
|
- placeholder="备注"
|
|
|
+ oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
+ v-model="scope.row.fGrossweight"
|
|
|
+ placeholder="入库毛重"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fnetweight"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="入库净重"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
+ v-model="scope.row.fNetweight"
|
|
|
+ placeholder="入库净重"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -942,9 +972,9 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.Fdelete"
|
|
|
- :disabled="browseStatus"
|
|
|
- placeholder="备注"
|
|
|
+ oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
+ v-model="scope.row.fGoodsval"
|
|
|
+ placeholder="货值"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1233,7 +1263,21 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fDC"
|
|
|
+ prop="remarks"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="备注"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.remarks"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="备注"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="收、付"
|
|
|
@@ -1503,7 +1547,21 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fDC"
|
|
|
+ prop="remarks"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="备注"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.remarks"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="备注"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="收、付"
|
|
|
@@ -2217,65 +2275,98 @@ export default {
|
|
|
this.open = true;
|
|
|
this.title = "添加仓库主(出入库)";
|
|
|
},
|
|
|
- /** 修改按钮操作 */
|
|
|
- handleUpdate(row) {
|
|
|
- console.log(row);
|
|
|
- this.reset();
|
|
|
- const fId = row.fid || this.ids;
|
|
|
- getWarehousebills(row.fid).then((response) => {
|
|
|
- console.log(response);
|
|
|
- this.form = response.data.warehousebills;
|
|
|
- console.log(JSON.stringify(this.form));
|
|
|
- this.open = true;
|
|
|
- this.title = "修改仓库主(出入库)";
|
|
|
- });
|
|
|
- },
|
|
|
- /** 提交按钮 */
|
|
|
- submitForm() {
|
|
|
- this.$refs["form"].validate((valid) => {
|
|
|
- if (valid) {
|
|
|
- // let formData = new FormData()
|
|
|
- // console.log(JSON.stringify(this.form));
|
|
|
- // formData.append('tWarehouseBills', JSON.stringify(this.formData))
|
|
|
- let formData = new window.FormData();
|
|
|
- // 附件数据
|
|
|
- formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
- console.log(JSON.stringify(this.form));
|
|
|
- // 附件数据
|
|
|
- console.log(JSON.stringify(this.dataList));
|
|
|
- formData.append("tWhgenleg", null);
|
|
|
- console.log(JSON.stringify(this.dataList));
|
|
|
- // // 费用明细付款
|
|
|
- formData.append("tWarehousebillsfeesCr", JSON.stringify(this.form));
|
|
|
- // // 收款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesDr",
|
|
|
- JSON.stringify(this.CollectionList)
|
|
|
- );
|
|
|
- // // 库存明细
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsitems",
|
|
|
- JSON.stringify(this.dataList)
|
|
|
- );
|
|
|
-
|
|
|
- // 附件数据
|
|
|
- // formData.append('tWhgenleg', dataForm)
|
|
|
- // // 费用明细付款
|
|
|
- // formData.append('tWarehousebillsfeesCr', dataForm)
|
|
|
- // // 收款
|
|
|
- // formData.append('tWarehousebillsfeesDr"', dataForm)
|
|
|
- // // 库存明细
|
|
|
- // formData.append('tWarehousebillsitems', dataForm)
|
|
|
-
|
|
|
- addWarehousebills(formData).then((response) => {
|
|
|
- console.log(response);
|
|
|
- this.msgSuccess("新增成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
- },
|
|
|
+
|
|
|
+ /** 修改按钮操作 */
|
|
|
+ handleUpdate(row) {
|
|
|
+ this.reset();
|
|
|
+ const fId = row.fid || this.ids;
|
|
|
+ getWarehousebills(row.fid).then((response) => {
|
|
|
+ this.form = response.data.warehousebills;
|
|
|
+ this.$set(this.form, 'fCorpid', response.data.warehousebills.fcorpid)
|
|
|
+ this.$set(this.form, 'fWarehouseid', response.data.warehousebills.fwarehouseid)
|
|
|
+ this.$set(this.form, 'fContacts', response.data.warehousebills.fcontacts)
|
|
|
+ this.$set(this.form, 'fTel', response.data.warehousebills.ftel)
|
|
|
+ this.$set(this.form, 'fMblno', response.data.warehousebills.fmblno)
|
|
|
+ this.$set(this.form, 'fBsdate', Date.parse(response.data.warehousebills.fbsdate))
|
|
|
+ this.$set(this.form, 'fStorekeeper', response.data.warehousebills.fstorekeeper)
|
|
|
+ this.$set(this.form, 'createBy', response.data.warehousebills.createBy)
|
|
|
+ this.$set(this.form, 'fDeptid', response.data.warehousebills.fdeptid)
|
|
|
+ this.$set(this.form, 'fDilldate', Date.parse(response.data.warehousebills.fbilldate))
|
|
|
+ this.$set(this.form, 'fVslvoy', response.data.warehousebills.fvslvoy)
|
|
|
+ this.$set(this.form, 'fEta', Date.parse(response.data.warehousebills.feta))
|
|
|
+ this.$set(this.form, 'createTime', Date.parse(response.data.warehousebills.createTime))
|
|
|
+ this.$set(this.form, 'fTrademodeid', response.data.warehousebills.ftrademodeid + '')
|
|
|
+ this.$set(this.form, 'fBillingway', response.data.warehousebills.fbillingway + '')
|
|
|
+ this.$set(this.form, 'fFeetunit', response.data.warehousebills.ffeetunit + '')
|
|
|
+ this.$set(this.form, 'fBscorpno', response.data.warehousebills.fbscorpno)
|
|
|
+ this.$set(this.form, 'fCustomno', response.data.warehousebills.fcustomno)
|
|
|
+ this.$set(this.form, 'fStltypeid', response.data.warehousebills.fstltypeid + '')
|
|
|
+ this.$set(this.form, 'fIfweigh', response.data.warehousebills.fifweigh + '')
|
|
|
+ this.$set(this.form, 'fIfdamage', response.data.warehousebills.fifdamage + '')
|
|
|
+ this.$set(this.form, 'fSbu', response.data.warehousebills.fsbu)
|
|
|
+ this.$set(this.form, 'fIfpledge', response.data.warehousebills.fifpledge + '')
|
|
|
+ this.$set(this.form, 'fBankcorpid', response.data.warehousebills.fbankcorpid)
|
|
|
+ this.$set(this.form, 'remark', response.data.warehousebills.remark)
|
|
|
+ this.deptOptions = []
|
|
|
+ this.deptOptions.push(response.data.dept)
|
|
|
+ this.fMblnoOptions = []
|
|
|
+ this.fMblnoOptions.push(response.data.fCorps)
|
|
|
+ if (response.data.fSbu !== null) {
|
|
|
+ this.fSbuOptions = []
|
|
|
+ this.fSbuOptions.push(response.data.fSbu)
|
|
|
+ }
|
|
|
+ if (response.data.warehouse !== null) {
|
|
|
+ this.warehouseOptions = []
|
|
|
+ this.warehouseOptions.push(response.data.warehouse)
|
|
|
+ }
|
|
|
+ if (typeof response.data.warehouseBillsItem !== 'undefined' && response.data.warehouseBillsItem !== null) {
|
|
|
+ this.dataList = response.data.warehouseBillsItem
|
|
|
+ if (response.data.goodsList !== null) {
|
|
|
+ this.goodsOptions = []
|
|
|
+ this.goodsOptions = response.data.goodsList
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.open = true;
|
|
|
+ this.title = "修改仓库主(出入库)";
|
|
|
+ });
|
|
|
+ },
|
|
|
+ /** 提交按钮 */
|
|
|
+ submitForm() {
|
|
|
+ this.$refs["form"].validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ // let formData = new FormData()
|
|
|
+ // console.log(JSON.stringify(this.form));
|
|
|
+ // formData.append('tWarehouseBills', JSON.stringify(this.formData))
|
|
|
+ let formData = new window.FormData();
|
|
|
+ // 附件数据
|
|
|
+ formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
+ console.log(JSON.stringify(this.form));
|
|
|
+ // 附件数据
|
|
|
+ formData.append("tWhgenleg", null);
|
|
|
+ // // 费用明细付款
|
|
|
+ formData.append("tWarehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ // // 收款
|
|
|
+ formData.append("tWarehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
+ // // 库存明细
|
|
|
+ formData.append("tWarehousebillsitems", JSON.stringify(this.dataList));
|
|
|
+ // 附件数据
|
|
|
+ // formData.append('tWhgenleg', dataForm)
|
|
|
+ // // 费用明细付款
|
|
|
+ // formData.append('tWarehousebillsfeesCr', dataForm)
|
|
|
+ // // 收款
|
|
|
+ // formData.append('tWarehousebillsfeesDr"', dataForm)
|
|
|
+ // // 库存明细
|
|
|
+ // formData.append('tWarehousebillsitems', dataForm)
|
|
|
+ addWarehousebills(formData).then((response) => {
|
|
|
+ console.log(response);
|
|
|
+ this.msgSuccess("新增成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const fIds = row.fId || this.ids;
|
tong