表格样式调整

This commit is contained in:
猫猫guowen
2025-08-25 16:50:13 +08:00
parent 853acbc9a3
commit eb551b3f1b
26 changed files with 552 additions and 428 deletions

View File

@@ -3965,6 +3965,47 @@ export default {
shelfCalledSuccess: '料架 {containerCode} 已从 {sourcePortName} 呼叫到 {currentPortName}',
callCancelled: '已取消呼叫'
},
// **************Interface Log****************
interfaceLog: {
// Query Form
requestParam: 'Request Parameters',
inputRequestParam: 'Please enter request parameters',
errorInfo: 'Error Information',
inputErrorInfo: 'Please enter error information',
isSuccess: 'Is Successful',
selectIsSuccess: 'Please select success status',
search: 'Search',
reset: 'Reset',
// Table Columns
requestId: 'Request ID',
requestTime: 'Request Time',
sourceSystem: 'Source System',
targetSystem: 'Target System',
interfaceName: 'Interface Name',
requestUrl: 'Request URL',
requestMethod: 'Request Method',
requestHeaders: 'Request Headers',
requestBody: 'Request Body',
responseTime: 'Response Time',
responseBody: 'Response Body',
responseStatus: 'Response Status',
errorDetails: 'Error Details',
duration: 'Duration',
isSuccessful: 'Is Successful',
// Dialog
add: 'Add Interface Record',
edit: 'Edit Interface Record',
inputContent: 'Please enter content',
confirm: 'Confirm',
cancel: 'Cancel',
deleteConfirm: 'Are you sure to delete the interface record with ID "{0}"?',
addSuccess: 'Added successfully',
editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully'
},
dict: {
is_available: {
n: '否',

View File

@@ -3965,6 +3965,47 @@ export default {
shelfCalledSuccess: '料架 {containerCode} 已从 {sourcePortName} 呼叫到 {currentPortName}',
callCancelled: '已取消呼叫'
},
// **************接口日志****************
interfaceLog: {
// 查询表单
requestParam: '请求参数',
inputRequestParam: '请输入请求参数',
errorInfo: '错误信息',
inputErrorInfo: '请输入错误信息',
isSuccess: '是否成功',
selectIsSuccess: '请选择是否成功',
search: '搜索',
reset: '重置',
// 表格列
requestId: '请求id',
requestTime: '请求时间',
sourceSystem: '来源系统',
targetSystem: '目标系统',
interfaceName: '接口名称',
requestUrl: '请求URL',
requestMethod: '请求方式',
requestHeaders: '请求头信息',
requestBody: '请求参数',
responseTime: '响应时间',
responseBody: '响应主体',
responseStatus: '响应状态',
errorDetails: '错误信息',
duration: '耗时',
isSuccessful: '是否成功',
// 弹窗
add: '添加接口记录',
edit: '修改接口记录',
inputContent: '请输入内容',
confirm: '确 定',
cancel: '取 消',
deleteConfirm: '是否确认删除接口记录编号为"{0}"的数据项?',
addSuccess: '新增成功',
editSuccess: '修改成功',
deleteSuccess: '删除成功'
},
dict: {
is_available: {
n: '否',

View File

@@ -3967,6 +3967,47 @@ export default {
shelfCalledSuccess: '料架 {containerCode} 已从 {sourcePortName} 呼叫到 {currentPortName}',
callCancelled: '已取消呼叫'
},
// **************接口日志****************
interfaceLog: {
// 查询表单
requestParam: '请求参数',
inputRequestParam: '请输入请求参数',
errorInfo: '错误信息',
inputErrorInfo: '请输入错误信息',
isSuccess: '是否成功',
selectIsSuccess: '请选择是否成功',
search: '搜索',
reset: '重置',
// 表格列
requestId: '请求id',
requestTime: '请求时间',
sourceSystem: '来源系统',
targetSystem: '目标系统',
interfaceName: '接口名称',
requestUrl: '请求URL',
requestMethod: '请求方式',
requestHeaders: '请求头信息',
requestBody: '请求参数',
responseTime: '响应时间',
responseBody: '响应主体',
responseStatus: '响应状态',
errorDetails: '错误信息',
duration: '耗时',
isSuccessful: '是否成功',
// 弹窗
add: '添加接口记录',
edit: '修改接口记录',
inputContent: '请输入内容',
confirm: '确 定',
cancel: '取 消',
deleteConfirm: '是否确认删除接口记录编号为"{0}"的数据项?',
addSuccess: '新增成功',
editSuccess: '修改成功',
deleteSuccess: '删除成功'
},
dict: {
is_available: {
n: '否',

View File

@@ -87,30 +87,30 @@
<el-table v-loading="loading" :data="BasCustomerList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('basCustomer.customerNo')" align="left" prop="customerNo" /> <!-- 客户编号 -->
<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 width="120" :label="$t('basCustomer.customerNo')" align="left" prop="customerNo" /> <!-- 客户编号 -->
<el-table-column width="120" :label="$t('basCustomer.customerGroupNo')" align="left" prop="customerGroupNo" /> <!-- 客户基本分类 -->
<el-table-column width="220" :label="$t('basCustomer.customerName')" align="left" prop="customerName" /> <!-- 客户名称 -->
<el-table-column width="120" :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" /> <!-- 客户简称 -->
<el-table-column width="120" :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" /> <!-- 业务员 -->
<el-table-column :label="$t('basCustomer.mnemonicCode')" align="left" prop="mnemonicCode" /> <!-- 助忆码 -->
<el-table-column :label="$t('basCustomer.type')" align="left" prop="type" /> <!-- 客户类型 -->
<el-table-column :label="$t('basCustomer.taxpayerRegistrationNumber')" align="left" prop="taxpayerRegistrationNumber" /> <!-- 纳税人登记号 -->
<el-table-column :label="$t('basCustomer.organization')" align="left" prop="organization" /> <!-- 对应财务组织 -->
<el-table-column :label="$t('basCustomer.supCustomer')" align="left" prop="supCustomer" /> <!-- 上级客户 -->
<el-table-column :label="$t('basCustomer.retailInvestor')" align="left" prop="retailInvestor" /> <!-- 散户 -->
<el-table-column :label="$t('basCustomer.country')" align="left" prop="country" /> <!-- 国家/地区 -->
<el-table-column :label="$t('basCustomer.timeZone')" align="left" prop="timeZone" /> <!-- 时区 -->
<el-table-column :label="$t('basCustomer.dataFormat')" align="left" prop="dataFormat" /> <!-- 数据格式 -->
<el-table-column :label="$t('basCustomer.contactName')" align="left" prop="contactName" /> <!-- 联系人姓名 -->
<el-table-column :label="$t('basCustomer.shipment')" align="left" prop="shipment" /> <!-- 发货国家 -->
<el-table-column :label="$t('basCustomer.taxCategory')" align="left" prop="taxCategory" /> <!-- 税类 -->
<el-table-column width="120" :label="$t('basCustomer.remark')" align="left" prop="remark" /> <!-- 备注 -->
<el-table-column width="120" :label="$t('basCustomer.businessDepartment')" align="left" prop="businessDepartment" /> <!-- 业务部门 -->
<el-table-column width="120" :label="$t('basCustomer.salesman')" align="left" prop="salesman" /> <!-- 业务员 -->
<el-table-column width="120" :label="$t('basCustomer.mnemonicCode')" align="left" prop="mnemonicCode" /> <!-- 助忆码 -->
<el-table-column width="120" :label="$t('basCustomer.type')" align="left" prop="type" /> <!-- 客户类型 -->
<el-table-column width="120" :label="$t('basCustomer.taxpayerRegistrationNumber')" align="left" prop="taxpayerRegistrationNumber" /> <!-- 纳税人登记号 -->
<el-table-column width="120" :label="$t('basCustomer.organization')" align="left" prop="organization" /> <!-- 对应财务组织 -->
<el-table-column width="120" :label="$t('basCustomer.supCustomer')" align="left" prop="supCustomer" /> <!-- 上级客户 -->
<el-table-column width="120" :label="$t('basCustomer.retailInvestor')" align="left" prop="retailInvestor" /> <!-- 散户 -->
<el-table-column width="120" :label="$t('basCustomer.country')" align="left" prop="country" /> <!-- 国家/地区 -->
<el-table-column width="120" :label="$t('basCustomer.timeZone')" align="left" prop="timeZone" /> <!-- 时区 -->
<el-table-column width="120" :label="$t('basCustomer.dataFormat')" align="left" prop="dataFormat" /> <!-- 数据格式 -->
<el-table-column width="120" :label="$t('basCustomer.contactName')" align="left" prop="contactName" /> <!-- 联系人姓名 -->
<el-table-column width="120" :label="$t('basCustomer.shipment')" align="left" prop="shipment" /> <!-- 发货国家 -->
<el-table-column width="120" :label="$t('basCustomer.taxCategory')" align="left" prop="taxCategory" /> <!-- 税类 -->
<el-table-column :label="$t('basCustomer.operation')" 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="['bas:BasCustomer:edit']">{{$t('basCustomer.modify')}}</el-button> <!-- 修改 -->

View File

@@ -194,29 +194,29 @@
<el-table v-loading="loading" :data="BasSupplierList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('BasSupplier.supplierNo')" align="left" prop="supplierNo" /> <!-- 供应商编号 -->
<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.supplierNo')" align="left" prop="supplierNo" width="120" /> <!-- 供应商编号 -->
<el-table-column :label="$t('BasSupplier.supplierGroupNo')" align="left" prop="supplierGroupNo" width="120" /> <!-- 供应商名称 -->
<el-table-column :label="$t('BasSupplier.supplierName')" align="left" prop="supplierName" width="120" /> <!-- 供应商名称 -->
<el-table-column :label="$t('BasSupplier.simpleName')" align="left" prop="simpleName" width="120" /> <!-- 简称 -->
<el-table-column :label="$t('BasSupplier.useable')" align="left" prop="useable" width="120" >
<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" /> <!-- 纳税人登记号 -->
<el-table-column :label="$t('BasSupplier.country')" align="left" prop="country" /> <!-- 国家 -->
<el-table-column :label="$t('BasSupplier.timeZone')" align="left" prop="timeZone" /> <!-- 时区 -->
<el-table-column :label="$t('BasSupplier.dataFormat')" align="left" prop="dataFormat" /> <!-- 数据格式 -->
<el-table-column :label="$t('BasSupplier.receivingCountry')" align="left" prop="receivingCountry" /> <!-- 收货国家 -->
<el-table-column :label="$t('BasSupplier.taxCategory')" align="left" prop="taxCategory" /> <!-- 税类 -->
<el-table-column :label="$t('BasSupplier.legalPerson')" align="left" prop="legalPerson" /> <!-- 法人 -->
<el-table-column :label="$t('BasSupplier.registeredCapital')" align="right" prop="registeredCapital" /> <!-- 注册资金 -->
<el-table-column :label="$t('BasSupplier.address')" align="left" prop="address" /> <!-- 企业地址 -->
<el-table-column :label="$t('BasSupplier.contactName')" align="left" prop="contactName" /> <!-- 联系人姓名 -->
<el-table-column :label="$t('BasSupplier.contactNumber')" align="left" prop="contactNumber" /> <!-- 联系电话 -->
<el-table-column :label="$t('BasSupplier.operation')" align="center" class-name="small-padding fixed-width"><!-- 操作 -->
<el-table-column :label="$t('BasSupplier.remark')" align="left" prop="remark" width="120" /> <!-- 备注 -->
<el-table-column :label="$t('BasSupplier.supplierArae')" align="left" prop="supplierArae" width="120" /> <!-- 地区分类 -->
<el-table-column :label="$t('BasSupplier.taxpayerRegistrationNumber')" align="left" prop="taxpayerRegistrationNumber" width="120" /> <!-- 纳税人登记号 -->
<el-table-column :label="$t('BasSupplier.country')" align="left" prop="country" width="120" /> <!-- 国家 -->
<el-table-column :label="$t('BasSupplier.timeZone')" align="left" prop="timeZone" width="120" /> <!-- 时区 -->
<el-table-column :label="$t('BasSupplier.dataFormat')" align="left" prop="dataFormat" width="120" /> <!-- 数据格式 -->
<el-table-column :label="$t('BasSupplier.receivingCountry')" align="left" prop="receivingCountry" width="120" /> <!-- 收货国家 -->
<el-table-column :label="$t('BasSupplier.taxCategory')" align="left" prop="taxCategory" width="120" /> <!-- 税类 -->
<el-table-column :label="$t('BasSupplier.legalPerson')" align="left" prop="legalPerson" width="120" /> <!-- 法人 -->
<el-table-column :label="$t('BasSupplier.registeredCapital')" align="right" prop="registeredCapital" width="120" /> <!-- 注册资金 -->
<el-table-column :label="$t('BasSupplier.address')" align="left" prop="address" width="120" /> <!-- 企业地址 -->
<el-table-column :label="$t('BasSupplier.contactName')" align="left" prop="contactName" width="120" /> <!-- 联系人姓名 -->
<el-table-column :label="$t('BasSupplier.contactNumber')" align="left" prop="contactNumber" width="120" /> <!-- 联系电话 -->
<el-table-column :label="$t('BasSupplier.operation')" align="center" class-name="small-padding fixed-width" width="120"><!-- 操作 -->
<template slot-scope="scope">
<el-button
size="mini"

View File

@@ -139,17 +139,17 @@
<el-table v-loading="loading" :data="containerDetailsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column :label="$t('bas_ContainerManagement.id')" align="left" prop="id" />
<el-table-column width="120" :label="$t('bas_ContainerManagement.id')" align="left" prop="id" />
<!-- 容器编号 -->
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="left" prop="containerId" />
<el-table-column width="120" :label="$t('bas_ContainerManagement.containerId')" align="left" prop="containerId" />
<!-- 物料编码 -->
<el-table-column :label="$t('bas_ContainerManagement.productId')" align="left" prop="productId" />
<el-table-column width="120" :label="$t('bas_ContainerManagement.productId')" align="left" prop="productId" />
<!-- 物料名称 -->
<el-table-column :label="$t('bas_ContainerManagement.productName')" align="left" prop="productName" />
<el-table-column width="120" :label="$t('bas_ContainerManagement.productName')" align="left" prop="productName" />
<!-- 数量 -->
<el-table-column :label="$t('bas_ContainerManagement.quantity')" align="right" prop="quantity" />
<el-table-column width="120" :label="$t('bas_ContainerManagement.quantity')" align="right" prop="quantity" />
<!-- 单位 -->
<el-table-column :label="$t('bas_ContainerManagement.unit')" align="left" prop="unit" />
<el-table-column width="120" :label="$t('bas_ContainerManagement.unit')" align="left" prop="unit" />
<!-- 人工操作 -->
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">

View File

@@ -91,9 +91,9 @@
<el-table ref="table" v-loading="loading" :data="traycodeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column :label="$t('traycode.formatId')" align="center" prop="formatName" />
<el-table-column :label="$t('traycode.trayCode')" align="center" prop="trayCode" />
<el-table-column label="id" align="left" prop="id" width="120" />
<el-table-column :label="$t('traycode.formatId')" align="left" prop="formatName" />
<el-table-column :label="$t('traycode.trayCode')" align="left" prop="trayCode" />
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段3" align="center" prop="spare3" /> -->

View File

@@ -138,14 +138,14 @@
<el-table v-loading="loading" :data="traycodeFormatList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('traycodeFormat.id')" align="center" prop="id" />
<el-table-column :label="$t('traycodeFormat.barcodeFormat')" align="center" prop="barcodeFormat" />
<el-table-column :label="$t('traycodeFormat.serialRule')" align="center" prop="serialRule" />
<el-table-column :label="$t('traycodeFormat.serialExample')" align="center" prop="serialExample" />
<el-table-column :label="$t('traycodeFormat.remarks')" align="center" prop="remarks" />
<el-table-column :label="$t('traycodeFormat.minNum')" align="center" prop="minNum" />
<el-table-column :label="$t('traycodeFormat.maxNum')" align="center" prop="maxNum" />
<el-table-column :label="$t('traycodeFormat.spare1')" align="center" prop="spare1" />
<el-table-column :label="$t('traycodeFormat.id')" align="left" prop="id" />
<el-table-column :label="$t('traycodeFormat.barcodeFormat')" align="left" prop="barcodeFormat" />
<el-table-column :label="$t('traycodeFormat.serialExample')" align="left" prop="serialExample" />
<el-table-column :label="$t('traycodeFormat.remarks')" align="left" prop="remarks" />
<el-table-column :label="$t('traycodeFormat.serialRule')" align="right" prop="serialRule" />
<el-table-column :label="$t('traycodeFormat.minNum')" align="right" prop="minNum" />
<el-table-column :label="$t('traycodeFormat.maxNum')" align="right" prop="maxNum" />
<el-table-column :label="$t('traycodeFormat.spare1')" align="right" prop="spare1" />
<!-- <el-table-column :label="$t('traycodeFormat.spare2')" align="center" prop="spare2" /> -->
<!-- <el-table-column :label="$t('traycodeFormat.spare3')" align="center" prop="spare3" /> -->
<el-table-column :label="$t('traycodeFormat.operation')" align="center" class-name="small-padding fixed-width">

View File

@@ -142,7 +142,7 @@
<el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 仓库ID(序号) -->
<el-table-column :label="$t('warehouse.Id')" align="left" prop="warehouseId" width="50"/>
<el-table-column :label="$t('warehouse.Id')" align="left" prop="warehouseId" width="120"/>
<!-- 仓库编号 -->
<el-table-column :label="$t('warehouse.warehouseId')" align="left" prop="warehouseNo" />
<!-- 项目编号 -->

View File

@@ -29,7 +29,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('inReceiveStockin.status')" prop="status"><!--单据状态-->
<el-select v-model="queryParams.status" :placeholder="$t('inReceiveStockin.selectStatus')" clearable>
<el-select v-model="queryParams.status" :placeholder="$t('inReceiveStockin.selectStatus')" >
<el-option
v-for="dict in dict.type.in_bill_status"
:key="dict.value"

View File

@@ -1,24 +1,24 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="请求参数" prop="requestBody">
<el-form-item :label="$t('interfaceLog.requestParam')" prop="requestBody">
<el-input
v-model="queryParams.requestBody"
placeholder="请输入请求参数"
:placeholder="$t('interfaceLog.inputRequestParam')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="错误信息" prop="errorDetails">
<el-form-item :label="$t('interfaceLog.errorInfo')" prop="errorDetails">
<el-input
v-model="queryParams.errorDetails"
placeholder="请输入错误信息"
:placeholder="$t('interfaceLog.inputErrorInfo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否成功" prop="isSuccessful">
<el-select v-model="queryParams.isSuccessful" placeholder="请选择是否成功" clearable>
<el-form-item :label="$t('interfaceLog.isSuccess')" prop="isSuccessful">
<el-select v-model="queryParams.isSuccessful" :placeholder="$t('interfaceLog.selectIsSuccess')" clearable>
<el-option
v-for="dict in dict.type.is_available"
:key="dict.value"
@@ -28,8 +28,8 @@
</el-select>
</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-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('interfaceLog.search') }}</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('interfaceLog.reset') }}</el-button>
</el-form-item>
</el-form>
@@ -80,22 +80,22 @@
</el-row>
<el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange" >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="请求id" align="center" prop="requestId" />
<el-table-column label="请求时间" align="center" prop="requestTime" />
<el-table-column label="来源系统" align="center" prop="sourceSystem" />
<el-table-column label="目标系统" align="center" prop="targetSystem" />
<el-table-column label="接口名称" align="center" prop="endpoint" />
<el-table-column label="请求URL" width="300" align="left" prop="requestUrl" />
<el-table-column label="请求方式" align="center" prop="requestMethod" />
<el-table-column label="请求头信息" align="center" prop="requestHeaders" />
<el-table-column label="请求参数" width="300" align="left" prop="requestBody" />
<el-table-column label="响应时间" width="180" align="left" prop="responseTime" />
<el-table-column label="响应主体" align="center" prop="responseBody" />
<el-table-column label="响应状态" align="center" prop="responseStatus" />
<el-table-column label="错误信息" align="center" prop="errorDetails" />
<el-table-column label="耗时" align="center" prop="duration" />
<el-table-column label="是否成功" align="center" prop="isSuccessful">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column width="120" :label="$t('interfaceLog.requestId')" align="left" prop="requestId" show-overflow-tooltip />
<el-table-column width="160" :label="$t('interfaceLog.requestTime')" align="left" prop="requestTime" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.sourceSystem')" align="left" prop="sourceSystem" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.targetSystem')" align="left" prop="targetSystem" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.interfaceName')" align="left" prop="endpoint" show-overflow-tooltip />
<el-table-column width="300" :label="$t('interfaceLog.requestUrl')" align="left" prop="requestUrl" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.requestMethod')" align="left" prop="requestMethod" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.requestHeaders')" align="left" prop="requestHeaders" show-overflow-tooltip />
<el-table-column width="300" :label="$t('interfaceLog.requestBody')" align="left" prop="requestBody" show-overflow-tooltip />
<el-table-column width="160" :label="$t('interfaceLog.responseTime')" align="left" prop="responseTime" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.responseBody')" align="left" prop="responseBody" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.responseStatus')" align="left" prop="responseStatus" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.errorDetails')" align="left" prop="errorDetails" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.duration')" align="left" prop="duration" show-overflow-tooltip />
<el-table-column width="120" :label="$t('interfaceLog.isSuccessful')" align="left" prop="isSuccessful" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.is_available" :value="scope.row.isSuccessful"/>
</template>
@@ -131,38 +131,38 @@
<!-- 添加或修改接口记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="来源系统" prop="sourceSystem">
<el-input v-model="form.sourceSystem" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('interfaceLog.sourceSystem')" prop="sourceSystem">
<el-input v-model="form.sourceSystem" type="textarea" :placeholder="$t('interfaceLog.inputContent')" />
</el-form-item>
<el-form-item label="目标系统" prop="targetSystem">
<el-input v-model="form.targetSystem" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('interfaceLog.targetSystem')" prop="targetSystem">
<el-input v-model="form.targetSystem" type="textarea" :placeholder="$t('interfaceLog.inputContent')" />
</el-form-item>
<el-form-item label="接口名称" prop="endpoint">
<el-input v-model="form.endpoint" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('interfaceLog.interfaceName')" prop="endpoint">
<el-input v-model="form.endpoint" type="textarea" :placeholder="$t('interfaceLog.inputContent')" />
</el-form-item>
<el-form-item label="请求URL" prop="requestUrl">
<el-input v-model="form.requestUrl" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('interfaceLog.requestUrl')" prop="requestUrl">
<el-input v-model="form.requestUrl" type="textarea" :placeholder="$t('interfaceLog.inputContent')" />
</el-form-item>
<el-form-item label="请求方式" prop="requestMethod">
<el-input v-model="form.requestMethod" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('interfaceLog.requestMethod')" prop="requestMethod">
<el-input v-model="form.requestMethod" type="textarea" :placeholder="$t('interfaceLog.inputContent')" />
</el-form-item>
<el-form-item label="请求头信息" prop="requestHeaders">
<el-input v-model="form.requestHeaders" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('interfaceLog.requestHeaders')" prop="requestHeaders">
<el-input v-model="form.requestHeaders" type="textarea" :placeholder="$t('interfaceLog.inputContent')" />
</el-form-item>
<el-form-item label="请求参数" prop="requestBody">
<el-input v-model="form.requestBody" placeholder="请输入请求参数" />
<el-form-item :label="$t('interfaceLog.requestBody')" prop="requestBody">
<el-input v-model="form.requestBody" :placeholder="$t('interfaceLog.inputRequestParam')" />
</el-form-item>
<el-form-item label="响应主体" prop="responseBody">
<el-input v-model="form.responseBody" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('interfaceLog.responseBody')" prop="responseBody">
<el-input v-model="form.responseBody" type="textarea" :placeholder="$t('interfaceLog.inputContent')" />
</el-form-item>
<el-form-item label="错误信息" prop="errorDetails">
<el-input v-model="form.errorDetails" placeholder="请输入错误信息" />
<el-form-item :label="$t('interfaceLog.errorDetails')" prop="errorDetails">
<el-input v-model="form.errorDetails" :placeholder="$t('interfaceLog.inputErrorInfo')" />
</el-form-item>
<el-form-item label="耗时" prop="duration">
<el-input v-model="form.duration" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('interfaceLog.duration')" prop="duration">
<el-input v-model="form.duration" type="textarea" :placeholder="$t('interfaceLog.inputContent')" />
</el-form-item>
<el-form-item label="是否成功" prop="isSuccessful">
<el-select v-model="form.isSuccessful" placeholder="请选择是否成功">
<el-form-item :label="$t('interfaceLog.isSuccessful')" prop="isSuccessful">
<el-select v-model="form.isSuccessful" :placeholder="$t('interfaceLog.selectIsSuccess')">
<el-option
v-for="dict in dict.type.is_available"
:key="dict.value"
@@ -173,8 +173,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{ $t('interfaceLog.confirm') }}</el-button>
<el-button @click="cancel">{{ $t('interfaceLog.cancel') }}</el-button>
</div>
</el-dialog>
</div>

