|
|
|
|
@ -72,7 +72,7 @@
|
|
|
|
|
<el-table-column label="物料类型" align="center" prop="matrialTypeName" v-if="columns[2].visible"/>
|
|
|
|
|
<el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[3].visible"/>
|
|
|
|
|
<el-table-column label="计量单位名称" align="center" prop="materialUnit" v-if="columns[4].visible"/>
|
|
|
|
|
<el-table-column label="物料规格" align="center" prop="materialCategoryName" v-if="columns[5].visible"/>
|
|
|
|
|
<el-table-column label="物料规格" align="center" prop="materialSpec" v-if="columns[5].visible"/>
|
|
|
|
|
<el-table-column label="最小停放时间" align="center" prop="minParkingTime" v-if="columns[6].visible">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<span>{{ formatDayHourMinutes(scope.row.minParkingTime) }}</span>
|
|
|
|
|
@ -88,7 +88,7 @@
|
|
|
|
|
<el-table-column label="安全库存" align="center" prop="safeStockAmount" v-if="columns[13].visible"/>
|
|
|
|
|
<el-table-column label="质检要求" align="center" prop="inspectionRequest" v-if="columns[10].visible">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<dict-tag :options="inspection_request" :value="scope.row.auditStatus"/>
|
|
|
|
|
<dict-tag :options="inspection_request" :value="scope.row.inspectionRequest"/>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="是否高价值物料" align="center" prop="isHighValue" v-if="columns[9].visible">
|
|
|
|
|
@ -155,6 +155,18 @@
|
|
|
|
|
<el-input v-model="form.materialSpec" placeholder="请输入物料规格" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item label="物料单位" prop="materialUnitId">
|
|
|
|
|
<el-select v-model="form.materialUnitId" placeholder="请选择物料单位">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in measurementUnitInfoList"
|
|
|
|
|
:key="item.unitId"
|
|
|
|
|
:label="item.unitName"
|
|
|
|
|
:value="item.unitId"
|
|
|
|
|
></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
|
|
@ -197,13 +209,13 @@
|
|
|
|
|
:min="0"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="安全库存" prop="safeStockAmount">
|
|
|
|
|
<el-input-number
|
|
|
|
|
v-model="form.safeStockAmount"
|
|
|
|
|
placeholder="请输入安全库存"
|
|
|
|
|
:min="0"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<!-- <el-form-item label="安全库存" prop="safeStockAmount">-->
|
|
|
|
|
<!-- <el-input-number-->
|
|
|
|
|
<!-- v-model="form.safeStockAmount"-->
|
|
|
|
|
<!-- placeholder="请输入安全库存"-->
|
|
|
|
|
<!-- :min="0"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row :gutter="20">
|
|
|
|
|
@ -260,6 +272,7 @@ import { BaseMaterialInfoVO, BaseMaterialInfoQuery, BaseMaterialInfoForm } from
|
|
|
|
|
import { getBaseMaterialTypeList } from "@/api/wms/baseMaterialType";
|
|
|
|
|
import {getBaseMaterialCategoryListInWMS} from "@/api/wms/baseMaterialCategory";
|
|
|
|
|
import { formatDayHourMinutes } from '@/utils/ruoyi';
|
|
|
|
|
import { getBaseMeasurementUnitInfoList } from '@/api/wms/baseMeasurementUnitInfo';
|
|
|
|
|
|
|
|
|
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
|
|
|
const { apply_flag, inner_tube_flag,
|
|
|
|
|
@ -752,7 +765,16 @@ const materialCategoryIdBymaterialTypeId = (materialTypeId: string | number) =>
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//获取计量单位
|
|
|
|
|
let measurementUnitInfoList = ref([]);
|
|
|
|
|
const getMeasurementUnitInfoList = async () => {
|
|
|
|
|
const res = await getBaseMeasurementUnitInfoList(null);
|
|
|
|
|
measurementUnitInfoList.value = res.data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onMounted(() => {
|
|
|
|
|
getMeasurementUnitInfoList();
|
|
|
|
|
getBaseMaterialCategorySelect();
|
|
|
|
|
getInfoOptions();
|
|
|
|
|
getList();
|
|
|
|
|
|