zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.zianxin.com:8418/zianxin/biz-pc-cloud

Browse Source
This commit is contained in:
weiwei committed 2025-02-20 15:04:17 +08:00
2 parents dc5772f50c caf65b79cb
commit 211ba23883
2 files changed
+15 -80
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/supermarketerp/smErpInventoryRecords/index.vue
+6 -29
View File
@@ -3,8 +3,8 @@
<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="inventoryCode">
<el-input placeholder="请输入单据编号(出入库编号)" v-model="state.queryForm.inventoryCode" />
<el-form-item label="单据编号" prop="inventoryCode">
<el-input placeholder="请输入单据编号" v-model="state.queryForm.inventoryCode" />
</el-form-item>
<el-form-item label="单据日期" prop="inventoryDate">
<el-date-picker
@@ -15,15 +15,7 @@
value-format="yyyy-MM-dd"
/>
</el-form-item>
<el-form-item label="单据类型(字典inventory_type)采购入库、采购退货、盘点入库等" prop="inventoryType">
<el-select
v-model="state.queryForm.inventoryType"
placeholder="请选择单据类型(字典inventory_type)采购入库、采购退货、盘点入库等"
>
<el-option :label="item.label" :value="item.value" v-for="(item, index) in inventory_type" :key="index" />
</el-select>
</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="0" />
</el-select>
@@ -82,32 +74,17 @@
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="inventoryCode" label="单据编号(出入库编号)" show-overflow-tooltip />
<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="inventoryType" label="单据类型(字典inventory_type)采购入库、采购退货、盘点入库等" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="inventory_type" :value="scope.row.inventoryType" />
</template>
</el-table-column>
<el-table-column prop="sourceId" label="来源ID（根据类型指向对应的表，如采购单ID、退货单ID等）" 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="inventoryDate" 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="supplierId" label="货商" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column prop="orderType" label="订单类型(1入库 2出库)" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="erp_order_type" :value="scope.row.orderType"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
<el-table-column label="操作" width="150">
<template #default="scope">
src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
+9 -51
View File
@@ -3,37 +3,19 @@
<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="inventoryCode">
<el-form-item label="单据编号" prop="inventoryCode">
<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" />
</el-form-item>
<el-form-item label="单据日期" prop="inventoryDate">
<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" />
</el-form-item>
<el-form-item label="单据类型(字典inventory_type)采购入库、采购退货、盘点入库等" prop="inventoryType">
<el-select
v-model.trim="baseDataForm.inventoryType"
placeholder="请选择单据类型(字典inventory_type)采购入库、采购退货、盘点入库等"
style="width: 200px"
>
<el-option :value="item.value" :label="item.label" v-for="(item, index) in inventory_type" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="来源ID（根据类型指向对应的表，如采购单ID、退货单ID等）" prop="sourceId">
<el-input
v-model.trim="baseDataForm.sourceId"
placeholder="请输入来源ID（根据类型指向对应的表，如采购单ID、退货单ID等）"
style="width: 200px"
/>
</el-form-item>
<el-form-item label="仓库id" prop="warehouseId">
<el-input v-model.trim="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.trim="baseDataForm.handlerUserId" placeholder="请选择采购订单" style="width: 200px">
<el-option label="请选择" value="0" />
</el-select>
</el-form-item>
<el-form-item label="经办人" prop="handlerUserId">
<el-select v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人id" style="width: 200px">
<el-option label="请选择" value="0" />
</el-select>
@@ -43,22 +25,6 @@
<el-input v-model.trim="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
</el-form-item>
<el-form-item label="审批人id" prop="checkUserId">
<el-input v-model.trim="baseDataForm.checkUserId" placeholder="请输入审批人id" style="width: 200px" />
</el-form-item>
<el-form-item label="审核日期" prop="checkTime">
<el-input v-model.trim="baseDataForm.checkTime" placeholder="请输入审核日期" style="width: 200px" />
</el-form-item>
<el-form-item label="商户编号" prop="merchantId">
<el-input v-model.trim="baseDataForm.merchantId" placeholder="请输入商户编号" style="width: 200px" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model.trim="baseDataForm.deptId" placeholder="请输入部门id" style="width: 200px" />
</el-form-item>
<el-form-item label="货商" prop="supplierId">
<el-input v-model.trim="baseDataForm.supplierId" placeholder="请输入货商" style="width: 200px" />
</el-form-item>
@@ -66,14 +32,6 @@
<el-form-item label="备注" prop="remark">
<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
</el-form-item>
<el-form-item label="订单类型(1入库 2出库)" prop="orderType">
<el-input v-model.trim="baseDataForm.orderType" placeholder="请输入订单类型(1入库 2出库)" style="width: 200px" />
</el-form-item>
<el-form-item label="入库总金额" prop="totalAmount">
<el-input v-model.trim="baseDataForm.totalAmount" placeholder="请输入入库总金额" style="width: 200px" />
</el-form-item>
</div>
</el-form>
@@ -353,7 +311,7 @@ const baseDataForm = reactive<FormVO>({
deptId: "",
supplierId: "",
remark: "",
orderType: "",
orderType: "1",
totalAmount: "",
})
const state = reactive<{
@@ -410,7 +368,7 @@ const getInitData = async () => {
}
// 获取货商选项 & 获取采购计划编号
const [supplierTypeOptions, planCode] = await Promise.allSettled([getSupplierTypeOptions(), getPlanCode({ type: 2 })]).then((results) =>
const [supplierTypeOptions, planCode] = await Promise.allSettled([getSupplierTypeOptions(), getPlanCode({ type: 3 })]).then((results) =>
results.map((result) => (result.status === "fulfilled" ? result.value : null)),
)
supplierTypeOptions && supplierTypeOptions.code === 0 && (supplierTypeDict.value = supplierTypeOptions.data)