View File

@@ -47,22 +47,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchStockSummary.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
:placeholder="$t('searchStockSummary.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchStockSummary.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
:placeholder="$t('searchStockSummary.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item :label="$t('searchStockSummary.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.spec"-->
<!-- :placeholder="$t('searchStockSummary.inputSpec')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('searchStockSummary.lotNo')" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- :placeholder="$t('searchStockSummary.inputLotNo')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchStockSummary.cargoSpace')" prop="cargoSpaceId"> <!-- 巷道 -->
<el-input
v-model="queryParams.cargoSpaceId"
@@ -97,20 +97,20 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchStockSummary.productId')" align="left" prop="productId" v-if="queryParams.groupFields.includes('productId')" /> <!-- 物料编码 -->
<el-table-column :label="$t('searchStockSummary.productName')" align="left" prop="productName" v-if="queryParams.groupFields.includes('productName')" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchStockSummary.unit')" align="left" prop="unit" v-if="queryParams.groupFields.includes('unit')" /> <!-- 单位 -->
<el-table-column :label="$t('searchStockSummary.warehouseId')" align="left" prop="warehouseName" v-if="queryParams.groupFields.includes('warehouseId')" /> <!-- 仓库 -->
<el-table-column :label="$t('searchStockSummary.cargoSpace')" align="left" prop="cargoSpaceName" v-if="queryParams.groupFields.includes('cargoSpaceId')" /> <!-- 货位 -->
<el-table-column :label="$t('searchStockSummary.quantity')" align="right" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" v-if="queryParams.groupFields.includes('spare1')" /><!-- 英文名称 -->
<el-table-column :label="$t('searchStockSummary.productId')" align="left" prop="productId" width="120" v-if="queryParams.groupFields.includes('productId')" /> <!-- 物料编码 -->
<el-table-column :label="$t('searchStockSummary.productName')" align="left" prop="productName" width="120" v-if="queryParams.groupFields.includes('productName')" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchStockSummary.unit')" align="left" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" /> <!-- 单位 -->
<el-table-column :label="$t('searchStockSummary.warehouseId')" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" /> <!-- 仓库 -->
<el-table-column :label="$t('searchStockSummary.cargoSpace')" align="left" prop="cargoSpaceName" width="120" v-if="queryParams.groupFields.includes('cargoSpaceId')" /> <!-- 货位 -->
<el-table-column :label="$t('searchStockSummary.quantity')" align="right" prop="quantity" width="120" /> <!-- 库存数量 -->
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" v-if="queryParams.groupFields.includes('spare5')" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" v-if="queryParams.groupFields.includes('spare6')" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" v-if="queryParams.groupFields.includes('spare7')" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" v-if="queryParams.groupFields.includes('spare8')" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" v-if="queryParams.groupFields.includes('price')" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" width="120" v-if="queryParams.groupFields.includes('spare5')" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" width="120" v-if="queryParams.groupFields.includes('price')" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" width="120" /> <!-- 描述 -->
</el-table>
<pagination

View File

@@ -162,20 +162,20 @@
<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="$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('searchViewFlatWarehouseInFlow.warehouseName')" width="120" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.inOrOutId')" width="120" align="left" prop="inOrOutSotckId" />
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.inOrOutDId')" width="120" align="left" prop="inOrOutSotckDetailId" />
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialId')" width="120" align="left" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialName')" width="120" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('basproduct1.englishName')" width="120" 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 -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" /><!-- 宽MM -->
<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="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('basproduct1.long')" width="120" align="right" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" width="120" align="right" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" width="120" align="right" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" width="120" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" width="120" align="right" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" width="120" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.quantity')" width="120" align="right" prop="quantity" /> <!-- 数量 -->
</el-table>

