diff --git a/src/api/contract/ContractPurInt/index.ts b/src/api/contract/ContractPurInt/index.ts index 43d000d..f141167 100644 --- a/src/api/contract/ContractPurInt/index.ts +++ b/src/api/contract/ContractPurInt/index.ts @@ -3,16 +3,38 @@ import { defHttp } from '/@/utils/http/axios'; import { ErrorMessageMode } from '/#/axios'; enum Api { - Page = '/contract/contractPurInt/page', + // Page = '/contract/contractPurInt/page', + Page = '/magic-api/contract/contractPurInt/page', List = '/contract/contractPurInt/list', Info = '/contract/contractPurInt/info', LngContract = '/contract/contractPurInt', + queryAllPriceTerm = '/magic-api/mdm/queryAllPriceTerm', + queryCom = '/magic-api/mdm/queryCom', } - +export async function getAllCom (mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.queryCom, + }, + { + errorMessageMode: mode, + }, + ); +} +export async function getAllPriceTerm (mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.queryAllPriceTerm, + }, + { + errorMessageMode: mode, + }, + ); +} /** * @description: 查询LngContract分页列表 */ diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue index 9398f68..b99a88d 100644 --- a/src/components/SecondDev/OpinionDialog.vue +++ b/src/components/SecondDev/OpinionDialog.vue @@ -30,11 +30,11 @@ - + diff --git a/src/components/common/correlationContractFactList.vue b/src/components/common/correlationContractFactList.vue index a50930a..9d0c22b 100644 --- a/src/components/common/correlationContractFactList.vue +++ b/src/components/common/correlationContractFactList.vue @@ -10,7 +10,7 @@ diff --git a/src/views/contract/ContractFact/components/config.ts b/src/views/contract/ContractFact/components/config.ts index e05416e..378fe16 100644 --- a/src/views/contract/ContractFact/components/config.ts +++ b/src/views/contract/ContractFact/components/config.ts @@ -6,29 +6,40 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ + { + field: 'dateFrom', + label: '有效期', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD', + style: { width: '100%' }, + getPopupContainer: () => document.body, + }, + }, { field: 'kName', label: '合同号/名称', component: 'Input', }, { - field: 'relTypeCode', - label: '关联类别', - component: 'XjrSelect', + field: 'comId', + label: '合同主体', + component: 'Select', componentProps: { - datasourceType: 'dic', - params: { itemId: '2003815292742479874' }, - labelField: 'name', - valueField: 'value', + showSearch: true, + optionFilterProp: 'label', + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0; + }, + options: [ + // { label: '全部', value: '' }, + ], + placeholder: '请选择', + allowClear: true, getPopupContainer: () => document.body, }, }, - { - field: 'comId', - label: '合同主体', - component: 'Input', - }, { field: 'approCode', label: '审批状态', @@ -62,7 +73,7 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { + { dataIndex: 'relTypeName', title: '关联类别', componentType: 'input', diff --git a/src/views/contract/ContractFact/components/createForm.vue b/src/views/contract/ContractFact/components/createForm.vue index 5c70e67..0b90598 100644 --- a/src/views/contract/ContractFact/components/createForm.vue +++ b/src/views/contract/ContractFact/components/createForm.vue @@ -52,12 +52,12 @@ - + - + @@ -452,6 +452,12 @@ if (!val) return formState.amountCn = amountToChinese(Number(val)*10000) } + const dateChange = (val, k) => { + if (!val) { + k=='dateFrom' && (formState.dateFrom = null) + k=='dateTo' && (formState.dateTo = null) + } + } const disabledDateStart = (startValue) => { const endValue = formState?.dateTo; if (!startValue || !endValue) { diff --git a/src/views/contract/ContractFact/index.vue b/src/views/contract/ContractFact/index.vue index 196b3b2..6f9f8df 100644 --- a/src/views/contract/ContractFact/index.vue +++ b/src/views/contract/ContractFact/index.vue @@ -52,6 +52,7 @@ import ApprovalProcess from '/@/views/workflow/task/components/ApprovalProcess.vue'; import { getDraftInfo } from '/@/api/workflow/process'; import { isValidJSON } from '/@/utils/event/design'; + import { getAllCom } from '/@/api/contract/ContractPurInt'; import ContractFactModal from './components/ContractFactModal.vue'; import {formConfig, searchFormSchema, columns } from './components/config'; @@ -79,7 +80,7 @@ const tableRef = ref(); //所有按钮 - const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true,"type":"primary"},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true},{"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":false,"isUse":true},{"name":"变更","code":"update","icon":"ant-design:edit-filled","isDefault":false,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]); + const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true,"type":"primary"},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true},{"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":false,"isUse":true},{"name":"变更","code":"update","icon":"ant-design:edit-filled","isDefault":false,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true},{"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},]); //展示在列表内的按钮 const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete','update', 'startwork','flowRecord','approve']); const buttonConfigs = computed(()=>{ @@ -94,7 +95,7 @@ return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code)); }); - const btnEvent = {add : handleAdd,edit : handleEdit,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,delete : handleDelete,update: handleUpdate, approve: handleApprove} + const btnEvent = {add : handleAdd,edit : handleEdit,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,delete : handleDelete,update: handleUpdate, approve: handleApprove,datalog : handleDatalog} const { currentRoute } = useRouter(); const router = useRouter(); @@ -127,7 +128,7 @@ gutter: 16, }, schemas: customSearchFormSchema, - fieldMapToTime: [], + fieldMapToTime: [['dateFrom', ['startDate', 'endDate'], 'YYYY-MM-DD']], showResetButton: true, }, beforeFetch: (params) => { @@ -324,8 +325,18 @@ dbClickRow(record); } - onMounted(() => { - + onMounted(async () => { + let res = await getAllCom() || [] + customSearchFormSchema.value.forEach(v => { + if (v.field == 'comId') { + v.componentProps.options = res.map(v=> { + return { + label: v.name, + value: v.id + } + }) + } + }); if (schemaIdComputedRef.value) { bus.on(FLOW_PROCESSED, handleRefresh); bus.on(CREATE_FLOW, handleRefresh); @@ -352,7 +363,7 @@ let approveBtn: ActionItem[] = []; let hasFlowRecord = false; actionButtonConfig.value?.map((button) => { - if (['view', 'copyData', 'enable', 'disable'].includes(button.code)) { + if (['view', 'copyData', 'enable', 'disable', 'datalog'].includes(button.code)) { actionsList.push({ icon: button?.icon, tooltip: button?.name, @@ -504,4 +515,22 @@ .hide{ display: none !important; } + + :deep( .ant-col-8:nth-child(1)) { + width: 320px !important; + max-width: 320px !important;; + } + :deep(.ant-col-8:nth-child(1) .ant-form-item-label) { + width: 80px !important; + } + :deep( .ant-col-8:nth-child(4)) { + width: 320px !important; + max-width: 320px !important;; + } + :deep(.ant-col-8:nth-child(4) .ant-form-item-label) { + width: 80px !important; + } + :deep(.ant-col-8:nth-child(3) .ant-select-selector) { + width: 172px !important; + } \ No newline at end of file diff --git a/src/views/contract/ContractPurInt/components/config.ts b/src/views/contract/ContractPurInt/components/config.ts index 59150c3..256a9a1 100644 --- a/src/views/contract/ContractPurInt/components/config.ts +++ b/src/views/contract/ContractPurInt/components/config.ts @@ -6,6 +6,16 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ + { + field: 'dateFrom', + label: '有效期', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD', + style: { width: '100%' }, + getPopupContainer: () => document.body, + }, + }, { field: 'kName', label: '合同号/名称', @@ -16,6 +26,51 @@ export const searchFormSchema: FormSchema[] = [ label: '供应商', component: 'Input', }, + { + field: 'longSpotCode', + label: '长协现货', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '2018871666841546754' }, + labelField: 'name', + valueField: 'value', + + getPopupContainer: () => document.body, + }, + }, + { + field: 'comId', + label: '合同主体', + component: 'Select', + componentProps: { + showSearch: true, + optionFilterProp: 'label', + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0; + }, + options: [ + // { label: '全部', value: '' }, + ], + placeholder: '请选择', + allowClear: true, + + getPopupContainer: () => document.body, + }, + }, + { + field: 'approCode', + label: '审批状态', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '1990669393069129729' }, + labelField: 'name', + valueField: 'value', + + getPopupContainer: () => document.body, + }, + }, ]; export const columns: BasicColumn[] = [ @@ -25,7 +80,7 @@ export const columns: BasicColumn[] = [ title: '合同号', componentType: 'input', align: 'left', - + width:150, sorter: true, }, @@ -39,7 +94,7 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'cpCode', + dataIndex: 'cpName', title: '供应商', componentType: 'input', align: 'left', @@ -52,7 +107,7 @@ export const columns: BasicColumn[] = [ title: '有效期开始', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, @@ -61,30 +116,30 @@ export const columns: BasicColumn[] = [ title: '有效期结束', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, { - dataIndex: 'approCode', + dataIndex: 'approName', title: '状态', componentType: 'input', align: 'left', - + width: 100, sorter: true, }, { - dataIndex: 'ruleUserId', + dataIndex: 'longSpotName', title: '长协/现货', componentType: 'input', align: 'left', - + width: 100, sorter: true, }, { - dataIndex: 'comId', + dataIndex: 'comName', title: '合同主体', componentType: 'input', align: 'left', diff --git a/src/views/contract/ContractPurInt/components/createForm.vue b/src/views/contract/ContractPurInt/components/createForm.vue new file mode 100644 index 0000000..a1ff320 --- /dev/null +++ b/src/views/contract/ContractPurInt/components/createForm.vue @@ -0,0 +1,718 @@ + + + + + diff --git a/src/views/contract/ContractPurInt/index.vue b/src/views/contract/ContractPurInt/index.vue index 48ab42e..35f7567 100644 --- a/src/views/contract/ContractPurInt/index.vue +++ b/src/views/contract/ContractPurInt/index.vue @@ -34,7 +34,7 @@ import { Modal } from 'ant-design-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table'; - import { getLngContractPage, deleteLngContract} from '/@/api/contract/ContractPurInt'; + import { getLngContractPage, deleteLngContract, getAllCom} from '/@/api/contract/ContractPurInt'; import { PageWrapper } from '/@/components/Page'; import { useMessage } from '/@/hooks/web/useMessage'; import { useI18n } from '/@/hooks/web/useI18n'; @@ -57,6 +57,9 @@ import useEventBus from '/@/hooks/event/useEventBus'; import { cloneDeep } from 'lodash-es'; + import { useUserStore } from '/@/store/modules/user'; + const userStore = useUserStore(); + const userInfo = userStore.getUserInfo; const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus(); @@ -72,7 +75,7 @@ const tableRef = ref(); //所有按钮 - const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true, "type":"primary"},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true},{"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"变更","code":"update","icon":"ant-design:edit-filled","isDefault":true,"isUse":true},{"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]); + const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true, "type":"primary"},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true},{"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"变更","code":"update","icon":"ant-design:edit-filled","isDefault":true,"isUse":true},{"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true},{"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true}]); //展示在列表内的按钮 const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord', 'update', 'approve']); const buttonConfigs = computed(()=>{ @@ -87,7 +90,7 @@ return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code)); }); - const btnEvent = {add : handleAdd,edit : handleEdit,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,update : handleUpdate,approve : handleApprove,delete : handleDelete,} + const btnEvent = {add : handleAdd,edit : handleEdit,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,update : handleUpdate,approve : handleApprove,delete : handleDelete,datalog : handleDatalog} const { currentRoute } = useRouter(); const router = useRouter(); @@ -119,7 +122,7 @@ gutter: 16, }, schemas: customSearchFormSchema, - fieldMapToTime: [], + fieldMapToTime: [['dateFrom', ['startDate', 'endDate'], 'YYYY-MM-DD']], showResetButton: true, }, beforeFetch: (params) => { @@ -157,7 +160,9 @@ query: { taskId: taskIds[0], formName: formName, - formId:currentRoute.value.meta.formId + formId:currentRoute.value.meta.formId, + id: record.id, + readonly: 1, } }); } else if (schemaId && !taskIds && processId) { @@ -167,18 +172,32 @@ readonly: 1, taskId: '', formName: formName, - formId:currentRoute.value.meta.formId + formId:currentRoute.value.meta.formId, + id: record.id, } }); } else { - router.push({ - path: '/form/ContractPurInt/' + record.id + '/viewForm', - query: { - formPath: 'contract/ContractPurInt', - formName: formName, - formId:currentRoute.value.meta.formId - } - }); + if (schemaIdComputedRef.value) { + router.push({ + path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow', + query: { + formPath: 'contract/ContractPurInt', + formName: "查看"+formName, + formId:currentRoute.value.meta.formId, + type:'edit', + id: record.id, + disabled: 1, + } + }); + } + // router.push({ + // path: '/form/ContractPurInt/' + record.id + '/viewForm', + // query: { + // formPath: 'contract/ContractPurInt', + // formName: formName, + // formId:currentRoute.value.meta.formId + // } + // }); } } @@ -194,7 +213,11 @@ function handleAdd() { if (schemaIdComputedRef.value) { router.push({ - path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow' + path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow', + query: { + formPath: 'contract/ContractPurInt', + formName: "新建"+formName, + } }); } else { router.push({ @@ -209,21 +232,57 @@ } function handleEdit(record: Recordable) { - - router.push({ - path: '/form/ContractPurInt/' + record.id + '/updateForm', - query: { + if (schemaIdComputedRef.value) { + router.push({ + path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow', + query: { formPath: 'contract/ContractPurInt', - formName: formName, - formId:currentRoute.value.meta.formId - } - }); + formName: "编辑"+formName, + formId:currentRoute.value.meta.formId, + type:'edit', + id: record.id + } + }); + } else { + router.push({ + path: '/form/ContractPurInt/' + record.id + '/updateForm', + query: { + formPath: 'contract/ContractPurInt', + formName: formName, + formId:currentRoute.value.meta.formId + } + }); + } } function handleUpdate(record: Recordable) { - + const { processId, taskIds, schemaId } = record.workflowData || {}; + if (schemaIdComputedRef.value) { + router.push({ + path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow', + query: { + formPath: 'contract/ContractPurInt', + formName: "变更"+formName, + formId:currentRoute.value.meta.formId, + type:'update', + id: record.id, + processId: processId + } + }); + } } function handleApprove(record: Recordable) { - + const { processId, taskIds, schemaId } = record.workflowData || {}; + if (taskIds && taskIds.length) { + router.push({ + path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow', + query: { + taskId: taskIds[0], + formName: "审批"+formName, + formId:currentRoute.value.meta.formId, + id: record.id + } + }); + } } function handleDelete(record: Recordable) { deleteList([record.id]); @@ -260,8 +319,19 @@ dbClickRow(record); } - onMounted(() => { - + onMounted(async () => { + let res = await getAllCom() || [] + customSearchFormSchema.value.forEach(v => { + if (v.field == 'comId') { + v.componentProps.options = res.map(v=> { + return { + label: v.name, + value: v.id + } + }) + } + }); + if (schemaIdComputedRef.value) { bus.on(FLOW_PROCESSED, handleRefresh); bus.on(CREATE_FLOW, handleRefresh); @@ -284,9 +354,11 @@ let actionsList: ActionItem[] = []; let editAndDelBtn: ActionItem[] = []; - let hasFlowRecord = false; + let updateBtn: ActionItem[] = []; + let approveBtn: ActionItem[] = []; + let hasFlowRecord = false; actionButtonConfig.value?.map((button) => { - if (['view', 'copyData'].includes(button.code)) { + if (['view', 'copyData','datalog'].includes(button.code)) { actionsList.push({ icon: button?.icon, tooltip: button?.name, @@ -301,21 +373,54 @@ onClick: btnEvent[button.code].bind(null, record), }); } + if (['update'].includes(button.code)) { + updateBtn.push({ + icon: button?.icon, + tooltip: button?.name, + onClick: btnEvent[button.code].bind(null, record), + }); + } + if (['approve'].includes(button.code)) { + approveBtn.push({ + icon: button?.icon, + tooltip: button?.name, + onClick: btnEvent[button.code].bind(null, record), + }); + } if (button.code === 'flowRecord') hasFlowRecord = true; }); - if (record.workflowData?.enabled) { - //与工作流有关联的表单 - if (record.workflowData.status) { - actionsList.unshift(setIndexFlowStatus(record.workflowData)) - } else { - actionsList = actionsList.concat(editAndDelBtn); - } - } else { - if (!record.workflowData?.processId) { - //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上 - actionsList = actionsList.concat(editAndDelBtn); + + // 未提交或已驳回 + if (record.approCode == 'WTJ' || record.approCode == 'YBH' ) { + actionsList = actionsList.concat(editAndDelBtn); + + if (record.createUserId !== userInfo.id) { + let idx = actionsList.findIndex(v =>v.tooltip == '删除') + idx > -1 && actionsList.splice(idx, 1) } } + // 审批中SPZ + if (record.workflowData?.editable) { + actionsList = actionsList.concat(approveBtn); + } + // 已审批 + if (record.approCode == 'YSP') { + actionsList = actionsList.concat(updateBtn); + } + + // if (record.workflowData?.enabled) { + // //与工作流有关联的表单 + // if (record.workflowData.status) { + // actionsList.unshift(setIndexFlowStatus(record.workflowData)) + // } else { + // actionsList = actionsList.concat(editAndDelBtn); + // } + // } else { + // if (!record.workflowData?.processId) { + // //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上 + // actionsList = actionsList.concat(editAndDelBtn); + // } + // } return actionsList; } function handleStartwork(record: Recordable) { @@ -406,4 +511,21 @@ .hide{ display: none !important; } + :deep( .ant-col-8:nth-child(1)) { + width: 320px !important; + max-width: 320px !important;; + } + :deep(.ant-col-8:nth-child(1) .ant-form-item-label) { + width: 80px !important; + } + :deep( .ant-col-8:nth-child(4)) { + width: 320px !important; + max-width: 320px !important;; + } + :deep(.ant-col-8:nth-child(4) .ant-form-item-label) { + width: 80px !important; + } + :deep(.ant-col-8:nth-child(5) .ant-select-selector) { + width: 172px !important; + } \ No newline at end of file diff --git a/src/views/contract/ContractSalesLng/components/createForm.vue b/src/views/contract/ContractSalesLng/components/createForm.vue index 38fed36..1b2c0df 100644 --- a/src/views/contract/ContractSalesLng/components/createForm.vue +++ b/src/views/contract/ContractSalesLng/components/createForm.vue @@ -182,8 +182,8 @@ const userStore = useUserStore(); const userInfo = userStore.getUserInfo; - const tableName = 'ContractSales'; - const columnName = 'ContractSales' + const tableName = 'ContractSalesLng'; + const columnName = 'ContractSalesLng' const formType = ref('2'); // 0 新建 1 修改 2 查看 const formRef = ref(); @@ -566,19 +566,6 @@ margin-bottom: 12px; border-bottom: 1px solid #eee; } - .redStyle { - color: red; - } - .iconStyle { - position: absolute; - color: rgba(0, 0, 0, 0.45); - // top: 0; - } - .tbStyle { - border: 1px dashed #d9d9d9; - padding: 10px; - margin-bottom: 10px; - } h4 { margin-top: 10px; diff --git a/src/views/secondDev/customFormConfig.ts b/src/views/secondDev/customFormConfig.ts index ab0f66a..d4e18f4 100644 --- a/src/views/secondDev/customFormConfig.ts +++ b/src/views/secondDev/customFormConfig.ts @@ -8,6 +8,7 @@ export const customFormConfig = { 'contractFactApprove', 'addContractPurPng', 'addContractSales', - 'addContractSalesLng' + 'addContractSalesLng', + 'ContractPurInt' ], }; \ No newline at end of file