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-04-10 10:23:34 +08:00
parent f76c277d79
commit 393540ae28
97 changed files with 5982 additions and 3479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,22 +43,21 @@
<!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList">
<el-table-column label="仓库" align="center" prop="warehouseName" />
<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="productName" show-overflow-tooltip/>
<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="orderId" width="120"/>
<el-table-column label="产品号" align="center" prop="power" width="100"/>
<el-table-column label="台次" align="center" prop="spec" width="80"/>
<el-table-column label="单重" align="center" prop="netWeight" />
<el-table-column label="路线" align="center" prop="grossWeight" show-overflow-tooltip/>
<el-table-column label="供应商" align="center" prop="phase" show-overflow-tooltip/>
<el-table-column label="部门" align="center" prop="model" />
<el-table-column :label="'操作'" align="center" class-name="small-padding fixed-width"><!--操作-->
<template slot-scope="scope">
@@ -120,17 +119,14 @@
<el-table v-loading="materialLoading" :data="materialOptions" @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="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="代号" align="center" prop="distribution" width="160"/>
<el-table-column label="物料名称" align="center" prop="productName" show-overflow-tooltip/>
<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="orderId" width="160"/>
<el-table-column label="产品号" align="center" prop="power" width="160"/>
<el-table-column label="台次" align="center" prop="spare5" width="160"/>
<el-table-column label="单重" align="center" prop="netWeight" />
<el-table-column label="路线" align="center" prop="grossWeight" />
<el-table-column label="路线" align="center" prop="grossWeight" show-overflow-tooltip />
<el-table-column label="供应商" align="center" prop="phase" />
<el-table-column label="部门" align="center" prop="model" />
</el-table>
@@ -440,6 +436,7 @@ export default {
grossWeight: item.grossWeight,
phase: item.phase,
model: item.model,
voltage: item.voltage,
}))
);

2
ruoyi-ui/src/views/out/outJobFlow.vue
View File

@@ -115,7 +115,7 @@
<el-table-column label="代号" align="center" prop="managementNo" width="160"/>
<el-table-column label="台次" align="center" prop="units" width="160"/>
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" width="160"/>
<el-table-column label="物料名称" align="center" prop="productName" width="160" show-overflow-tooltip/>
<!-- <el-table-column label="规格" align="center" prop="spec" width="160"/>-->
<el-table-column label="出库数量" align="center" prop="outQuantity" />
<el-table-column label="创建时间" align="center" prop="createTime" width="160"/>

40
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -109,16 +109,16 @@
v-hasPermi="['out:outStockout:autoAllot']"
>{{'自动分配'}}</el-button> <!-- 自动分配 -->
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="el-icon-s-tools"
size="mini"
@click="handleManualAllot"
v-hasPermi="['out:outStockout:manualAllot']"
>{{'手动分配'}}</el-button> <!-- 手动分配 -->
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="info"-->
<!-- plain-->
<!-- icon="el-icon-s-tools"-->
<!-- size="mini"-->
<!-- @click="handleManualAllot"-->
<!-- v-hasPermi="['out:outStockout:manualAllot']"-->
<!-- >{{'手动分配'}}</el-button> &lt;!&ndash; 手动分配 &ndash;&gt;-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -160,7 +160,6 @@
</template>
</el-table-column>
<el-table-column label="领料人" align="left" prop="classNowId" />
<!-- <el-table-column label="客户名称" align="left" prop="customerName" />-->
<el-table-column label="创建时间" align="left" prop="createDate" width="160"/><!-- 创建时间 -->
<el-table-column label="开始时间" align="left" prop="startDate" width="160"/><!-- 开始时间 -->
<el-table-column label="确认时间" align="left" prop="finishDate" width="160"/> <!-- 确认时间 -->
@@ -178,21 +177,18 @@
<!-- 子表数据 -->
<el-table v-loading="detailLoading" :data="outStockDetailList" style="margin-top: 20px;" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="'出库子单编号'" align="center" prop="stockoutDetailId" width="160" /> <!-- 出库子单编号 -->
<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="stockoutDetailId" 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="netWeight" />
<el-table-column label="路线" align="center" prop="grossWeight" width="160"/>
<el-table-column label="供应商" align="center" prop="phase" 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="productName" show-overflow-tooltip/>
<el-table-column label="计划数量" align="center" prop="quantity" />
<el-table-column label="分配数量" align="center" prop="allotQuantity" />
<el-table-column label="实际数量" align="center" prop="assignNum" />
<el-table-column label="合同号" align="center" prop="orderId" width="100"/>
<el-table-column label="产品号" align="center" prop="power" width="120"/>
<el-table-column label="台次" align="center" prop="spec" width="80"/>
<el-table-column label="单重" align="center" prop="netWeight" />
<el-table-column label="路线" align="center" prop="grossWeight" show-overflow-tooltip/>
<el-table-column label="供应商" align="center" prop="phase" show-overflow-tooltip/>
</el-table>
<!-- 审核弹窗 -->