View File

@@ -48,20 +48,20 @@
</el-row>
<el-table v-loading="loading" :data="ViewFlatWarehouseOutFlowList" @selection-change="handleSelectionChange">
<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('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" width="120" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.inOrOutId')" width="120" align="left" prop="inOrOutSotckId" />
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.inOrOutDId')" width="120" align="left" prop="inOrOutSotckDetailId" />
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialId')" width="120" align="left" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialName')" width="120" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('basproduct1.englishName')" width="120" 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 -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" /><!-- 宽MM -->
<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="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('basproduct1.long')" width="120" align="right" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" width="120" align="right" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" width="120" align="right" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" width="120" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" width="120" align="right" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" width="120" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.quantity')" width="120" align="right" prop="quantity" /> <!-- 数量 -->
</el-table>
<pagination

View File

@@ -27,16 +27,16 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewInJobFlow.status')" prop="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('searchViewInJobFlow.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewInJobFlow.status')" prop="status"> &lt;!&ndash; 状态 &ndash;&gt;-->
<!-- <el-select v-model="queryParams.status" :placeholder="$t('searchViewInJobFlow.selectStatus')" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.mydo_job_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewInJobFlow.taskNo')" prop="taskNo"> <!-- 任务号 -->
<el-input
v-model="queryParams.taskNo"
@@ -307,30 +307,30 @@
<el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchViewInJobFlow.jobId')" align="left" prop="jobId" />
<el-table-column :label="$t('searchViewInJobFlow.jobDetailId')" align="left" prop="jobDetailId" />
<el-table-column :label="$t('searchViewInJobFlow.status')" align="left" prop="status">
<el-table-column :label="$t('searchViewInJobFlow.jobId')" width="120" align="left" prop="jobId" />
<el-table-column :label="$t('searchViewInJobFlow.jobDetailId')" width="120" align="left" prop="jobDetailId" />
<el-table-column :label="$t('searchViewInJobFlow.status')" width="120" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</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.taskNo')" width="120" align="left" prop="taskNo" />
<el-table-column :label="$t('searchViewInJobFlow.trayCode')" width="120" align="left" prop="trayCode" />
<!-- <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.cargoSpaceName')" width="120" align="left" prop="cargoSpaceName" />
<el-table-column :label="$t('searchViewInJobFlow.priority')" width="120" align="right" prop="priority" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="left" prop="executionPhase">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewInJobFlow.inOrOut')" align="left" prop="inOrOut">
<el-table-column :label="$t('searchViewInJobFlow.inOrOut')" width="120" align="left" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<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.entranceId')" width="120" align="left" prop="entranceId" />
<el-table-column :label="$t('searchViewInJobFlow.productId')" width="120" 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">-->
@@ -338,24 +338,24 @@
<!-- <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" />
<el-table-column :label="$t('searchViewInJobFlow.inQuantity')" width="120" align="right" prop="inQuantity" />
<el-table-column :label="$t('searchViewInJobFlow.inOrOutId')" width="120" align="left" prop="inOrOutId" />
<el-table-column :label="$t('searchViewInJobFlow.inOrOutDId')" width="120" align="left" prop="inOrOutDId" />
<el-table-column :label="$t('searchViewInJobFlow.createTime')" align="left" prop="createTime" width="180" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.startTime')" align="left" prop="startTime" width="180" />-->
<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.warehouseId')" width="120" align="left" prop="warehouseId" />
<el-table-column :label="$t('searchViewInJobFlow.productName')" width="120" align="left" prop="productName" />
<!-- <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('searchViewInJobFlow.unit')" width="120" align="left" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" width="120" 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 -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" /><!-- 宽MM -->
<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="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('basproduct1.long')" width="120" align="right" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" width="120" align="right" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" width="120" align="right" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" width="120" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" width="120" align="right" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" width="120" align="left" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->

