diff --git a/src/components/common/certificateModal.vue b/src/components/common/certificateModal.vue index 47e9179..0e0a5fc 100644 --- a/src/components/common/certificateModal.vue +++ b/src/components/common/certificateModal.vue @@ -142,7 +142,8 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data ...formState, dateFrom: formState.dateFrom ? dayjs(formState.dateFrom).format('YYYY-MM-DD') : '', dateTo: formState.dateTo ? dayjs(formState.dateTo).format('YYYY-MM-DD') : '', - fileList: formState.fileList || [] + fileList: formState.fileList || [], + docTypeName: (optionList.find(v=>v.code == formState.docTypeCode) || {}).fullName } let idx =list.value.findIndex(v => v.docTypeCode == obj.docTypeCode) if (idx > -1 && formState.docTypeCode !=curData.value) { diff --git a/src/views/approve/Appro/components/createForm.vue b/src/views/approve/Appro/components/createForm.vue index 7fd370b..4bdf100 100644 --- a/src/views/approve/Appro/components/createForm.vue +++ b/src/views/approve/Appro/components/createForm.vue @@ -245,8 +245,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const onSearch = (val)=> { openModalDept(true,{isUpdate: false}) diff --git a/src/views/contract/ContractFact/components/createForm.vue b/src/views/contract/ContractFact/components/createForm.vue index 4faee43..134c4ee 100644 --- a/src/views/contract/ContractFact/components/createForm.vue +++ b/src/views/contract/ContractFact/components/createForm.vue @@ -440,8 +440,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const periodTypeCodeChange = (val) => { if (val === 'Y') { diff --git a/src/views/contract/ContractProc/components/config.ts b/src/views/contract/ContractProc/components/config.ts index cc6624e..aedf93a 100644 --- a/src/views/contract/ContractProc/components/config.ts +++ b/src/views/contract/ContractProc/components/config.ts @@ -53,7 +53,7 @@ export const columns: BasicColumn[] = [ title: '合同号', componentType: 'input', align: 'left', - + width: 200, sorter: true, }, @@ -62,7 +62,7 @@ export const columns: BasicColumn[] = [ title: '合同名称', componentType: 'input', align: 'left', - + width: 250, sorter: true, }, @@ -71,7 +71,7 @@ export const columns: BasicColumn[] = [ title: '供应商', componentType: 'input', align: 'left', - + width: 150, sorter: true, }, @@ -92,31 +92,12 @@ export const columns: BasicColumn[] = [ width: 120, sorter: true, }, - - { - dataIndex: 'approName', - title: '状态', - componentType: 'input', - align: 'left', - width: 80, - sorter: true, - }, - { dataIndex: 'staName', title: '接收站', componentType: 'input', align: 'left', - - sorter: true, - }, - - { - dataIndex: 'wasteDesc', - title: '损耗说明', - componentType: 'input', - align: 'left', - + width: 140, sorter: true, }, @@ -125,16 +106,16 @@ export const columns: BasicColumn[] = [ title: '合同主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, { - dataIndex: 'note', - title: '备注', + dataIndex: 'approName', + title: '状态', componentType: 'input', align: 'left', - + width: 80, sorter: true, }, ]; diff --git a/src/views/contract/ContractProc/components/createForm.vue b/src/views/contract/ContractProc/components/createForm.vue index 824f582..c69d84d 100644 --- a/src/views/contract/ContractProc/components/createForm.vue +++ b/src/views/contract/ContractProc/components/createForm.vue @@ -452,8 +452,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const getApproList = (val) => { diff --git a/src/views/contract/ContractProc/index.vue b/src/views/contract/ContractProc/index.vue index 9fe63c5..df18700 100644 --- a/src/views/contract/ContractProc/index.vue +++ b/src/views/contract/ContractProc/index.vue @@ -137,7 +137,7 @@ striped: false, actionColumn: { - width: 160, + width: 130, title: '操作', dataIndex: 'action', slots: { customRender: 'action' }, diff --git a/src/views/contract/ContractPurInt/components/config.ts b/src/views/contract/ContractPurInt/components/config.ts index 256a9a1..c11d60c 100644 --- a/src/views/contract/ContractPurInt/components/config.ts +++ b/src/views/contract/ContractPurInt/components/config.ts @@ -80,7 +80,7 @@ export const columns: BasicColumn[] = [ title: '合同号', componentType: 'input', align: 'left', - width:150, + width: 200, sorter: true, }, @@ -89,7 +89,7 @@ export const columns: BasicColumn[] = [ title: '合同名称', componentType: 'input', align: 'left', - + width: 250, sorter: true, }, @@ -98,7 +98,7 @@ export const columns: BasicColumn[] = [ title: '供应商', componentType: 'input', align: 'left', - + width: 150, sorter: true, }, @@ -119,16 +119,6 @@ export const columns: BasicColumn[] = [ width: 120, sorter: true, }, - - { - dataIndex: 'approName', - title: '状态', - componentType: 'input', - align: 'left', - width: 100, - sorter: true, - }, - { dataIndex: 'longSpotName', title: '长协/现货', @@ -143,16 +133,15 @@ export const columns: BasicColumn[] = [ title: '合同主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, - { - dataIndex: 'note', - title: '备注', + dataIndex: 'approName', + title: '状态', componentType: 'input', align: 'left', - + width: 80, sorter: true, }, ]; diff --git a/src/views/contract/ContractPurInt/components/createForm.vue b/src/views/contract/ContractPurInt/components/createForm.vue index c44bc88..2eac1d1 100644 --- a/src/views/contract/ContractPurInt/components/createForm.vue +++ b/src/views/contract/ContractPurInt/components/createForm.vue @@ -526,8 +526,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const tipCheck = () => { isExpend.value = !isExpend.value diff --git a/src/views/contract/ContractPurInt/index.vue b/src/views/contract/ContractPurInt/index.vue index 35f7567..b696e3a 100644 --- a/src/views/contract/ContractPurInt/index.vue +++ b/src/views/contract/ContractPurInt/index.vue @@ -137,7 +137,7 @@ striped: false, actionColumn: { - width: 160, + width: 130, title: '操作', dataIndex: 'action', slots: { customRender: 'action' }, diff --git a/src/views/contract/ContractPurPng/components/config.ts b/src/views/contract/ContractPurPng/components/config.ts index ae22b72..57a70b5 100644 --- a/src/views/contract/ContractPurPng/components/config.ts +++ b/src/views/contract/ContractPurPng/components/config.ts @@ -71,7 +71,7 @@ export const columns: BasicColumn[] = [ title: '合同号', componentType: 'input', align: 'left', - + width: 200, sorter: true, }, @@ -80,7 +80,7 @@ export const columns: BasicColumn[] = [ title: '合同名称', componentType: 'input', align: 'left', - + width: 250, sorter: true, }, @@ -89,7 +89,7 @@ export const columns: BasicColumn[] = [ title: '供应商', componentType: 'input', align: 'left', - + width: 150, sorter: true, }, @@ -113,21 +113,12 @@ export const columns: BasicColumn[] = [ width: 120 }, - { - dataIndex: 'approName', - title: '状态', - componentType: 'input', - align: 'left', - width: 100, - sorter: true, - }, - { dataIndex: 'pointUpName', title: '上载点', componentType: 'input', align: 'left', - + width: 160, sorter: true, }, @@ -136,7 +127,7 @@ export const columns: BasicColumn[] = [ title: '是否托运', componentType: 'input', align: 'left', - width: 100, + width: 80, sorter: true, }, @@ -145,16 +136,15 @@ export const columns: BasicColumn[] = [ title: '合同主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, - { - dataIndex: 'note', - title: '备注', + dataIndex: 'approName', + title: '状态', componentType: 'input', align: 'left', - + width: 80, sorter: true, }, ]; diff --git a/src/views/contract/ContractPurPng/components/createForm.vue b/src/views/contract/ContractPurPng/components/createForm.vue index 122d0eb..df194c8 100644 --- a/src/views/contract/ContractPurPng/components/createForm.vue +++ b/src/views/contract/ContractPurPng/components/createForm.vue @@ -387,8 +387,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const getApproList = (val) => { dataListAppro.value = val diff --git a/src/views/contract/ContractPurPng/index.vue b/src/views/contract/ContractPurPng/index.vue index 94dbca1..6ff5ea6 100644 --- a/src/views/contract/ContractPurPng/index.vue +++ b/src/views/contract/ContractPurPng/index.vue @@ -140,7 +140,7 @@ striped: false, actionColumn: { - width: 160, + width: 130, title: '操作', dataIndex: 'action', slots: { customRender: 'action' }, diff --git a/src/views/contract/ContractSales/components/config.ts b/src/views/contract/ContractSales/components/config.ts index 54e0b3a..e11fad2 100644 --- a/src/views/contract/ContractSales/components/config.ts +++ b/src/views/contract/ContractSales/components/config.ts @@ -72,7 +72,7 @@ export const columns: BasicColumn[] = [ title: '合同号', componentType: 'input', align: 'left', - + width: 200, sorter: true, }, @@ -81,7 +81,7 @@ export const columns: BasicColumn[] = [ title: '合同名称', componentType: 'input', align: 'left', - + width: 250, sorter: true, }, @@ -90,7 +90,7 @@ export const columns: BasicColumn[] = [ title: '客户', componentType: 'input', align: 'left', - + width: 150, sorter: true, }, @@ -112,30 +112,12 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { - dataIndex: 'approName', - title: '状态', - componentType: 'input', - align: 'left', - width: 100, - sorter: true, - }, - { dataIndex: 'pointUpName', title: '交割点', componentType: 'input', align: 'left', - - sorter: true, - }, - - { - dataIndex: 'transName', - title: '是否托运', - componentType: 'input', - align: 'left', - width: 100, + width: 160, sorter: true, }, @@ -144,16 +126,16 @@ export const columns: BasicColumn[] = [ title: '合同主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, { - dataIndex: 'note', - title: '备注', + dataIndex: 'approName', + title: '状态', componentType: 'input', align: 'left', - + width: 80, sorter: true, }, ]; diff --git a/src/views/contract/ContractSales/components/createForm.vue b/src/views/contract/ContractSales/components/createForm.vue index 72ce258..b58ac10 100644 --- a/src/views/contract/ContractSales/components/createForm.vue +++ b/src/views/contract/ContractSales/components/createForm.vue @@ -418,8 +418,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const getApproList = (val) => { dataListAppro.value = val diff --git a/src/views/contract/ContractSales/index.vue b/src/views/contract/ContractSales/index.vue index f0c1ced..b758019 100644 --- a/src/views/contract/ContractSales/index.vue +++ b/src/views/contract/ContractSales/index.vue @@ -139,7 +139,7 @@ striped: false, actionColumn: { - width: 160, + width: 130, title: '操作', dataIndex: 'action', slots: { customRender: 'action' }, diff --git a/src/views/contract/ContractSalesInt/components/config.ts b/src/views/contract/ContractSalesInt/components/config.ts index a30a36e..1009e34 100644 --- a/src/views/contract/ContractSalesInt/components/config.ts +++ b/src/views/contract/ContractSalesInt/components/config.ts @@ -80,7 +80,7 @@ export const columns: BasicColumn[] = [ title: '合同号', componentType: 'input', align: 'left', - width:150, + width: 200, sorter: true, }, @@ -89,7 +89,7 @@ export const columns: BasicColumn[] = [ title: '合同名称', componentType: 'input', align: 'left', - + width: 250, sorter: true, }, @@ -98,7 +98,7 @@ export const columns: BasicColumn[] = [ title: '客户', componentType: 'input', align: 'left', - + width: 150, sorter: true, }, @@ -119,16 +119,6 @@ export const columns: BasicColumn[] = [ width: 120, sorter: true, }, - - { - dataIndex: 'approName', - title: '状态', - componentType: 'input', - align: 'left', - width: 100, - sorter: true, - }, - { dataIndex: 'longSpotName', title: ' 长协/现货', @@ -143,16 +133,15 @@ export const columns: BasicColumn[] = [ title: '合同主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, - { - dataIndex: 'note', - title: '备注', + dataIndex: 'approName', + title: '状态', componentType: 'input', align: 'left', - + width: 80, sorter: true, }, ]; diff --git a/src/views/contract/ContractSalesInt/components/createForm.vue b/src/views/contract/ContractSalesInt/components/createForm.vue index 0e68af5..e088e80 100644 --- a/src/views/contract/ContractSalesInt/components/createForm.vue +++ b/src/views/contract/ContractSalesInt/components/createForm.vue @@ -528,8 +528,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const tipCheck = () => { isExpend.value = !isExpend.value diff --git a/src/views/contract/ContractSalesInt/index.vue b/src/views/contract/ContractSalesInt/index.vue index 12d9abc..56bf654 100644 --- a/src/views/contract/ContractSalesInt/index.vue +++ b/src/views/contract/ContractSalesInt/index.vue @@ -138,7 +138,7 @@ striped: false, actionColumn: { - width: 160, + width: 130, title: '操作', dataIndex: 'action', slots: { customRender: 'action' }, diff --git a/src/views/contract/ContractSalesLng/components/config.ts b/src/views/contract/ContractSalesLng/components/config.ts index 7860ba8..120ebe7 100644 --- a/src/views/contract/ContractSalesLng/components/config.ts +++ b/src/views/contract/ContractSalesLng/components/config.ts @@ -67,7 +67,7 @@ export const columns: BasicColumn[] = [ title: '合同号', componentType: 'input', align: 'left', - + width: 200, sorter: true, }, @@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [ title: '合同名称', componentType: 'input', align: 'left', - width: 200, + width: 250, sorter: true, }, @@ -85,16 +85,7 @@ export const columns: BasicColumn[] = [ title: '客户', componentType: 'input', align: 'left', - - sorter: true, - }, - - { - dataIndex: 'onlineSign', - title: '竞拍', - componentType: 'input', - align: 'left', - width: 90, + width: 150, sorter: true, }, @@ -115,31 +106,28 @@ export const columns: BasicColumn[] = [ width: 120, sorter: true, }, - { - dataIndex: 'approName', - title: '状态', + dataIndex: 'onlineSign', + title: '竞拍', componentType: 'input', align: 'left', - width: 100, + width: 60, sorter: true, }, - { dataIndex: 'comName', title: '合同主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, - { - dataIndex: 'note', - title: '备注', + dataIndex: 'approName', + title: '状态', componentType: 'input', align: 'left', - + width: 80, sorter: true, }, ]; diff --git a/src/views/contract/ContractSalesLng/components/createForm.vue b/src/views/contract/ContractSalesLng/components/createForm.vue index 7373b64..1c2d423 100644 --- a/src/views/contract/ContractSalesLng/components/createForm.vue +++ b/src/views/contract/ContractSalesLng/components/createForm.vue @@ -355,8 +355,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const dateCfmChange = (val) => { if (formState.dateCfmFrom || formState.dateCfmTo) { diff --git a/src/views/contract/ContractSalesLng/index.vue b/src/views/contract/ContractSalesLng/index.vue index b84f5ef..e12185f 100644 --- a/src/views/contract/ContractSalesLng/index.vue +++ b/src/views/contract/ContractSalesLng/index.vue @@ -140,7 +140,7 @@ striped: false, actionColumn: { - width: 160, + width: 130, title: '操作', dataIndex: 'action', slots: { customRender: 'action' }, diff --git a/src/views/contract/ContractTransPng/components/config.ts b/src/views/contract/ContractTransPng/components/config.ts index 4658f3f..fe1c69b 100644 --- a/src/views/contract/ContractTransPng/components/config.ts +++ b/src/views/contract/ContractTransPng/components/config.ts @@ -59,7 +59,7 @@ export const columns: BasicColumn[] = [ title: '合同号', componentType: 'input', align: 'left', - + width: 200, sorter: true, }, @@ -68,7 +68,7 @@ export const columns: BasicColumn[] = [ title: '合同名称', componentType: 'input', align: 'left', - + width: 250, sorter: true, }, @@ -77,7 +77,7 @@ export const columns: BasicColumn[] = [ title: '供应商', componentType: 'input', align: 'left', - + width: 150, sorter: true, }, @@ -99,21 +99,12 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { - dataIndex: 'approName', - title: '状态', - componentType: 'input', - align: 'left', - width: 80, - sorter: true, - }, - { dataIndex: 'pointName', title: '上下载点', componentType: 'input', align: 'left', - + width: 140, sorter: true, }, @@ -122,16 +113,16 @@ export const columns: BasicColumn[] = [ title: '合同主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, { - dataIndex: 'note', - title: '备注', + dataIndex: 'approName', + title: '状态', componentType: 'input', align: 'left', - + width: 80, sorter: true, }, ]; diff --git a/src/views/contract/ContractTransPng/components/createForm.vue b/src/views/contract/ContractTransPng/components/createForm.vue index 72e4e0e..2eb0be1 100644 --- a/src/views/contract/ContractTransPng/components/createForm.vue +++ b/src/views/contract/ContractTransPng/components/createForm.vue @@ -458,8 +458,10 @@ formState.bDeptName = res?.dept?.name formState.bDeptId = res?.dept?.id - formState.comName = res?.comp?.name - formState.comId = res?.comp?.id + if (!pageId.value) { + formState.comName = res?.comp?.name + formState.comId = res?.comp?.id + } } const getApproList = (val) => { dataListAppro.value = val diff --git a/src/views/contract/ContractTransPng/index.vue b/src/views/contract/ContractTransPng/index.vue index ee7ed5b..470d753 100644 --- a/src/views/contract/ContractTransPng/index.vue +++ b/src/views/contract/ContractTransPng/index.vue @@ -137,7 +137,7 @@ striped: false, actionColumn: { - width: 160, + width: 130, title: '操作', dataIndex: 'action', slots: { customRender: 'action' },