lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试问题修改

Browse Source
This commit is contained in:
liuhanqing
2025-10-10 08:39:42 +08:00
parent 2f6f808923
commit 0565a9c15b
10 changed files with 120 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-ui/src/views/bas/BasProductCode/index.vue
View File

@@ -356,14 +356,14 @@ const FORM_FIELDS = [
{ prop: 'model', label: '型号', placeholder: '请输入型号', required: true },
{ prop: 'serial', label: '序列号', placeholder: '请输入序列号', required: true },
{ prop: 'color', label: '颜色', placeholder: '请输入颜色', required: true },
{ prop: 'v', label: '电压', placeholder: '请输入电压' },
{ prop: 'hz', label: '功率', placeholder: '请输入功率' },
{ prop: 'ph', label: '相位', placeholder: '请输入相位' },
{ prop: 'v', label: '电压', placeholder: '请输入电压', required: true },
{ prop: 'hz', label: '功率', placeholder: '请输入功率' , required: true},
{ prop: 'ph', label: '相位', placeholder: '请输入相位' , required: true},
{ prop: 'nW', label: '净重', placeholder: '请输入净重', required: true },
{ prop: 'gW', label: '毛重', placeholder: '请输入毛重', required: true },
{ prop: 'spare1', label: '订单号', placeholder: '请输入订单号' },
{ prop: 'spare2', label: '机型', placeholder: '请输入机型' },
{ prop: 'spare3', label: '分销', placeholder: '请输入分销' }
{ prop: 'spare1', label: '订单号', placeholder: '请输入订单号', required: true },
{ prop: 'spare2', label: '机型', placeholder: '请输入机型', required: true },
{ prop: 'spare3', label: '分销', placeholder: '请输入分销', required: true }
]
const TABLE_COLUMNS = [

7
ruoyi-ui/src/views/bas/basProduct/index.vue
View File

@@ -506,6 +506,9 @@
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<!-- <el-form-item label="产品分类" prop="parentId">-->
<!-- <el-input v-model="form.parentId" placeholder="请输入产品分类" />-->
<!-- </el-form-item>-->
@@ -542,9 +545,7 @@
<!-- <el-form-item label="功率" prop="spare6">-->
<!-- <el-input v-model="form.spare6" placeholder="请输入功率" />-->
<!-- </el-form-item>-->
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<!-- <el-form-item label="相位" prop="spare7">-->
<!-- <el-input v-model="form.spare7" placeholder="请输入相位" />-->
<!-- </el-form-item>-->

36
ruoyi-ui/src/views/bas/roadway/index.vue
View File

@@ -9,14 +9,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库id" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库id" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="巷道名称" prop="roadwayName">
<el-input
v-model="queryParams.roadwayName"
@@ -25,14 +25,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备id" prop="deviceId">
<el-input
v-model="queryParams.deviceId"
placeholder="请输入设备id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="设备id" prop="deviceId">-->
<!-- <el-input-->
<!-- v-model="queryParams.deviceId"-->
<!-- placeholder="请输入设备id"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="一层入库锁" prop="inLocked">
<el-select v-model="queryParams.inLocked" placeholder="请选择一层入库锁" clearable>
<el-option
@@ -128,9 +128,9 @@
<el-table v-loading="loading" :data="roadwayList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="巷道号" align="center" prop="roadwayId" />
<el-table-column label="仓库id" align="center" prop="warehouseId" />
<!-- <el-table-column label="仓库id" align="center" prop="warehouseId" />-->
<el-table-column label="巷道名称" align="center" prop="roadwayName" />
<el-table-column label="设备id" align="center" prop="deviceId" />
<!-- <el-table-column label="设备id" align="center" prop="deviceId" />-->
<el-table-column label="一层入库锁" align="center" prop="inLocked">
<template slot-scope="scope">
<dict-tag :options="dict.type.roadway_lock" :value="scope.row.inLocked"/>

36
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -80,21 +80,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId"><!--仓库-->
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
clearable
@change="handleQuery"
>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
<!-- <el-select-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请选择仓库"-->
<!-- clearable-->
<!-- @change="handleQuery"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in warehouseOptions"-->
<!-- :key="item.warehouseId"-->
<!-- :label="item.warehouseName"-->
<!-- :value="item.warehouseId"-->
<!-- />-->
<!-- </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>
@@ -145,7 +145,6 @@
</template>
</el-table-column>
<el-table-column label="任务号" align="left" prop="taskNo" />
<el-table-column label="批号" align="left" prop="lotNo" fixed />
<el-table-column label="托盘码" align="left" prop="trayCode" width="140" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" />
<el-table-column label="优先级" align="left" prop="priority" />
@@ -179,6 +178,8 @@
<el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
<el-table-column label="物料编码" align="left" prop="productId" width="140" />
<el-table-column label="物料名称" align="left" prop="productName" />
<el-table-column label="批号" align="left" prop="lotNo" />
<el-table-column label="入库数量" align="right" prop="inQuantity" />
<el-table-column label="机型" align="left" prop="unit"/><!--机型-->
<el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
<el-table-column label="规格" align="left" prop="spec"/><!--规格-->
@@ -190,7 +191,6 @@
<el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
<el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
<el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
<el-table-column label="入库数量" align="right" prop="inQuantity" />
</el-table>
<pagination
@@ -288,7 +288,7 @@ export default {
created() {
// 获取字典数据后，设置默认值
this.getList()
this.getWarehouseList()
//this.getWarehouseList()
},
methods: {
/** 获取仓库列表 */

4
ruoyi-ui/src/views/in/stockIn/add/index_new.vue
View File

@@ -52,10 +52,10 @@
<el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleAddProduct" v-hasPermi="['receive:stockin:add']">
添加物料</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-download" size="mini" @click="handleImport" v-hasPermi="['receive:stockin:import']">
导入物料</el-button>
</el-col>
</el-col>-->
</el-row>
</div>