yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(wms): 注释入库、出库、库存价格字段

Browse Source
dev
wanghao 2 weeks ago
parent 8850c6df45
commit 1ab6d4a941
4 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File

54
src/views/wms/inStockBill/index.vue
Unescape Escape View File

@ -82,10 +82,10 @@
<el-table-column prop="productCode" align="center" label="物料编码" />
<el-table-column prop="productName" align="center" label="物料名称" />
<el-table-column prop="batchNumber" align="center" label="批次号" />
<el-table-column prop="unitPrice" align="center" label="单价" />
<!--<el-table-column prop="unitPrice" align="center" label="单价" />-->
<el-table-column prop="inStockAmount" align="center" label="入库数量" />
<el-table-column prop="unitName" align="center" label="单位" />
<el-table-column prop="totalPrice" align="center" label="总价(元)" />
<!--<el-table-column prop="totalPrice" align="center" label="总价(元)" />-->
<el-table-column prop="warehouseName" align="center" label="仓库名称" />
</el-table>
</template>
@ -233,20 +233,20 @@
<el-input v-model="scope.row.batchNumber" placeholder="自动生成批次号" :readonly="true" size="small" />
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="单价(元)" width="140">
<template #default="scope">
<el-input-number
v-model="scope.row.unitPrice"
:min="0"
:precision="2"
:step="0.5"
controls-position="right"
size="small"
placeholder="请输入单价"
@change="calculateTotalPrice(scope.row)"
/>
</template>
</el-table-column>
<!--<el-table-column prop="unitPrice" label="单价(元)" width="140">-->
<!-- <template #default="scope">-->
<!-- <el-input-number-->
<!-- v-model="scope.row.unitPrice"-->
<!-- :min="0"-->
<!-- :precision="2"-->
<!-- :step="0.5"-->
<!-- controls-position="right"-->
<!-- size="small"-->
<!-- placeholder="请输入单价"-->
<!-- @change="calculateTotalPrice(scope.row)"-->
<!-- />-->
<!-- </template>-->
<!--</el-table-column>-->
<el-table-column prop="inStockAmount" label="入库数量" width="140">
<template #default="scope">
<el-input-number
@ -256,17 +256,17 @@
:step="1"
controls-position="right"
size="small"
placeholder="请输入数量"
@change="calculateTotalPrice(scope.row)"
/>
</template>
</el-table-column>
<el-table-column prop="unitName" label="单位" width="50" />
<el-table-column prop="totalPrice" label="总价(元)" width="120">
<template #default="scope">
<span>{{ scope.row.totalPrice || 0 }}</span>
placeholder="请输入数量"/>
<!--@change="calculateTotalPrice(scope.row)"-->
</template>
</el-table-column>
<el-table-column prop="unitName" label="单位" width="80" />
<!--<el-table-column prop="totalPrice" label="总价(元)" width="120">-->
<!-- <template #default="scope">-->
<!-- <span>{{ scope.row.totalPrice || 0 }}</span>-->
<!-- </template>-->
<!--</el-table-column>-->
<!--选择仓库-->
<el-table-column prop="warehouseId" label="选择仓库" width="150">
<template #default="scope">
@ -608,10 +608,10 @@ const handleAddSubmit = () => {
inStockDetailsId: material.inStockDetailsId, // 物料ID
materialId: material.productId, // 物料ID
batchNumber: material.batchNumber, // 批次号
unitPrice: material.unitPrice, // 单价
// unitPrice: material.unitPrice, // 单价
inStockAmount: material.inStockAmount, // 数量
unitName: material.unitName, // 单位
totalPrice: material.totalPrice, // 总价
// totalPrice: material.totalPrice, // 总价
warehouseId: material.warehouseId // 仓库ID
}))
};

6
src/views/wms/inventoryDetails/index.vue
Unescape Escape View File