View File

@@ -27,16 +27,16 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewOutJobFlow.status')" prop="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('searchViewOutJobFlow.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewOutJobFlow.status')" prop="status"> &lt;!&ndash; 状态 &ndash;&gt;-->
<!-- <el-select v-model="queryParams.status" :placeholder="$t('searchViewOutJobFlow.selectStatus')" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.mydo_job_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewOutJobFlow.taskNo')" prop="taskNo"> <!-- 任务号 -->
<el-input
v-model="queryParams.taskNo"
@@ -306,34 +306,34 @@
<el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column :label="$t('searchViewOutJobFlow.jobId')" align="left" prop="jobId"/>
<el-table-column :label="$t('searchViewOutJobFlow.jobDetailId')" align="left" prop="jobDetailId"/>
<el-table-column :label="$t('searchViewOutJobFlow.status')" align="left" prop="status">
<el-table-column :label="$t('searchViewOutJobFlow.jobId')" align="left" prop="jobId" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.jobDetailId')" align="left" prop="jobDetailId" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.status')" align="left" prop="status" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</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.taskNo')" align="left" prop="taskNo" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.trayCode')" align="left" prop="trayCode" width="120"/>
<!-- <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"/>
<el-table-column :label="$t('searchViewOutJobFlow.theColumn')" align="left" prop="theColumn"/>
<el-table-column :label="$t('searchViewOutJobFlow.theFloor')" align="left" prop="theFloor"/>
<el-table-column :label="$t('searchViewOutJobFlow.priority')" align="right" prop="priority"/>
<el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceId')" align="left" prop="cargoSpaceId" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.thePlatoon')" align="left" prop="thePlatoon" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.theColumn')" align="left" prop="theColumn" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.theFloor')" align="left" prop="theFloor" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.priority')" align="right" prop="priority" width="120"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.executionPhase')" align="left" prop="executionPhase">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewOutJobFlow.inOrOut')" align="left" prop="inOrOut">
<el-table-column :label="$t('searchViewOutJobFlow.inOrOut')" align="left" prop="inOrOut" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<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.exitId')" align="left" prop="exitId" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.productId')" align="left" prop="productId" width="120"/>
<!-- <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">-->
@@ -341,27 +341,27 @@
<!-- <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.outQuantity')" align="right" prop="outQuantity" width="120"/>
<!-- <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.inOrOutId')" align="left" prop="inOrOutId" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.inOrOutDId')" align="left" prop="inOrOutDId" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.createTime')" align="left" prop="createTime" width="180"/>
<el-table-column :label="$t('searchViewOutJobFlow.startTime')" align="left" prop="startTime" width="180"/>
<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.warehouseId')" align="left" prop="warehouseId" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.productName')" align="left" prop="productName" width="120"/>
<!-- <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"/>
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('searchViewOutJobFlow.unit')" align="left" prop="unit" width="120"/>
<el-table-column :label="$t('searchViewOutJobFlow.customerName')" align="left" prop="customerName" width="120"/>
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" width="120"/><!-- 英文名称 -->
<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 -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" /><!-- 宽MM -->
<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="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" width="120"/><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" width="120"/><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" width="120"/><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" width="120"/><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" width="120"/> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" width="120"/> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

