盘点出库、入库页面显示
This commit is contained in:
@@ -35,6 +35,8 @@
|
||||
|
||||
<!-- 物资明细表格 -->
|
||||
<el-table v-loading="loading" :data="materialList">
|
||||
|
||||
<el-table-column label="货位编码" align="left" prop="cargoSpaceId" width="160"/>
|
||||
<el-table-column label="物资编号" align="left" prop="productId" />
|
||||
<el-table-column label="物资名称" align="left" prop="productName" />
|
||||
<el-table-column label="批号" align="left" prop="lotNo"/>
|
||||
@@ -529,24 +531,35 @@
|
||||
|
||||
this.materialList = this.materialList.concat(
|
||||
newTrays.map(item => ({
|
||||
trayCode: item.trayCode,
|
||||
productId: item.productId,
|
||||
productGuId: item.productGuid,
|
||||
productName: item.productName,
|
||||
quantity: item.quantity,
|
||||
lotNo: item.lotNo,
|
||||
onlyIdentity: item.onlyIdentity,
|
||||
warehouseId: item.warehouseId,
|
||||
warehouseName: item.warehouseName,
|
||||
cargoSpaceId: item.cargoSpaceId,
|
||||
cargoSpaceName: item.cargoSpaceName,
|
||||
spec: item.spare1,
|
||||
// spare3: item.spare3,
|
||||
spare1: item.spare4,
|
||||
spare3: item.spare5,
|
||||
spare4: item.spare6,
|
||||
spare5: item.voltage,
|
||||
spare6: item.power,
|
||||
spare7: item.phase,
|
||||
spare2: item.netWeight,
|
||||
spare8: item.grossWeight,
|
||||
spec: item.spec,
|
||||
spare1: item.spare1,
|
||||
spare2: item.voltage,
|
||||
spare3: item.spare3,
|
||||
spare4: item.spare4,
|
||||
spare5: item.spare5,
|
||||
spare6: item.orderId,
|
||||
spare7: item.power,
|
||||
spare8: item.spare8,
|
||||
spare9: item.distribution,
|
||||
unit: item.model,
|
||||
// orderId: item.orderId
|
||||
unit: item.unit,
|
||||
orderId: item.orderId,
|
||||
price: item.spare6,
|
||||
productStatus: item.productStatus,
|
||||
parentId: item.parentId,
|
||||
createSys: item.createSys,
|
||||
supplierName: item.supplierName,
|
||||
supplierId: item.phase,
|
||||
trayCode: item.trayCode
|
||||
}))
|
||||
);
|
||||
this.materialDialogByTrayCode = false;
|
||||
|
||||
@@ -187,7 +187,7 @@
|
||||
<el-table-column label="物料名称" align="left" prop="productName" />
|
||||
<el-table-column label="批号" align="left" prop="lotNo" />
|
||||
<el-table-column label="入库数量" align="right" prop="inQuantity" />
|
||||
<el-table-column label="生产图号" align="left" prop="stackingId" />
|
||||
<el-table-column label="生产图号" align="left" prop="cargoNo" />
|
||||
<el-table-column label="单价" align="left" prop="printDate" />
|
||||
<el-table-column label="供应商" align="left" prop="supplierName" />
|
||||
<el-table-column label="来源" align="left" prop="spare1" ><!--来源-->
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="仓库" prop="warehouseId">
|
||||
<el-form-item label="仓库" prop="warehouseId">
|
||||
<el-select
|
||||
v-model="queryParams.warehouseId"
|
||||
placeholder="请选择仓库"
|
||||
@@ -94,7 +94,7 @@
|
||||
:value="item.warehouseId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
</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>
|
||||
@@ -146,7 +146,7 @@
|
||||
<!-- <el-table-column label="部门" align="left" prop="departmentName" />-->
|
||||
<!-- <el-table-column label="托盘码" align="left" prop="trayCode" />-->
|
||||
<el-table-column label="货位" align="left" prop="cargoSpaceName" />
|
||||
<el-table-column label="订单号" align="right" prop="lineId" />
|
||||
<!-- <el-table-column label="订单号" align="right" prop="lineId" />-->
|
||||
<!-- <el-table-column label="执行阶段" align="left" prop="executionPhase">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
|
||||
@@ -158,7 +158,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
|
||||
<el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
|
||||
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" />-->
|
||||
<el-table-column label="仓库" align="left" prop="warehouseName" />
|
||||
|
||||
</el-table>
|
||||
|
||||
@@ -171,25 +171,48 @@
|
||||
/>
|
||||
|
||||
<el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
|
||||
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
|
||||
<el-table-column label="任务ID" align="left" prop="jobId" width="160" />
|
||||
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="160" />
|
||||
<el-table-column label="子任务ID" align="left" prop="jobDetailId" width="150" />
|
||||
<el-table-column label="任务ID" align="left" prop="jobId" width="140" />
|
||||
<el-table-column label="单据ID" align="left" prop="inOrOutId" width="150" />
|
||||
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
|
||||
<el-table-column label="库存ID" align="left" prop="stockId" width="160" />
|
||||
<el-table-column label="物料编码" align="left" prop="productId" />
|
||||
<el-table-column label="物料名称" align="left" prop="productName" width="160" />
|
||||
<el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
|
||||
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
|
||||
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
|
||||
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
|
||||
<el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
|
||||
<el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
|
||||
<el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
|
||||
<el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
|
||||
<el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
|
||||
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
|
||||
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
|
||||
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
|
||||
<el-table-column label="物料编码" align="left" prop="productId" width="140" />
|
||||
<el-table-column label="物料名称" align="left" prop="productName" />
|
||||
<el-table-column label="批号" align="left" prop="lotNo" />
|
||||
<el-table-column label="出库数量" align="right" prop="outQuantity" />
|
||||
<el-table-column label="生产图号" align="left" prop="cargoNo" />
|
||||
<el-table-column label="单价" align="left" prop="printDate" />
|
||||
<el-table-column label="供应商" align="left" prop="supplierName" />
|
||||
<el-table-column label="来源" align="left" prop="spare1" ><!--来源-->
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" align="left" prop="spare2" ><!--用途-->
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.turnover_type" :value="scope.row.spare2"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="套账" align="left" prop="spare3" ><!--用途-->
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="用途" align="left" prop="spare4" ><!--用途-->
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.purpose_type" :value="scope.row.spare4"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="台次" align="left" prop="spare5" />
|
||||
<el-table-column label="合同号" align="left" prop="spare6" />
|
||||
<el-table-column label="件次" align="left" prop="spare7" />
|
||||
<el-table-column label="质量等级" align="left" prop="spare8" ><!--用途-->
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="管理号" align="left" prop="spare9" />
|
||||
<el-table-column label="规格" align="left" prop="spec" />
|
||||
<el-table-column label="单位" align="left" prop="unit" />
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
@@ -211,7 +234,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
|
||||
|
||||
export default {
|
||||
name: "MydoJob",
|
||||
dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status'],
|
||||
dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status', 'sys_yes_no', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no', 'account_type', 'origin_type', 'purpose_type',],
|
||||
data() {
|
||||
return {
|
||||
warehouseOptions:[],
|
||||
|
||||
@@ -129,6 +129,7 @@
|
||||
<el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange">
|
||||
<el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160"/><!--子单ID-->
|
||||
<el-table-column label="主单ID" align="left" prop="stockCheckId" width="160"/><!--主单ID-->
|
||||
<el-table-column label="货位编码" align="left" prop="cargoSpaceId" width="160"/>
|
||||
<el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
|
||||
<el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
|
||||
<el-table-column label="供应商" align="left" prop="supplierName" width="160"/><!--供应商-->
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
<el-table-column label="物料名称" align="left" prop="productName" />
|
||||
<el-table-column label="批号" align="left" prop="lotNo" />
|
||||
<el-table-column label="入库数量" align="right" prop="inQuantity" />
|
||||
<el-table-column label="生产图号" align="left" prop="stackingId" />
|
||||
<el-table-column label="生产图号" align="left" prop="cargoNo" />
|
||||
<el-table-column label="单价" align="left" prop="printDate" />
|
||||
<el-table-column label="供应商" align="left" prop="supplierName" />
|
||||
<el-table-column label="来源" align="left" prop="spare1" ><!--来源-->
|
||||
|
||||
Reference in New Issue
Block a user