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

1.0.10 合同修改优化、合同物料优化

Browse Source
dev
yinq 2 months ago
parent 9530bee1de
commit d8ad7227a9
7 changed files with 734 additions and 243 deletions
Show Stats Download Patch File Download Diff File

5
src/api/oa/erp/contractInfo/types.ts
Unescape Escape View File

@ -272,6 +272,11 @@ export interface ContractInfoForm extends BaseEntity {
*/ */
activeFlag?: string; activeFlag?: string;
/**
* 合同物料列表
*/
contractMaterielList?: any[];
} }
export interface ContractInfoQuery extends PageQuery { export interface ContractInfoQuery extends PageQuery {

76
src/api/oa/erp/contractMaterial/index.ts
Unescape Escape View File

@ -0,0 +1,76 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ContractMaterialVO, ContractMaterialForm, ContractMaterialQuery } from '@/api/oa/erp/contractMaterial/types';
/**
* 查询合同物料信息列表
* @param query
* @returns {*}
*/
export const listContractMaterial = (query?: ContractMaterialQuery): AxiosPromise<ContractMaterialVO[]> => {
return request({
url: '/oa/erp/contractMaterial/list',
method: 'get',
params: query
});
};
/**
* 查询合同物料信息详细
* @param contractMaterialId
*/
export const getContractMaterial = (contractMaterialId: string | number): AxiosPromise<ContractMaterialVO> => {
return request({
url: '/oa/erp/contractMaterial/' + contractMaterialId,
method: 'get'
});
};
/**
* 新增合同物料信息
* @param data
*/
export const addContractMaterial = (data: ContractMaterialForm) => {
return request({
url: '/oa/erp/contractMaterial',
method: 'post',
data: data
});
};
/**
* 修改合同物料信息
* @param data
*/
export const updateContractMaterial = (data: ContractMaterialForm) => {
return request({
url: '/oa/erp/contractMaterial',
method: 'put',
data: data
});
};
/**
* 删除合同物料信息
* @param contractMaterialId
*/
export const delContractMaterial = (contractMaterialId: string | number | Array<string | number>) => {
return request({
url: '/oa/erp/contractMaterial/' + contractMaterialId,
method: 'delete'
});
};
/**
* 下拉框查询合同物料信息列表
* @param query
* @returns {*}
*/
export function getErpContractMaterialList (query) {
return request({
url: '/oa/erp/contractMaterial/getErpContractMaterialList',
method: 'get',
params: query
});
};

52
src/api/oa/erp/contractMateriel/types.ts → src/api/oa/erp/contractMaterial/types.ts
Unescape Escape View File

@ -1,8 +1,13 @@
export interface ContractMaterielVO { export interface ContractMaterialVO {
/** /**
* 合同物料ID * 合同物料ID
*/ */
contractMaterielId: string | number; contractMaterialId: string | number;
/**
* 计划标识（1计划内 2计划外）
*/
planFlag: string;
/** /**
* 合同ID * 合同ID
@ -22,12 +27,12 @@ export interface ContractMaterielVO {
/** /**
* 物料ID * 物料ID
*/ */
materielId: string | number; materialId: string | number;
/** /**
* 销售物料ID * 销售物料ID
*/ */
relationMaterielId: string | number; relationMaterialId: string | number;
/** /**
* 数量 * 数量
@ -69,13 +74,33 @@ export interface ContractMaterielVO {
*/ */
activeFlag: string; activeFlag: string;
/**
* 创建部门
*/
createDept: number;
/**
* 创建人
*/
createBy: number;
/**
* 创建时间
*/
createTime: string;
} }
export interface ContractMaterielForm extends BaseEntity { export interface ContractMaterialForm extends BaseEntity {
/** /**
* 合同物料ID * 合同物料ID
*/ */
contractMaterielId?: string | number; contractMaterialId?: string | number;
/**
* 计划标识（1计划内 2计划外）
*/
planFlag?: string;
/** /**
* 合同ID * 合同ID
@ -95,12 +120,12 @@ export interface ContractMaterielForm extends BaseEntity {
/** /**
* 物料ID * 物料ID
*/ */
materielId?: string | number; materialId?: string | number;
/** /**
* 销售物料ID * 销售物料ID
*/ */
relationMaterielId?: string | number; relationMaterialId?: string | number;
/** /**
* 数量 * 数量
@ -144,7 +169,12 @@ export interface ContractMaterielForm extends BaseEntity {
} }
export interface ContractMaterielQuery extends PageQuery { export interface ContractMaterialQuery extends PageQuery {
/**
* 计划标识（1计划内 2计划外）
*/
planFlag?: string;
/** /**
* 合同ID * 合同ID
@ -164,12 +194,12 @@ export interface ContractMaterielQuery extends PageQuery {
/** /**
* 物料ID * 物料ID
*/ */
materielId?: string | number; materialId?: string | number;
/** /**
* 销售物料ID * 销售物料ID
*/ */
relationMaterielId?: string | number; relationMaterialId?: string | number;
/** /**
* 数量 * 数量

76
src/api/oa/erp/contractMateriel/index.ts
Unescape Escape View File

@ -1,76 +0,0 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ContractMaterielVO, ContractMaterielForm, ContractMaterielQuery } from '@/api/oa/erp/contractMateriel/types';
/**
* 查询合同物料信息列表
* @param query
* @returns {*}
*/
export const listContractMateriel = (query?: ContractMaterielQuery): AxiosPromise<ContractMaterielVO[]> => {
return request({
url: '/oa/erp/contractMateriel/list',
method: 'get',
params: query
});
};
/**
* 查询合同物料信息详细
* @param contractMaterielId
*/
export const getContractMateriel = (contractMaterielId: string | number): AxiosPromise<ContractMaterielVO> => {
return request({
url: '/oa/erp/contractMateriel/' + contractMaterielId,
method: 'get'
});
};
/**
* 新增合同物料信息
* @param data
*/
export const addContractMateriel = (data: ContractMaterielForm) => {
return request({
url: '/oa/erp/contractMateriel',
method: 'post',
data: data
});
};
/**
* 修改合同物料信息
* @param data
*/
export const updateContractMateriel = (data: ContractMaterielForm) => {
return request({
url: '/oa/erp/contractMateriel',
method: 'put',
data: data
});
};
/**
* 删除合同物料信息
* @param contractMaterielId
*/
export const delContractMateriel = (contractMaterielId: string | number | Array<string | number>) => {
return request({
url: '/oa/erp/contractMateriel/' + contractMaterielId,
method: 'delete'
});
};
/**
* 下拉框查询合同物料信息列表
* @param query
* @returns {*}
*/
export function getErpContractMaterielList (query) {
return request({
url: '/oa/erp/contractMateriel/getErpContractMaterielList',
method: 'get',
params: query
});
};

8
src/views/oa/base/relationMaterial/index.vue
Unescape Escape View File

@ -107,7 +107,7 @@
<el-form-item label="物料名称" prop="materialId"> <el-form-item label="物料名称" prop="materialId">
<el-input v-model="form.materialName" placeholder="请点击右侧图标检索物料" readonly> <el-input v-model="form.materialName" placeholder="请点击右侧图标检索物料" readonly>
<template #suffix> <template #suffix>
<el-icon style="cursor: pointer" @click="openUserSelect"> <el-icon style="cursor: pointer" @click="openMaterialSelect">
<Search /> <Search />
</el-icon> </el-icon>
</template> </template>
@ -137,7 +137,7 @@
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
<!-- 申请人 --> <!-- 物料选择 -->
<MaterialSelect ref="materialSelectRef" :multiple="false" @confirm-call-back="materialSelectCallBack"></MaterialSelect> <MaterialSelect ref="materialSelectRef" :multiple="false" @confirm-call-back="materialSelectCallBack"></MaterialSelect>
</div> </div>
</template> </template>
@ -241,8 +241,8 @@ const getList = async () => {
loading.value = false; loading.value = false;
}; };
//打开申请人选择 //打开物料选择
const openUserSelect = () => { const openMaterialSelect = () => {
materialSelectRef.value.open(); materialSelectRef.value.open();
}; };

540
src/views/oa/erp/contractInfo/edit.vue
Unescape Escape View File

@ -2,20 +2,24 @@
<div class="p-2"> <div class="p-2">
<el-card shadow="never"> <el-card shadow="never">
<template #header> <template #header>
<div style="text-align: left; font-weight: bold; font-size: 24px;">合同{{ form.contractId ? ' - 修改' : ' - 新增' }}</div> <div style="text-align: left; font-weight: bold; font-size: 24px">合同{{ form.contractId ? ' - 修改' : ' - 新增' }}</div>
</template> </template>
<el-form ref="contractInfoFormRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="contractInfoFormRef" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="有无合同" prop="contractFlag"> <el-form-item label="有无合同" prop="contractFlag">
<el-radio-group v-model="form.contractFlag"> <el-radio-group v-model="form.contractFlag">
<el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio> <el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合同编号" prop="contractCode"> <el-form-item label="合同编号" prop="contractCode" v-if="form.contractFlag === '1'">
<el-input v-model="form.contractCode" placeholder="请输入合同编号" /> <el-input v-model="form.contractCode" placeholder="请输入合同编号">
<template #append>
<el-button type="primary" @click="generateContractCode" :disabled="isCodeGenerated">生成合同编号</el-button>
</template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -57,7 +61,14 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合同总价" prop="totalPrice"> <el-form-item label="合同总价" prop="totalPrice">
<el-input v-model="form.totalPrice" placeholder="请输入合同总价" /> <el-input v-model="form.totalPrice" placeholder="根据合同物料自动计算" disabled>
<template #append>元</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="付款方式" prop="paymentMethod">
<el-input v-model="form.paymentMethod" placeholder="请输入付款方式" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -65,27 +76,27 @@
<el-input v-model="form.aCustomerId" placeholder="请输入甲方公司" /> <el-input v-model="form.aCustomerId" placeholder="请输入甲方公司" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="乙方公司" prop="bCustomerId">
<el-input v-model="form.bCustomerId" placeholder="请输入乙方公司" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="甲方授权代表" prop="aRepresent"> <el-form-item label="甲方授权代表" prop="aRepresent">
<el-input v-model="form.aRepresent" placeholder="请输入甲方授权代表" /> <el-input v-model="form.aRepresent" placeholder="请输入甲方授权代表" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="乙方授权代表" prop="bRepresent">
<el-input v-model="form.bRepresent" placeholder="请输入乙方授权代表" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="甲方签字日期" prop="aDate"> <el-form-item label="甲方签字日期" prop="aDate">
<el-date-picker clearable v-model="form.aDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择甲方签字日期"> <el-date-picker clearable v-model="form.aDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择甲方签字日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="乙方公司" prop="bCustomerId">
<el-input v-model="form.bCustomerId" placeholder="请输入乙方公司" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="乙方授权代表" prop="bRepresent">
<el-input v-model="form.bRepresent" placeholder="请输入乙方授权代表" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="乙方签字日期" prop="bDate"> <el-form-item label="乙方签字日期" prop="bDate">
<el-date-picker clearable v-model="form.bDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择乙方签字日期"> <el-date-picker clearable v-model="form.bDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择乙方签字日期">
@ -94,16 +105,16 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合同状态" prop="contractStatus"> <el-form-item label="合同状态" prop="contractStatus">
<el-radio-group v-model="form.contractStatus"> <el-radio-group v-model="form.contractStatus" disabled>
<el-radio v-for="dict in contract_status" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio> <el-radio v-for="dict in contract_status" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="流程状态" prop="flowStatus"> <!-- <el-form-item label="流程状态" prop="flowStatus">-->
<el-input v-model="form.flowStatus" placeholder="请输入流程状态" /> <!-- <el-input v-model="form.flowStatus" placeholder="请输入流程状态" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合同模板ID" prop="templateId"> <el-form-item label="合同模板ID" prop="templateId">
<el-input v-model="form.templateId" placeholder="请输入合同模板ID" /> <el-input v-model="form.templateId" placeholder="请输入合同模板ID" />
@ -114,48 +125,201 @@
<el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="付款方式" prop="paymentMethod">
<el-input v-model="form.paymentMethod" placeholder="请输入付款方式" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="签字合同附件" prop="signatureAppendix">
<el-input v-model="form.signatureAppendix" placeholder="请输入签字合同附件" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同税率(预留)" prop="taxRate">
<el-input v-model="form.taxRate" placeholder="请输入合同税率(预留)" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="12">
<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-col>
<el-col :span="24">
<el-form-item>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">保 存</el-button>
<el-button @click="goBack">返 回</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-card> </el-card>
<!-- 合同物料管理区域 -->
<el-card shadow="never" style="margin-top: 20px">
<template #header>
<div style="text-align: left; font-weight: bold; font-size: 18px">合同物料管理</div>
</template>
<!-- 合同物料表格 -->
<div style="margin-bottom: 16px">
<el-button type="primary" icon="Plus" @click="handleAddMaterial">新增物料</el-button>
</div>
<el-table :data="contractMaterialList" border v-loading="materialLoading">
<el-table-column label="产品名称" align="center" prop="productName" min-width="120" />
<el-table-column label="规格描述" align="center" prop="specificationDescription" min-width="120" />
<el-table-column label="物料ID" align="center" prop="materialId" width="100" />
<el-table-column label="销售物料ID" align="center" prop="relationMaterialId" width="120" />
<el-table-column label="数量" align="center" prop="amount" width="100">
<template #default="scope">
{{ scope.row.amount ? Number(scope.row.amount).toFixed(2) : '0.00' }}
</template>
</el-table-column>
<el-table-column label="单位ID" align="center" prop="unitId" width="100" />
<el-table-column label="未税单价" align="center" prop="beforePrice" width="120">
<template #default="scope">
{{ scope.row.beforePrice ? Number(scope.row.beforePrice).toFixed(2) : '0.00' }}
</template>
</el-table-column>
<el-table-column label="税率(%)" align="center" prop="taxRate" width="100">
<template #default="scope">
{{ scope.row.taxRate ? Number(scope.row.taxRate).toFixed(2) : '0.00' }}
</template>
</el-table-column>
<el-table-column label="含税单价" align="center" prop="includingPrice" width="120">
<template #default="scope">
{{ scope.row.includingPrice ? Number(scope.row.includingPrice).toFixed(2) : '0.00' }}
</template>
</el-table-column>
<el-table-column label="小计" align="center" prop="subtotal" width="120">
<template #default="scope">
{{ scope.row.subtotal ? Number(scope.row.subtotal).toFixed(2) : '0.00' }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" min-width="100" />
<el-table-column label="操作" align="center" fixed="right" width="150">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleEditMaterial(scope.row)">编辑</el-button>
<el-button link type="danger" icon="Delete" @click="handleDeleteMaterial(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-card shadow="never" style="margin-top: 20px">
<el-col :span="24">
<el-form-item>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">保 存</el-button>
<el-button @click="goBack">返 回</el-button>
</el-form-item>
</el-col>
</el-card>
</el-card>
<!-- 合同物料编辑对话框 -->
<el-dialog :title="materialDialog.title" v-model="materialDialog.visible" width="800px" append-to-body>
<el-form ref="materialFormRef" :model="materialForm" :rules="materialRules" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="产品名称" prop="productName">
<el-input v-model="materialForm.productName" placeholder="计划内请点击右侧图标检索物料">
<template #suffix>
<el-icon style="cursor: pointer" @click="openMaterialSelect">
<Search />
</el-icon>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="规格描述" prop="specificationDescription">
<el-input v-model="materialForm.specificationDescription" placeholder="请输入规格描述" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料ID" prop="materialId">
<el-input v-model="materialForm.materialId" placeholder="请输入物料ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="销售物料ID" prop="relationMaterialId">
<el-input v-model="materialForm.relationMaterialId" placeholder="请输入销售物料ID" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="数量" prop="amount">
<el-input-number
v-model="materialForm.amount"
placeholder="请输入数量"
style="width: 100%"
@change="calculateSubtotal"
:precision="2"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料单位" prop="unitId">
<el-select v-model="materialForm.unitId" placeholder="请选择物料单位">
<el-option v-for="item in unitInfoList" :key="item.unitId" :label="item.unitName" :value="item.unitId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="税率(%)" prop="taxRate">
<el-input-number
v-model="materialForm.taxRate"
placeholder="请输入税率"
style="width: 100%"
@change="calculateBeforePrice"
:precision="2"
:min="0"
:max="100"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="未税单价" prop="beforePrice">
<el-input-number
v-model="materialForm.beforePrice"
placeholder="自动计算"
style="width: 100%"
:precision="2"
:controls="false"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="含税单价" prop="includingPrice">
<el-input-number
v-model="materialForm.includingPrice"
placeholder="请输入含税单价"
style="width: 100%"
:precision="2"
@change="calculateBeforePrice"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="小计" prop="subtotal">
<el-input-number
v-model="materialForm.subtotal"
placeholder="自动计算"
style="width: 100%"
readonly
:precision="2"
:controls="false"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="materialForm.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="materialButtonLoading" type="primary" @click="submitMaterialForm">确 定</el-button>
<el-button @click="cancelMaterial">取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 物料选择 -->
<MaterialSelect ref="materialSelectRef" :multiple="false" @confirm-call-back="materialSelectCallBack"></MaterialSelect>
</div> </div>
</template> </template>
<script setup name="ContractInfoEdit" lang="ts"> <script setup name="ContractInfoEdit" lang="ts">
import { addContractInfo, getContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo'; import { addContractInfo, getContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo';
import { ContractInfoForm } from '@/api/oa/erp/contractInfo/types'; import { ContractInfoForm } from '@/api/oa/erp/contractInfo/types';
import { getErpContractMaterialList } from '@/api/oa/erp/contractMaterial';
import { ContractMaterialVO, ContractMaterialForm } from '@/api/oa/erp/contractMaterial/types';
import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
import { getRuleGenerateCode } from '@/api/system/codeRule';
import MaterialSelect from '@/components/MaterialSelect/index.vue';
import { ref } from 'vue';
const route = useRoute(); const route = useRoute();
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -166,12 +330,65 @@ const { contract_category, business_direction, active_flag, contract_flag, contr
const buttonLoading = ref(false); const buttonLoading = ref(false);
const contractInfoFormRef = ref<ElFormInstance>(); const contractInfoFormRef = ref<ElFormInstance>();
// 合同编号生成状态
const isCodeGenerated = ref(false);
// 合同物料相关
const materialLoading = ref(false);
const materialButtonLoading = ref(false);
const materialFormRef = ref<ElFormInstance>();
// 合同物料列表计算属性
const contractMaterialList = computed(() => {
return (form.value as any).contractMaterialList || [];
});
/** 查询单位信息下拉框结构 */
const unitInfoList = ref([]);
const getUnitInfoListSelect = async () => {
let res = await getBaseUnitInfoList(null);
unitInfoList.value = res.data;
};
// 合同物料对话框
const materialDialog = reactive({
visible: false,
title: ''
});
// 合同物料表单数据
const initMaterialFormData: ContractMaterialForm = {
contractMaterialId: undefined,
contractId: undefined,
productName: undefined,
specificationDescription: undefined,
materialId: undefined,
relationMaterialId: undefined,
amount: undefined,
unitId: undefined,
beforePrice: undefined,
taxRate: undefined,
includingPrice: undefined,
subtotal: undefined,
remark: undefined,
activeFlag: '1'
};
const materialForm = ref<ContractMaterialForm>({ ...initMaterialFormData });
// 合同物料表单验证规则
const materialRules = {
productName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
amount: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
taxRate: [{ required: true, message: '税率不能为空', trigger: 'blur' }]
};
const initFormData: ContractInfoForm = { const initFormData: ContractInfoForm = {
contractId: undefined, contractId: undefined,
contractFlag: undefined, contractFlag: '1',
contractCode: undefined, contractCode: undefined,
contractName: undefined, contractName: undefined,
contractCategory: undefined, contractCategory: '1',
contractType: undefined, contractType: undefined,
businessDirection: undefined, businessDirection: undefined,
contractDeptId: undefined, contractDeptId: undefined,
@ -191,8 +408,9 @@ const initFormData: ContractInfoForm = {
signatureAppendix: undefined, signatureAppendix: undefined,
taxRate: undefined, taxRate: undefined,
remark: undefined, remark: undefined,
activeFlag: undefined activeFlag: undefined,
}; contractMaterialList: []
} as any;
const data = reactive<{ form: ContractInfoForm; rules: any }>({ const data = reactive<{ form: ContractInfoForm; rules: any }>({
form: { ...initFormData }, form: { ...initFormData },
@ -207,6 +425,48 @@ const goBack = () => {
proxy?.$tab.closePage(); proxy?.$tab.closePage();
}; };
// 监听contractFlag变化
watch(() => form.value.contractFlag, (newVal, oldVal) => {
if (newVal === '2') {
// 当选择"无合同"时，清空合同编号并重置生成状态
form.value.contractCode = undefined;
isCodeGenerated.value = false;
}
});
// 生成合同编号
const generateContractCode = async () => {
if (isCodeGenerated.value) return; // 如果已经生成过，直接返回
try {
const params = { codeRuleCode: '1001' } as any;
const res = await getRuleGenerateCode(params);
form.value.contractCode = res.msg;
isCodeGenerated.value = true; // 标记为已生成
proxy?.$modal.msgSuccess('合同编号生成成功');
} catch (error) {
console.error('生成合同编号失败:', error);
proxy?.$modal.msgError('生成合同编号失败');
}
};
const materialSelectRef = ref<InstanceType<typeof MaterialSelect>>();
//打开物料选择
const openMaterialSelect = () => {
materialSelectRef.value.open();
};
//确认选择申请人
const materialSelectCallBack = (data) => {
const materialList = data;
if (materialList.length > 0) {
materialForm.value.materialId = materialList[0].materialId;
materialForm.value.productName = materialList[0].materialName;
}
};
const submitForm = () => { const submitForm = () => {
contractInfoFormRef.value?.validate(async (valid: boolean) => { contractInfoFormRef.value?.validate(async (valid: boolean) => {
if (valid) { if (valid) {
@ -222,13 +482,179 @@ const submitForm = () => {
}); });
}; };
// 获取合同物料列表
const getContractMaterialList = async () => {
if (!form.value.contractId) return;
materialLoading.value = true;
try {
const res = await getErpContractMaterialList({
contractId: form.value.contractId
});
// 将获取到的数据存储到form中
(form.value as any).contractMaterialList = res.data || [];
} catch (error) {
console.error('获取合同物料列表失败:', error);
} finally {
materialLoading.value = false;
}
};
// 新增物料（新增合同时也可添加，不依赖contractId）
const handleAddMaterial = () => {
resetMaterialForm();
materialForm.value.contractId = form.value.contractId;
materialDialog.visible = true;
materialDialog.title = '新增合同物料';
};
// 编辑物料
const handleEditMaterial = (row: ContractMaterialVO) => {
resetMaterialForm();
materialForm.value = { ...row };
materialDialog.visible = true;
materialDialog.title = '编辑合同物料';
};
// 删除物料
const handleDeleteMaterial = async (row: ContractMaterialVO) => {
await proxy?.$modal.confirm('是否确认删除该合同物料？');
try {
// 确保contractMaterialList存在
if (!(form.value as any).contractMaterialList) {
(form.value as any).contractMaterialList = [];
}
// 从本地数据中删除
const index = (form.value as any).contractMaterialList.findIndex((item: any) => item.contractMaterialId === row.contractMaterialId);
if (index !== -1) {
(form.value as any).contractMaterialList.splice(index, 1);
}
// 更新合同总价
calculateTotalPrice();
proxy?.$modal.msgSuccess('删除成功');
} catch (error) {
console.error('删除合同物料失败:', error);
}
};
// 重置物料表单
const resetMaterialForm = () => {
materialForm.value = { ...initMaterialFormData };
materialFormRef.value?.resetFields();
};
// 取消物料编辑
const cancelMaterial = () => {
resetMaterialForm();
materialDialog.visible = false;
};
// 计算未税单价（由含税与税率推未税）
const calculateBeforePrice = () => {
const tax = Number(materialForm.value.taxRate);
const including = Number(materialForm.value.includingPrice);
if (!isNaN(tax) && !isNaN(including)) {
const divisor = 1 + tax / 100;
if (divisor > 0) {
materialForm.value.beforePrice = Number((including / divisor).toFixed(2));
}
}
// 未税变更后联动小计
calculateSubtotal();
};
// 计算小计（数量 × 含税单价）
const calculateSubtotal = () => {
const amount = Number(materialForm.value.amount);
const including = Number(materialForm.value.includingPrice);
if (!isNaN(amount) && !isNaN(including)) {
materialForm.value.subtotal = Number((amount * including).toFixed(2));
}
// 计算小计后更新合同总价
calculateTotalPrice();
};
// 计算合同总价（所有物料小计相加）
const calculateTotalPrice = () => {
const materialList = (form.value as any).contractMaterialList || [];
const total = materialList.reduce((sum: number, material: any) => {
const subtotal = Number(material.subtotal) || 0;
return sum + subtotal;
}, 0);
form.value.totalPrice = Number(total.toFixed(2));
};
// 提交物料表单
const submitMaterialForm = () => {
materialFormRef.value?.validate((valid: boolean) => {
if (valid) {
materialButtonLoading.value = true;
try {
// 确保contractMaterialList存在
if (!(form.value as any).contractMaterialList) {
(form.value as any).contractMaterialList = [];
}
if (materialForm.value.contractMaterialId) {
// 编辑模式：更新现有物料
const index = (form.value as any).contractMaterialList.findIndex(
(item: any) => item.contractMaterialId === materialForm.value.contractMaterialId
);
if (index !== -1) {
(form.value as any).contractMaterialList[index] = { ...materialForm.value };
}
} else {
// 新增模式：添加新物料
const newMaterial = {
...materialForm.value,
contractMaterialId: Date.now() // 临时ID
};
(form.value as any).contractMaterialList.push(newMaterial);
}
// 更新合同总价
calculateTotalPrice();
proxy?.$modal.msgSuccess('操作成功');
materialDialog.visible = false;
} catch (error) {
console.error('保存合同物料失败:', error);
} finally {
materialButtonLoading.value = false;
}
}
});
};
onMounted(async () => { onMounted(async () => {
const id = (route.query.id || route.params.id) as string | number; const id = (route.query.id || route.params.id) as string | number;
if (id) { if (id) {
proxy?.$modal.loading('正在加载数据，请稍后...');
const res = await getContractInfo(id); const res = await getContractInfo(id);
Object.assign(form.value, res.data); Object.assign(form.value, res.data);
proxy?.$modal.closeLoading();
// 编辑模式：如果已有合同编号，禁用生成按钮
if (form.value.contractCode) {
isCodeGenerated.value = true;
} else if (form.value.contractFlag === '1') {
// 如果有合同但没有编号，允许生成
isCodeGenerated.value = false;
}
// 加载合同物料列表
await getContractMaterialList();
} else {
// 新增模式：如果已有合同编号，禁用生成按钮
if (form.value.contractCode) {
isCodeGenerated.value = true;
} else if (form.value.contractFlag === '1') {
// 如果有合同但没有编号，允许生成
isCodeGenerated.value = false;
}
} }
await getUnitInfoListSelect();
}); });
</script> </script>

220
src/views/oa/erp/contractMateriel/index.vue → src/views/oa/erp/contractMaterial/index.vue
Unescape Escape View File

@ -3,24 +3,32 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="80px">
<el-form-item label="计划标识" prop="planFlag">
<el-select v-model="queryParams.planFlag" placeholder="请选择计划标识" clearable>
<el-option v-for="dict in plan_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="合同ID" prop="contractId">-->
<!-- <el-input v-model="queryParams.contractId" placeholder="请输入合同ID" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="产品名称" prop="productName"> <el-form-item label="产品名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="规格描述" prop="specificationDescription"> <el-form-item label="规格描述" prop="specificationDescription">
<el-input v-model="queryParams.specificationDescription" placeholder="请输入规格描述" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.specificationDescription" placeholder="请输入规格描述" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="物料ID" prop="materielId">--> <!-- <el-form-item label="物料ID" prop="materialId">-->
<!-- <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />--> <!-- <el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="销售物料ID" prop="relationMaterielId">--> <!-- <el-form-item label="销售物料ID" prop="relationMaterialId">-->
<!-- <el-input v-model="queryParams.relationMaterielId" placeholder="请输入销售物料ID" clearable @keyup.enter="handleQuery" />--> <!-- <el-input v-model="queryParams.relationMaterialId" placeholder="请输入销售物料ID" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="激活标识" prop="activeFlag">--> <!-- <el-form-item label="激活标识" prop="activeFlag">-->
<!-- <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>--> <!-- <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-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -34,49 +42,61 @@
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:contractMateriel:add']"> 新增 </el-button> <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/erp:contractMaterial:add']"> 新增 </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:contractMateriel:edit']" <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/erp:contractMaterial:edit']"
>修改 >修改
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:contractMateriel:remove']" <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/erp:contractMaterial:remove']"
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:contractMateriel:export']">导出 </el-button> <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/erp:contractMaterial:export']">导出 </el-button>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar> <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
</template> </template>
<el-table v-loading="loading" border :data="contractMaterielList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="contractMaterialList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="合同物料ID" align="center" prop="contractMaterielId" v-if="columns[0].visible" /> <el-table-column label="合同物料ID" align="center" prop="contractMaterialId" v-if="columns[0].visible" />
<el-table-column label="合同ID" align="center" prop="contractId" v-if="columns[2].visible" /> <el-table-column label="计划标识" align="center" prop="planFlag" v-if="columns[2].visible">
<el-table-column label="产品名称" align="center" prop="productName" v-if="columns[3].visible" /> <template #default="scope">
<el-table-column label="规格描述" align="center" prop="specificationDescription" v-if="columns[4].visible" /> <dict-tag :options="plan_flag" :value="scope.row.planFlag" />
<el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[5].visible" /> </template>
<el-table-column label="销售物料ID" align="center" prop="relationMaterielId" v-if="columns[6].visible" /> </el-table-column>
<el-table-column label="数量" align="center" prop="amount" v-if="columns[7].visible" /> <el-table-column label="合同ID" align="center" prop="contractId" v-if="columns[3].visible" />
<el-table-column label="单位ID" align="center" prop="unitId" v-if="columns[8].visible" /> <el-table-column label="产品名称" align="center" prop="productName" v-if="columns[4].visible" />
<el-table-column label="未税单价" align="center" prop="beforePrice" v-if="columns[9].visible" /> <el-table-column label="规格描述" align="center" prop="specificationDescription" v-if="columns[5].visible" />
<el-table-column label="税率" align="center" prop="taxRate" v-if="columns[10].visible" /> <el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[6].visible" />
<el-table-column label="含税单价" align="center" prop="includingPrice" v-if="columns[11].visible" /> <el-table-column label="销售物料ID" align="center" prop="relationMaterialId" v-if="columns[7].visible" />
<el-table-column label="小计" align="center" prop="subtotal" v-if="columns[12].visible" /> <el-table-column label="数量" align="center" prop="amount" v-if="columns[8].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[13].visible" /> <el-table-column label="单位ID" align="center" prop="unitId" v-if="columns[9].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[14].visible"> <el-table-column label="未税单价" align="center" prop="beforePrice" v-if="columns[10].visible" />
<el-table-column label="税率" align="center" prop="taxRate" v-if="columns[11].visible" />
<el-table-column label="含税单价" align="center" prop="includingPrice" v-if="columns[12].visible" />
<el-table-column label="小计" align="center" prop="subtotal" v-if="columns[13].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[14].visible" />
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[15].visible">
<template #default="scope"> <template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag" /> <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[17].visible" />
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[18].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[19].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" fixed="right" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:contractMateriel:edit']"></el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/erp:contractMaterial:edit']"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top"> <el-tooltip content="删除" placement="top">
<el-button <el-button
@ -84,7 +104,7 @@
type="primary" type="primary"
icon="Delete" icon="Delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['oa/erp:contractMateriel:remove']" v-hasPermi="['oa/erp:contractMaterial:remove']"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
@ -95,7 +115,12 @@
</el-card> </el-card>
<!-- 添加或修改合同物料信息对话框 --> <!-- 添加或修改合同物料信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="contractMaterielFormRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="contractMaterialFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="计划标识" prop="planFlag">
<el-radio-group v-model="form.planFlag">
<el-radio v-for="dict in plan_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="合同ID" prop="contractId"> <el-form-item label="合同ID" prop="contractId">
<el-input v-model="form.contractId" placeholder="请输入合同ID" /> <el-input v-model="form.contractId" placeholder="请输入合同ID" />
</el-form-item> </el-form-item>
@ -105,11 +130,11 @@
<el-form-item label="规格描述" prop="specificationDescription"> <el-form-item label="规格描述" prop="specificationDescription">
<el-input v-model="form.specificationDescription" placeholder="请输入规格描述" /> <el-input v-model="form.specificationDescription" placeholder="请输入规格描述" />
</el-form-item> </el-form-item>
<el-form-item label="物料ID" prop="materielId"> <el-form-item label="物料ID" prop="materialId">
<el-input v-model="form.materielId" placeholder="请输入物料ID" /> <el-input v-model="form.materialId" placeholder="请输入物料ID" />
</el-form-item> </el-form-item>
<el-form-item label="销售物料ID" prop="relationMaterielId"> <el-form-item label="销售物料ID" prop="relationMaterialId">
<el-input v-model="form.relationMaterielId" placeholder="请输入销售物料ID" /> <el-input v-model="form.relationMaterialId" placeholder="请输入销售物料ID" />
</el-form-item> </el-form-item>
<el-form-item label="数量" prop="amount"> <el-form-item label="数量" prop="amount">
<el-input v-model="form.amount" placeholder="请输入数量" /> <el-input v-model="form.amount" placeholder="请输入数量" />
@ -148,20 +173,20 @@
</div> </div>
</template> </template>
<script setup name="ContractMateriel" lang="ts"> <script setup name="ContractMaterial" lang="ts">
import { import {
listContractMateriel, listContractMaterial,
getContractMateriel, getContractMaterial,
delContractMateriel, delContractMaterial,
addContractMateriel, addContractMaterial,
updateContractMateriel updateContractMaterial
} from '@/api/oa/erp/contractMateriel'; } from '@/api/oa/erp/contractMaterial';
import { ContractMaterielVO, ContractMaterielQuery, ContractMaterielForm } from '@/api/oa/erp/contractMateriel/types'; import { ContractMaterialVO, ContractMaterialQuery, ContractMaterialForm } from '@/api/oa/erp/contractMaterial/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag')); const { active_flag, plan_flag } = toRefs<any>(proxy?.useDict('active_flag', 'plan_flag'));
const contractMaterielList = ref<ContractMaterielVO[]>([]); const contractMaterialList = ref<ContractMaterialVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
const loading = ref(true); const loading = ref(true);
const showSearch = ref(true); const showSearch = ref(true);
@ -171,7 +196,7 @@ const multiple = ref(true);
const total = ref(0); const total = ref(0);
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const contractMaterielFormRef = ref<ElFormInstance>(); const contractMaterialFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({ const dialog = reactive<DialogOption>({
visible: false, visible: false,
@ -181,35 +206,37 @@ const dialog = reactive<DialogOption>({
// 列显隐信息 // 列显隐信息
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
{ key: 0, label: `合同物料ID`, visible: false }, { key: 0, label: `合同物料ID`, visible: false },
{ key: 1, label: `租户编号`, visible: true }, { key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `合同ID`, visible: true }, { key: 2, label: `计划标识`, visible: true },
{ key: 3, label: `产品名称`, visible: true }, { key: 3, label: `合同ID`, visible: true },
{ key: 4, label: `规格描述`, visible: true }, { key: 4, label: `产品名称`, visible: true },
{ key: 5, label: `物料ID`, visible: true }, { key: 5, label: `规格描述`, visible: true },
{ key: 6, label: `销售物料ID`, visible: true }, { key: 6, label: `物料ID`, visible: true },
{ key: 7, label: `数量`, visible: true }, { key: 7, label: `销售物料ID`, visible: true },
{ key: 8, label: `单位ID`, visible: true }, { key: 8, label: `数量`, visible: true },
{ key: 9, label: `未税单价`, visible: true }, { key: 9, label: `单位ID`, visible: true },
{ key: 10, label: `税率`, visible: true }, { key: 10, label: `未税单价`, visible: true },
{ key: 11, label: `含税单价`, visible: true }, { key: 11, label: `税率`, visible: true },
{ key: 12, label: `小计`, visible: true }, { key: 12, label: `含税单价`, visible: true },
{ key: 13, label: `备注`, visible: true }, { key: 13, label: `小计`, visible: true },
{ key: 14, label: `激活标识`, visible: false }, { key: 14, label: `备注`, visible: true },
{ key: 15, label: `删除标志`, visible: false }, { key: 15, label: `激活标识`, visible: true },
{ key: 16, label: `创建部门`, visible: false }, { key: 16, label: `删除标志`, visible: false },
{ key: 17, label: `创建人`, visible: false }, { key: 17, label: `创建部门`, visible: false },
{ key: 18, label: `创建时间`, visible: false }, { key: 18, label: `创建人`, visible: false },
{ key: 19, label: `更新人`, visible: false }, { key: 19, label: `创建时间`, visible: false },
{ key: 20, label: `更新时间`, visible: false } { key: 20, label: `更新人`, visible: false },
{ key: 21, label: `更新时间`, visible: false }
]); ]);
const initFormData: ContractMaterielForm = { const initFormData: ContractMaterialForm = {
contractMaterielId: undefined, contractMaterialId: undefined,
planFlag: undefined,
contractId: undefined, contractId: undefined,
productName: undefined, productName: undefined,
specificationDescription: undefined, specificationDescription: undefined,
materielId: undefined, materialId: undefined,
relationMaterielId: undefined, relationMaterialId: undefined,
amount: undefined, amount: undefined,
unitId: undefined, unitId: undefined,
beforePrice: undefined, beforePrice: undefined,
@ -219,16 +246,17 @@ const initFormData: ContractMaterielForm = {
remark: undefined, remark: undefined,
activeFlag: undefined activeFlag: undefined
}; };
const data = reactive<PageData<ContractMaterielForm, ContractMaterielQuery>>({ const data = reactive<PageData<ContractMaterialForm, ContractMaterialQuery>>({
form: { ...initFormData }, form: { ...initFormData },
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
planFlag: undefined,
contractId: undefined, contractId: undefined,
productName: undefined, productName: undefined,
specificationDescription: undefined, specificationDescription: undefined,
materielId: undefined, materialId: undefined,
relationMaterielId: undefined, relationMaterialId: undefined,
amount: undefined, amount: undefined,
unitId: undefined, unitId: undefined,
beforePrice: undefined, beforePrice: undefined,
@ -238,7 +266,9 @@ const data = reactive<PageData<ContractMaterielForm, ContractMaterielQuery>>({
activeFlag: undefined, activeFlag: undefined,
params: {} params: {}
}, },
rules: {} rules: {
contractMaterialId: [{ required: true, message: '合同物料ID不能为空', trigger: 'blur' }]
}
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
@ -246,8 +276,8 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询合同物料信息列表 */ /** 查询合同物料信息列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
const res = await listContractMateriel(queryParams.value); const res = await listContractMaterial(queryParams.value);
contractMaterielList.value = res.rows; contractMaterialList.value = res.rows;
total.value = res.total; total.value = res.total;
loading.value = false; loading.value = false;
}; };
@ -261,7 +291,7 @@ const cancel = () => {
/** 表单重置 */ /** 表单重置 */
const reset = () => { const reset = () => {
form.value = { ...initFormData }; form.value = { ...initFormData };
contractMaterielFormRef.value?.resetFields(); contractMaterialFormRef.value?.resetFields();
}; };
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -277,8 +307,8 @@ const resetQuery = () => {
}; };
/** 多选框选中数据 */ /** 多选框选中数据 */
const handleSelectionChange = (selection: ContractMaterielVO[]) => { const handleSelectionChange = (selection: ContractMaterialVO[]) => {
ids.value = selection.map((item) => item.contractMaterielId); ids.value = selection.map((item) => item.contractMaterialId);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
}; };
@ -291,10 +321,10 @@ const handleAdd = () => {
}; };
/** 修改按钮操作 */ /** 修改按钮操作 */
const handleUpdate = async (row?: ContractMaterielVO) => { const handleUpdate = async (row?: ContractMaterialVO) => {
reset(); reset();
const _contractMaterielId = row?.contractMaterielId || ids.value[0]; const _contractMaterialId = row?.contractMaterialId || ids.value[0];
const res = await getContractMateriel(_contractMaterielId); const res = await getContractMaterial(_contractMaterialId);
Object.assign(form.value, res.data); Object.assign(form.value, res.data);
dialog.visible = true; dialog.visible = true;
dialog.title = '修改合同物料信息'; dialog.title = '修改合同物料信息';
@ -302,13 +332,13 @@ const handleUpdate = async (row?: ContractMaterielVO) => {
/** 提交按钮 */ /** 提交按钮 */
const submitForm = () => { const submitForm = () => {
contractMaterielFormRef.value?.validate(async (valid: boolean) => { contractMaterialFormRef.value?.validate(async (valid: boolean) => {
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
if (form.value.contractMaterielId) { if (form.value.contractMaterialId) {
await updateContractMateriel(form.value).finally(() => (buttonLoading.value = false)); await updateContractMaterial(form.value).finally(() => (buttonLoading.value = false));
} else { } else {
await addContractMateriel(form.value).finally(() => (buttonLoading.value = false)); await addContractMaterial(form.value).finally(() => (buttonLoading.value = false));
} }
proxy?.$modal.msgSuccess('操作成功'); proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false; dialog.visible = false;
@ -318,10 +348,10 @@ const submitForm = () => {
}; };
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (row?: ContractMaterielVO) => { const handleDelete = async (row?: ContractMaterialVO) => {
const _contractMaterielIds = row?.contractMaterielId || ids.value; const _contractMaterialIds = row?.contractMaterialId || ids.value;
await proxy?.$modal.confirm('是否确认删除合同物料信息编号为"' + _contractMaterielIds + '"的数据项？').finally(() => (loading.value = false)); await proxy?.$modal.confirm('是否确认删除合同物料信息编号为"' + _contractMaterialIds + '"的数据项？').finally(() => (loading.value = false));
await delContractMateriel(_contractMaterielIds); await delContractMaterial(_contractMaterialIds);
proxy?.$modal.msgSuccess('删除成功'); proxy?.$modal.msgSuccess('删除成功');
await getList(); await getList();
}; };
@ -329,11 +359,11 @@ const handleDelete = async (row?: ContractMaterielVO) => {
/** 导出按钮操作 */ /** 导出按钮操作 */
const handleExport = () => { const handleExport = () => {
proxy?.download( proxy?.download(
'oa/erp/contractMateriel/export', 'oa/erp/contractMaterial/export',
{ {
...queryParams.value ...queryParams.value
}, },
`contractMateriel_${new Date().getTime()}.xlsx` `contractMaterial_${new Date().getTime()}.xlsx`
); );
}; };
Write Preview
Loading…
Cancel
Save