1.0.5 物料关联销售名称

dev
yinq 4 months ago
parent feb47d0dd0
commit 74b191b3be

@ -0,0 +1,76 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { MaterialInfoVO, MaterialInfoForm, MaterialInfoQuery } from '@/api/oa/base/materialInfo/types';
/**
* SAP
* @param query
* @returns {*}
*/
export const listMaterialInfo = (query?: MaterialInfoQuery): AxiosPromise<MaterialInfoVO[]> => {
return request({
url: '/oa/base/materialInfo/list',
method: 'get',
params: query
});
};
/**
* SAP
* @param materialId
*/
export const getMaterialInfo = (materialId: string | number): AxiosPromise<MaterialInfoVO> => {
return request({
url: '/oa/base/materialInfo/' + materialId,
method: 'get'
});
};
/**
* SAP
* @param data
*/
export const addMaterialInfo = (data: MaterialInfoForm) => {
return request({
url: '/oa/base/materialInfo',
method: 'post',
data: data
});
};
/**
* SAP
* @param data
*/
export const updateMaterialInfo = (data: MaterialInfoForm) => {
return request({
url: '/oa/base/materialInfo',
method: 'put',
data: data
});
};
/**
* SAP
* @param materialId
*/
export const delMaterialInfo = (materialId: string | number | Array<string | number>) => {
return request({
url: '/oa/base/materialInfo/' + materialId,
method: 'delete'
});
};
/**
* SAP
* @param query
* @returns {*}
*/
export function getBaseMaterialInfoList (query) {
return request({
url: '/oa/base/materialInfo/getBaseMaterialInfoList',
method: 'get',
params: query
});
};