View File

@@ -177,16 +177,16 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockManagement.stockStatus')" prop="stockStatus"><!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('stockManagement.stockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('stockManagement.stockStatus')" prop="stockStatus">&lt;!&ndash; 库存状态 &ndash;&gt;-->
<!-- <el-select v-model="queryParams.stockStatus" :placeholder="$t('stockManagement.stockStatus')" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.stock_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('searchViewStockDetail.search')}} <!-- 搜索 --></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockDetail.reset')}} <!-- 重置 --></el-button>
@@ -242,47 +242,47 @@
<el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="id" align="center" prop="onlyIdentity" />-->
<el-table-column :label="$t('searchViewStockDetail.stockId')" align="left" prop="stockId" />
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceId')" align="left" prop="cargoSpaceId" />
<el-table-column :label="$t('searchViewStockDetail.trayCode')" align="left" prop="trayCode" />
<el-table-column :label="$t('searchViewStockDetail.quantity')" align="right" prop="quantity" />
<el-table-column :label="$t('searchViewStockDetail.jobId')" align="left" prop="jobId" />
<el-table-column :label="$t('searchViewStockDetail.stockinDetailId')" align="left" prop="stockinDetailId" />
<el-table-column :label="$t('searchViewStockDetail.inDate')" align="left" prop="inDate" />
<el-table-column :label="$t('searchViewStockDetail.warehouseId')" align="left" prop="warehouseName" />
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceName')" align="left" prop="cargoSpaceName" />
<el-table-column :label="$t('searchViewStockDetail.roadwayId')" align="left" prop="roadwayId" />
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceStatus')" align="left" prop="cargoSpaceStatus" >
<el-table-column :label="$t('searchViewStockDetail.stockId')" align="left" prop="stockId" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceId')" align="left" prop="cargoSpaceId" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.trayCode')" align="left" prop="trayCode" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.quantity')" align="right" prop="quantity" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.jobId')" align="left" prop="jobId" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.stockinDetailId')" align="left" prop="stockinDetailId" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.inDate')" align="left" prop="inDate" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.warehouseId')" align="left" prop="warehouseName" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceName')" align="left" prop="cargoSpaceName" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.roadwayId')" align="left" prop="roadwayId" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceStatus')" align="left" prop="cargoSpaceStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockDetail.stockStatus')" align="left" prop="stockStatus" >
<el-table-column :label="$t('searchViewStockDetail.stockStatus')" align="left" prop="stockStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockDetail.productStatus')" align="left" prop="productStatus" >
<el-table-column :label="$t('searchViewStockDetail.productStatus')" align="left" prop="productStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockDetail.locked')" align="left" prop="locked" >
<el-table-column :label="$t('searchViewStockDetail.locked')" align="left" prop="locked" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockDetail.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewStockDetail.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewStockDetail.unit')" align="left" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column :label="$t('searchViewStockDetail.productId')" align="left" prop="productId" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.productName')" align="left" prop="productName" width="120"/>
<el-table-column :label="$t('searchViewStockDetail.unit')" align="left" prop="unit" width="120"/>
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" width="120"/>
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<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('basproduct1.long')" align="right" prop="spare5" width="120"/>
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" width="120"/>
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" width="120"/>
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" width="120"/>
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" width="120"/>
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" width="120"/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

