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

1.1.15合同相关表交付启动期限改为发货/交货期文字描述

Browse Source
dev
yinq 4 days ago
parent 51eabb6334
commit b4663a0160
8 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File

6
src/api/oa/erp/contractChangeInfo/types.ts
Unescape Escape View File

@ -145,7 +145,7 @@ export interface ContractChangeInfoVO {
projectContractCode: string;
/**
* 交付启动期限
* 发货/交货期
*/
deliveryStart: number;
@ -343,7 +343,7 @@ export interface ContractChangeInfoForm extends BaseEntity {
projectContractCode?: string;
/**
* 交付启动期限
* 发货/交货期
*/
deliveryStart?: number;
@ -537,7 +537,7 @@ export interface ContractChangeInfoQuery extends PageQuery {
projectContractCode?: string;
/**
* 交付启动期限
* 发货/交货期
*/
deliveryStart?: number;

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

@ -155,9 +155,9 @@ export interface ContractInfoVO {
mesnacContractPrice: number;
/**
* 交付启动期限
* 发货/交货期
*/
deliveryStart: number;
deliveryStart: string;
/**
* 质保期（天）
@ -383,9 +383,9 @@ export interface ContractInfoForm extends BaseEntity {
mesnacContractPrice?: number;
/**
* 交付启动期限
* 发货/交货期
*/
deliveryStart?: number;
deliveryStart?: string;
/**
* 质保期（天）
@ -604,9 +604,9 @@ export interface ContractInfoQuery extends PageQuery {
projectContractCode?: string;
/**
* 交付启动期限
* 发货/交货期
*/
deliveryStart?: number;
deliveryStart?: string;
/**
* 质保期（天）

2
src/api/oa/erp/contractLedgerReport/index.ts
Unescape Escape View File

@ -25,7 +25,7 @@ export interface ContractLedgerReportVO {
mesnacContractPrice: number;
totalPrice: number;
paymentMethod: string;
deliveryStart: number;
deliveryStart: string;
warrantyPeriod: number;
contractManagerName: string;
contractDeptName: string;

2
src/views/oa/erp/contractChange/edit.vue
Unescape Escape View File

@ -247,7 +247,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="交付启动期限(天)">
<el-form-item label="发货/交货期">
<el-input-number v-model="form.changeInfo.deliveryStart" placeholder="天" :disabled="isFormDisabled" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
</el-col>

12
src/views/oa/erp/contractChangeInfo/index.vue
Unescape Escape View File

@ -85,8 +85,8 @@
<el-form-item label="项目号" prop="projectContractCode">
<el-input v-model="queryParams.projectContractCode" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="交付启动期限" prop="deliveryStart">
<el-input v-model="queryParams.deliveryStart" placeholder="请输入交付启动期限" clearable @keyup.enter="handleQuery" />
<el-form-item label="发货/交货期" prop="deliveryStart">
<el-input v-model="queryParams.deliveryStart" placeholder="请输入发货/交货期" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="质保期描述" prop="warrantyPeriodDescription">
<el-input v-model="queryParams.warrantyPeriodDescription" placeholder="请输入质保期描述" clearable @keyup.enter="handleQuery" />
@ -193,7 +193,7 @@
<el-table-column label="外部合同号" align="center" prop="externalContractCode" v-if="columns[27].visible" />
<el-table-column label="订单号" align="center" prop="orderContractCode" v-if="columns[28].visible" />
<el-table-column label="项目号" align="center" prop="projectContractCode" v-if="columns[29].visible" />
<el-table-column label="交付启动期限" align="center" prop="deliveryStart" v-if="columns[30].visible" />
<el-table-column label="发货/交货期" align="center" prop="deliveryStart" v-if="columns[30].visible" />
<el-table-column label="质保期描述" align="center" prop="warrantyPeriodDescription" v-if="columns[31].visible" />
<el-table-column label="交货地点" align="center" prop="deliveryLocation" v-if="columns[32].visible" />
<el-table-column label="运输方式" align="center" prop="shipMethod" v-if="columns[33].visible" />
@ -310,8 +310,8 @@
<el-form-item label="项目号" prop="projectContractCode">
<el-input v-model="form.projectContractCode" placeholder="请输入项目号" />
</el-form-item>
<el-form-item label="交付启动期限" prop="deliveryStart">
<el-input v-model="form.deliveryStart" placeholder="请输入交付启动期限" />
<el-form-item label="发货/交货期" prop="deliveryStart">
<el-input v-model="form.deliveryStart" placeholder="请输入发货/交货期" />
</el-form-item>
<el-form-item label="质保期描述" prop="warrantyPeriodDescription">
<el-input v-model="form.warrantyPeriodDescription" placeholder="请输入质保期描述" />
@ -412,7 +412,7 @@ const columns = ref<FieldOption[]>([
{ key: 27, label: `外部合同号`, visible: true },
{ key: 28, label: `订单号`, visible: true },
{ key: 29, label: `项目号`, visible: true },
{ key: 30, label: `交付启动期限`, visible: true },
{ key: 30, label: `发货/交货期`, visible: true },
{ key: 31, label: `质保期描述`, visible: true },
{ key: 32, label: `交货地点`, visible: true },
{ key: 33, label: `运输方式`, visible: true },

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

@ -225,7 +225,7 @@
<el-form-item label="质保期描述" prop="warrantyPeriodDescription">
<el-input
v-model="form.warrantyPeriodDescription"
placeholder="请输入质保期描述（如：验收合格后12个月或发货后18个月等）"
placeholder="请完整输入质保期描述（如：验收合格后12个月或发货后18个月等）"
:disabled="isFormDisabled"
/>
</el-form-item>
@ -248,44 +248,26 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="交付启动期限" prop="deliveryStart">
<el-input-number
v-model="form.deliveryStart"
placeholder="交付启动期限（天）"
:disabled="isFormDisabled"
:min="0"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="签订地点" prop="signingPlace">
<el-input v-model="form.signingPlace" placeholder="请输入签订地点" :disabled="isFormDisabled" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="付款方式" prop="paymentMethod">
<el-select
v-model="form.paymentMethod"
placeholder="请选择付款方式"
<el-form-item label="发货/交货期" prop="deliveryStart">
<el-input
v-model="form.deliveryStart"
placeholder="请完整描述发货/交货条件（如：合同签订生效后XX日且乙方收到甲方合同约定的XX款）"
type="textarea"
:rows="2"
:disabled="isFormDisabled"
clearable
style="width: 100%"
>
<el-option
v-for="item in paymentMethodOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="isFormDisabled" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注（该处备注信息不体现在合同模板）" :disabled="isFormDisabled" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -310,10 +292,26 @@
<template #header>
<div style="text-align: left; font-weight: bold; font-size: 18px">合同付款方式</div>
</template>
<div style="margin-bottom: 16px">
<div style="margin-bottom: 16px; display: flex; align-items: center; gap: 12px">
<el-button type="primary" icon="Plus" v-if="!isFormDisabled" @click="handleAddPaymentMethod"
>新增付款方式
</el-button>
<el-form-item label="付款方式" prop="paymentMethod" style="margin-bottom: 0; width: 360px">
<el-select
v-model="form.paymentMethod"
placeholder="请选择付款方式"
:disabled="isFormDisabled"
clearable
style="width: 100%"
>
<el-option
v-for="item in paymentMethodOptions"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
</div>
<el-table :data="contractPaymentMethodList" v-loading="buttonLoading" border>
<el-table-column label="序号" align="center" prop="sortOrder" width="80" />
@ -1021,7 +1019,7 @@ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
}
});
// 判断表单是否禁用（查看或审批模式）
// 判断表单是否禁用（查看或审批模式；reapprove 为审批通过未激活后修改重提，可编辑）
const isFormDisabled = computed(() => {
return routeParams.value.type === 'view' || routeParams.value.type === 'approval';
});
@ -1460,7 +1458,13 @@ onMounted(async () => {
routeParams.value = route.query;
loadSelectOptions();
const id = routeParams.value.id as string | number;
if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
if (
id &&
(routeParams.value.type === 'update' ||
routeParams.value.type === 'reapprove' ||
routeParams.value.type === 'view' ||
routeParams.value.type === 'approval')
) {
proxy?.$modal.loading('正在加载数据，请稍后...');
const res = await getContractInfo(id);
Object.assign(form.value, res.data);

2
src/views/oa/erp/contractLedgerReport/index.vue
Unescape Escape View File

@ -72,7 +72,7 @@
<el-table-column label="付款方式" prop="paymentMethod" width="180" align="center" show-overflow-tooltip />
<el-table-column label="交货期" prop="deliveryStart" width="100" align="center">
<template #default="scope">
{{ scope.row.deliveryStart != null ? scope.row.deliveryStart + '天' : '-' }}
{{ scope.row.deliveryStart || '-' }}
</template>
</el-table-column>
<el-table-column label="质保期" prop="warrantyPeriod" width="100" align="center">

4
src/views/oa/erp/orderLedger/index.vue
Unescape Escape View File

@ -56,8 +56,8 @@
<el-descriptions-item label="付款方式">{{ contractInfo?.paymentMethod || '-' }}</el-descriptions-item>
<el-descriptions-item label="交货地点">{{ contractInfo?.deliveryLocation || '-' }}</el-descriptions-item>
<el-descriptions-item label="运输方式">{{ contractInfo?.shipMethod || '-' }}</el-descriptions-item>
<el-descriptions-item label="交付启动期限">{{
contractInfo?.deliveryStart ? contractInfo.deliveryStart + ' 天' : '-'
<el-descriptions-item label="发货/交货期">{{
contractInfo?.deliveryStart || '-'
}}</el-descriptions-item>
<el-descriptions-item label="质保期">{{
contractInfo?.warrantyPeriod ? contractInfo.warrantyPeriod + ' 天' : '-'

Write Preview
Loading…
Cancel
Save