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-06 11:57:48 +08:00
parent 87527e4c47 8eecfa8aac
commit bb7f0357a1
21 changed files with 1476 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,14 +30,46 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('outStockoutManage.customerNo')" prop="customerNo"> <!-- 客户编码 -->
<!-- <el-form-item label="客户编码" prop="customerNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.customerNo"-->
<!-- placeholder="请输入客户编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="客户名称" prop="customerName">
<el-input
v-model="queryParams.customerNo"
:placeholder="$t('outStockoutManage.inputCustomerNo')"
v-model="queryParams.customerName"
placeholder="请输入客户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物资名称" prop="productName">
<el-input
v-model="queryParams.customerNo"
placeholder="请输入客户编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建开始时间" prop="startDate">
<el-date-picker clearable
v-model="queryParams.startDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择创建开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建结束时间" prop="finishDate">
<el-date-picker clearable
v-model="queryParams.finishDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择创建结束时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('outStockoutManage.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('outStockoutManage.reset')}}</el-button> <!-- 重置 -->
@@ -110,12 +142,14 @@
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('outStockoutManage.customerNo')" align="center" prop="customerNo" /> <!-- 客户编码 -->
<el-table-column :label="$t('outStockoutManage.createManId')" align="center" prop="createManId" /> <!-- 建单人 -->
<el-table-column :label="$t('outStockoutManage.createDate')" align="center" prop="createDate" /> <!-- 创建时间 -->
<el-table-column :label="$t('outStockoutManage.startDate')" align="center" prop="startDate" /> <!-- 开始时间 -->
<el-table-column :label="$t('outStockoutManage.finishDate')" align="center" prop="finishDate" /> <!-- 确认时间 -->
<el-table-column :label="$t('outStockoutManage.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库编号 -->
<el-table-column label="$t('outStockoutManage.customerNo')" align="center" prop="customerNo" />
<el-table-column label="客户名称" align="center" prop="customerName" />
<el-table-column label="$t('outStockoutManage.createManId')" align="center" prop="createManId" />
<el-table-column label="$t('outStockoutManage.createDate')" align="center" prop="createDate" />
<el-table-column label="$t('outStockoutManage.startDate')" align="center" prop="startDate" />
<el-table-column label="$t('outStockoutManage.finishDate')" align="center" prop="finishDate" />
<!-- <el-table-column label="仓库编号" align="center" prop="warehouseId" />-->
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
</el-table>
<pagination
@@ -130,13 +164,15 @@
<el-table v-loading="detailLoading" :data="outStockDetailList.slice((detailQueryParams.pageNum-1)*detailQueryParams.pageSize, detailQueryParams.pageNum*detailQueryParams.pageSize)" style="margin-top: 20px;">
<el-table-column :label="$t('outStockoutManage.stockoutDetailId')" align="center" prop="stockoutDetailId" /> <!-- 出库子单编号 -->
<el-table-column :label="$t('outStockoutManage.productId')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column :label="$t('outStockoutManage.lotNo')" align="center" prop="lotNo" /> <!-- 批次 -->
<el-table-column :label="$t('outStockoutManage.quantity')" align="center" prop="quantity" /> <!-- 计划数量 -->
<el-table-column :label="$t('outStockoutManage.assignNum')" align="center" prop="assignNum" /> <!-- 实际数量 -->
<el-table-column :label="$t('outStockoutManage.allotQuantity')" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
<el-table-column :label="$t('outStockoutManage.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('outStockoutManage.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('outStockoutManage.price')" align="center" prop="price" /> <!-- 价格 -->
<!-- <el-table-column :label="$t('outStockoutManage.unit')" align="center" prop="unit" /> &lt;!&ndash; 单位 &ndash;&gt;-->
<!-- <el-table-column :label="$t('outStockoutManage.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<!-- <el-table-column :label="$t('outStockoutManage.price')" align="center" prop="price" /> &lt;!&ndash; 价格 &ndash;&gt;-->
<el-table-column :label="$t('outStockoutManage.remark')" align="center" prop="remark" /> <!-- 备注 -->
</el-table>
@@ -179,6 +215,10 @@ export default {
stockoutId: null,
outType: null,
customerNo: null,
customerName: null,
productName: null,
startDate: null,
finishDate: null,
status: '1'
},
// 子表分页参数