|
|
@@ -546,6 +546,7 @@
|
|
|
:visible.sync="showSetting"
|
|
|
width="700px"
|
|
|
v-dialogDrag
|
|
|
+ :close-on-click-modal="false"
|
|
|
>
|
|
|
<template slot="title">
|
|
|
<div class="avue-crud__dialog__header">
|
|
|
@@ -1795,9 +1796,14 @@
|
|
|
show-summary
|
|
|
:summary-method="warehouseDrSummaries"
|
|
|
>
|
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="序号" type="index" width="80">
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column type="selection" width="50" align="center" fixed />
|
|
|
+ <el-table-column
|
|
|
+ label="序号"
|
|
|
+ type="index"
|
|
|
+ width="50"
|
|
|
+ fixed
|
|
|
+ align="center"
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
prop="fCorpid"
|
|
|
header-align="center"
|
|
|
@@ -2125,8 +2131,10 @@
|
|
|
:modal="false"
|
|
|
style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
|
|
|
:visible.sync="whgenlegVisible"
|
|
|
- width="70%"
|
|
|
+ width="85%"
|
|
|
@close="init2()"
|
|
|
+ v-dialogDrag
|
|
|
+ :close-on-click-modal="false"
|
|
|
>
|
|
|
<el-dialog
|
|
|
title="自定义列显示"
|
|
|
@@ -2134,6 +2142,7 @@
|
|
|
width="700px"
|
|
|
v-dialogDrag
|
|
|
append-to-body
|
|
|
+ :close-on-click-modal="false"
|
|
|
>
|
|
|
<template slot="title">
|
|
|
<div class="avue-crud__dialog__header">
|
|
|
@@ -2202,20 +2211,32 @@
|
|
|
<el-button type="primary" @click="save2()">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
- <el-form ref="whgenlegParams" :model="whgenlegParams" label-width="120px">
|
|
|
+ <el-form ref="whgenlegParams" :model="whgenlegParams">
|
|
|
<el-row>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="箱号" prop="fCntrno">
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="提单号" prop="fMblno" label-width="70px">
|
|
|
+ <el-input
|
|
|
+ v-model="whgenlegParams.fMblno"
|
|
|
+ placeholder="请输入提单号"
|
|
|
+ clearable
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="箱号" prop="fCntrno" label-width="70px">
|
|
|
<el-input
|
|
|
v-model="whgenlegParams.fCntrno"
|
|
|
placeholder="请输入箱号"
|
|
|
clearable
|
|
|
- style="width: 80%"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
- <el-form-item label="入库日期区间" prop="orgStorageDate">
|
|
|
+ <el-form-item
|
|
|
+ label="入库日期区间"
|
|
|
+ prop="orgStorageDate"
|
|
|
+ label-width="120px"
|
|
|
+ >
|
|
|
<el-date-picker
|
|
|
style="width: 80%"
|
|
|
v-model="whgenlegParams.orgStorageDate"
|
|
|
@@ -2228,7 +2249,7 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="2">
|
|
|
<el-button
|
|
|
type="cyan"
|
|
|
icon="el-icon-search"
|
|
|
@@ -2236,7 +2257,7 @@
|
|
|
>搜索</el-button
|
|
|
>
|
|
|
</el-col>
|
|
|
- <el-col :span="2">
|
|
|
+ <el-col :span="2" style="display: flex; justify-content: flex-end">
|
|
|
<el-button
|
|
|
icon="el-icon-setting"
|
|
|
circle
|
|
|
@@ -2250,7 +2271,6 @@
|
|
|
ref="table"
|
|
|
tooltip-effect="dark"
|
|
|
width="100%"
|
|
|
- border
|
|
|
stripe
|
|
|
@selection-change="whgenlegSelectionChange"
|
|
|
>
|
|
|
@@ -3101,7 +3121,7 @@ export default {
|
|
|
label: "fOrgwarehouseInformation",
|
|
|
name: "库位",
|
|
|
checked: 0,
|
|
|
- width: 100,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
{
|
|
|
surface: "7",
|
|
|
@@ -3122,14 +3142,14 @@ export default {
|
|
|
label: "fPlangrossweight",
|
|
|
name: "结余毛重(kg)",
|
|
|
checked: 0,
|
|
|
- width: 100,
|
|
|
+ width: 120,
|
|
|
},
|
|
|
{
|
|
|
surface: "10",
|
|
|
label: "fPlannetweight",
|
|
|
name: "结余净重(kg)",
|
|
|
checked: 0,
|
|
|
- width: 100,
|
|
|
+ width: 120,
|
|
|
},
|
|
|
|
|
|
{
|
|
|
@@ -3144,14 +3164,14 @@ export default {
|
|
|
label: "fGrossweight",
|
|
|
name: "调拨毛重(kg)",
|
|
|
checked: 0,
|
|
|
- width: 100,
|
|
|
+ width: 120,
|
|
|
},
|
|
|
{
|
|
|
surface: "13",
|
|
|
label: "fNetweight",
|
|
|
name: "调拨净重(kg)",
|
|
|
checked: 0,
|
|
|
- width: 100,
|
|
|
+ width: 120,
|
|
|
},
|
|
|
|
|
|
{
|
|
|
@@ -3684,7 +3704,7 @@ export default {
|
|
|
fId: null,
|
|
|
fCntrtype: null,
|
|
|
fGrossweight: e.fGrossweightblc2,
|
|
|
- fNetweight:e.fNetweightblc2,
|
|
|
+ fNetweight: e.fNetweightblc2,
|
|
|
fQty: e.fQtyblc2,
|
|
|
fCntqty: 1,
|
|
|
fIsPass: "F",
|
|
|
@@ -3707,7 +3727,7 @@ export default {
|
|
|
fPackagespecs: e.fPackagespecs,
|
|
|
fPlannetweight: e.fNetweightblc,
|
|
|
fOriginalbillno: e.fOriginalbillno,
|
|
|
- fBusinessType: e.fBusinessType+"",
|
|
|
+ fBusinessType: e.fBusinessType + "",
|
|
|
fPlangrossweight: e.fGrossweightblc,
|
|
|
fOriginalbilldate: e.fOriginalbilldate,
|
|
|
fWarehouselocid: e.fWarehouseLocationid,
|
|
|
@@ -4656,7 +4676,6 @@ export default {
|
|
|
},
|
|
|
// 查询库存总账信息
|
|
|
getWhgenlegList() {
|
|
|
- this.whgenlegParams.fMblno = this.form.fMblno;
|
|
|
this.whgenlegParams.fCorpid = this.form.fCorpid;
|
|
|
this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
|
|
|
this.whgenlegParams.fWarehouseid = this.form.fInwarehouseid;
|
qukaidi