@ -69,7 +69,7 @@
<el-table-column label="外部品牌" align="center" prop="externalBrand" v-if="columns[4].visible" />
<el-table-column label="批次号" align="center" prop="batchNumber" v-if="columns[5].visible" />
<el-table-column label="库存数量" align="center" prop="inventoryAmount" v-if="columns[6].visible" />
<el-table-column label="单价" align="center" prop="unitPrice" v-if="columns[6].visible" />
<!--<el-table-column label="单价" align="center" prop="unitPrice" v-if="columns[6].visible" />-->
<!-- <el-table-column label="锁定数量" align="center" prop="lockedAmount" v-if="columns[7].visible" />-->
<!-- <el-table-column label="可用数量" align="center" prop="useAmount" v-if="columns[7].visible" />-->
<el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible" />
@ -173,8 +173,8 @@ const columns = ref<FieldOption[]>([
{ key: 0, label: `库存ID`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `库位编码`, visible: false },
{ key: 3, label: `仓库ID`, visible: true },
{ key: 4, label: `物料ID`, visible: true },
{ key: 3, label: `所属仓库`, visible: true },
{ key: 4, label: `物料信息`, visible: true },
{ key: 5, label: `批次号`, visible: true },
{ key: 6, label: `库存数量`, visible: true },
{ key: 7, label: `锁定数量`, visible: true },

52
src/views/wms/outStockBill/index.vue
Unescape Escape View File

@ -64,16 +64,16 @@
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:outStockBill:add']">新增 </el-button>
</el-col>
<!--<el-col :span="1.5">-->
<!-- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:outStockBill:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!--</el-col>-->
<!--<el-col :span="1.5">-->
<!-- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:outStockBill:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!--</el-col>-->
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:outStockBill:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:outStockBill:remove']"
>删除
</el-button>
</el-col>
<!--<el-col :span="1.5">-->
<!-- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:outStockBill:export']">导出 </el-button>-->
<!--</el-col>-->
@ -95,10 +95,10 @@
<el-table-column label="物料编码" align="center" prop="productCode" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="批次号" align="center" prop="batchNumber" />
<el-table-column label="单价" align="center" prop="unitPrice" />
<!--<el-table-column label="单价" align="center" prop="unitPrice" />-->
<el-table-column label="出库数量" align="center" prop="outStockAmount" />
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="总价" align="center" prop="totalPrice" />
<!--<el-table-column label="总价" align="center" prop="totalPrice" />-->
</el-table>
</template>
</el-table-column>
@ -253,7 +253,7 @@
<el-table-column label="批次号" align="center" prop="batchNumber" />
<el-table-column label="物料编码" align="center" prop="productCode" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="单价" align="center" prop="unitPrice" width="80" />
<!--<el-table-column label="单价" align="center" prop="unitPrice" width="80" />-->
<el-table-column label="当前库存" align="center" prop="inventoryAmount" width="90" />
<el-table-column label="出库数量" align="center" prop="outStockAmount" width="140">
<template #default="scope">
@ -263,19 +263,19 @@
:precision="2"
:step="1"
:max="scope.row.inventoryAmount"
@change="calculateTotalPrice(scope.row)"
controls-position="right"
size="small"
placeholder="请输入出库数量"
/>
<!--@change="calculateTotalPrice(scope.row)"-->
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unitName" width="80" />
<el-table-column label="总价" align="center" prop="totalPrice" width="80">
<!-- <el-table-column label="总价" align="center" prop="totalPrice" width="80">
<template #default="scope">
{{ scope.row.totalPrice || '0.00' }}
</template>
</el-table-column>
</el-table-column>-->
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="60">
<template #default="scope">
@ -289,15 +289,15 @@
</div>
<template #footer>
<div class="dialog-footer" style="display: flex; justify-content: space-between; align-items: center; width: 100%">
<div class="total-price-summary">
<span style="font-weight: bold; color: #409eff">总价合计: {{ totalPriceSum }} 元</span>
</div>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
<!--<div class="dialog-footer" style="display: flex; justify-content: space-between; align-items: center; width: 100%">-->
<!--<div class="total-price-summary">-->
<!-- <span style="font-weight: bold; color: #409eff">总价合计: {{ totalPriceSum }} 元</span>-->
<!--</div>-->
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
<!--</div>-->
</template>
</el-dialog>
</div>
@ -583,10 +583,10 @@ const submitForm = () => {
warehouseId: form.value.warehouseId,
materielId: item.materielId,
batchNumber: item.batchNumber,
unitPrice: item.unitPrice,
// unitPrice: item.unitPrice,
outStockAmount: item.outStockAmount,
unitName: item.unitName,
totalPrice: item.totalPrice,
// totalPrice: item.totalPrice,
inProjectId: item.projectId,
outProjectId: form.value.projectId,
inventoryDetailsId: item.inventoryDetailsId,

22
src/views/wms/wmsBaseProduct/index.vue
Unescape Escape View File

@ -54,11 +54,11 @@
<el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible" />
<el-table-column label="物料编码" align="center" prop="productCode" v-if="columns[2].visible" />
<el-table-column label="物料名称" align="center" prop="productName" v-if="columns[3].visible" />
<el-table-column label="外部品牌规格" align="center" prop="externalBrand" v-if="columns[3].visible" />
<el-table-column label="品牌" align="center" prop="externalBrand" v-if="columns[3].visible" />
<el-table-column label="物料描述" align="center" prop="productSpe" v-if="columns[4].visible" />
<el-table-column label="单位" align="center" prop="unitName" v-if="columns[5].visible" />
<el-table-column label="参考成本" align="center" prop="purchasePrice" v-if="columns[6].visible" />
<el-table-column label="统一报价(参考)" align="center" prop="foreignPrice" v-if="columns[7].visible" />
<!--<el-table-column label="参考成本" align="center" prop="purchasePrice" v-if="columns[6].visible" />-->
<!--<el-table-column label="统一报价(参考)" align="center" prop="foreignPrice" v-if="columns[7].visible" />-->
<el-table-column label="备货期(天)" align="center" prop="stockingPeriod" v-if="columns[8].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[9].visible">
<template #default="scope">
@ -113,12 +113,12 @@
<el-option v-for="dict in unitInfoList" :key="dict.unitId" :label="dict.unitName" :value="dict.unitId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="参考成本" prop="purchasePrice">
<el-input v-model="form.purchasePrice" placeholder="请输入参考成本" />
</el-form-item>
<el-form-item label="统一报价(参考)" prop="foreignPrice">
<el-input v-model="form.foreignPrice" placeholder="请输入统一报价(参考)" />
</el-form-item>
<!-- <el-form-item label="参考成本" prop="purchasePrice">
<el-input v-model="form.purchasePrice" placeholder="请输入参考成本" />
</el-form-item>
<el-form-item label="统一报价(参考)" prop="foreignPrice">
<el-input v-model="form.foreignPrice" placeholder="请输入统一报价(参考)" />
</el-form-item>-->
<el-form-item label="备货期" prop="stockingPeriod">
<el-input v-model="form.stockingPeriod" placeholder="请输入备货期" />
</el-form-item>
@ -171,8 +171,8 @@ const columns = ref<FieldOption[]>([
{ key: 3, label: `物料名称`, visible: true },
{ key: 4, label: `物料描述`, visible: true },
{ key: 5, label: `单位`, visible: true },
{ key: 6, label: `参考成本`, visible: true },
{ key: 7, label: `统一报价(参考)`, visible: true },
{ key: 6, label: `参考成本`, visible: false },
{ key: 7, label: `统一报价(参考)`, visible: false },
{ key: 8, label: `备货期`, visible: true },
{ key: 9, label: `激活标识`, visible: true },
{ key: 10, label: `创建部门`, visible: false },

Write Preview
Loading…
Cancel
Save