View File

@@ -93,30 +93,30 @@
<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.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" > <!-- 库存状态 -->
<el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="left" prop="warehouseName" width="120"/> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="left" prop="stockId" width="120"/> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="left" prop="cargoSpaceId" width="120"/> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" width="120"> <!-- 库存状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" > <!-- 物料状态 -->
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" width="120"> <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批次号 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('searchViewStockSecure.inDate')" align="left" prop="inDate" width="120"/> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('searchViewStockSecure.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('searchViewStockSecure.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('searchViewStockSecure.quantity')" align="right" prop="quantity" width="120"/> <!-- 库存数量 -->
<el-table-column :label="$t('searchViewStockSecure.jobId')" align="left" prop="jobId" width="120"/> <!-- 作业ID -->
<el-table-column :label="$t('searchViewStockSecure.trayCode')" align="left" prop="trayCode" width="120"/> <!-- 托盘条码 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
<el-table-column :label="$t('searchViewStockSecure.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" > <!-- 入库类型 -->
<el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="left" prop="stockinDetailId" width="120"/> <!-- 入库子单ID -->
<el-table-column :label="$t('searchViewStockSecure.stockinId')" align="left" prop="stockinId" width="120"/> <!-- 入库主单 -->
<el-table-column :label="$t('searchViewStockSecure.inType')" align="left" prop="inType" width="120"> <!-- 入库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
</template>
@@ -130,24 +130,24 @@
<!-- <el-table-column label="备用字段4" align="center" prop="spare4" />-->
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />-->
<!-- <el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column :label="$t('searchViewStockSecure.productId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<el-table-column :label="$t('searchViewStockSecure.productId')" align="left" prop="productId" width="120"/> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockSecure.productName')" align="left" prop="productName" width="120"/> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockSecure.enName')" align="left" prop="enName" width="120"/> <!-- 英文名称 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> &lt;!&ndash; 仓库地址 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> &lt;!&ndash; 仓库描述 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> &lt;!&ndash; 仓库级别 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> &lt;!&ndash; 仓库类型 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> &lt;!&ndash; 是否可用 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockSecure.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewStockSecure.price')" align="right" prop="price" width="120"/> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockSecure.unit')" align="left" prop="unit" width="120"/> <!-- 单位 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockSecure.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
<el-table-column :label="$t('searchViewStockSecure.wide')" align="center" prop="wide" /> <!-- 宽MM -->
<el-table-column :label="$t('searchViewStockSecure.hight')" align="center" prop="hight" /> <!-- 高MM -->
<el-table-column :label="$t('searchViewStockSecure.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('searchViewStockSecure.weight')" align="right" prop="weight" width="120"/> <!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockSecure.longMM')" align="right" prop="longMM" width="120"/> <!-- 长MM -->
<el-table-column :label="$t('searchViewStockSecure.wide')" align="right" prop="wide" width="120"/> <!-- 宽MM -->
<el-table-column :label="$t('searchViewStockSecure.hight')" align="right" prop="hight" width="120"/> <!-- 高MM -->
<el-table-column :label="$t('searchViewStockSecure.volume')" align="right" prop="volume" width="120"/> <!-- 体积m³ -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="left" prop="cargoSpaceName" width="120"/> <!-- 货位名称 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
@@ -155,12 +155,12 @@
<!-- <el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> &lt;!&ndash; 排 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> &lt;!&ndash; 列 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> &lt;!&ndash; 层 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" > <!-- 货位状态 -->
<el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" width="120"> <!-- 货位状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" > <!-- 是否锁定 -->
<el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" width="120"> <!-- 是否锁定 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>

