|
|
@@ -434,7 +434,8 @@ RK CK DB HZ
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="联系人" prop="fContacts">
|
|
|
- <el-select
|
|
|
+ <el-input v-model="form.fContacts" placeholder="请输入电话"/>
|
|
|
+ <!--<el-select
|
|
|
v-model="form.fContacts"
|
|
|
filterable
|
|
|
remote
|
|
|
@@ -446,7 +447,7 @@ RK CK DB HZ
|
|
|
:label="dict.nickName"
|
|
|
:value="dict.userName"
|
|
|
></el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select>-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -690,7 +691,7 @@ RK CK DB HZ
|
|
|
<el-table-column label="序号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fbsdate"
|
|
|
+ prop="fBsdate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="入库日期"
|
|
|
@@ -707,7 +708,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fgoodsid"
|
|
|
+ prop="fGoodsid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="品名"
|
|
|
@@ -729,7 +730,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fcntrtype"
|
|
|
+ prop="fCntrtype"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="箱型"
|
|
|
@@ -759,7 +760,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fplangrossweight"
|
|
|
+ prop="fPlangrossweight"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="计划毛重"
|
|
|
@@ -774,7 +775,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fplannetweight"
|
|
|
+ prop="fPlannetweight"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="计划净重"
|
|
|
@@ -782,14 +783,14 @@ RK CK DB HZ
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
- v-model="scope.row.fplannetweight"
|
|
|
+ v-model="scope.row.fPlannetweight"
|
|
|
placeholder="计划净重"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fplanvolumn"
|
|
|
+ prop="fPlanvolumn"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="计划尺码"
|
|
|
@@ -804,7 +805,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fplanqty"
|
|
|
+ prop="fPlanqty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="计划件数"
|
|
|
@@ -819,7 +820,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fgrossweight"
|
|
|
+ prop="fGrossweight"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="入库毛重"
|
|
|
@@ -834,7 +835,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fnetweight"
|
|
|
+ prop="fNetweight"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="入库净重"
|
|
|
@@ -849,7 +850,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fqty"
|
|
|
+ prop="fQty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="入库件数"
|
|
|
@@ -879,7 +880,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fwarehouselocid"
|
|
|
+ prop="fWarehouselocid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="库区"
|
|
|
@@ -923,7 +924,7 @@ RK CK DB HZ
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="ftruckno"
|
|
|
+ prop="fTruckno"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="车号"
|
|
|
@@ -1610,6 +1611,9 @@ export default {
|
|
|
this.getDicts("data_unitfees").then((response) => {
|
|
|
this.fFeetunitOptions = response.data;
|
|
|
});
|
|
|
+ this.getDicts("data_stltype_type").then((response) => {
|
|
|
+ this.fStltypeOptions = response.data;
|
|
|
+ });
|
|
|
this.getDicts("data_ifweigh_status").then((response) => {
|
|
|
this.fIfweighOptions = response.data;
|
|
|
});
|
|
|
@@ -1738,18 +1742,103 @@ export default {
|
|
|
this.single = selection.length !== 1;
|
|
|
this.multiple = !selection.length;
|
|
|
},
|
|
|
+ queryUser() {
|
|
|
+ queryUserVal().then((response) => {
|
|
|
+ if (response.user !== null) {
|
|
|
+ this.userVal = response.user
|
|
|
+ this.$set(this.form, 'fDeptid', this.userVal.deptId)
|
|
|
+ this.$set(this.form, 'createBy', this.userVal.userName)
|
|
|
+ this.$set(this.form, 'createTime', Date.parse(new Date()))
|
|
|
+ }
|
|
|
+ if (response.dept !== null) {
|
|
|
+ this.deptOptions = []
|
|
|
+ this.deptOptions.push(response.dept)
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
this.reset();
|
|
|
+ this.queryUser()
|
|
|
this.open = true;
|
|
|
- this.title = "添加仓库主(出入库)";
|
|
|
+ this.title = "入库单";
|
|
|
+ },
|
|
|
+ // 添加list
|
|
|
+ addRelevant() {
|
|
|
+ console.log(JSON.stringify(this.dataList))
|
|
|
+ this.dataList.push({
|
|
|
+ fbsdate: null,
|
|
|
+ fgoodsid: null,
|
|
|
+ fcntrtype: null,
|
|
|
+ fCntqty: null,
|
|
|
+ fplangrossweight: null,
|
|
|
+ fplanvolumn: null,
|
|
|
+ fplanqty: null,
|
|
|
+ fgrossweight: null,
|
|
|
+ fqty: null,
|
|
|
+ fPackagespecs: null,
|
|
|
+ fwarehouselocid: null,
|
|
|
+ fBoxno: null,
|
|
|
+ fGoodsval: null,
|
|
|
+ ftruckno: null,
|
|
|
+ remark: null
|
|
|
+ });
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
- const fId = row.fId || this.ids;
|
|
|
- getWarehousebills(fId).then((response) => {
|
|
|
- this.form = response.data;
|
|
|
+ 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
|
|
|
+ for (let item in this.dataList) {
|
|
|
+ this.$set(this.dataList[item], 'fBsdate', Date.parse(this.dataList[item].fBsdate))
|
|
|
+ }
|
|
|
+ console.log(JSON.stringify(this.dataList))
|
|
|
+
|
|
|
+ if (response.data.goodsList !== null) {
|
|
|
+ this.goodsOptions = []
|
|
|
+ this.goodsOptions = response.data.goodsList
|
|
|
+ }
|
|
|
+ }
|
|
|
this.open = true;
|
|
|
this.title = "修改仓库主(出入库)";
|
|
|
});
|
|
|
@@ -1758,19 +1847,22 @@ export default {
|
|
|
submitForm() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- if (this.form.fId != null) {
|
|
|
- updateWarehousebills(this.form).then((response) => {
|
|
|
- this.msgSuccess("修改成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- } else {
|
|
|
- addWarehousebills(this.form).then((response) => {
|
|
|
- this.msgSuccess("新增成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- }
|
|
|
+ let formData = new window.FormData();
|
|
|
+ // 附件数据
|
|
|
+ formData.append("tWarehouseBills", 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));
|
|
|
+ addWarehousebills(formData).then((response) => {
|
|
|
+ this.msgSuccess("新增成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
},
|
阿伏兔