|
|
@@ -389,67 +389,66 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item>
|
|
|
- <el-table
|
|
|
- :data="CntrTable"
|
|
|
- style="width: 80%"
|
|
|
- :header-cell-style="{ lineHeight: '16px' }"
|
|
|
- height="139"
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- prop="fCntrid "
|
|
|
- label="箱型"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
+ <div style="display: flex; align-items: center">
|
|
|
+ <el-table
|
|
|
+ :data="CntrTable"
|
|
|
+ style="width: 80%"
|
|
|
+ :header-cell-style="{ lineHeight: '16px' }"
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- placeholder="请选择箱型"
|
|
|
- v-model="scope.row.fCntrid"
|
|
|
- size="mini"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in cntrList"
|
|
|
- :key="index.fId"
|
|
|
- :label="item.fName"
|
|
|
- :value="item.fId"
|
|
|
+ <el-table-column
|
|
|
+ prop="fCntrid "
|
|
|
+ label="箱型"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ placeholder="请选择箱型"
|
|
|
+ v-model="scope.row.fCntrid"
|
|
|
+ size="mini"
|
|
|
>
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fCntrcount"
|
|
|
- label="箱量"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- placeholder="请输入箱量"
|
|
|
- v-model="scope.row.fCntrcount"
|
|
|
- size="mini"
|
|
|
- >
|
|
|
- </el-input>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fCntrcount"
|
|
|
- label="操作"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="50"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
- @click.native.prevent="deleteRow(scope.$index, CntrTable)"
|
|
|
- icon="el-icon-delete"
|
|
|
- ></el-button>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- <div style="display: flex; justify-content: center; width: 80%">
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in cntrList"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="item.fName"
|
|
|
+ :value="item.fId"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fCntrcount"
|
|
|
+ label="箱量"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ placeholder="请输入箱量"
|
|
|
+ v-model="scope.row.fCntrcount"
|
|
|
+ size="mini"
|
|
|
+ >
|
|
|
+ </el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fCntrcount"
|
|
|
+ label="操作"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="50"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ @click.native.prevent="deleteRow(scope.$index, CntrTable)"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ ></el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
<el-tag class="tag-hover" @click="addRow"
|
|
|
><i class="el-icon-plus"></i
|
|
|
></el-tag>
|
|
|
@@ -1852,7 +1851,60 @@
|
|
|
style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
|
|
|
:visible.sync="whgenlegVisible"
|
|
|
width="70%"
|
|
|
+ @close="init2()"
|
|
|
>
|
|
|
+ <el-form
|
|
|
+ ref="whgenlegParams"
|
|
|
+ :model="whgenlegParams"
|
|
|
+ :rules="rules2"
|
|
|
+ label-width="120px"
|
|
|
+ >
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="提单号" prop="fMblno">
|
|
|
+ <el-input
|
|
|
+ v-model="whgenlegParams.fMblno"
|
|
|
+ placeholder="请输入提单号"
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="箱号" prop="fCntrno">
|
|
|
+ <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-date-picker
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="whgenlegParams.orgStorageDate"
|
|
|
+ type="daterange"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2">
|
|
|
+ <el-button
|
|
|
+ type="cyan"
|
|
|
+ icon="el-icon-search"
|
|
|
+ @click="getWhgenlegList()"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
<el-table
|
|
|
:data="whgenlegList"
|
|
|
ref="table"
|
|
|
@@ -1933,7 +1985,7 @@
|
|
|
@pagination="getWhgenlegList"
|
|
|
/>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="whgenlegData">导入库存总账</el-button>
|
|
|
+ <el-button type="primary" @click="whgenlegData()">导入库存总账</el-button>
|
|
|
<el-button @click="whgenlegVisible = false">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -2603,7 +2655,7 @@ export default {
|
|
|
Treeselect,
|
|
|
AddOrUpdate,
|
|
|
ApprovalComments,
|
|
|
- draggable
|
|
|
+ draggable,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -2638,6 +2690,11 @@ export default {
|
|
|
fTocorpid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fFeetUnit: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
},
|
|
|
+ rules2: {
|
|
|
+ fCorpid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ },
|
|
|
browseStatus: false,
|
|
|
goodsOptions: [],
|
|
|
warehouseOptions: [],
|
|
|
@@ -2718,10 +2775,12 @@ export default {
|
|
|
whgenlegParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- fMblno: null,
|
|
|
fCorpid: null,
|
|
|
fWarehouseid: null,
|
|
|
fTruckno: null,
|
|
|
+ fCntrno: null,
|
|
|
+ fMblno: null,
|
|
|
+ orgStorageDate: null,
|
|
|
},
|
|
|
stockoi: null,
|
|
|
drag: false,
|
|
|
@@ -3008,6 +3067,18 @@ export default {
|
|
|
this.CntrTable = [];
|
|
|
this.getForm();
|
|
|
},
|
|
|
+ init2() {
|
|
|
+ this.whgenlegParams = {
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: 10,
|
|
|
+ fCorpid: null,
|
|
|
+ fWarehouseid: null,
|
|
|
+ fTruckno: null,
|
|
|
+ fCntrno: null,
|
|
|
+ fMblno: null,
|
|
|
+ orgStorageDate: null,
|
|
|
+ };
|
|
|
+ },
|
|
|
//列设置全选
|
|
|
allChecked() {
|
|
|
if (this.allCheck == true) {
|
|
|
@@ -4616,9 +4687,9 @@ export default {
|
|
|
}
|
|
|
.tag-hover {
|
|
|
border-top-left-radius: 0;
|
|
|
- border-top-right-radius: 0;
|
|
|
+ border-bottom-left-radius: 0;
|
|
|
height: 15px;
|
|
|
- padding: 0px 4px;
|
|
|
+ padding: 0px 1px;
|
|
|
line-height: 12px;
|
|
|
}
|
|
|
.print-div {
|
qukaidi