@ -1,28 +1,28 @@
export interface MaterielInfoVO {
export interface MaterialInfoVO {
/**
* ID
*/
materielId: string | number;
materialId: string | number;
/**
* SAP
*/
materielCode: string;
materialCode: string;
/**
* SAP
*/
materielName: string;
materialName: string;
/**
*
*/
materielBrand: string;
materialBrand: string;
/**
*
*/
materielModel: string;
materialModel: string;
/**
* ID
@ -61,31 +61,31 @@ export interface MaterielInfoVO {
}
export interface MaterielInfoForm extends BaseEntity {
export interface MaterialInfoForm extends BaseEntity {
/**
* ID
*/
materielId?: string | number;
materialId?: string | number;
/**
* SAP
*/
materielCode?: string;
materialCode?: string;
/**
* SAP
*/
materielName?: string;
materialName?: string;
/**
*
*/
materielBrand?: string;
materialBrand?: string;
/**
*
*/
materielModel?: string;
materialModel?: string;
/**
* ID
@ -124,27 +124,27 @@ export interface MaterielInfoForm extends BaseEntity {
}
export interface MaterielInfoQuery extends PageQuery {
export interface MaterialInfoQuery extends PageQuery {
/**
* SAP
*/
materielCode?: string;
materialCode?: string;
/**
* SAP
*/
materielName?: string;
materialName?: string;
/**
*
*/
materielBrand?: string;
materialBrand?: string;
/**
*
*/
materielModel?: string;
materialModel?: string;
/**
* ID

@ -1,76 +0,0 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { MaterielInfoVO, MaterielInfoForm, MaterielInfoQuery } from '@/api/oa/base/materielInfo/types';
/**
* SAP
* @param query
* @returns {*}
*/
export const listMaterielInfo = (query?: MaterielInfoQuery): AxiosPromise<MaterielInfoVO[]> => {
return request({
url: '/oa/base/materielInfo/list',
method: 'get',
params: query
});
};
/**
* SAP
* @param materielId
*/
export const getMaterielInfo = (materielId: string | number): AxiosPromise<MaterielInfoVO> => {
return request({
url: '/oa/base/materielInfo/' + materielId,
method: 'get'
});
};
/**
* SAP
* @param data
*/
export const addMaterielInfo = (data: MaterielInfoForm) => {
return request({
url: '/oa/base/materielInfo',
method: 'post',
data: data
});
};
/**
* SAP
* @param data
*/
export const updateMaterielInfo = (data: MaterielInfoForm) => {
return request({
url: '/oa/base/materielInfo',
method: 'put',
data: data
});
};
/**
* SAP
* @param materielId
*/
export const delMaterielInfo = (materielId: string | number | Array<string | number>) => {
return request({
url: '/oa/base/materielInfo/' + materielId,
method: 'delete'
});
};
/**
* SAP
* @param query
* @returns {*}
*/
export function getBaseMaterielInfoList(query) {
return request({
url: '/oa/base/materielInfo/getBaseMaterielInfoList',
method: 'get',
params: query
});
}

@ -0,0 +1,76 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { RelationMaterialVO, RelationMaterialForm, RelationMaterialQuery } from '@/api/oa/base/relationMaterial/types';
/**
*
* @param query
* @returns {*}
*/
export const listRelationMaterial = (query?: RelationMaterialQuery): AxiosPromise<RelationMaterialVO[]> => {
return request({
url: '/oa/base/relationMaterial/list',
method: 'get',
params: query
});
};
/**
*
* @param relationMaterialId
*/
export const getRelationMaterial = (relationMaterialId: string | number): AxiosPromise<RelationMaterialVO> => {
return request({
url: '/oa/base/relationMaterial/' + relationMaterialId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addRelationMaterial = (data: RelationMaterialForm) => {
return request({
url: '/oa/base/relationMaterial',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updateRelationMaterial = (data: RelationMaterialForm) => {
return request({
url: '/oa/base/relationMaterial',
method: 'put',
data: data
});
};
/**
*
* @param relationMaterialId
*/
export const delRelationMaterial = (relationMaterialId: string | number | Array<string | number>) => {
return request({
url: '/oa/base/relationMaterial/' + relationMaterialId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getBaseRelationMaterialList (query) {
return request({
url: '/oa/base/relationMaterial/getBaseRelationMaterialList',
method: 'get',
params: query
});
};

@ -1,38 +1,23 @@
export interface RelationMaterielVO {
export interface RelationMaterialVO {
/**
* ID
*/
relationMaterielId: string | number;
relationMaterialId: string | number;
/**
* ID
*/
materielId: string | number;
materialId: string | number;
/**
* ID
*/
customerId: string | number;
/**
* SAP
*/
materielCode: string;
/**
* SAP
*/
materielName: string;
/**
*
*/
customerName: string;
/**
*
*/
saleMaterielName: string;
saleMaterialName: string;
/**
*
@ -44,43 +29,53 @@ export interface RelationMaterielVO {
*/
activeFlag: string;
/**
*
*/
createDept: number;
/**
*
*/
createBy: number;
/**
*
*/
createTime: string;
/**
*
*/
updateBy: number;
/**
*
*/
updateTime: string;
}
export interface RelationMaterielForm extends BaseEntity {
export interface RelationMaterialForm extends BaseEntity {
/**
* ID
*/
relationMaterielId?: string | number;
relationMaterialId?: string | number;
/**
* ID
*/
materielId?: string | number;
materialId?: string | number;
/**
* ID
*/
customerId?: string | number;
/**
* SAP
*/
materielCode: string;
/**
* SAP
*/
materielName: string;
/**
*
*/
customerName: string;
/**
*
*/
saleMaterielName?: string;
saleMaterialName?: string;
/**
*
@ -92,14 +87,19 @@ export interface RelationMaterielForm extends BaseEntity {
*/
activeFlag?: string;
/**
* SAP
*/
materialName: string;
}
export interface RelationMaterielQuery extends PageQuery {
export interface RelationMaterialQuery extends PageQuery {
/**
* ID
*/
materielId?: string | number;
materialId?: string | number;
/**
* ID
@ -109,22 +109,7 @@ export interface RelationMaterielQuery extends PageQuery {
/**
*
*/
saleMaterielName?: string;
/**
* SAP
*/
materielCode: string;
/**
* SAP
*/
materielName: string;
/**
*
*/
customerName: string;
saleMaterialName?: string;
/**
* 1 0
@ -135,6 +120,21 @@ export interface RelationMaterielQuery extends PageQuery {
*
*/
params?: any;
/**
* SAP
*/
materialCode: string;
/**
* SAP
*/
materialName: string;
/**
*
*/
customerName: string;
}

@ -1,76 +0,0 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { RelationMaterielVO, RelationMaterielForm, RelationMaterielQuery } from '@/api/oa/base/relationMateriel/types';
/**
*
* @param query
* @returns {*}
*/
export const listRelationMateriel = (query?: RelationMaterielQuery): AxiosPromise<RelationMaterielVO[]> => {
return request({
url: '/oa/base/relationMateriel/list',
method: 'get',
params: query
});
};
/**
*
* @param relationMaterielId
*/
export const getRelationMateriel = (relationMaterielId: string | number): AxiosPromise<RelationMaterielVO> => {
return request({
url: '/oa/base/relationMateriel/' + relationMaterielId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addRelationMateriel = (data: RelationMaterielForm) => {
return request({
url: '/oa/base/relationMateriel',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updateRelationMateriel = (data: RelationMaterielForm) => {
return request({
url: '/oa/base/relationMateriel',
method: 'put',
data: data
});
};
/**
*
* @param relationMaterielId
*/
export const delRelationMateriel = (relationMaterielId: string | number | Array<string | number>) => {
return request({
url: '/oa/base/relationMateriel/' + relationMaterielId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getBaseRelationMaterielList(query) {
return request({
url: '/oa/base/relationMateriel/getBaseRelationMaterielList',
method: 'get',
params: query
});
}

@ -0,0 +1,266 @@
<template>
<div>
<el-dialog v-model="materialDialog.visible.value" :title="materialDialog.title.value" width="80%" append-to-body>
<el-row :gutter="20">
<el-col :span="24">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="SAP物料编码" prop="materialCode">
<el-input v-model="queryParams.materialCode" placeholder="请输入SAP物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="SAP物料名称" prop="materialName">
<el-input v-model="queryParams.materialName" placeholder="请输入SAP物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料品牌" prop="materialBrand">
<el-input v-model="queryParams.materialBrand" placeholder="请输入物料品牌" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料型号" prop="materialModel">
<el-input v-model="queryParams.materialModel" placeholder="请输入物料型号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="() => resetQuery()">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="hover">
<template v-if="prop.multiple" #header>
<el-tag v-for="material in selectMaterialList" :key="material.materialId" closable style="margin: 2px" @close="handleCloseTag(material)">
{{ material.materialName }}
</el-tag>
</template>
<vxe-table
ref="tableRef"
height="400px"
border
show-overflow
:data="materialInfoList"
:loading="loading"
:row-config="{ keyField: 'materialId', isHover: true }"
:checkbox-config="{ reserve: true, trigger: 'row', highlight: true, showHeader: prop.multiple }"
@checkbox-all="handleCheckboxAll"
@checkbox-change="handleCheckboxChange"
>
<vxe-column type="checkbox" width="50" align="center" />
<!-- <vxe-column key="materialId" title="物料ID" align="center" field="materialId" />-->
<vxe-column key="materialCode" title="SAP物料编码" align="center" field="materialCode" width="120" />
<vxe-column key="materialName" title="SAP物料名称" align="center" field="materialName" width="120" />
<vxe-column key="materialBrand" title="物料品牌" align="center" field="materialBrand" width="120" />
<vxe-column key="materialModel" title="物料型号" align="center" field="materialModel" width="120" />
<vxe-column key="unitName" title="物料单位" align="center" field="unitName" />
<vxe-column key="materialParameter" title="物料参数" align="center" field="materialParameter" />
<!-- <vxe-column key="purchasePrice" title="采购单价(元)" align="center" field="purchasePrice" width="120" />-->
<!-- <vxe-column key="foreignPrice" title="售前对外单价(元)" align="center" field="foreignPrice" width="140" />-->
<!-- <vxe-column key="stockingPeriod" title="备货期" align="center" field="stockingPeriod" />-->
<!-- <vxe-column key="activeFlag" title="激活标识" align="center">-->
<!-- <template #default="scope">-->
<!-- <dict-tag :options="active_flag" :value="scope.row.activeFlag"></dict-tag>-->
<!-- </template>-->
<!-- </vxe-column>-->
</vxe-table>
<pagination
v-show="total > 0"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:total="total"
@pagination="pageList"
/>
</el-card>
</el-col>
</el-row>
<template #footer>
<el-button @click="close"></el-button>
<el-button type="primary" @click="confirm"></el-button>
</template>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { listMaterialInfo } from '@/api/oa/base/materialInfo';
import { MaterialInfoVO, MaterialInfoQuery } from '@/api/oa/base/materialInfo/types';
import { VxeTableInstance } from 'vxe-table';
import useDialog from '@/hooks/useDialog';
interface PropType {
modelValue?: MaterialInfoVO[] | MaterialInfoVO | undefined;
multiple?: boolean;
data?: string | number | (string | number)[] | undefined;
}
const prop = withDefaults(defineProps<PropType>(), {
multiple: true,
modelValue: undefined,
data: undefined
});
const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
const materialInfoList = ref<MaterialInfoVO[]>([]);
const loading = ref(true);
const showSearch = ref(true);
const total = ref(0);
const selectMaterialList = ref<MaterialInfoVO[]>([]);
const queryFormRef = ref<ElFormInstance>();
const tableRef = ref<VxeTableInstance<MaterialInfoVO>>();
const materialDialog = useDialog({
title: '物料选择'
});
const queryParams = ref<MaterialInfoQuery>({
pageNum: 1,
pageSize: 10,
materialCode: undefined,
materialName: undefined,
materialBrand: undefined,
materialModel: undefined,
unitId: undefined,
materialParameter: undefined,
purchasePrice: undefined,
foreignPrice: undefined,
stockingPeriod: undefined,
activeFlag: undefined,
params: {}
});
const defaultSelectMaterialIds = computed(() => computedIds(prop.data));
const confirm = () => {
emit('update:modelValue', selectMaterialList.value);
emit('confirmCallBack', selectMaterialList.value);
materialDialog.closeDialog();
};
const computedIds = (data) => {
if (data === '' || data === null || data === undefined) {
return [];
}
if (data instanceof Array) {
return data.map((item) => String(item));
} else if (typeof data === 'string') {
return data.split(',');
} else if (typeof data === 'number') {
return [String(data)];
} else {
console.warn('<MaterialSelect> The data type of data should be array or string or number, but I received other');
return [];
}
};
/** 查询物料信息列表 */
const getList = async () => {
loading.value = true;
const res = await listMaterialInfo(queryParams.value);
loading.value = false;
materialInfoList.value = res.rows;
total.value = res.total;
};
const pageList = async () => {
await getList();
const materials = materialInfoList.value.filter((item) => {
return selectMaterialList.value.some((material) => material.materialId === item.materialId);
});
await tableRef.value.setCheckboxRow(materials, true);
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = (refresh = true) => {
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
refresh && handleQuery();
};
const handleCheckboxChange = (checked) => {
if (!prop.multiple && checked.checked) {
tableRef.value.setCheckboxRow(selectMaterialList.value, false);
selectMaterialList.value = [];
}
const row = checked.row;
if (checked.checked) {
selectMaterialList.value.push(row);
} else {
selectMaterialList.value = selectMaterialList.value.filter((item) => {
return item.materialId !== row.materialId;
});
}
};
const handleCheckboxAll = (checked) => {
const rows = materialInfoList.value;
if (checked.checked) {
rows.forEach((row) => {
if (!selectMaterialList.value.some((item) => item.materialId === row.materialId)) {
selectMaterialList.value.push(row);
}
});
} else {
selectMaterialList.value = selectMaterialList.value.filter((item) => {
return !rows.some((row) => row.materialId === item.materialId);
});
}
};
const handleCloseTag = (material: MaterialInfoVO) => {
const materialId = material.materialId;
// 使splice
const index = selectMaterialList.value.findIndex((item) => item.materialId === materialId);
const rows = selectMaterialList.value[index];
tableRef.value?.setCheckboxRow(rows, false);
selectMaterialList.value.splice(index, 1);
};
const initSelectMaterial = async () => {
if (defaultSelectMaterialIds.value.length > 0) {
//
const materials = materialInfoList.value.filter((item) => {
return defaultSelectMaterialIds.value.includes(String(item.materialId));
});
selectMaterialList.value = materials;
await nextTick(() => {
tableRef.value.setCheckboxRow(materials, true);
});
}
};
const close = () => {
materialDialog.closeDialog();
};
watch(
() => materialDialog.visible.value,
async (newValue: boolean) => {
if (newValue) {
await getList(); //
await initSelectMaterial();
} else {
tableRef.value.clearCheckboxReserve();
tableRef.value.clearCheckboxRow();
resetQuery(false);
selectMaterialList.value = [];
}
}
);
defineExpose({
open: materialDialog.openDialog,
close: materialDialog.closeDialog
});
</script>

@ -4,26 +4,23 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="SAP物料编码" prop="materielCode">
<el-input v-model="queryParams.materielCode" placeholder="请输入SAP物料编码" clearable @keyup.enter="handleQuery" />
<el-form-item label="SAP物料编码" prop="materialCode">
<el-input v-model="queryParams.materialCode" placeholder="请输入SAP物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="SAP物料名称" prop="materielName">
<el-input v-model="queryParams.materielName" placeholder="请输入SAP物料名称" clearable @keyup.enter="handleQuery" />
<el-form-item label="SAP物料名称" prop="materialName">
<el-input v-model="queryParams.materialName" placeholder="请输入SAP物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料品牌" prop="materielBrand">
<el-input v-model="queryParams.materielBrand" placeholder="请输入物料品牌" clearable @keyup.enter="handleQuery" />
<el-form-item label="物料品牌" prop="materialBrand">
<el-input v-model="queryParams.materialBrand" placeholder="请输入物料品牌" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料型号" prop="materielModel">
<el-input v-model="queryParams.materielModel" placeholder="请输入物料型号" clearable @keyup.enter="handleQuery" />
<el-form-item label="物料型号" prop="materialModel">
<el-input v-model="queryParams.materialModel" placeholder="请输入物料型号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料参数" prop="materialParameter">
<el-input v-model="queryParams.materialParameter" placeholder="请输入物料参数" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="激活标识" prop="activeFlag">-->
<!-- <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>-->
<!-- <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="激活标识" prop="activeFlag">-->
<!-- <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>-->
<!-- <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
@ -37,36 +34,36 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/base:materielInfo:add']"> </el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/base:materialInfo:add']"> </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/base:materielInfo:edit']"
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/base:materialInfo:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/base:materielInfo:remove']"
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/base:materialInfo:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/base:materielInfo:export']"> </el-button>
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/base:materialInfo:export']"> </el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" border :data="materielInfoList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" border :data="materialInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[0].visible" />
<el-table-column label="SAP物料编码" align="center" prop="materielCode" width="120" v-if="columns[2].visible" />
<el-table-column label="SAP物料名称" align="center" prop="materielName" width="120" v-if="columns[3].visible" />
<el-table-column label="物料品牌" align="center" prop="materielBrand" width="120" v-if="columns[4].visible" />
<el-table-column label="物料型号" align="center" prop="materielModel" width="120" v-if="columns[5].visible" />
<el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[0].visible" />
<el-table-column label="SAP物料编码" align="center" prop="materialCode" width="120" v-if="columns[2].visible" />
<el-table-column label="SAP物料名称" align="center" prop="materialName" width="220" v-if="columns[3].visible" />
<el-table-column label="物料品牌" align="center" prop="materialBrand" width="120" v-if="columns[4].visible" />
<el-table-column label="物料型号" align="center" prop="materialModel" width="120" v-if="columns[5].visible" />
<el-table-column label="物料单位" align="center" prop="unitName" v-if="columns[6].visible" />
<el-table-column label="物料参数" align="center" prop="materialParameter" v-if="columns[7].visible" />
<el-table-column label="物料参数" align="center" prop="materialParameter" width="120" v-if="columns[7].visible" />
<el-table-column label="采购单价(元)" align="center" prop="purchasePrice" width="120" v-if="columns[8].visible" />
<el-table-column label="售前对外单价(元)" align="center" prop="foreignPrice" width="140" v-if="columns[9].visible" />
<el-table-column label="售前对外单价(元)" align="center" prop="foreignPrice" width="130" v-if="columns[9].visible" />
<el-table-column label="备货期" align="center" prop="stockingPeriod" v-if="columns[10].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[11].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[12].visible">
@ -77,10 +74,10 @@
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/base:materielInfo:edit']"></el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/base:materialInfo:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/base:materielInfo:remove']"></el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/base:materialInfo:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
@ -90,18 +87,18 @@
</el-card>
<!-- 添加或修改SAP物料信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="materielInfoFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="SAP物料编码" prop="materielCode">
<el-input v-model="form.materielCode" placeholder="请输入SAP物料编码" />
<el-form ref="materialInfoFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="SAP物料编码" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入SAP物料编码" />
</el-form-item>
<el-form-item label="SAP物料名称" prop="materielName">
<el-input v-model="form.materielName" placeholder="请输入SAP物料名称" />
<el-form-item label="SAP物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入SAP物料名称" />
</el-form-item>
<el-form-item label="物料品牌" prop="materielBrand">
<el-input v-model="form.materielBrand" placeholder="请输入物料品牌" />
<el-form-item label="物料品牌" prop="materialBrand">
<el-input v-model="form.materialBrand" placeholder="请输入物料品牌" />
</el-form-item>
<el-form-item label="物料型号" prop="materielModel">
<el-input v-model="form.materielModel" placeholder="请输入物料型号" />
<el-form-item label="物料型号" prop="materialModel">
<el-input v-model="form.materialModel" placeholder="请输入物料型号" />
</el-form-item>
<el-form-item label="物料单位" prop="unitId">
<el-select v-model="form.unitId" placeholder="请选择物料单位">
@ -125,14 +122,14 @@
<el-form-item label="备货期" prop="stockingPeriod">
<el-input-number v-model="form.stockingPeriod" placeholder="请输入备货期" style="width: 240px" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<!-- <el-form-item label="激活标识" prop="activeFlag">-->
<!-- <el-radio-group v-model="form.activeFlag">-->
<!-- <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注" prop="remark">-->
<!-- <el-input v-model="form.remark" placeholder="请输入备注" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="激活标识" prop="activeFlag">-->
<!-- <el-radio-group v-model="form.activeFlag">-->
<!-- <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
</el-form>
<template #footer>
<div class="dialog-footer">
@ -144,15 +141,15 @@
</div>
</template>
<script setup name="MaterielInfo" lang="ts">
import { listMaterielInfo, getMaterielInfo, delMaterielInfo, addMaterielInfo, updateMaterielInfo } from '@/api/oa/base/materielInfo';
import { MaterielInfoVO, MaterielInfoQuery, MaterielInfoForm } from '@/api/oa/base/materielInfo/types';
<script setup name="MaterialInfo" lang="ts">
import { listMaterialInfo, getMaterialInfo, delMaterialInfo, addMaterialInfo, updateMaterialInfo } from '@/api/oa/base/materialInfo';
import { MaterialInfoVO, MaterialInfoQuery, MaterialInfoForm } from '@/api/oa/base/materialInfo/types';
import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
const materielInfoList = ref<MaterielInfoVO[]>([]);
const materialInfoList = ref<MaterialInfoVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
@ -162,7 +159,7 @@ const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const materielInfoFormRef = ref<ElFormInstance>();
const materialInfoFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
@ -179,7 +176,7 @@ const getUnitInfoListSelect = async () => {
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `物料ID`, visible: false },
{ key: 1, label: `租户编号`, visible: true },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `SAP物料编码`, visible: true },
{ key: 3, label: `SAP物料名称`, visible: true },
{ key: 4, label: `物料品牌`, visible: true },
@ -199,12 +196,12 @@ const columns = ref<FieldOption[]>([
{ key: 18, label: `更新时间`, visible: false }
]);
const initFormData: MaterielInfoForm = {
materielId: undefined,
materielCode: undefined,
materielName: undefined,
materielBrand: undefined,
materielModel: undefined,
const initFormData: MaterialInfoForm = {
materialId: undefined,
materialCode: undefined,
materialName: undefined,
materialBrand: undefined,
materialModel: undefined,
unitId: undefined,
materialParameter: undefined,
purchasePrice: undefined,
@ -213,15 +210,15 @@ const initFormData: MaterielInfoForm = {
remark: undefined,
activeFlag: undefined
};
const data = reactive<PageData<MaterielInfoForm, MaterielInfoQuery>>({
const data = reactive<PageData<MaterialInfoForm, MaterialInfoQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
materielCode: undefined,
materielName: undefined,
materielBrand: undefined,
materielModel: undefined,
materialCode: undefined,
materialName: undefined,
materialBrand: undefined,
materialModel: undefined,
unitId: undefined,
materialParameter: undefined,
purchasePrice: undefined,
@ -242,8 +239,8 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询SAP物料信息列表 */
const getList = async () => {
loading.value = true;
const res = await listMaterielInfo(queryParams.value);
materielInfoList.value = res.rows;
const res = await listMaterialInfo(queryParams.value);
materialInfoList.value = res.rows;
total.value = res.total;
loading.value = false;
};
@ -257,7 +254,7 @@ const cancel = () => {
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
materielInfoFormRef.value?.resetFields();
materialInfoFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
@ -273,8 +270,8 @@ const resetQuery = () => {
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: MaterielInfoVO[]) => {
ids.value = selection.map((item) => item.materielId);
const handleSelectionChange = (selection: MaterialInfoVO[]) => {
ids.value = selection.map((item) => item.materialId);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
@ -287,10 +284,10 @@ const handleAdd = () => {
};
/** 修改按钮操作 */
const handleUpdate = async (row?: MaterielInfoVO) => {
const handleUpdate = async (row?: MaterialInfoVO) => {
reset();
const _materielId = row?.materielId || ids.value[0];
const res = await getMaterielInfo(_materielId);
const _materialId = row?.materialId || ids.value[0];
const res = await getMaterialInfo(_materialId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改SAP物料信息';
@ -298,13 +295,13 @@ const handleUpdate = async (row?: MaterielInfoVO) => {
/** 提交按钮 */
const submitForm = () => {
materielInfoFormRef.value?.validate(async (valid: boolean) => {
materialInfoFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.materielId) {
await updateMaterielInfo(form.value).finally(() => (buttonLoading.value = false));
if (form.value.materialId) {
await updateMaterialInfo(form.value).finally(() => (buttonLoading.value = false));
} else {
await addMaterielInfo(form.value).finally(() => (buttonLoading.value = false));
await addMaterialInfo(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
@ -314,10 +311,10 @@ const submitForm = () => {
};
/** 删除按钮操作 */
const handleDelete = async (row?: MaterielInfoVO) => {
const _materielIds = row?.materielId || ids.value;
await proxy?.$modal.confirm('是否确认删除SAP物料信息编号为"' + _materielIds + '"的数据项?').finally(() => (loading.value = false));
await delMaterielInfo(_materielIds);
const handleDelete = async (row?: MaterialInfoVO) => {
const _materialIds = row?.materialId || ids.value;
await proxy?.$modal.confirm('是否确认删除SAP物料信息编号为"' + _materialIds + '"的数据项?').finally(() => (loading.value = false));
await delMaterialInfo(_materialIds);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
@ -325,11 +322,11 @@ const handleDelete = async (row?: MaterielInfoVO) => {
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'oa/base/materielInfo/export',
'oa/base/materialInfo/export',
{
...queryParams.value
},
`materielInfo_${new Date().getTime()}.xlsx`
`materialInfo_${new Date().getTime()}.xlsx`
);
};

@ -0,0 +1,347 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="SAP物料编码" prop="materialCode">
<el-input v-model="queryParams.materialCode" placeholder="请输入SAP物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="SAP物料名称" prop="materialName">
<el-input v-model="queryParams.materialName" placeholder="请输入SAP物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="客户名称" prop="customerId">
<el-select v-model="queryParams.customerId" placeholder="请选择客户名称" filterable clearable @keyup.enter="handleQuery">
<el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
</el-select>
</el-form-item>
<el-form-item label="销售物料名称" prop="saleMaterialName">
<el-input v-model="queryParams.saleMaterialName" placeholder="请输入销售物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="激活标识" prop="activeFlag">-->
<!-- <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>-->
<!-- <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/base:relationMaterial:add']"> </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/base:relationMaterial:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/base:relationMaterial:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/base:relationMaterial:export']"> </el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" border :data="relationMaterialList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="关联物料ID" align="center" prop="relationMaterialId" v-if="columns[0].visible" />
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible" />
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible" />
<el-table-column label="客户名称" align="center" prop="customerName" v-if="columns[3].visible" />
<el-table-column label="销售物料名称" align="center" prop="saleMaterialName" v-if="columns[4].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag" />
</template>
</el-table-column>
<el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[8].visible" />
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[9].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[10].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[11].visible" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[12].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/base:relationMaterial:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['oa/base:relationMaterial:remove']"
></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改关联销售物料信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="relationMaterialFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="物料名称" prop="materialId">
<el-input v-model="form.materialName" placeholder="请点击右侧图标检索物料" readonly>
<template #suffix>
<el-icon style="cursor: pointer" @click="openUserSelect">
<Search />
</el-icon>
</template>
</el-input>
</el-form-item>
<el-form-item label="客户名称" prop="customerId">
<el-select v-model="form.customerId" placeholder="请选择所属客户" filterable clearable>
<el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
</el-select>
</el-form-item>
<el-form-item label="销售物料名称" prop="saleMaterialName">
<el-input v-model="form.saleMaterialName" placeholder="请输入销售物料名称" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<!-- <el-form-item label="激活标识" prop="activeFlag">-->
<!-- <el-radio-group v-model="form.activeFlag">-->
<!-- <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
<!-- 申请人 -->
<MaterialSelect ref="materialSelectRef" :multiple="false" @confirm-call-back="materialSelectCallBack"></MaterialSelect>
</div>
</template>
<script setup name="RelationMaterial" lang="ts">
import {
listRelationMaterial,
getRelationMaterial,
delRelationMaterial,
addRelationMaterial,
updateRelationMaterial
} from '@/api/oa/base/relationMaterial';
import { RelationMaterialVO, RelationMaterialQuery, RelationMaterialForm } from '@/api/oa/base/relationMaterial/types';
import MaterialSelect from '@/components/MaterialSelect/index.vue';
import { ref } from 'vue';
import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
const relationMaterialList = ref<RelationMaterialVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const relationMaterialFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const materialSelectRef = ref<InstanceType<typeof MaterialSelect>>();
/** 查询客户信息下拉框结构 */
const customerInfoList = ref([]);
const getCustomerInfoListSelect = async () => {
let res = await getCrmCustomerInfoList(null);
customerInfoList.value = res.data;
};
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `关联物料ID`, visible: false },
{ key: 1, label: `物料编码`, visible: true },
{ key: 2, label: `物料名称`, visible: true },
{ key: 3, label: `客户名称`, visible: true },
{ key: 4, label: `销售物料名称`, visible: true },
{ key: 5, label: `备注`, visible: true },
{ key: 6, label: `激活标识`, visible: false },
{ key: 7, label: `删除标志`, visible: false },
{ key: 8, label: `创建部门`, visible: false },
{ key: 9, label: `创建人`, visible: false },
{ key: 10, label: `创建时间`, visible: true },
{ key: 11, label: `更新人`, visible: false },
{ key: 12, label: `更新时间`, visible: true }
]);
const initFormData: RelationMaterialForm = {
relationMaterialId: undefined,
materialId: undefined,
materialName: undefined,
customerId: undefined,
saleMaterialName: undefined,
remark: undefined,
activeFlag: undefined
};
const data = reactive<PageData<RelationMaterialForm, RelationMaterialQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
materialId: undefined,
customerId: undefined,
saleMaterialName: undefined,
activeFlag: undefined,
materialCode: undefined,
materialName: undefined,
customerName: undefined,
params: {}
},
rules: {
materialId: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
customerId: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询关联销售物料信息列表 */
const getList = async () => {
loading.value = true;
const res = await listRelationMaterial(queryParams.value);
relationMaterialList.value = res.rows;
total.value = res.total;
loading.value = false;
};
//
const openUserSelect = () => {
materialSelectRef.value.open();
};
//
const materialSelectCallBack = (data) => {
const materialList = data;
if (materialList.length > 0) {
form.value.materialId = materialList[0].materialId;
form.value.materialName = materialList[0].materialName;
}
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
relationMaterialFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: RelationMaterialVO[]) => {
ids.value = selection.map((item) => item.relationMaterialId);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = '添加关联销售物料信息';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: RelationMaterialVO) => {
reset();
const _relationMaterialId = row?.relationMaterialId || ids.value[0];
const res = await getRelationMaterial(_relationMaterialId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改关联销售物料信息';
};
/** 提交按钮 */
const submitForm = () => {
relationMaterialFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.relationMaterialId) {
await updateRelationMaterial(form.value).finally(() => (buttonLoading.value = false));
} else {
await addRelationMaterial(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: RelationMaterialVO) => {
const _relationMaterialIds = row?.relationMaterialId || ids.value;
await proxy?.$modal.confirm('是否确认删除关联销售物料信息编号为"' + _relationMaterialIds + '"的数据项?').finally(() => (loading.value = false));
await delRelationMaterial(_relationMaterialIds);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'oa/base/relationMaterial/export',
{
...queryParams.value
},
`relationMaterial_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getCustomerInfoListSelect();
getList();
});
</script>

@ -58,8 +58,8 @@
<el-table v-loading="loading" border :data="relationMaterielList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="关联物料ID" align="center" prop="relationMaterielId" v-if="columns[0].visible" />
<el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[2].visible" />
<el-table-column label="客户名称" align="center" prop="customerId" v-if="columns[3].visible" />
<el-table-column label="物料名称" align="center" prop="materielName" v-if="columns[2].visible" />
<el-table-column label="客户名称" align="center" prop="customerName" v-if="columns[3].visible" />
<el-table-column label="销售物料名称" align="center" prop="saleMaterielName" v-if="columns[4].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
@ -90,11 +90,19 @@
<!-- 添加或修改关联销售物料信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="relationMaterielFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="物料ID" prop="materielId">
<el-input v-model="form.materielId" placeholder="请输入物料ID" />
<el-form-item label="物料名称" prop="materielId">
<el-input v-model="form.materielName" placeholder="请点击右侧图标检索物料" readonly>
<template #suffix>
<el-icon style="cursor: pointer" @click="openUserSelect">
<Search />
</el-icon>
</template>
</el-input>
</el-form-item>
<el-form-item label="客户名称" prop="customerId">
<el-input v-model="form.customerId" placeholder="请输入客户名称" />
<el-select v-model="form.customerId" placeholder="请选择所属客户" filterable clearable>
<el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
</el-select>
</el-form-item>
<el-form-item label="销售物料名称" prop="saleMaterielName">
<el-input v-model="form.saleMaterielName" placeholder="请输入销售物料名称" />
@ -115,6 +123,8 @@
</div>
</template>
</el-dialog>
<!-- 申请人 -->
<MaterielSelect ref="userSelectRef" :multiple="false" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></MaterielSelect>
</div>
</template>
@ -128,6 +138,8 @@ import {
} from '@/api/oa/base/relationMateriel';
import { RelationMaterielVO, RelationMaterielQuery, RelationMaterielForm } from '@/api/oa/base/relationMateriel/types';
import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
import { ref } from 'vue';
import MaterielSelect from 'src/components/MaterialSelect';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@ -144,6 +156,10 @@ const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const relationMaterielFormRef = ref<ElFormInstance>();
const userSelectRef = ref<InstanceType<typeof MaterielSelect>>();
//id
const selectUserIds = ref<Array<number | string>>([]);
const dialog = reactive<DialogOption>({
visible: false,
title: ''
@ -158,9 +174,9 @@ const getCustomerInfoListSelect = async () => {
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `关联物料ID`, visible: true },
{ key: 0, label: `关联物料名称`, visible: false },
{ key: 1, label: `租户编号`, visible: true },
{ key: 2, label: `物料ID`, visible: true },
{ key: 2, label: `物料名称`, visible: true },
{ key: 3, label: `客户名称`, visible: true },
{ key: 4, label: `销售物料名称`, visible: true },
{ key: 5, label: `备注`, visible: true },
@ -199,7 +215,8 @@ const data = reactive<PageData<RelationMaterielForm, RelationMaterielQuery>>({
params: {}
},
rules: {
relationMaterielId: [{ required: true, message: '关联物料ID不能为空', trigger: 'blur' }]
materielId: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
customerId: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }]
}
});
@ -214,6 +231,21 @@ const getList = async () => {
loading.value = false;
};
//
const openUserSelect = () => {
userSelectRef.value.open();
};
//
const userSelectCallBack = (data) => {
const materielList = data;
console.log(materielList);
if (materielList.length > 0) {
form.value.materielId = materielList[0].materielId;
form.value.materielName = materielList[0].materielName;
}
};
/** 取消按钮 */
const cancel = () => {
reset();

Loading…
Cancel
Save