Yangwl 1 month ago
commit f435d6ab58

@ -0,0 +1,43 @@
export default {
data() {
return {
tableHeight: 100
}
},
methods: {
calculateHeight() {
let conditionHeight = 0
if (this.pageHeaderRef && this.pageHeaderRef.offsetHeight) {
conditionHeight = this.pageHeaderRef.offsetHeight
}
const remainingHeight = window.innerHeight - this.fixedHeight - conditionHeight
this.tableHeight = Math.max(remainingHeight, this.minHeight)
}
},
mounted() {
this.$nextTick(() => {
this.calculateHeight()
window.addEventListener('resize', this.calculateHeight)
});
},
beforeDestroy() {
window.removeEventListener('resize', this.calculateHeight)
},
props: {
pageHeaderRef: {
type: HTMLElement,
default: null
},
fixedHeight: {
type: Number,
default: 200
},
minHeight: {
type: Number,
default: 350
}
}
}

@ -93,7 +93,7 @@
<el-table-column prop="shiftDesc" label="班次" width="80"/>
<el-table-column prop="prodType" label="品类" width="80"/>
<el-table-column prop="teamLeaderName" label="组长" width="100" :formatter="teamLeaderFormate"/>
<el-table-column prop="workorderCode" label="工单号" width="150"/>
<el-table-column prop="workorderCodeSaps" label="工单号" width="150"/>
<el-table-column prop="productCode" label="产品编码" width="120" :formatter="productCodeFormate"/>
<el-table-column prop="productName" label="产品名称" width="200"/>
<el-table-column prop="spec" label="规格" width="100"/>

