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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lsymicc
2025-06-10 11:38:14 +08:00
parent 7576cf3bcb b8d4b76bef
commit 95f5aeaa5e
50 changed files with 820 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<el-form-item :label="$t('checkCreate.warehouse')" prop="warehouseId" required> <!-- 仓库 -->
<el-form-item :label="$t('checkCreate.warehouse')" prop="warehouseId" required>
<el-select v-model="formData.warehouseId" :placeholder="$t('checkCreate.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
@@ -12,13 +12,13 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('checkCreate.customer')" prop="customerNo" required> <!-- 客户 -->
<!-- <el-form-item :label="$t('checkCreate.customer')" prop="customerNo" required> &lt;!&ndash; 客户 &ndash;&gt;
<el-input
v-model="formData.customerNo"
:placeholder="$t('checkCreate.inputCustomerNo')"
clearable
/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('checkCreate.documentType')" prop="checkType" required> <!-- 单据类型 -->
<el-select v-model="formData.checkType" :placeholder="$t('checkCreate.selectDocumentType')" clearable>
<el-option
@@ -54,6 +54,7 @@
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template>
</el-table-column>
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">{{ $t('checkCreate.delete') }}</el-button> <!-- 删除 -->
@@ -88,14 +89,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" :placeholder="$t('checkCreate.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('checkCreate.search') }}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('checkCreate.reset') }}</el-button> <!-- 重置 -->
@@ -107,6 +110,9 @@
<el-table-column :label="$t('checkCreate.materialCode')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('checkCreate.materialName')" align="center" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('checkCreate.lotNo')" align="center" prop="lotNo" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" /> <!-- 物资名称 -->
</el-table>
<div slot="footer" class="dialog-footer">
@@ -223,7 +229,9 @@
quantity: item.quantity,
quantityOrignal: item.quantity,
lotNo: item.lotNo,
onlyIdentity: item.onlyIdentity
onlyIdentity: item.onlyIdentity,
warehouseId: item.warehouseId,
warehouseName: item.warehouseName
}))
);
this.materialDialog = false;

6
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -202,7 +202,7 @@
<dict-tag :options="dict.type.check_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库ID -->
<el-table-column :label="$t('checkStockCheck.stockSource')" align="center" prop="stockSource" /> <!-- 单据来源 -->
<el-table-column :label="$t('checkStockCheck.departmentNo')" align="center" prop="departmentNo" /> <!-- 部门编码 -->
<el-table-column :label="$t('checkStockCheck.createManId')" align="center" prop="createManId" /> <!-- 创建人 -->
@@ -228,8 +228,8 @@
<el-table-column :label="$t('checkStockCheck.productId')" align="center" prop="productId"/> <!-- 物料编码 -->
<el-table-column :label="$t('checkStockCheck.materialDesc')" align="center" prop="extraField.materialDesc"/> <!-- 物料描述 -->
<el-table-column :label="$t('checkStockCheck.englishDesc')" align="center" prop="extraField.englishDesc"/> <!-- 英文描述 -->
<el-table-column :label="$t('checkStockCheck.cartonNo')" align="center" prop="extraField.cartonNo"/> <!-- 箱号 -->
<el-table-column :label="$t('checkStockCheck.packingMethod')" align="center" prop="extraField.packingMethod"/> <!-- 包装方式 -->
<!-- <el-table-column :label="$t('checkStockCheck.cartonNo')" align="center" prop="extraField.cartonNo"/> &lt;!&ndash; 箱号 &ndash;&gt;-->
<!-- <el-table-column :label="$t('checkStockCheck.packingMethod')" align="center" prop="extraField.packingMethod"/> &lt;!&ndash; 包装方式 &ndash;&gt;-->
<el-table-column :label="$t('checkStockCheck.quantity')" align="center" prop="quantity"/> <!-- 计划数量 -->
<el-table-column :label="$t('checkStockCheck.scanNum')" align="center" prop="scanNum"/> <!-- 扫码数量 -->
<el-table-column :label="$t('checkStockCheck.assignNum')" align="center" prop="assignNum"/> <!-- 实际数量 -->

11
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -231,8 +231,7 @@
<!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" prop="inType"/><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.status"/>
@@ -269,6 +268,8 @@
>删除</el-button>
</template>
</el-table-column> -->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
</el-table>
<pagination
@@ -316,10 +317,10 @@
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/><!--毛重-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/>&lt;!&ndash;毛重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight"/><!--净重-->
<el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/><!--总价格-->
<el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/><!--总净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/>&lt;!&ndash;总价格&ndash;&gt;-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/>&lt;!&ndash;总净重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
<template slot-scope="scope">
<el-input-number

10
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -258,15 +258,12 @@
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<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('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"><!--单据来源-->
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
@@ -274,6 +271,9 @@
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="center" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
</el-table>
<pagination
@@ -295,8 +295,8 @@
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重-->
<el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->

10
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -122,7 +122,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@@ -130,7 +130,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['stock:freeze:add']"
>{{$t('stockFreeze.add')}}</el-button> <!-- 新增 -->
>{{$t('stockFreeze.add')}}</el-button> &lt;!&ndash; 新增 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
@@ -141,7 +141,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['stock:freeze:edit']"
>{{$t('stockFreeze.edit')}}</el-button> <!-- 修改 -->
>{{$t('stockFreeze.edit')}}</el-button> &lt;!&ndash; 修改 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
@@ -152,8 +152,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['stock:freeze:remove']"
>{{$t('stockFreeze.delete')}}</el-button> <!-- 删除 -->
</el-col>
>{{$t('stockFreeze.delete')}}</el-button> &lt;!&ndash; 删除 &ndash;&gt;
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"