View File

@@ -92,30 +92,31 @@
</el-row>
<el-table v-loading="loading" :data="ViewStockWarningList" @selection-change="handleSelectionChange">
<el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" > <!-- 库存状态 -->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="left" prop="warehouseName" width="120" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="left" prop="stockId" width="120" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="left" prop="cargoSpaceId" width="120" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" width="120" > <!-- 库存状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" > <!-- 物料状态 -->
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" width="120" > <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批次号 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.inDate')" align="left" prop="inDate" /> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('searchViewStockSecure.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('searchViewStockSecure.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.quantity')" align="right" prop="quantity" /> <!-- 库存数量 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.jobId')" align="left" prop="jobId" /> <!-- 作业ID -->
<el-table-column width=120 :label="$t('searchViewStockSecure.trayCode')" align="left" prop="trayCode" /> <!-- 托盘条码 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
<el-table-column :label="$t('searchViewStockSecure.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" > <!-- 入库类型 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.stockinDetailId')" align="left" prop="stockinDetailId" /> <!-- 入库子单ID -->
<el-table-column width=120 :label="$t('searchViewStockSecure.stockinId')" align="left" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" > <!-- 入库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
</template>
@@ -129,24 +130,24 @@
<!-- <el-table-column label="备用字段4" align="center" prop="spare4" />-->
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />-->
<!-- <el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column :label="$t('searchViewStockSecure.productId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.productId')" align="left" prop="productId" /> <!-- 物料ID -->
<el-table-column width=120 :label="$t('searchViewStockSecure.productName')" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.enName')" align="left" prop="enName" /> <!-- 英文名称 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> &lt;!&ndash; 仓库地址 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> &lt;!&ndash; 仓库描述 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> &lt;!&ndash; 仓库级别 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> &lt;!&ndash; 仓库类型 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> &lt;!&ndash; 是否可用 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockSecure.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.price')" align="right" prop="price" /> <!-- 价格 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.unit')" align="left" prop="unit" /> <!-- 单位 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockSecure.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
<el-table-column :label="$t('searchViewStockSecure.wide')" align="center" prop="wide" /> <!-- 宽MM -->
<el-table-column :label="$t('searchViewStockSecure.hight')" align="center" prop="hight" /> <!-- 高MM -->
<el-table-column :label="$t('searchViewStockSecure.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.weight')" align="right" prop="weight" /> <!-- 单件净重 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.longMM')" align="right" prop="longMM" /> <!-- 长MM -->
<el-table-column width=120 :label="$t('searchViewStockSecure.wide')" align="right" prop="wide" /> <!-- 宽MM -->
<el-table-column width=120 :label="$t('searchViewStockSecure.hight')" align="right" prop="hight" /> <!-- 高MM -->
<el-table-column width=120 :label="$t('searchViewStockSecure.volume')" align="right" prop="volume" /> <!-- 体积m³ -->
<el-table-column width=120 :label="$t('searchViewStockSecure.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位名称 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
@@ -154,12 +155,12 @@
<!-- <el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> &lt;!&ndash; 排 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> &lt;!&ndash; 列 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> &lt;!&ndash; 层 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" > <!-- 货位状态 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" > <!-- 货位状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" > <!-- 是否锁定 -->
<el-table-column width=120 :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" > <!-- 是否锁定 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>

View File

