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

代码修改

Browse Source
This commit is contained in:
liuhanqing
2026-03-25 14:32:32 +08:00
parent f4e3d2c898
commit f76c277d79
28 changed files with 589 additions and 917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

304
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -22,7 +22,7 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="'备注'" prop="remark"><!--客户-->
<el-form-item :label="'备注'" prop="remark">
<el-input
v-model="formData.remark"
:placeholder="'请输入备注'"
@@ -43,78 +43,22 @@
<!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList">
<!-- <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
<el-table-column label="仓库" align="center" prop="warehouseName" />
<el-table-column label="合同号" align="center" prop="cargoNo" width="160"/>
<el-table-column label="产品号" align="center" prop="phase" width="160"/>
<el-table-column label="代号" align="center" prop="fid" width="160"/>
<el-table-column label="台次" align="center" prop="power" width="160"/>
<el-table-column label="物料编码" align="center" prop="productId" /><!--物资编号-->
<el-table-column label="物料名称" align="center" prop="productName" /><!--物资名称-->
<!-- <el-table-column label="批次" align="center" prop="lotNo" />-->
<!-- <el-table-column label="规格型号" align="center" prop="productSpec" />-->
<!-- <el-table-column label="供应商" align="center" prop="supplierName" />-->
<!-- <el-table-column label="客户编码" align="center" prop="outId" />-->
<!-- <el-table-column label="客户名称" align="center" prop="customerName" width="230">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.customerName"-->
<!-- placeholder="点击选择客户"-->
<!-- readonly-->
<!-- size="mini"-->
<!-- @focus="openRowCustomerSelector(scope.row)"-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="'数量'" align="center" prop="quantity" width="150"><!--数量-->
<el-table-column label="合同号" align="center" prop="orderId" width="160"/>
<el-table-column label="产品号" align="center" prop="power" width="160"/>
<el-table-column label="代号" align="center" prop="distribution" width="160"/>
<el-table-column label="台次" align="center" prop="spec" width="160"/>
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="单重" align="center" prop="netWeight" />
<el-table-column label="路线" align="center" prop="grossWeight" />
<el-table-column label="供应商" align="center" prop="phase" />
<el-table-column label="部门" align="center" prop="model" />
<el-table-column label="数量" align="center" prop="quantity" width="150">
<template slot-scope="scope">
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template>
</el-table-column>
<!-- <el-table-column label="状态" align="center" prop="spec">
<template slot-scope="scope">
<dict-tag :options="dict.type.turnover_type" :value="scope.row.spec"/>
</template>
</el-table-column>
<el-table-column label="来源" align="center" prop="unit" >
<template slot-scope="scope">
<dict-tag :options="dict.type.origin_type" :value="scope.row.unit"/>
</template>
</el-table-column>-->
<!-- <el-table-column label="入库单价" align="center" prop="price" />-->
<!-- <el-table-column label="产品质量" align="center" prop="voltage" >
<template slot-scope="scope">
<dict-tag :options="dict.type.quality_type" :value="scope.row.voltage"/>
</template>
</el-table-column>-->
<!-- <el-table-column label="用途" align="center" prop="model" >
<template slot-scope="scope">
<dict-tag :options="dict.type.purpose_type" :value="scope.row.model"/>
</template>
</el-table-column>
<el-table-column label="套账" align="center" prop="entryid" >
<template slot-scope="scope">
<dict-tag :options="dict.type.account_type" :value="scope.row.entryid"/>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="productUnit" />
<el-table-column label="图号" align="center" prop="productDrawNo" />-->
<!-- <el-table-column label="物料状态" align="center" prop="productStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.productStatus"/>
</template>
</el-table-column>-->
<!-- <el-table-column label="常用编码" align="center" prop="parentId" />
<el-table-column label="是否启用" align="center" prop="isUsed" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isUsed"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="创建用户" align="center" prop="createSys" />-->
<el-table-column :label="'操作'" align="center" class-name="small-padding fixed-width"><!--操作-->
<template slot-scope="scope">
@@ -124,7 +68,7 @@
</el-table>
<!-- 选择物资弹窗 -->
<el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="1700px" append-to-body><!--选择物资-->
<el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="80%" custom-class="material-dialog" append-to-body><!--选择物资-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="合同号" prop="orderId">
@@ -159,14 +103,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="物料编码" prop="productId">&lt;!&ndash;物资编码&ndash;&gt;
<el-input
v-model="queryParams.productId"
:placeholder="'请输入物料编码'"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="物料名称" prop="productName"><!--物资名称-->
<el-input
v-model="queryParams.productName"
@@ -175,15 +111,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{'搜索'}}<!--搜索--></el-button>
@@ -193,65 +120,19 @@
<el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="onlyIdentity" />
<el-table-column label="仓库编码" align="center" prop="warehouseId" />
<el-table-column label="仓库" align="center" prop="warehouseName" />
<el-table-column label="id" align="center" prop="onlyIdentity" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="数量" align="center" prop="quantity" />
<el-table-column label="仓库id" align="center" prop="warehouseId" />
<el-table-column label="合同号" align="center" prop="orderId" />
<el-table-column label="产品号" align="center" prop="power" />
<el-table-column label="代号" align="center" prop="distribution" />
<el-table-column label="台次" align="center" prop="spare5" />
<el-table-column label="物料编码" align="center" prop="productId" />
<!-- <el-table-column label="批次" align="center" prop="lotNo" />-->
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="规格型号" align="center" prop="spec" />
<!-- <el-table-column label="图号" align="center" prop="cargoNo" />-->
<el-table-column label="库存数量" align="center" prop="quantity" />
<!-- <el-table-column label="来源" align="center" prop="spare1">
<template slot-scope="scope">
<dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
</template>
</el-table-column>
<el-table-column label="套账" align="center" prop="spare3">
<template slot-scope="scope">
<dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
</template>
</el-table-column>
<el-table-column label="用途" align="center" prop="spare4">
<template slot-scope="scope">
<dict-tag :options="dict.type.purpose_type" :value="scope.row.spare4"/>
</template>
</el-table-column>-->
<!-- <el-table-column label="入库单价" align="center" prop="spare6" />-->
<!-- <el-table-column label="状态" align="center" prop="voltage">
<template slot-scope="scope">
<dict-tag :options="dict.type.turnover_type" :value="scope.row.voltage"/>
</template>
</el-table-column>-->
<!-- <el-table-column label="供应商" align="center" prop="phase" />-->
<!-- <el-table-column label="供应商" align="center" prop="supplierName" />-->
<!-- <el-table-column label="质量等级" align="center" prop="spare8">
<template slot-scope="scope">
<dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
</template>
</el-table-column>
<el-table-column label="单价" align="center" prop="price" />
<el-table-column label="物料状态" align="center" prop="productStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column label="常用编码" align="center" prop="parentId" />
<el-table-column label="启用标识" align="center" prop="spare7">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.spare7"/>
</template>
</el-table-column>-->
<!-- <el-table-column label="创建用户" align="center" prop="createSys" />-->
<!-- <el-table-column label="单位" align="center" prop="unit" />-->
<el-table-column label="单重" align="center" prop="netWeight" />
<el-table-column label="路线" align="center" prop="grossWeight" />
<el-table-column label="供应商" align="center" prop="phase" />
<el-table-column label="部门" align="center" prop="model" />
</el-table>
<pagination
@@ -268,104 +149,6 @@
</div>
</el-dialog>
<!-- 选择客户弹窗 -->
<el-dialog :title="'客户管理'" :visible.sync="customerDialog" width="800px" append-to-body>
<el-form :model="customerQueryParams" ref="customerQueryForm" size="small" :inline="true" label-width="100px">
<el-form-item :label="'客户编号'" prop="customerNo"><!--客户编号-->
<el-input
v-model="customerQueryParams.customerNo"
:placeholder="'请输入客户编号'"
clearable
@keyup.enter.native="handleCustomerQuery"
/>
</el-form-item>
<el-form-item :label="'客户名称'" prop="customerName"><!--客户名称-->
<el-input
v-model="customerQueryParams.customerName"
:placeholder="'请输入客户名称'"
clearable
@keyup.enter.native="handleCustomerQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleCustomerQuery">搜索<!--搜索--></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetCustomerQuery">重置<!--重置--></el-button>
</el-form-item>
</el-form>
<el-table ref="customerTable" v-loading="customerLoading" :data="customerList" @row-click="handleCustomerRowClick" highlight-current-row>
<el-table-column :label="'客户编号'" align="left" prop="customerNo" /><!--客户编号-->
<el-table-column :label="'客户名称'" align="left" prop="customerName" /><!--客户名称-->
<!-- <el-table-column :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" />客户简称 -->
<el-table-column :label="'是否可用'" 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>
<pagination
v-show="customerTotal > 0"
:total="customerTotal"
:page.sync="customerQueryParams.pageNum"
:limit.sync="customerQueryParams.pageSize"
@pagination="getCustomerList"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelectCustomer">确定<!--确 定--></el-button>
<el-button @click="cancelSelectCustomer">取消<!--取 消--></el-button>
</div>
</el-dialog>
<!-- 选择供应商弹窗 -->
<el-dialog :title="'选择供应商'" :visible.sync="supplierDialog" width="800px" append-to-body>
<el-form :model="supplierQueryParams" ref="supplierQueryForm" size="small" :inline="true" label-width="100px">
<el-form-item :label="'供应商编号'" prop="supplierNo">
<el-input
v-model="supplierQueryParams.supplierNo"
:placeholder="'请输入供应商编号'"
clearable
@keyup.enter.native="handleSupplierQuery"
/>
</el-form-item>
<el-form-item :label="'供应商名称'" prop="supplierName">
<el-input
v-model="supplierQueryParams.supplierName"
:placeholder="'请输入供应商名称'"
clearable
@keyup.enter.native="handleSupplierQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSupplierQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetSupplierQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table ref="supplierTable" v-loading="supplierLoading" :data="supplierList" @row-click="handleSupplierRowClick" highlight-current-row>
<el-table-column :label="'供应商编号'" align="left" prop="supplierNo" />
<el-table-column :label="'供应商名称'" align="left" prop="supplierName" />
<el-table-column :label="'是否可用'" 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>
<pagination
v-show="supplierTotal > 0"
:total="supplierTotal"
:page.sync="supplierQueryParams.pageNum"
:limit.sync="supplierQueryParams.pageSize"
@pagination="getSupplierListForDialog"
/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelectSupplier">确定</el-button>
<el-button @click="cancelSelectSupplier">取消</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -642,36 +425,21 @@ export default {
this.materialList = this.materialList.concat(
newMaterials.map(item => ({
onlyIdentity: item.onlyIdentity,
productId: item.productId,
productName: item.productName,
quantity: item.quantity,
quantityOrignal: item.quantity,
spec: item.voltage,
supplierId: item.phase,
supplierName: item.supplierName,
phase: item.power,
fid: item.distribution,
cargoNo: item.orderId,
entryid: item.spare3,
unit: item.spare1,
model: item.spare4,
price:item.spare6,
power:item.spare5,
warehouseId: item.warehouseId,
warehouseName: item.warehouseName,
lotNo: item.lotNo,
voltage:item.spare8,
onlyIdentity: item.onlyIdentity,
productPrice:item.price,
productSpec:item.spec,
productUnit:item.unit,
productDrawNo:item.cargoNo,
productStatus:item.productStatus,
parentId: item.parentId,
isUsed:item.spare7,
createTime: item.createTime,
createSys:item.createSys
orderId: item.orderId,
power: item.power,
distribution: item.distribution,
spec: item.spare5,
netWeight: item.netWeight,
grossWeight: item.grossWeight,
phase: item.phase,
model: item.model,
}))
);
@@ -759,4 +527,14 @@ export default {
width: auto;
min-width: fit-content;
}
.material-dialog {
height: 50vh;
overflow: hidden;
display: flex;
flex-direction: column;
}
.material-dialog >>> .el-dialog__body {
flex: 1;
overflow-y: auto;
}
</style>