查询统计修改

This commit is contained in:
liuhanqing
2025-08-05 14:19:09 +08:00
parent 65a1c0814c
commit df2a2fa4b2
31 changed files with 325 additions and 487 deletions

View File

@@ -3358,7 +3358,9 @@ export default {
inputWarehouseDesc: '请输入仓库描述',
inputWarehouseLevel: '请输入仓库级别',
confirm: '确 定',
cancel: '取 消'
cancel: '取 消',
inOrOutDId: '子出库流水单',
inOrOutId: '出库流水单号',
},
// ***************平库入库流水*************
searchViewFlatWarehouseInFlow: {
@@ -3391,7 +3393,9 @@ export default {
warehouseDesc: '仓库描述',
warehouseLevel: '仓库级别',
warehouseType: '仓库类型',
available: '是否可用'
available: '是否可用',
inOrOutDId: '子入库流水单',
inOrOutId: '入库流水单号',
},
// ***************出库单据历史查询*************
searchViewStockoutHistory: {

View File

@@ -14,7 +14,14 @@
<el-input v-model="queryParams.simpleName" :placeholder="$t('basCustomer.inputSimpleName')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('basCustomer.useable')" prop="useable"> <!-- 是否可用 -->
<el-input v-model="queryParams.useable" :placeholder="$t('basCustomer.inputUseable')" clearable @keyup.enter.native="handleQuery" />
<el-select v-model="queryParams.useable" :placeholder="$t('basCustomer.inputUseable')" clearable>
<el-option
v-for="dict in dict.type.is_available"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('basCustomer.businessDepartment')" prop="businessDepartment"> <!-- 业务部门 -->
<el-input v-model="queryParams.businessDepartment" :placeholder="$t('basCustomer.inputBusinessDepartment')" clearable @keyup.enter.native="handleQuery" />
@@ -84,7 +91,11 @@
<el-table-column :label="$t('basCustomer.customerGroupNo')" align="left" prop="customerGroupNo" /> <!-- 客户基本分类 -->
<el-table-column :label="$t('basCustomer.customerName')" align="left" prop="customerName" /> <!-- 客户名称 -->
<el-table-column :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" /> <!-- 客户简称 -->
<el-table-column :label="$t('basCustomer.useable')" align="left" prop="useable" /> <!-- 是否可用 -->
<el-table-column :label="$t('basCustomer.useable')" align="left" prop="useable" >
<template slot-scope="scope">
<dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
</template>
</el-table-column> <!-- 是否可用 -->
<el-table-column :label="$t('basCustomer.remark')" align="left" prop="remark" /> <!-- 备注 -->
<el-table-column :label="$t('basCustomer.businessDepartment')" align="left" prop="businessDepartment" /> <!-- 业务部门 -->
<el-table-column :label="$t('basCustomer.salesman')" align="left" prop="salesman" /> <!-- 业务员 -->
@@ -135,7 +146,14 @@
<el-input v-model="form.simpleName" :placeholder="$t('basCustomer.inputSimpleName')" />
</el-form-item>
<el-form-item :label="$t('basCustomer.useable')" prop="useable"> <!-- 是否可用 -->
<el-input v-model="form.useable" :placeholder="$t('basCustomer.inputUseable')" />
<el-select v-model="form.useable" :placeholder="$t('basCustomer.inputUseable')" clearable>
<el-option
v-for="dict in dict.type.is_available"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('basCustomer.remark')" prop="remark"> <!-- 备注 -->
<el-input v-model="form.remark" :placeholder="$t('basCustomer.inputRemark')" />
@@ -193,6 +211,7 @@ import { listBasCustomer, getBasCustomer, delBasCustomer, addBasCustomer, update
export default {
name: "BasCustomer",
dicts:['is_available'],
data() {
return {
// 遮罩层

View File

@@ -34,12 +34,15 @@
/>
</el-form-item>
<el-form-item :label="$t('BasSupplier.useable')" prop="useable"> <!-- 是否可用 -->
<el-input
v-model="queryParams.useable"
:placeholder="$t('BasSupplier.inputUseable')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.useable" :placeholder="$t('BasSupplier.inputUseable')" clearable>
<el-option
v-for="dict in dict.type.is_available"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('BasSupplier.supplierArae')" prop="supplierArae"> <!-- 地区分类 -->
<el-input
@@ -195,7 +198,11 @@
<el-table-column :label="$t('BasSupplier.supplierGroupNo')" align="left" prop="supplierGroupNo" /> <!-- 供应商名称 -->
<el-table-column :label="$t('BasSupplier.supplierName')" align="left" prop="supplierName" /> <!-- 供应商名称 -->
<el-table-column :label="$t('BasSupplier.simpleName')" align="left" prop="simpleName" /> <!-- 简称 -->
<el-table-column :label="$t('BasSupplier.useable')" align="left" prop="useable" /> <!-- 是否可用 -->
<el-table-column :label="$t('BasSupplier.useable')" align="left" prop="useable" >
<template slot-scope="scope">
<dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
</template>
</el-table-column> <!-- 是否可用 -->
<el-table-column :label="$t('BasSupplier.remark')" align="left" prop="remark" /> <!-- 备注 -->
<el-table-column :label="$t('BasSupplier.supplierArae')" align="left" prop="supplierArae" /> <!-- 地区分类 -->
<el-table-column :label="$t('BasSupplier.taxpayerRegistrationNumber')" align="left" prop="taxpayerRegistrationNumber" /> <!-- 纳税人登记号 -->
@@ -253,7 +260,14 @@
<el-input v-model="form.simpleName" :placeholder="$t('BasSupplier.inputSimpleName')" />
</el-form-item>
<el-form-item :label="$t('BasSupplier.useable')" prop="useable"> <!-- 是否可用 -->
<el-input v-model="form.useable" :placeholder="$t('BasSupplier.inputUseable')" />
<el-select v-model="form.useable" :placeholder="$t('BasSupplier.inputUseable')" clearable>
<el-option
v-for="dict in dict.type.is_available"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('BasSupplier.remark')" prop="remark"> <!-- 备注 -->
<el-input v-model="form.remark" :placeholder="$t('BasSupplier.inputRemark')" />
@@ -308,6 +322,7 @@ import { listBasSupplier, getBasSupplier, delBasSupplier, addBasSupplier, update
export default {
name: "BasSupplier",
dicts:['is_available'],
data() {
return {
// 遮罩层

View File

@@ -10,12 +10,14 @@
/>
</el-form-item>
<el-form-item :label="$t('BasPort.portType')" prop="portType"> <!-- 点位分类 -->
<el-input
v-model="queryParams.portType"
:placeholder="$t('BasPort.inputPortType')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.portType" :placeholder="$t('BasPort.inputPortType')" clearable>
<el-option
v-for="dict in dict.type.port_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('BasPort.portDesc')" prop="portDesc"> <!-- 点位描述 -->
<el-input
@@ -82,7 +84,11 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('BasPort.id')" align="left" prop="id" /> <!-- id -->
<el-table-column :label="$t('BasPort.portName')" align="left" prop="portName" /> <!-- 点位名称 -->
<el-table-column :label="$t('BasPort.portType')" align="left" prop="portType" /> <!-- 点位分类 -->
<el-table-column :label="$t('BasPort.portType')" align="left" prop="portType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.port_type" :value="scope.row.portType"/>
</template>
</el-table-column> <!-- 点位分类 -->
<el-table-column :label="$t('BasPort.portDesc')" align="left" prop="portDesc" /> <!-- 点位描述 -->
<el-table-column :label="$t('BasPort.createMan')" align="left" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('BasPort.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
@@ -129,7 +135,14 @@
<el-input v-model="form.portName" :placeholder="$t('BasPort.inputPortName')" />
</el-form-item>
<el-form-item :label="$t('BasPort.portType')" prop="portType"> <!-- 点位分类 -->
<el-input v-model="form.portType" :placeholder="$t('BasPort.inputPortType')" />
<el-select v-model="form.portType" :placeholder="$t('BasPort.inputPortType')" clearable>
<el-option
v-for="dict in dict.type.port_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('BasPort.portDesc')" prop="portDesc"> <!-- 点位描述 -->
<el-input v-model="form.portDesc" :placeholder="$t('BasPort.inputPortDesc')" />
@@ -255,7 +268,7 @@ import {listPortProductRel, addPortProductRel, delPortProductRel} from "@/api/ba
export default {
name: "Port",
dicts:['product_port_rel_status'],
dicts:['product_port_rel_status','port_type'],
data() {
return {
// 遮罩层

View File

@@ -51,22 +51,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.createMan')" prop="createMan"> <!-- 创建人 -->
<el-input
v-model="queryParams.createMan"
:placeholder="$t('searchViewFlatWarehouseInFlow.inputCreateMan')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.isCurrent')" prop="isCurrent"> <!-- 是否可用 -->
<el-input
v-model="queryParams.isCurrent"
:placeholder="$t('searchViewFlatWarehouseInFlow.inputIsCurrent')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewFlatWarehouseInFlow.createMan')" prop="createMan"> &lt;!&ndash; 创建人 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.createMan"-->
<!-- :placeholder="$t('searchViewFlatWarehouseInFlow.inputCreateMan')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchViewFlatWarehouseInFlow.isCurrent')" prop="isCurrent"> &lt;!&ndash; 是否可用 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.isCurrent"-->
<!-- :placeholder="$t('searchViewFlatWarehouseInFlow.inputIsCurrent')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
@@ -75,14 +75,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
:placeholder="$t('searchViewFlatWarehouseInFlow.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewFlatWarehouseInFlow.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.spec"-->
<!-- :placeholder="$t('searchViewFlatWarehouseInFlow.inputSpec')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="品牌" prop="cargoNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoNo"-->
@@ -161,9 +161,12 @@
<el-table v-loading="loading" :data="ViewFlatWarehouseInFlowList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="入出库类型" align="left" prop="inOrOut" />
<el-table-column label="入出库主单据ID" align="left" prop="inOrOutSotckId" />
<el-table-column label="入出库主子单据ID" align="left" prop="inOrOutSotckDetailId" />
<!-- <el-table-column label="入出库类型" align="left" prop="inOrOut" />-->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.inOrOutId')" align="left" prop="inOrOutSotckId" />
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.inOrOutDId')" align="left" prop="inOrOutSotckDetailId" />
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialId')" align="left" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialName')" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" width="120" align="right" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" /><!-- 长MM -->
@@ -172,36 +175,8 @@
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.createMan')" align="left" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialId')" align="left" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialName')" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseId')" align="left" prop="warehouseId" /> <!-- 仓库id -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.address')" align="left" prop="address" /> <!-- 仓库地址 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseDesc')" align="left" prop="cDesc" /> <!-- 仓库描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseLevel')" align="left" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseType')" align="left" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.available')" align="left" prop="isCurrent" /> <!-- 是否可用 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewFlatWarehouseInFlow:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewFlatWarehouseInFlow:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination

View File

@@ -11,38 +11,6 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="入出库类型" prop="inOrOut">-->
<!-- <el-input-->
<!-- v-model="queryParams.inOrOut"-->
<!-- placeholder="请输入入出库类型"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入出库主单据ID" prop="inOrOutSotckId">-->
<!-- <el-input-->
<!-- v-model="queryParams.inOrOutSotckId"-->
<!-- placeholder="请输入入出库主单据ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入出库主子单据ID" prop="inOrOutSotckDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.inOrOutSotckDetailId"-->
<!-- placeholder="请输入入出库主子单据ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料GUID" prop="productGuid">-->
<!-- <el-input-->
<!-- v-model="queryParams.productGuid"-->
<!-- placeholder="请输入物料GUID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.productId')" prop="productId"> <!-- 物料ID -->
<el-input
v-model="queryParams.productId"
@@ -51,70 +19,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="入出库数量" prop="quantity">-->
<!-- <el-input-->
<!-- v-model="queryParams.quantity"-->
<!-- placeholder="请输入入出库数量"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.createMan')" prop="createMan"> <!-- 创建人 -->
<el-input
v-model="queryParams.createMan"
:placeholder="$t('searchViewFlatWarehouseOutFlow.inputCreateMan')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库ID" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库名称" prop="warehouseName">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseName"-->
<!-- placeholder="请输入仓库名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库地址" prop="address">-->
<!-- <el-input-->
<!-- v-model="queryParams.address"-->
<!-- placeholder="请输入仓库地址"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库描述" prop="cDesc">-->
<!-- <el-input-->
<!-- v-model="queryParams.cDesc"-->
<!-- placeholder="请输入仓库描述"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库级别" prop="warehouseKind">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseKind"-->
<!-- placeholder="请输入仓库级别"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.isCurrent')" prop="isCurrent"> <!-- 是否可用 -->
<el-input
v-model="queryParams.isCurrent"
:placeholder="$t('searchViewFlatWarehouseOutFlow.inputIsCurrent')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
@@ -123,14 +27,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
:placeholder="$t('searchViewFlatWarehouseOutFlow.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('searchViewFlatWarehouseOutFlow.search') }}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('searchViewFlatWarehouseOutFlow.reset') }}</el-button> <!-- 重置 -->
@@ -138,38 +34,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['search:ViewFlatWarehouseOutFlow:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['search:ViewFlatWarehouseOutFlow:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['search:ViewFlatWarehouseOutFlow:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -184,26 +48,11 @@
</el-row>
<el-table v-loading="loading" :data="ViewFlatWarehouseOutFlowList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="入出库类型" align="center" prop="inOrOut" />-->
<!-- <el-table-column label="入出库主单据ID" align="center" prop="inOrOutSotckId" />-->
<!-- <el-table-column label="入出库主子单据ID" align="center" prop="inOrOutSotckDetailId" />-->
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.creator')" align="left" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.inOrOutId')" align="left" prop="inOrOutSotckId" />
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.inOrOutDId')" align="left" prop="inOrOutSotckDetailId" />
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialId')" align="left" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialName')" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.spec')" align="left" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.brand')" align="left" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.unit')" align="left" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.description')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseId')" align="left" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.address')" align="left" prop="address" /> <!-- 仓库地址 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseDesc')" align="left" prop="cDesc" /> <!-- 仓库描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseLevel')" align="left" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseType')" align="left" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.available')" align="left" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" /><!-- 长MM -->
@@ -211,26 +60,8 @@
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" /> <!-- 价格 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewFlatWarehouseOutFlow:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewFlatWarehouseOutFlow:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
</el-table>
<pagination

View File

@@ -144,14 +144,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewInJobFlow.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
:placeholder="$t('searchViewInJobFlow.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="垛型ID" prop="stackingId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stackingId"-->
@@ -323,7 +316,7 @@
</el-table-column>
<el-table-column :label="$t('searchViewInJobFlow.taskNo')" align="left" prop="taskNo" />
<el-table-column :label="$t('searchViewInJobFlow.trayCode')" align="left" prop="trayCode" />
<el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="left" prop="roadwayId" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="left" prop="roadwayId" />-->
<el-table-column :label="$t('searchViewInJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName" />
<el-table-column :label="$t('searchViewInJobFlow.priority')" align="right" prop="priority" />
<el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="left" prop="executionPhase">
@@ -334,13 +327,13 @@
<el-table-column :label="$t('searchViewInJobFlow.inOrOut')" align="left" prop="inOrOut" />
<el-table-column :label="$t('searchViewInJobFlow.entranceId')" align="left" prop="entranceId" />
<el-table-column :label="$t('searchViewInJobFlow.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewInJobFlow.lotNo')" align="left" prop="lotNo" />
<el-table-column :label="$t('searchViewInJobFlow.stackingId')" align="left" prop="stackingId" />
<el-table-column :label="$t('searchViewInJobFlow.stockStatus')" align="left" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewInJobFlow.lotNo')" align="left" prop="lotNo" />-->
<!-- <el-table-column :label="$t('searchViewInJobFlow.stackingId')" align="left" prop="stackingId" />-->
<!-- <el-table-column :label="$t('searchViewInJobFlow.stockStatus')" align="left" prop="stockStatus">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewInJobFlow.inQuantity')" align="right" prop="inQuantity" />
<el-table-column :label="$t('searchViewInJobFlow.inOrOutId')" align="left" prop="inOrOutId" />
<el-table-column :label="$t('searchViewInJobFlow.inOrOutDId')" align="left" prop="inOrOutDId" />
@@ -349,7 +342,7 @@
<el-table-column :label="$t('searchViewInJobFlow.finishTime')" align="left" prop="finishTime" width="180" />
<el-table-column :label="$t('searchViewInJobFlow.warehouseId')" align="left" prop="warehouseId" />
<el-table-column :label="$t('searchViewInJobFlow.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewInJobFlow.spec')" align="left" prop="spec" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.spec')" align="left" prop="spec" />-->
<el-table-column :label="$t('searchViewInJobFlow.unit')" align="left" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" /><!-- 单件净重 -->

View File

@@ -53,7 +53,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewOutJobFlow.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<!-- <el-form-item :label="$t('searchViewOutJobFlow.stockStatus')" prop="stockStatus"> &lt;!&ndash; 库存状态 &ndash;&gt;
<el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewOutJobFlow.selectStockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
@@ -62,7 +62,7 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<!-- <el-form-item label="巷道ID" prop="roadwayId">-->
<!-- <el-input-->
<!-- v-model="queryParams.roadwayId"-->
@@ -161,14 +161,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewOutJobFlow.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
:placeholder="$t('searchViewOutJobFlow.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="剁型ID" prop="stackingId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stackingId"-->
@@ -323,7 +315,7 @@
</el-table-column>
<el-table-column :label="$t('searchViewOutJobFlow.taskNo')" align="left" prop="taskNo"/>
<el-table-column :label="$t('searchViewOutJobFlow.trayCode')" align="left" prop="trayCode"/>
<el-table-column :label="$t('searchViewOutJobFlow.roadwayId')" align="left" prop="roadwayId"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.roadwayId')" align="left" prop="roadwayId"/>-->
<el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceId')" align="left" prop="cargoSpaceId"/>
<el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName"/>
<el-table-column :label="$t('searchViewOutJobFlow.thePlatoon')" align="left" prop="thePlatoon"/>
@@ -338,15 +330,15 @@
<el-table-column :label="$t('searchViewOutJobFlow.inOrOut')" align="left" prop="inOrOut"/>
<el-table-column :label="$t('searchViewOutJobFlow.exitId')" align="left" prop="exitId"/>
<el-table-column :label="$t('searchViewOutJobFlow.productId')" align="left" prop="productId"/>
<el-table-column :label="$t('searchViewOutJobFlow.lotNo')" align="left" prop="lotNo"/>
<el-table-column :label="$t('searchViewOutJobFlow.stackingId')" align="left" prop="stackingId"/>
<el-table-column :label="$t('searchViewOutJobFlow.stockStatus')" align="left" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.lotNo')" align="left" prop="lotNo"/>-->
<!-- <el-table-column :label="$t('searchViewOutJobFlow.stackingId')" align="left" prop="stackingId"/>-->
<!-- <el-table-column :label="$t('searchViewOutJobFlow.stockStatus')" align="left" prop="stockStatus">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewOutJobFlow.outQuantity')" align="right" prop="outQuantity"/>
<el-table-column :label="$t('searchViewOutJobFlow.giveNum')" align="right" prop="giveNum"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.giveNum')" align="right" prop="giveNum"/>-->
<el-table-column :label="$t('searchViewOutJobFlow.inOrOutId')" align="left" prop="inOrOutId"/>
<el-table-column :label="$t('searchViewOutJobFlow.inOrOutDId')" align="left" prop="inOrOutDId"/>
<el-table-column :label="$t('searchViewOutJobFlow.createTime')" align="left" prop="createTime" width="180"/>
@@ -354,7 +346,7 @@
<el-table-column :label="$t('searchViewOutJobFlow.finishTime')" align="left" prop="finishTime" width="180"/>
<el-table-column :label="$t('searchViewOutJobFlow.warehouseId')" align="left" prop="warehouseId"/>
<el-table-column :label="$t('searchViewOutJobFlow.productName')" align="left" prop="productName"/>
<el-table-column :label="$t('searchViewOutJobFlow.spec')" align="left" prop="spec"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.spec')" align="left" prop="spec"/>-->
<el-table-column :label="$t('searchViewOutJobFlow.cargoNo')" align="left" prop="cargoNo"/>
<el-table-column :label="$t('searchViewOutJobFlow.unit')" align="left" prop="unit"/>
<el-table-column :label="$t('searchViewOutJobFlow.customerName')" align="left" prop="customerName"/>

View File

@@ -157,7 +157,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="stockList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="left" prop="stockId" />
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="left" prop="cargoSpaceId" />

View File

@@ -314,10 +314,10 @@
</el-table-column>
<el-table-column :label="$t('searchViewStockinHistory.warehouseId')" align="left" prop="warehouseId" />
<el-table-column :label="$t('searchViewStockinHistory.finishDate')" align="left" prop="finishDate" />
<el-table-column :label="$t('searchViewStockinHistory.erpBill')" align="left" prop="erpBill" />
<!-- <el-table-column :label="$t('searchViewStockinHistory.erpBill')" align="left" prop="erpBill" /> -->
<el-table-column :label="$t('searchViewStockinHistory.stockSource')" align="left" prop="stockSource" />
<el-table-column :label="$t('searchViewStockinHistory.departmentNo')" align="left" prop="departmentNo" />
<el-table-column :label="$t('searchViewStockinHistory.classNo')" align="left" prop="classNo" />
<!-- <el-table-column :label="$t('searchViewStockinHistory.classNo')" align="left" prop="classNo" /> -->
<el-table-column :label="$t('searchViewStockinHistory.supplierNo')" align="left" prop="supplierNo" />
<el-table-column :label="$t('searchViewStockinHistory.supplierName')" align="left" prop="supplierName" />
<el-table-column :label="$t('searchViewStockinHistory.simpleName')" align="left" prop="simpleName" />
@@ -325,21 +325,21 @@
<el-table-column :label="$t('searchViewStockinHistory.contactNumber')" align="left" prop="contactNumber" />
<el-table-column :label="$t('searchViewStockinHistory.address')" align="left" prop="address" />
<el-table-column :label="$t('searchViewStockinHistory.stockinDetailId')" align="left" prop="stockinDetailId" />
<el-table-column :label="$t('searchViewStockinHistory.lotNo')" align="left" prop="lotNo" />
<!-- <el-table-column :label="$t('searchViewStockinHistory.lotNo')" align="left" prop="lotNo" /> -->
<el-table-column :label="$t('searchViewStockinHistory.quantity')" align="right" prop="quantity" />
<el-table-column :label="$t('searchViewStockinHistory.quantityX')" align="right" prop="quantityX" />
<el-table-column :label="$t('searchViewStockinHistory.quantityJ')" align="right" prop="quantityJ" />
<!-- <el-table-column :label="$t('searchViewStockinHistory.quantityX')" align="right" prop="quantityX" /> -->
<!-- <el-table-column :label="$t('searchViewStockinHistory.quantityJ')" align="right" prop="quantityJ" /> -->
<el-table-column :label="$t('searchViewStockinHistory.assignNum')" align="right" prop="assignNum" />
<el-table-column :label="$t('searchViewStockinHistory.assignNumX')" align="right" prop="assignNumX" />
<el-table-column :label="$t('searchViewStockinHistory.assignNumJ')" align="right" prop="assignNumJ" />
<!-- <el-table-column :label="$t('searchViewStockinHistory.assignNumX')" align="right" prop="assignNumX" /> -->
<!-- <el-table-column :label="$t('searchViewStockinHistory.assignNumJ')" align="right" prop="assignNumJ" /> -->
<el-table-column :label="$t('searchViewStockinHistory.scanNum')" align="right" prop="scanNum" />
<el-table-column :label="$t('searchViewStockinHistory.scanNumX')" align="right" prop="scanNumX" />
<el-table-column :label="$t('searchViewStockinHistory.scanNumJ')" align="right" prop="scanNumJ" />
<el-table-column :label="$t('searchViewStockinHistory.printDate')" align="left" prop="printDate" width="180">
<!-- <el-table-column :label="$t('searchViewStockinHistory.scanNumX')" align="right" prop="scanNumX" /> -->
<!-- <el-table-column :label="$t('searchViewStockinHistory.scanNumJ')" align="right" prop="scanNumJ" /> -->
<!-- <el-table-column :label="$t('searchViewStockinHistory.printDate')" align="left" prop="printDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column :label="$t('searchViewStockinHistory.stockStatus')" align="left" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
@@ -348,7 +348,7 @@
<el-table-column :label="$t('searchViewStockinHistory.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewStockinHistory.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewStockinHistory.unit')" align="left" prop="unit" />
<el-table-column :label="$t('searchViewStockinHistory.spec')" align="left" prop="spec" />
<!-- <el-table-column :label="$t('searchViewStockinHistory.spec')" align="left" prop="spec" /> -->
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />

View File

@@ -95,14 +95,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockoutHistory.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input
v-model="queryParams.lotNo"
:placeholder="$t('searchViewStockoutHistory.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockoutHistory.quantity')" prop="quantity"> <!-- 出库数量 -->
<el-input
v-model="queryParams.quantity"
@@ -127,22 +120,8 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewStockoutHistory.erpStockoutId')" prop="erpStockoutId" style="white-space: nowrap"> <!-- ERP出库单ID -->
<el-input
v-model="queryParams.erpStockoutId"
:placeholder="$t('searchViewStockoutHistory.inputErpStockoutId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockoutHistory.entryid')" prop="entryid"> <!-- 客户编号 -->
<el-input
v-model="queryParams.entryid"
:placeholder="$t('searchViewStockoutHistory.inputEntryid')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockoutHistory.customerName')" prop="customerName"> <!-- 客户名称 -->
<el-input
v-model="queryParams.customerName"
@@ -151,22 +130,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockoutHistory.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
:placeholder="$t('searchViewStockoutHistory.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockoutHistory.brand')" prop="cargoNo"> <!-- 品牌 -->
<el-input
v-model="queryParams.cargoNo"
:placeholder="$t('searchViewStockoutHistory.inputBrand')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="单位" prop="unit">-->
<!-- <el-input-->
<!-- v-model="queryParams.unit"-->
@@ -229,18 +193,18 @@
<el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchViewStockoutHistory.exitId')" align="left" prop="exitId" />
<el-table-column :label="$t('searchViewStockoutHistory.stockoutDetailId')" align="left" prop="stockoutDetailId" />
<el-table-column :label="$t('searchViewStockoutHistory.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewStockoutHistory.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewStockoutHistory.lotNo')" align="left" prop="lotNo" />
<!-- <el-table-column :label="$t('searchViewStockoutHistory.lotNo')" align="left" prop="lotNo" />-->
<el-table-column :label="$t('searchViewStockoutHistory.exitId')" align="left" prop="exitId" />
<el-table-column :label="$t('searchViewStockoutHistory.quantity')" align="right" prop="quantity" />
<el-table-column :label="$t('searchViewStockoutHistory.allotQuantity')" align="right" prop="allotQuantity" />
<el-table-column :label="$t('searchViewStockoutHistory.assignNum')" align="right" prop="assignNum" />
<el-table-column :label="$t('searchViewStockoutHistory.erpStockoutId')" align="left" prop="erpStockoutId" />
<el-table-column :label="$t('searchViewStockoutHistory.entryid')" align="left" prop="entryid" />
<!-- <el-table-column :label="$t('searchViewStockoutHistory.erpStockoutId')" align="left" prop="erpStockoutId" />-->
<!-- <el-table-column :label="$t('searchViewStockoutHistory.entryid')" align="left" prop="entryid" />-->
<el-table-column :label="$t('searchViewStockoutHistory.customerName')" align="left" prop="customerName" />
<el-table-column :label="$t('searchViewStockoutHistory.spec')" align="left" prop="spec" />
<!-- <el-table-column :label="$t('searchViewStockoutHistory.spec')" align="left" prop="spec" />-->
<el-table-column :label="$t('searchViewStockoutHistory.unit')" align="left" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />