合同列表字段宽度调整

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) {

src/views/approve/Appro/components/createForm.vue

@@ -245,9 +245,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+       if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
     const onSearch = (val)=> {
       openModalDept(true,{isUpdate: false})
     }

src/views/contract/ContractFact/components/createForm.vue

@@ -440,9 +440,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+      if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
     const periodTypeCodeChange = (val) => {
       if (val === 'Y') {
         rules.dateTo =  [{ required: true, message: "该项为必填项", trigger: 'change' }]

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',
-
+    width: 140,
-    sorter: true,
-  },
-
-  {
-    dataIndex: 'wasteDesc',
-    title: '损耗说明',
-    componentType: 'input',
-    align: 'left',
-
     sorter: true,
   },
 
@@ -125,16 +106,16 @@ export const columns: BasicColumn[] = [
     title: '合同主体',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
   {
-    dataIndex: 'note',
+    dataIndex: 'approName',
-    title: '备注',
+    title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];

src/views/contract/ContractProc/components/createForm.vue

@@ -452,9 +452,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+      if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
 
     const getApproList = (val) => {
       dataListAppro.value = val

src/views/contract/ContractProc/index.vue

@@ -137,7 +137,7 @@
     
     striped: false,
     actionColumn: {
-      width: 160,
+      width: 130,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },

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',
+    dataIndex: 'approName',
-    title: '备注',
+    title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];

src/views/contract/ContractPurInt/components/createForm.vue

@@ -526,9 +526,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+      if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
     const tipCheck = () => {
       isExpend.value = !isExpend.value
     }

src/views/contract/ContractPurInt/index.vue

@@ -137,7 +137,7 @@
     
     striped: false,
     actionColumn: {
-      width: 160,
+      width: 130,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },

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',
+    dataIndex: 'approName',
-    title: '备注',
+    title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];

src/views/contract/ContractPurPng/components/createForm.vue

@@ -387,9 +387,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+      if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
     const getApproList = (val) => {
       dataListAppro.value = val
     }

src/views/contract/ContractPurPng/index.vue

@@ -140,7 +140,7 @@
     
     striped: false,
     actionColumn: {
-      width: 160,
+      width: 130,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },

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',
-
+    width: 160,
-    sorter: true,
-  },
-
-  {
-    dataIndex: 'transName',
-    title: '是否托运',
-    componentType: 'input',
-    align: 'left',
-    width: 100,
     sorter: true,
   },
 
@@ -144,16 +126,16 @@ export const columns: BasicColumn[] = [
     title: '合同主体',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
   {
-    dataIndex: 'note',
+    dataIndex: 'approName',
-    title: '备注',
+    title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];

src/views/contract/ContractSales/components/createForm.vue

@@ -418,9 +418,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+      if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
     const getApproList = (val) => {
       dataListAppro.value = val
     }

src/views/contract/ContractSales/index.vue

@@ -139,7 +139,7 @@
     
     striped: false,
     actionColumn: {
-      width: 160,
+      width: 130,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },

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',
+    dataIndex: 'approName',
-    title: '备注',
+    title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];

src/views/contract/ContractSalesInt/components/createForm.vue

@@ -528,9 +528,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+      if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
     const tipCheck = () => {
       isExpend.value = !isExpend.value
     }

src/views/contract/ContractSalesInt/index.vue

@@ -138,7 +138,7 @@
     
     striped: false,
     actionColumn: {
-      width: 160,
+      width: 130,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },

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',
-
+    width: 150,
-    sorter: true,
-  },
-
-  {
-    dataIndex: 'onlineSign',
-    title: '竞拍',
-    componentType: 'input',
-    align: 'left',
-    width: 90,
     sorter: true,
   },
 
@@ -115,31 +106,28 @@ export const columns: BasicColumn[] = [
     width: 120,
     sorter: true,
   },
-
   {
-    dataIndex: 'approName',
+    dataIndex: 'onlineSign',
-    title: '状态',
+    title: '竞拍',
     componentType: 'input',
     align: 'left',
-    width: 100,
+    width: 60,
     sorter: true,
   },
-
   {
     dataIndex: 'comName',
     title: '合同主体',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
-
   {
-    dataIndex: 'note',
+    dataIndex: 'approName',
-    title: '备注',
+    title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];

src/views/contract/ContractSalesLng/components/createForm.vue

@@ -355,9 +355,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+      if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
     const dateCfmChange = (val) => {
       if (formState.dateCfmFrom || formState.dateCfmTo) {
         rules.periodTypeCode = [{ required: true, message: "该项为必填项", trigger: 'change' }]

src/views/contract/ContractSalesLng/index.vue

@@ -140,7 +140,7 @@
     
     striped: false,
     actionColumn: {
-      width: 160,
+      width: 130,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },

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',
+    dataIndex: 'approName',
-    title: '备注',
+    title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 80,
     sorter: true,
   },
 ];

src/views/contract/ContractTransPng/components/createForm.vue

@@ -458,9 +458,11 @@
       formState.bDeptName = res?.dept?.name
       formState.bDeptId = res?.dept?.id
 
+      if (!pageId.value) {
         formState.comName = res?.comp?.name
         formState.comId = res?.comp?.id
       }
+    }
     const getApproList = (val) => {
       dataListAppro.value = val
     }

src/views/contract/ContractTransPng/index.vue

@@ -137,7 +137,7 @@
     
     striped: false,
     actionColumn: {
-      width: 160,
+      width: 130,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },