geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

自定义接口

Browse Source
This commit is contained in:
‘huanghaiixia’
2026-01-28 18:21:33 +08:00
parent 06aa85caee
commit 22fdadc17d
25 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/approve/Appro/index.ts
View File

@ -3,8 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
Page = '/approve/appro/page',
// Page = '/magic-api/sales/lngApproPage',
// Page = '/approve/appro/page',
Page = '/magic-api/sales/lngApproPage',
List = '/approve/appro/list',
Info = '/approve/appro/info',
LngAppro = '/approve/appro',

3
src/api/contract/ContractPurPng/index.ts
View File

@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
Page = '/contract/contractPurPng/page',
// Page = '/contract/contractPurPng/page',
Page = '/magic-api/contract/contractPurPng/page',
List = '/contract/contractPurPng/list',
Info = '/contract/contractPurPng/info',
LngContract = '/contract/contractPurPng',

3
src/api/contract/ContractSales/index.ts
View File

@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
Page = '/contract/contractSales/page',
// Page = '/contract/contractSales/page',
Page = '/magic-api/contract/contractSales/page',
List = '/contract/contractSales/list',
Info = '/contract/contractSales/info',
LngContract = '/contract/contractSales',

3
src/api/sales/Customer/index.ts
View File

@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
Page = '/sales/customer/page',
// Page = '/sales/customer/page',
Page = '/magic-api/sales/customer/page',
List = '/sales/customer/list',
Info = '/sales/customer/info',
LngCustomer = '/sales/customer',

3
src/api/sales/GradeSystem/index.ts
View File

@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
Page = '/sales/gradeSystem/page',
// Page = '/sales/gradeSystem/page',
Page = '/magic-api/sales/gradeSystem/page',
List = '/sales/gradeSystem/list',
Info = '/sales/gradeSystem/info',
LngGradeSystem = '/sales/gradeSystem',

4
src/api/sales/ScoreCustomer/index.ts
View File

@ -3,8 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
Page = '/sales/scoreCustomer/page',
// Page = '/magic-api/sales/scoreCustomerPage',
// Page = '/sales/scoreCustomer/page',
Page = '/magic-api/sales/scoreCustomerPage',
List = '/sales/scoreCustomer/list',
Info = '/sales/scoreCustomer/info',
LngScore = '/sales/scoreCustomer',

4
src/api/supplier/ScoreSupplier/index.ts
View File

@ -3,8 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
Page = '/supplier/scoreSupplier/page',
// Page = '/magic-api/supplier/scoreSupplierPage',
// Page = '/supplier/scoreSupplier/page',
Page = '/magic-api/supplier/scoreSupplierPage',
List = '/supplier/scoreSupplier/list',
Info = '/supplier/scoreSupplier/info',
LngScore = '/supplier/scoreSupplier',

3
src/api/supplier/Supplier/index.ts
View File

@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
enum Api {
Page = '/supplier/supplier/page',
// Page = '/supplier/supplier/page',
Page = '/magic-api/supplier/supplier/page',
List = '/supplier/supplier/list',
Info = '/supplier/supplier/info',
LngSupplier = '/supplier/supplier',

7
src/components/CreateCodeStep/src/ViewDesignStep.vue
View File

@ -671,6 +671,13 @@
icon: 'ant-design:printer-outlined',
isDefault: true
},
{
isUse: false,
name: t('提交'),
code: 'submit',
icon: 'ant-design:send-outlined',
isDefault: true
},
{
isUse: false,
name: t('变更'),

2
src/components/common/approListModal.vue
View File

@ -64,7 +64,7 @@
},
immediate: false, // 设置为不立即调用
beforeFetch: (params) => {
return { ...params, valid: 'Y',approCode: 'YSP'};
return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
},
rowSelection: {
type: props.selectType,

2
src/components/common/customerListModal.vue
View File

@ -61,7 +61,7 @@
},
immediate: false, // 设置为不立即调用
beforeFetch: (params) => {
return { ...params, valid: 'Y',approCode: 'YSP'};
return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
},
rowSelection: {
type: props.selectType,

4
src/components/common/customerSupplierListModal.vue
View File

@ -81,7 +81,7 @@
},
immediate: false, // 设置为不立即调用
beforeFetch: (params) => {
return { ...params, valid: 'Y',approCode: 'YSP'};
return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
},
rowSelection: {
type: props.selectType,
@ -104,7 +104,7 @@
},
immediate: false, // 设置为不立即调用
beforeFetch: (params) => {
return { ...params, valid: 'Y',approCode: 'YSP'};
return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
},
rowSelection: {
type: props.selectType,

2
src/components/common/supplierListModal.vue
View File

@ -61,7 +61,7 @@
},
immediate: false, // 设置为不立即调用
beforeFetch: (params) => {
return { ...params, valid: 'Y',approCode: 'YSP'};
return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
},
rowSelection: {
type: props.selectType,

2
src/views/approve/Appro/index.vue
View File

@ -127,7 +127,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id'};
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit};
},
afterFetch: (res) => {
tableRef.value.setToolBarWidth();

2
src/views/contract/ContractPurPng/index.vue
View File

@ -127,7 +127,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
},
afterFetch: (res) => {
tableRef.value.setToolBarWidth();

2
src/views/contract/ContractSales/index.vue
View File

@ -127,7 +127,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
return { ...params, FormId: formIdComputedRef.value, PK: 'id', page:params.limit };
},
afterFetch: (res) => {
tableRef.value.setToolBarWidth();

6
src/views/dayPlan/Demand/components/config.ts
View File

@ -92,7 +92,7 @@ export const columns: BasicColumn[] = [
},
{
dataIndex: 'priceSalesGj',
dataIndex: 'qtySalesGj',
title: '批复量 (吉焦)',
componentType: 'input',
align: 'left',
@ -101,7 +101,7 @@ export const columns: BasicColumn[] = [
},
{
dataIndex: 'priceSalesM3',
dataIndex: 'qtySalesM3',
title: '批复量 (万方)',
componentType: 'input',
align: 'left',
@ -110,7 +110,7 @@ export const columns: BasicColumn[] = [
},
{
dataIndex: 'ksName',
dataIndex: 'kName',
title: '合同',
componentType: 'input',
align: 'left',

6
src/views/dayPlan/Demand/components/createForm.vue
View File

@ -15,7 +15,7 @@
</template>
</div>
<Card :title="title" :bordered="false" v-if="pageType=='compare'&&titleNew">
<Card :title="titleNew" :bordered="false" v-if="pageType=='compare'&&titleNew">
<basicForm :formObj="formStateNew" :changeList="diffResultList" :list="dataListNew" :disable="true"></basicForm>
</Card>
<Card :title="title" :bordered="false" v-if="title">
@ -127,6 +127,10 @@
}
}
const changeData = (obj) => {
if (Object.keys(obj).length === 0) return {
list : [],
params: {}
}
let arr = obj.lngPngDemandPurList || []
obj.datePlan = obj.datePlan ? dayjs(obj.datePlan) : null
obj.qtyContractM3 = NP.divide(Number(obj.qtyContractM3), 10000)

13
src/views/dayPlan/Demand/index.vue
View File

@ -18,6 +18,12 @@
<template v-if="column.dataIndex === 'action'">
<TableAction :actions="getActions(record)" />
</template>
<template v-if="column.dataIndex === 'qtySalesM3'">
{{ NP.divide(Number(record.qtySalesM3), 10000) }}
</template>
<template v-if="column.dataIndex === 'qtyDemandM3'">
{{ NP.divide(Number(record.qtyDemandM3), 10000) }}
</template>
</template>
</BasicTable>
<DemandModal @register="registerModal" @success="handleSuccess" />
@ -31,9 +37,7 @@
const logId = ref('')
const logPath = ref('/dayPlan/demand/datalog');
import { DataLog } from '/@/components/pcitc';
import { ref, computed, onMounted, onUnmounted, createVNode,
} from 'vue';
import { ref, computed, onMounted, onUnmounted, createVNode} from 'vue';
import { Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
@ -63,6 +67,7 @@
import useEventBus from '/@/hooks/event/useEventBus';
import { cloneDeep } from 'lodash-es';
import NP from 'number-precision';
const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
@ -570,7 +575,7 @@
display: none !important;
}
:deep( .ant-col-8:nth-child(2)) {
width: 360px !important;
width: 320px !important;
max-width: 320px !important;;
}
:deep(.ant-col-8:nth-child(2) .ant-form-item-label) {

7
src/views/dayPlan/PngAppro/components/createForm.vue
View File

@ -107,7 +107,7 @@
let data = await getLngPngApproCompare(id) || {}
spinning.value = false
diffResultList.value = data.diffResultList || []
let obj = changeData(data.oldBean)
let obj = changeData(data.oldBean || {})
Object.assign(formState, {...obj.params})
Object.assign(dataList.value, obj.list || [])
title.value = formState.verNo? ('版本V'+ formState.verNo) : ''
@ -120,6 +120,7 @@
} catch (error) {
console.log(error, 'error')
spinning.value = false
}
@ -137,6 +138,10 @@
}
}
const changeData = (obj) => {
if (Object.keys(obj).length === 0) return {
list : [],
params: {}
}
let arr = obj.lngPngApproPurList || []
obj.qtyContractM3 = NP.divide(Number(obj.qtyContractM3), 10000)
obj.qtyPlanM3 = NP.divide(Number(obj.qtyPlanM3), 10000)

2
src/views/sales/Customer/index.vue
View File

@ -127,7 +127,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
},
afterFetch: (res) => {
clearSelectedRowKeys()

2
src/views/sales/GradeSystem/index.vue
View File

@ -105,7 +105,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
},
afterFetch: (res) => {
clearSelectedRowKeys()

2
src/views/sales/ScoreCustomer/index.vue
View File

@ -130,7 +130,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit};
},
afterFetch: (res) => {
clearSelectedRowKeys()

2
src/views/supplier/ScoreSupplier/index.vue
View File

@ -127,7 +127,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id'};
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit};
},
afterFetch: (res) => {
clearSelectedRowKeys()

2
src/views/supplier/Supplier/index.vue
View File

@ -125,7 +125,7 @@
showResetButton: true,
},
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
},
afterFetch: (res) => {
clearSelectedRowKeys()