@ -19,24 +19,17 @@
clearable
/>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-form-item label="工单号" prop="workorderCode">
<el-input
v-model="queryParams.productName"
placeholder="请输入产品名称"
v-model="queryParams.workorderCode"
placeholder="请输入工单号"
clearable
/>
</el-form-item>
<el-form-item label="规格型号" prop="productSpc">
<el-form-item label="批次信息" prop="batch">
<el-input
v-model="queryParams.productSpc"
placeholder="请输入规格型号"
clearable
/>
</el-form-item>
<el-form-item label="工厂名称" prop="factoryName">
<el-input
v-model="queryParams.factoryName"
placeholder="请输入工厂名称"
v-model="queryParams.batch"
placeholder="请输入批次信息"
clearable
/>
</el-form-item>
@ -87,7 +80,9 @@
<el-table-column label="车间名称" align="center" prop="carName" />
<el-table-column label="机台编码" align="center" prop="machineCode" />
<el-table-column label="机台名称" align="center" prop="machineName" />
<el-table-column label="产品编码" align="center" prop="productCode" width="180" :show-overflow-tooltip="true"
<el-table-column label="工单号" align="center" prop="workorderCode" width="200" :show-overflow-tooltip="true"/>
<el-table-column label="批次号" align="center" prop="batch" width="200" :show-overflow-tooltip="true"/>
<el-table-column label="产品编码" align="center" prop="productCode" width="180" :show-overflow-tooltip="true"
:formatter="productCodeFormate"/>
<el-table-column label="产品名称" align="center" prop="productName" width="200" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
@ -250,6 +245,9 @@ export default {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (column.label === "工厂编码"){
return;
}
if (index === 0) {
sums[index] = '合计';
return;

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<div ref="pageHeaderRef">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
@ -54,6 +55,15 @@
/>
</el-form-item>
<el-form-item label="物料组" prop="matkl">
<el-input
v-model="queryParams.matkl"
placeholder="请输入物料组"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="送货时间" prop="gmtCreate">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.gmtCreate"-->
@ -90,11 +100,13 @@
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<div>
</div>
<el-table v-loading="loading" :data="matetowsnList" @selection-change="handleSelectionChange"
:summary-method="getSummary"
:show-summary="true"
:summary-align="'center'"
:max-height="tableHeight"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="唯一序列号" align="center" prop="storageId" v-if="false" />
@ -109,7 +121,7 @@
<span>{{ formatProductCode(scope.row.matnr) }}</span>
</template>
</el-table-column>
<el-table-column label="物料描述" align="center" prop="maktx" width="120"/>
<el-table-column label="物料描述" align="center" prop="maktx" />
<el-table-column label="工厂" align="center" prop="werks" width="80"/>
<el-table-column label="库存地点" align="center" prop="lgort" width="80"/>
<el-table-column label="批号" align="center" prop="charg" width="120"/>
@ -122,6 +134,11 @@
lgort
<el-table-column label="限制库存" align="center" prop="ceinm" width="120" />
<el-table-column label="冻结库存" align="center" prop="cspem" width="120" />
<el-table-column label="抽取时间" align="center" prop="gmtModified" >
<template slot-scope="scope">
<span>{{ formatDate(scope.row.gmtModified) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="仓库" align="center" prop="whCode" />-->
@ -144,8 +161,8 @@
<el-table-column label="有效标记" align="center" prop="activeFlag"v-if="false" />
<el-table-column label="工厂号" align="center" prop="factoryCode" v-if="false" />
</el-table>
</div>
<pagination
ref="pagination"
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
@ -394,11 +411,15 @@ import {
listReturnDY,
listOutorderZU
} from '@/api/wms/outorderfc'
import {formatDate} from "../../../utils";
import useTableMaxHeight from "@/utils/useTableMaxHeight";
export default {
name: "Matetowsn",
mixins: [useTableMaxHeight],
data() {
return {
//
tableMaxHeight: 100,
//
loading: true,
//
ids: [],
@ -483,7 +504,11 @@ export default {
created() {
this.getList();
},
mounted() {
this.pageHeaderRef = this.$refs.pageHeaderRef
},
methods: {
formatDate,
/** 查询包材库存明细表列表 */
getList() {
this.loading = true;

@ -1,6 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<div ref="pageHeaderRef">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="送货单号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
@ -34,15 +35,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料描述" prop="materialDesc">
<el-input
v-model="queryParams.materialDesc"
placeholder="请输入物料描述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单状态" prop="status">
<el-select v-model="queryParams.orderStatus" placeholder="请选择拆分状态" clearable>
<el-option
v-for="dict in order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="供应商编码" prop="supplyCode" width="180">
<el-input
v-model="queryParams.supplyCode"
@ -52,6 +54,17 @@
/>
</el-form-item>
<el-form-item label="收货时间" prop="deliveryTimeArray">
<el-date-picker
v-model="queryParams.deliveryTimeArray"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
@ -136,8 +149,9 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange" :max-height="tableHeight">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="送货单号" align="center" prop="orderNo" width="130"/>
<el-table-column label="物料编码" align="center" prop="materialCode" min-width="150">
@ -360,11 +374,19 @@
<script>
import { listOdsRawOrderIn, getOdsRawOrderIn, delOdsRawOrderIn, addOdsRawOrderIn, updateOdsRawOrderIn ,sap105temporarilyCollected,handleUpdateSAP103,handleUpdateSAP105} from "@/api/wms/odsRawOrderIn";
import moment from "moment/moment";
import useTableMaxHeight from "@/utils/useTableMaxHeight";
export default {
name: "OdsRawOrderIn",
data() {
mixins: [useTableMaxHeight],
data() {
return {
order_status:[
{label:"暂收",value:"0"},
{label:"收货完成",value:"1"},
{label:"冲销",value:"5"},
],
//
loading: true,
//
@ -385,6 +407,7 @@ export default {
open: false,
//
queryParams: {
deliveryTimeArray:undefined,
pageNum: 1,
pageSize: 10,
factoryCode: null,
@ -448,9 +471,18 @@ export default {
created() {
this.getList();
},
mounted() {
this.pageHeaderRef = this.$refs.pageHeaderRef
},
methods: {
/** 查询包材到货单列表 */
getList() {
if(this.queryParams.deliveryTimeArray!=null){
this.queryParams.deliveryTimeStart = moment(this.queryParams.deliveryTimeArray[0]).format('YYYY-MM-DD');
this.queryParams.deliveryTimeEnd = moment(this.queryParams.deliveryTimeArray[1]).format('YYYY-MM-DD');
}
this.loading = true;
listOdsRawOrderIn(this.queryParams).then(response => {
this.odsRawOrderInList = response.rows;

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<div ref="pageHeaderRef">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form-item label="送货单号" prop="userDefined5">
<el-input
@ -45,92 +46,42 @@
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-form-item label="报检日期" prop="checkTimeArray">
<el-date-picker
v-model="queryParams.checkTimeArray"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">-->
<!--&lt;!&ndash; <el-col :span="1.5">&ndash;&gt;-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="primary"&ndash;&gt;-->
<!--&lt;!&ndash; plain&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-plus"&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; @click="handleAdd"&ndash;&gt;-->
<!--&lt;!&ndash; v-hasPermi="['wms:odsRawOrderIn:add']"&ndash;&gt;-->
<!--&lt;!&ndash; >新增</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!--&lt;!&ndash; <el-col :span="1.5">&ndash;&gt;-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="success"&ndash;&gt;-->
<!--&lt;!&ndash; plain&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-edit"&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; :disabled="single"&ndash;&gt;-->
<!--&lt;!&ndash; @click="handleUpdateSAP"&ndash;&gt;-->
<!--&lt;!&ndash; v-hasPermi="['wms:odsRawOrderIn:edit']"&ndash;&gt;-->
<!--&lt;!&ndash; >105过账</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!--&lt;!&ndash; <el-col :span="1.5">&ndash;&gt;-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="success"&ndash;&gt;-->
<!--&lt;!&ndash; plain&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-edit"&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; :disabled="single"&ndash;&gt;-->
<!--&lt;!&ndash; @click="handleUpdateSAP103"&ndash;&gt;-->
<!--&lt;!&ndash; v-hasPermi="['wms:odsRawOrderIn:edit']"&ndash;&gt;-->
<!--&lt;!&ndash; >104冲销</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!--&lt;!&ndash; <el-col :span="1.5">&ndash;&gt;-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="success"&ndash;&gt;-->
<!--&lt;!&ndash; plain&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-edit"&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; :disabled="single"&ndash;&gt;-->
<!--&lt;!&ndash; @click="handleUpdateSAP105"&ndash;&gt;-->
<!--&lt;!&ndash; v-hasPermi="['wms:odsRawOrderIn:edit']"&ndash;&gt;-->
<!--&lt;!&ndash; >106冲销</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!--&lt;!&ndash; <el-col :span="1.5">&ndash;&gt;-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="danger"&ndash;&gt;-->
<!--&lt;!&ndash; plain&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-delete"&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; :disabled="multiple"&ndash;&gt;-->
<!--&lt;!&ndash; @click="handleDelete"&ndash;&gt;-->
<!--&lt;!&ndash; v-hasPermi="['wms:odsRawOrderIn:remove']"&ndash;&gt;-->
<!--&lt;!&ndash; >删除</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!--&lt;!&ndash; <el-col :span="1.5">&ndash;&gt;-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="success"&ndash;&gt;-->
<!--&lt;!&ndash; plain&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-edit"&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; :disabled="single"&ndash;&gt;-->
<!--&lt;!&ndash; @click="handleUpdate"&ndash;&gt;-->
<!--&lt;!&ndash; v-hasPermi="['wms:odsRawOrderIn:edit']"&ndash;&gt;-->
<!--&lt;!&ndash; >修改</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!--&lt;!&ndash; <el-col :span="1.5">&ndash;&gt;-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; type="warning"&ndash;&gt;-->
<!--&lt;!&ndash; plain&ndash;&gt;-->
<!--&lt;!&ndash; icon="el-icon-download"&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; @click="handleExport"&ndash;&gt;-->
<!--&lt;!&ndash; v-hasPermi="['wms:odsRawOrderIn:export']"&ndash;&gt;-->
<!--&lt;!&ndash; >导出</el-button>&ndash;&gt;-->
<!--&lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
<el-row :gutter="10" class="mb8">
<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['wms:orderBJ:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
<el-table :max-height="tableHeight" v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="送货单号" align="center" prop="userDefined5" width="130"/>
<el-table-column label="采购单" align="center" prop="procureCode" width="130"/>
@ -142,6 +93,7 @@
<el-table-column label="物料描述" align="center" prop="materialDesc" :min-width="180"/>
<el-table-column label="数量" align="center" prop="operationNumber" width="130"/>
<el-table-column label="报检时间" align="center" prop="createtime" width="150"/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="150"/>
<el-table-column label="报检人" align="center" prop="createBy" width="150"/>
<el-table-column label="暂收时间" align="center" prop="gmtCreate" width="150"/>
<el-table-column label="质检开始时间" align="center" prop="createtime" width="150"/>
@ -340,10 +292,13 @@
<script>
import { listOdsRawOrderIn, getOdsRawOrderIn, delOdsRawOrderIn, addOdsRawOrderIn, updateOdsRawOrderIn ,sap105temporarilyCollected,handleUpdateSAP103,handleUpdateSAP105,listZJ} from "@/api/wms/odsRawOrderIn";
import moment from "moment";
import useTableMaxHeight from "@/utils/useTableMaxHeight";
export default {
name: "OdsRawOrderIn",
data() {
mixins: [useTableMaxHeight],
data() {
return {
//
loading: true,
@ -365,6 +320,7 @@ export default {
open: false,
//
queryParams: {
checkTimeArray:undefined,
pageNum: 1,
pageSize: 10,
factoryCode: null,
@ -428,9 +384,18 @@ export default {
created() {
this.getList();
},
mounted() {
this.pageHeaderRef = this.$refs.pageHeaderRef
},
methods: {
/** 查询包材到货单列表 */
getList() {
if(this.queryParams.checkTimeArray!=null){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD');
}
this.loading = true;
listZJ(this.queryParams).then(response => {
this.odsRawOrderInList = response.rows;
@ -509,6 +474,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.checkTimeArray = undefined;
this.handleQuery();
},
//
@ -605,7 +571,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('wms/odsRawOrderIn/export', {
this.download('wms/odsRawOrderIn/exportBJ', {
...this.queryParams
}, `odsRawOrderIn_${new Date().getTime()}.xlsx`)
}

@ -1,6 +1,8 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<div ref="pageHeaderRef">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="送货单号" prop="userDefined5">
@ -30,14 +32,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料描述" prop="materialDesc">
<el-input
v-model="queryParams.materialDesc"
placeholder="请输入物料描述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单状态" prop="status">
<el-select v-model="queryParams.orderStatus" placeholder="请选择拆分状态" clearable>
<el-option
v-for="dict in order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="计划日期" prop="planDate">
<el-date-picker clearable
v-model="queryParams.planDate"
@ -135,8 +139,9 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</div>
<div>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange" :show-summary="true" :summary-method="getSummary">
<el-table :max-height="tableHeight" v-loading="loading" :data="orderList" @selection-change="handleSelectionChange" :show-summary="true" :summary-method="getSummary">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" > </el-table-column>
<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
@ -309,10 +314,17 @@
<script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder,getIdCardList,getIdCardListDA } from "@/api/wms/order";
import useTableMaxHeight from "@/utils/useTableMaxHeight";
export default {
name: "Order",
data() {
mixins: [useTableMaxHeight],
data() {
return {
order_status:[
{label:"未收货",value:"0"},
{label:"收货中",value:"1"},
{label:"收货完成",value:"2"},
],
//
loading: true,
//
@ -380,6 +392,9 @@ export default {
created() {
this.getList();
},
mounted() {
this.pageHeaderRef = this.$refs.pageHeaderRef
},
methods: {
/** 查询包材采购单列表 */
getList() {

Loading…
Cancel
Save