@@ -309,40 +309,40 @@
<el-table v-loading="loading" :data="ViewStockinHistoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="入库单guid" align="center" prop="stockinGuid" />-->
<el-table-column :label="$t('searchViewStockinHistory.stockinId')" align="left" prop="stockinId" />
<el-table-column :label="$t('searchViewStockinHistory.inType')" align="left" prop="inType">
<el-table-column :label="$t('searchViewStockinHistory.stockinId')" align="left" prop="stockinId" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.inType')" align="left" prop="inType" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockinHistory.createDate')" align="left" prop="createDate" />
<el-table-column :label="$t('searchViewStockinHistory.createManId')" align="left" prop="createManId" />
<el-table-column :label="$t('searchViewStockinHistory.status')" align="left" prop="status">
<el-table-column :label="$t('searchViewStockinHistory.createDate')" align="left" prop="createDate" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.createManId')" align="left" prop="createManId" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.status')" align="left" prop="status" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</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.warehouseId')" align="left" prop="warehouseId" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.finishDate')" align="left" prop="finishDate" width="120" />
<!-- <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.stockSource')" align="left" prop="stockSource" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.departmentNo')" align="left" prop="departmentNo" width="120" />
<!-- <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" />
<el-table-column :label="$t('searchViewStockinHistory.contactName')" align="left" prop="contactName" />
<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.supplierNo')" align="left" prop="supplierNo" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.supplierName')" align="left" prop="supplierName" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.simpleName')" align="left" prop="simpleName" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.contactName')" align="left" prop="contactName" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.contactNumber')" align="left" prop="contactNumber" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.address')" align="left" prop="address" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.stockinDetailId')" align="left" prop="stockinDetailId" width="120" />
<!-- <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.quantity')" align="right" prop="quantity" width="120" />
<!-- <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.assignNum')" align="right" prop="assignNum" width="120" />
<!-- <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.scanNum')" align="right" prop="scanNum" width="120" />
<!-- <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">
@@ -355,18 +355,18 @@
<!-- <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<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.productId')" align="left" prop="productId" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.productName')" align="left" prop="productName" width="120" />
<el-table-column :label="$t('searchViewStockinHistory.unit')" align="left" prop="unit" width="120" />
<!-- <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.englishName')" align="left" prop="spare1" width="120" />
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<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('basproduct1.long')" align="right" prop="spare5" width="120" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" width="120" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" width="120" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" width="120" />
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" width="120" />
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" width="120" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

View File

@@ -202,27 +202,27 @@
<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.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 width=120 :label="$t('searchViewStockoutHistory.stockoutDetailId')" align="left" prop="stockoutDetailId" />
<el-table-column width=120 :label="$t('searchViewStockoutHistory.productId')" align="left" prop="productId" />
<el-table-column width=120 :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.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 width=120 :label="$t('searchViewStockoutHistory.exitId')" align="left" prop="exitId" />
<el-table-column width=120 :label="$t('searchViewStockoutHistory.quantity')" align="right" prop="quantity" />
<el-table-column width=120 :label="$t('searchViewStockoutHistory.allotQuantity')" align="right" prop="allotQuantity" />
<el-table-column width=120 :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.customerName')" align="left" prop="customerName" />
<el-table-column width=120 :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.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" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<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 width=120 :label="$t('searchViewStockoutHistory.unit')" align="left" prop="unit" />
<el-table-column width=120 :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column width=120 :label="$t('basproduct1.netWeightPerUnit')" align="right" prop="spare2" />
<el-table-column width=120 :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column width=120 :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column width=120 :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column width=120 :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<el-table-column width=120 :label="$t('basproduct1.price')" align="right" prop="price" />
<el-table-column width=120 :label="$t('basproduct1.notes')" align="left" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

View File

@@ -126,47 +126,47 @@
</el-row>
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockManagement.stockId')" align="left" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.stockStatus')" align="left" prop="stockStatus" ><!-- 库存状态 -->
<el-table-column type="selection" align="center" />
<el-table-column width=120 :label="$t('stockManagement.stockId')" align="left" prop="stockId" /> <!-- 库存id -->
<el-table-column width=120 :label="$t('stockManagement.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column width=120 :label="$t('stockManagement.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column width=120 :label="$t('stockManagement.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('stockManagement.cargoSpaceStockStatus')" align="left" prop="cargoSpaceStockStatus"> <!-- 货位状态 -->
<el-table-column width=120 :label="$t('stockManagement.cargoSpaceStockStatus')" align="left" prop="cargoSpaceStockStatus"> <!-- 货位状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('stockManagement.cargoSpaceStatus')" align="left" prop="cargoSpaceStatus" ><!--货位状态-->
<el-table-column width=120 :label="$t('stockManagement.cargoSpaceStatus')" align="left" prop="cargoSpaceStatus" ><!--货位状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column><!-- 货位状态 -->
<el-table-column :label="$t('stockManagement.productStatus')" align="left" width="120" prop="productStatus"> <!-- 物料状态 -->
<el-table-column width=120 :label="$t('stockManagement.productStatus')" align="left" prop="productStatus"> <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('stockManagement.productId')" align="left" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.materialDesc')" align="left" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="left" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column :label="$t('stockManagement.netWeight')" align="right" prop="extraField.netWeight" width="120" /> <!-- 净重 -->
<el-table-column :label="$t('stockManagement.length')" align="right" prop="extraField.length" width="100"/> <!-- 长 -->
<el-table-column :label="$t('stockManagement.width')" align="right" prop="extraField.width" width="100"/> <!-- 宽 -->
<el-table-column :label="$t('stockManagement.height')" align="right" prop="extraField.height" width="100"/> <!-- 高 -->
<el-table-column :label="$t('stockManagement.volume')" align="right" prop="extraField.volume" width="100"/> <!-- 体积 -->
<el-table-column :label="$t('stockManagement.quantity')" align="right" prop="quantity" width="100"/> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="left" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="left" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockManagement.stockinId')" align="left" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="left" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.inType')" align="left" prop="inType" /> <!-- 入库类型 -->
<el-table-column :label="$t('stockManagement.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.inDate')" align="left" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<el-table-column width=120 :label="$t('stockManagement.productId')" align="left" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column width=120 :label="$t('stockManagement.materialDesc')" align="left" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column width=120 :label="$t('stockManagement.englishDesc')" align="left" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column width=120 :label="$t('stockManagement.netWeight')" align="right" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column width=120 :label="$t('stockManagement.length')" align="right" prop="extraField.length" /> <!-- 长 -->
<el-table-column width=120 :label="$t('stockManagement.width')" align="right" prop="extraField.width" /> <!-- 宽 -->
<el-table-column width=120 :label="$t('stockManagement.height')" align="right" prop="extraField.height" /> <!-- 高 -->
<el-table-column width=120 :label="$t('stockManagement.volume')" align="right" prop="extraField.volume" /> <!-- 体积 -->
<el-table-column width=120 :label="$t('stockManagement.quantity')" align="right" prop="quantity"/> <!-- 库存数量 -->
<el-table-column width=120 :label="$t('stockManagement.jobId')" align="left" prop="jobId" /> <!-- 作业ID -->
<el-table-column width=120 :label="$t('stockManagement.trayCode')" align="left" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column width=120 :label="$t('stockManagement.stockinId')" align="left" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column width=120 :label="$t('stockManagement.stockinDetailId')" align="left" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column width=120 :label="$t('stockManagement.inType')" align="left" prop="inType" /> <!-- 入库类型 -->
<el-table-column width=120 :label="$t('stockManagement.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column width=120 :label="$t('stockManagement.inDate')" align="left" prop="inDate" /> <!-- 入库时间 -->
<el-table-column width=120 :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
size="mini"