This commit is contained in:
zjf committed 2025-02-18 18:08:44 +08:00
1 parent 4f242af329
commit b673a1029c
4 files changed
+24 -89

No files matched your search

+3 -10
View File
@@ -40,23 +40,16 @@
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="code" label="编号" show-overflow-tooltip />
<el-table-column prop="dDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="warehouseId" label="仓库id" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人id" show-overflow-tooltip />
<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="checkUserId" label="审批人id" show-overflow-tooltip />
<el-table-column prop="checkTime" label="审核日期" show-overflow-tooltip />
<el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip />
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip />
<el-table-column prop="quantity" label="出入库数量" show-overflow-tooltip />
<el-table-column prop="totalNumber" label="累计进货数量" show-overflow-tooltip />
<el-table-column prop="totalAmount" label="累计总金额" show-overflow-tooltip />
<el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip />
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column prop="orderNumber" label="订单编号" show-overflow-tooltip />
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button
@@ -18,50 +18,20 @@
/>
</el-form-item>
<el-form-item label="仓库id" prop="warehouseId">
<el-input v-model="baseDataForm.warehouseId" placeholder="请输入仓库id" style="width: 200px" />
</el-form-item>
<el-form-item label="经办人id" prop="handlerUserId">
<el-form-item label="经办人" prop="handlerUserId">
<el-select v-model="baseDataForm.handlerUserId" placeholder="请选择经办人id" style="width: 200px">
<el-option label="请选择" value="0" />
</el-select>
</el-form-item>
<el-form-item label="关联补货申请" prop="handlerUserId">
<el-select v-model="baseDataForm.handlerUserId" placeholder="请选择补货申请单" style="width: 200px">
<el-option label="请选择" value="0" />
</el-select>
</el-form-item>
<el-form-item label="审批状态" prop="checkStatus">
<el-input v-model="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
</el-form-item>
<el-form-item label="审批人id" prop="checkUserId">
<el-select v-model="baseDataForm.checkUserId" placeholder="请选择审批人id" style="width: 200px">
<el-option label="请选择" value="0" />
</el-select>
</el-form-item>
<el-form-item label="审核日期" prop="checkTime">
<el-input v-model="baseDataForm.checkTime" placeholder="请输入审核日期" style="width: 200px" />
</el-form-item>
<el-form-item label="商户编号" prop="merchantId">
<el-input v-model="baseDataForm.merchantId" placeholder="请输入商户编号" style="width: 200px" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="baseDataForm.deptId" placeholder="请输入部门id" style="width: 200px" />
</el-form-item>
<el-form-item label="出入库数量" prop="quantity">
<el-input v-model="baseDataForm.quantity" placeholder="请输入出入库数量" style="width: 200px" />
</el-form-item>
<el-form-item label="累计进货数量" prop="totalNumber">
<el-input v-model="baseDataForm.totalNumber" placeholder="请输入累计进货数量" style="width: 200px" />
</el-form-item>
<el-form-item label="累计总金额" prop="totalAmount">
<el-input v-model="baseDataForm.totalAmount" placeholder="请输入累计总金额" style="width: 200px" />
</el-form-item>
<el-form-item label="货商" prop="supplierId">
<el-input v-model="baseDataForm.supplierId" placeholder="请输入货商" style="width: 200px" />
</el-form-item>
@@ -69,10 +39,6 @@
<el-form-item label="备注" prop="remark">
<el-input v-model="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
</el-form-item>
<el-form-item label="订单编号" prop="orderNumber">
<el-input v-model="baseDataForm.orderNumber" placeholder="请输入订单编号" style="width: 200px" />
</el-form-item>
</div>
</el-form>
@@ -3,15 +3,10 @@
<div v-loading="loading" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
<el-form ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" formDialogRef label-width="140px">
<div class="flex flex-wrap">
<el-form-item label="采购计划编号" prop="planCode">
<el-input v-model.trim="baseDataForm.planCode" placeholder="请输入采购计划编号" disabled style="width: 200px" />
<el-form-item label="编号" prop="planCode">
<el-input v-model.trim="baseDataForm.planCode" placeholder="请输入编号" disabled style="width: 200px" />
</el-form-item>
<el-form-item label="订单编号" prop="orderNumber">
<el-input v-model.trim="baseDataForm.orderNumber" placeholder="请输入订单编号" maxlength="50" style="width: 200px" />
</el-form-item>
<el-form-item label="采购计划单据日期" prop="planDate">
<el-form-item label="单据日期" prop="planDate">
<el-date-picker
style="width: 200px"
v-model.trim="baseDataForm.planDate"
@@ -22,22 +17,12 @@
/>
</el-form-item>
<el-form-item label="货商" prop="supplierId">
<el-select v-model.trim="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
<el-option v-for="item in supplierTypeDict" :key="item?.id" :label="item?.typeName" :value="item?.id" />
</el-select>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-input v-model.trim="baseDataForm.warehouseId" placeholder="请输入仓库id" />
</el-form-item> -->
<el-form-item label="经办人" prop="handlerUserId">
<el-input v-model.trim="baseDataForm.handlerUserId" placeholder="请输入经办人" maxlength="20" style="width: 200px" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" maxlength="50" style="width: 200px" />
<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" maxlength="200" style="width: 200px" />
</el-form-item>
</div>
</el-form>
@@ -132,7 +117,7 @@
</template>
</vxe-column>
<vxe-column field="unitPrice" title="进价">
<!-- <vxe-column field="unitPrice" title="进价">
<template #default="{ row }">
{{ row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice }}
</template>
@@ -146,7 +131,7 @@
: ""
}}
</template>
</vxe-column>
</vxe-column>-->
<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
<template #edit="{ row }">
+9 -18
View File
@@ -3,13 +3,13 @@
<div class="layout-padding-auto layout-padding-view">
<el-row v-show="showSearch">
<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
<el-form-item label="采购计划编号" prop="planCode">
<el-input placeholder="请输入采购计划编号" v-model="state.queryForm.planCode" />
<el-form-item label="单据编号" prop="planCode">
<el-input placeholder="请输入采购单据编号" v-model="state.queryForm.planCode" />
</el-form-item>
<el-form-item label="采购计划单据日期" prop="planDate">
<el-date-picker type="date" placeholder="请输入采购计划单据日期" v-model="state.queryForm.planDate" />
<el-form-item label="单据日期" prop="planDate">
<el-date-picker type="date" placeholder="请输入单据日期" v-model="state.queryForm.planDate" />
</el-form-item>
<el-form-item label="经办人id" prop="handlerUserId">
<el-form-item label="经办人" prop="handlerUserId">
<el-select v-model="state.queryForm.handlerUserId" placeholder="请选择经办人id">
<el-option label="请选择" value="00" />
</el-select>
@@ -62,21 +62,12 @@
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="planCode" label="采购计划编号" show-overflow-tooltip />
<el-table-column prop="planDate" label="采购计划单据日期" show-overflow-tooltip />
<el-table-column prop="warehouseId" label="仓库id" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人id" show-overflow-tooltip />
<el-table-column prop="planCode" label="编号" show-overflow-tooltip />
<el-table-column prop="planDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="prodouctName" label="商品信息" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />
<el-table-column prop="checkUserId" label="审批人id" show-overflow-tooltip />
<el-table-column prop="checkTime" label="审核日期" show-overflow-tooltip />
<el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip />
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip />
<el-table-column prop="quantity" label="出入库数量" show-overflow-tooltip />
<el-table-column prop="totalNumber" label="累计进货数量" show-overflow-tooltip />
<el-table-column prop="totalAmount" label="累计总金额" show-overflow-tooltip />
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column prop="orderNumber" label="订单编号" show-overflow-tooltip />
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button