diff --git a/src/api/dayPlan/PngSettleHdrPur/index.ts b/src/api/dayPlan/PngSettleHdrPur/index.ts new file mode 100644 index 0000000..0d5ce15 --- /dev/null +++ b/src/api/dayPlan/PngSettleHdrPur/index.ts @@ -0,0 +1,90 @@ +import { LngPngSettleHdrPageModel, LngPngSettleHdrPageParams, LngPngSettleHdrPageResult } from './model/PngSettleHdrPurModel'; +import { defHttp } from '/@/utils/http/axios'; +import { ErrorMessageMode } from '/#/axios'; + +enum Api { + Page = '/dayPlan/pngSettleHdrPur/page', + List = '/dayPlan/pngSettleHdrPur/list', + Info = '/dayPlan/pngSettleHdrPur/info', + LngPngSettleHdr = '/dayPlan/pngSettleHdrPur', + + + + + DataLog = '/dayPlan/pngSettleHdrPur/datalog', +} + +/** + * @description: 查询LngPngSettleHdr分页列表 + */ +export async function getLngPngSettleHdrPage(params: LngPngSettleHdrPageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Page, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取LngPngSettleHdr信息 + */ +export async function getLngPngSettleHdr(id: String, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Info, + params: { id }, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 新增LngPngSettleHdr + */ +export async function addLngPngSettleHdr(lngPngSettleHdr: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.LngPngSettleHdr, + params: lngPngSettleHdr, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 更新LngPngSettleHdr + */ +export async function updateLngPngSettleHdr(lngPngSettleHdr: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.put( + { + url: Api.LngPngSettleHdr, + params: lngPngSettleHdr, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 删除LngPngSettleHdr(批量删除) + */ +export async function deleteLngPngSettleHdr(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.delete( + { + url: Api.LngPngSettleHdr, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} \ No newline at end of file diff --git a/src/api/dayPlan/PngSettleHdrPur/model/PngSettleHdrPurModel.ts b/src/api/dayPlan/PngSettleHdrPur/model/PngSettleHdrPurModel.ts new file mode 100644 index 0000000..43cb4bf --- /dev/null +++ b/src/api/dayPlan/PngSettleHdrPur/model/PngSettleHdrPurModel.ts @@ -0,0 +1,238 @@ +import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; + +/** + * @description: LngPngSettleHdr分页参数 模型 + */ +export interface LngPngSettleHdrPageParams extends BasicPageParams { + id: string; + + settleMonthStart: string; + settleMonthEnd: string; + + dateFromStart: string; + dateFromEnd: string; + + dateToStart: string; + dateToEnd: string; + + cpCode: string; + + settleDesc: string; + + qtySettleGj: string; + + qtySettleM3: string; + + amount: string; + + note: string; + + approCode: string; +} + +/** + * @description: LngPngSettleHdr分页返回值模型 + */ +export interface LngPngSettleHdrPageModel { + id: string; + + settleMonth: string; + + dateFrom: string; + + dateTo: string; + + cpCode: string; + + settleDesc: string; + + qtySettleGj: string; + + qtySettleM3: string; + + amount: string; + + note: string; + + approCode: string; +} + +/** + * @description: LngPngSettleHdr表类型 + */ +export interface LngPngSettleHdrModel { + id: number; + + settleMonth: string; + + dateFrom: string; + + dateTo: string; + + settleTypeCode: string; + + cpCode: string; + + comId: number; + + qtySettleGj: number; + + qtySettleM3: number; + + amount: number; + + rpSign: string; + + billAccount: string; + + approCode: string; + + settleDesc: string; + + note: string; + + createUserId: number; + + createDate: string; + + modifyUserId: number; + + modifyDate: string; + + tenantId: number; + + deptId: number; + + ruleUserId: number; + + lngPngSettlePurList?: LngPngSettlePurModel; + + lngPngSettlePurDtlList?: LngPngSettlePurDtlModel; +} + +/** + * @description: LngPngSettlePur表类型 + */ +export interface LngPngSettlePurModel { + id: number; + + settleHdrId: number; + + salesId: number; + + salesPurId: number; + + meaId: number; + + settleMonth: string; + + settleTypeCode: string; + + datePlan: string; + + dateMea: string; + + suCode: string; + + kpId: number; + + kpppId: number; + + pointUpCode: string; + + uomCode: string; + + cuCode: string; + + ksId: number; + + ksppId: number; + + pointDelyCode: string; + + rateM3Gj: number; + + qtyMeaGj: number; + + qtyMeaM3: number; + + qtySettleGj: number; + + qtySettleM3: number; + + priceGj: number; + + priceM3: number; + + amount: number; + + priceDesc: string; + + settleTimes: number; + + note: string; + + createUserId: number; + + createDate: string; + + modifyUserId: number; + + modifyDate: string; + + tenantId: number; + + deptId: number; + + ruleUserId: number; +} + +/** + * @description: LngPngSettlePurDtl表类型 + */ +export interface LngPngSettlePurDtlModel { + id: number; + + settleId: number; + + priceCode: string; + + sort: number; + + uomCode: string; + + rateQtyGj: number; + + rateQtyM3: number; + + rateM3Gj: number; + + qtySettleGj: number; + + qtySettleM3: number; + + priceM3: number; + + amount: number; + + note: string; + + createUserId: number; + + createDate: string; + + modifyUserId: number; + + modifyDate: string; + + tenantId: number; + + deptId: number; + + ruleUserId: number; +} + +/** + * @description: LngPngSettleHdr分页返回值结构 + */ +export type LngPngSettleHdrPageResult = BasicFetchResult; \ No newline at end of file diff --git a/src/components/common/measureListModal.vue b/src/components/common/measureListModal.vue index 4237bb9..76aa896 100644 --- a/src/components/common/measureListModal.vue +++ b/src/components/common/measureListModal.vue @@ -9,11 +9,11 @@ - - @@ -57,7 +57,7 @@ { dataIndex: 'qtyMeaM3', title: '完成量(方)', align: 'left',width: 120}, { dataIndex: 'rateM3Gj', title: '比值(方/吉焦)', align: 'left',width: 120}, { dataIndex: 'ksName', title: '销售合同', align: 'left',}, - { dataIndex: 'file', title: '附件', align: 'left',}, + { dataIndex: 'file', title: '附件', align: 'left',width: 200}, { dataIndex: 'settledSign', title: '已结算', align: 'left',width: 100}, ]; @@ -102,6 +102,16 @@ }, afterFetch: (res) => { tableData.value = res || [] + tableData.value.forEach(v => { + let a = v.attachList ? v.attachList.split(',') : [] + v.lngFileUploadList = [] + a.forEach(k => { + v.lngFileUploadList.push({ + fileOrg: k.split('@')[0], + fileUrl: k.split('@')[1] + }) + }) + }) }, rowSelection: { type: props.selectType, diff --git a/src/components/common/priceComposeListModal.vue b/src/components/common/priceComposeListModal.vue index 214927d..e007309 100644 --- a/src/components/common/priceComposeListModal.vue +++ b/src/components/common/priceComposeListModal.vue @@ -43,8 +43,8 @@ { title: t('价格描述'), dataIndex: 'priceDesc', width:130}, { title: t('数量(吉焦)'), dataIndex: 'qtySettleGj', width: 120}, { title: t('数量(方)'), dataIndex: 'qtySettleM3', width: 120}, - { title: t('价格(元/方)'), dataIndex: 'priceM3', width: 120}, { title: t('价格(元/吉焦)'), dataIndex: 'priceGj', width: 120}, + { title: t('价格(元/方)'), dataIndex: 'priceM3', width: 120}, { title: t('金额(元)'), dataIndex: 'amount', width: 120}, ]; diff --git a/src/router/routes/basic.ts b/src/router/routes/basic.ts index efcc604..eed9f3f 100644 --- a/src/router/routes/basic.ts +++ b/src/router/routes/basic.ts @@ -294,6 +294,14 @@ export const PAGE_CUSTOM_ROUTE: AppRouteRecordRaw[] = [{ title: (route) => route.query.formName } }, + { + path: '/contract/ContractSales/viewForm', + name: 'ContractSalesviewForm', + component: () => import('/@/views/contract/ContractSales/components/createForm.vue'), + meta: { + title: (route) => ('管道气销售合同详情') + } + }, ] diff --git a/src/views/contract/ContractSales/components/createForm.vue b/src/views/contract/ContractSales/components/createForm.vue index e62eba8..604d0b1 100644 --- a/src/views/contract/ContractSales/components/createForm.vue +++ b/src/views/contract/ContractSales/components/createForm.vue @@ -1,6 +1,6 @@