diff --git a/src/components/common/correlationApproList.vue b/src/components/common/correlationApproList.vue
index caab4ed..0b6f65c 100644
--- a/src/components/common/correlationApproList.vue
+++ b/src/components/common/correlationApproList.vue
@@ -33,14 +33,14 @@
   const { t } = useI18n();
   const dataList = ref([])
   const columns= ref([
-    { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 100},
-    { title: t('标题'), dataIndex: 'title', sorter: true, width:100},
+    { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 100},
+    { title: t('标题'), dataIndex: 'title',  width:100},
     { title: t('编号'), dataIndex: 'code', sorter: true},
-    { title: t('签报类型'), dataIndex: 'typeName', sorter: true, width: 140},
-    { title: t('拟稿人'), dataIndex: 'empName', sorter: true, width: 140},
-    { title: t('拟稿人所属部门'), dataIndex: 'bDeptName', sorter: true, width: 140},
-    { title: t('拟稿时间'), dataIndex: 'dateAppro', sorter: true, width: 140},
-    { title: t('附件'), dataIndex: 'file', sorter: true, width: 140},
+    { title: t('签报类型'), dataIndex: 'typeName',  width: 140},
+    { title: t('拟稿人'), dataIndex: 'empName',  width: 140},
+    { title: t('拟稿人所属部门'), dataIndex: 'bDeptName',  width: 140},
+    { title: t('拟稿时间'), dataIndex: 'dateAppro',  width: 140},
+    { title: t('附件'), dataIndex: 'file',  width: 140},
     { title: t('操作'), dataIndex: 'operation', width: 120, fixed: 'right',align: 'center'},
   ]);
   const [register, { openModal:openModal}] = useModal();
diff --git a/src/components/common/correlationContractFactList.vue b/src/components/common/correlationContractFactList.vue
index 1ea6c90..407b93f 100644
--- a/src/components/common/correlationContractFactList.vue
+++ b/src/components/common/correlationContractFactList.vue
@@ -33,16 +33,16 @@
   const { t } = useI18n();
   const dataList = ref([])
   const columns= ref([
-    { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 80},
-    { title: t('合同号'), dataIndex: 'kNo', sorter: true, width:180},
-    { title: t('合同名称'), dataIndex: 'kName', sorter: true, width: 300},
-    { title: t('关联类别'), dataIndex: 'relTypeName', sorter: true, width: 100},
-    { title: t('合同类别'), dataIndex: 'kTypeName1', sorter: true, width: 100},
-    { title: t('合同主体'), dataIndex: 'comName', sorter: true, width: 250},
-    { title: t('我方联系人'), dataIndex: 'empName', sorter: true, width: 140},
-    { title: t('联系电话'), dataIndex: 'tel', sorter: true, width: 140},
-    { title: t('业务部门'), dataIndex: 'bDeptName', sorter: true, width: 140},
-    { title: t('附件'), dataIndex: 'file', sorter: true, width: 140},
+    { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 80},
+    { title: t('合同号'), dataIndex: 'kNo',  width:180},
+    { title: t('合同名称'), dataIndex: 'kName',  width: 300},
+    { title: t('关联类别'), dataIndex: 'relTypeName',  width: 100},
+    { title: t('合同类别'), dataIndex: 'kTypeName1',  width: 100},
+    { title: t('合同主体'), dataIndex: 'comName',  width: 250},
+    { title: t('我方联系人'), dataIndex: 'empName',  width: 140},
+    { title: t('联系电话'), dataIndex: 'tel',  width: 140},
+    { title: t('业务部门'), dataIndex: 'bDeptName',  width: 140},
+    { title: t('附件'), dataIndex: 'file',  width: 140},
     { title: t('操作'), dataIndex: 'operation', width: 120, fixed: 'right',align: 'center'},
   ]);
   const [register, { openModal:openModal}] = useModal();
diff --git a/src/components/common/upLoadDemandListModal.vue b/src/components/common/upLoadDemandListModal.vue
index afddf16..585560b 100644
--- a/src/components/common/upLoadDemandListModal.vue
+++ b/src/components/common/upLoadDemandListModal.vue
@@ -15,8 +15,8 @@
 
     const { t } = useI18n();
     const columns: BasicColumn[] = [
-      { title: t('合同号'), dataIndex: 'id', sorter: true},
-      { title: t('合同名称'), dataIndex: 'kName', sorter: true},
+      { title: t('合同号'), dataIndex: 'id', },
+      { title: t('合同名称'), dataIndex: 'kName', },
     ];
 
     const emit = defineEmits(['success', 'register']);
diff --git a/src/views/contract/ContractFact/components/createForm.vue b/src/views/contract/ContractFact/components/createForm.vue
index 6d01a41..5c70e67 100644
--- a/src/views/contract/ContractFact/components/createForm.vue
+++ b/src/views/contract/ContractFact/components/createForm.vue
@@ -318,17 +318,17 @@
       wrapperCol: { span: 16 },
     }
     const columns= ref([
-      { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 100},
-      { title: t('相对方名称'), dataIndex: 'cpName', sorter: true, width:200},
-      { title: t('相对方顺序'), dataIndex: 'sort', sorter: true, width: 130},
-      { title: t('相对方银行名称'), dataIndex: 'cpBankName', sorter: true, width: 200},
-      { title: t('对方银行开户名'), dataIndex: 'cpBankAccountName', sorter: true, width: 300},
-      { title: t('对方银行账号'), dataIndex: 'cpBankAccount', sorter: true, width: 200},
-      { title: t('对方联系人姓名'), dataIndex: 'contactName', sorter: true, width: 200},
-      { title: t('对方联系人电话'), dataIndex: 'contactTel', sorter: true, width: 200},
-      { title: t('对方联系人邮箱'), dataIndex: 'contactEmail', sorter: true, width: 200},
-      { title: t('对方通讯地址'), dataIndex: 'contactAddress', sorter: true, width: 200},
-      { title: t('备注'), dataIndex: 'note', sorter: true, width: 200},
+      { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 100},
+      { title: t('相对方名称'), dataIndex: 'cpName',  width:200},
+      { title: t('相对方顺序'), dataIndex: 'sort',  width: 130},
+      { title: t('相对方银行名称'), dataIndex: 'cpBankName',  width: 200},
+      { title: t('对方银行开户名'), dataIndex: 'cpBankAccountName',  width: 300},
+      { title: t('对方银行账号'), dataIndex: 'cpBankAccount',  width: 200},
+      { title: t('对方联系人姓名'), dataIndex: 'contactName',  width: 200},
+      { title: t('对方联系人电话'), dataIndex: 'contactTel',  width: 200},
+      { title: t('对方联系人邮箱'), dataIndex: 'contactEmail',  width: 200},
+      { title: t('对方通讯地址'), dataIndex: 'contactAddress',  width: 200},
+      { title: t('备注'), dataIndex: 'note',  width: 200},
       { title: t('操作'), dataIndex: 'operation', width: 120, fixed: 'right',align: 'center'},
     ]);
     const dataList = ref([])
diff --git a/src/views/contract/ContractSales/components/createForm.vue b/src/views/contract/ContractSales/components/createForm.vue
index 87bc382..b1bd273 100644
--- a/src/views/contract/ContractSales/components/createForm.vue
+++ b/src/views/contract/ContractSales/components/createForm.vue
@@ -266,27 +266,27 @@
       wrapperCol: { span: 16 },
     }
     const columnsUp = ref([
-      { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 80},
-      { title: t('交割点'), dataIndex: 'pointDelyName', sorter: true, width:150},
-      { title: t('是否托运'), dataIndex: 'transName', sorter: true, width: 150},
-      { title: t('供应商'), dataIndex: 'cpName', sorter: true, width: 130},
-      { title: t('合同名称'), dataIndex: 'kName', sorter: true, width: 100},
-      { title: t('上载点'), dataIndex: 'pointUpName', sorter: true, width: 150},
-      { title: t('有效期开始'), dataIndex: 'dateFrom', sorter: true, width: 150},
-      { title: t('有效期结束'), dataIndex: 'dateTo', sorter: true, width: 150},
-      { title: t('备注)'), dataIndex: 'note', sorter: true, width: 180}
+      { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 80},
+      { title: t('交割点'), dataIndex: 'pointDelyName',  width:150},
+      { title: t('是否托运'), dataIndex: 'transName',  width: 150},
+      { title: t('供应商'), dataIndex: 'cpName',  width: 130},
+      { title: t('合同名称'), dataIndex: 'kName',  width: 100},
+      { title: t('上载点'), dataIndex: 'pointUpName',  width: 150},
+      { title: t('有效期开始'), dataIndex: 'dateFrom',  width: 150},
+      { title: t('有效期结束'), dataIndex: 'dateTo',  width: 150},
+      { title: t('备注)'), dataIndex: 'note',  width: 180}
     ])
      const columnsTrans = ref([
-      { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 80},
-      { title: t('交割点'), dataIndex: 'pointDelyName', sorter: true, width:150},
-      { title: t('是否托运'), dataIndex: 'transName', sorter: true, width: 150},
-      { title: t('托运商'), dataIndex: 'cpName', sorter: true, width: 130},
-      { title: t('合同名称'), dataIndex: 'kName', sorter: true, width: 100},
-      { title: t('管输上载点'), dataIndex: 'pointUpTransName', sorter: true, width: 150},
-      { title: t('管输下载点'), dataIndex: 'pointDelyTransName', sorter: true, width: 150},
-      { title: t('有效期开始'), dataIndex: 'dateFrom', sorter: true, width: 150},
-      { title: t('有效期结束'), dataIndex: 'dateTo', sorter: true, width: 150},
-      { title: t('备注)'), dataIndex: 'note', sorter: true, width: 180}
+      { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 80},
+      { title: t('交割点'), dataIndex: 'pointDelyName',  width:150},
+      { title: t('是否托运'), dataIndex: 'transName',  width: 150},
+      { title: t('托运商'), dataIndex: 'cpName',  width: 130},
+      { title: t('合同名称'), dataIndex: 'kName',  width: 100},
+      { title: t('管输上载点'), dataIndex: 'pointUpTransName',  width: 150},
+      { title: t('管输下载点'), dataIndex: 'pointDelyTransName',  width: 150},
+      { title: t('有效期开始'), dataIndex: 'dateFrom',  width: 150},
+      { title: t('有效期结束'), dataIndex: 'dateTo',  width: 150},
+      { title: t('备注)'), dataIndex: 'note',  width: 180}
     ])
     const dataListContractAgree = ref([])
     const dataFile = ref([]);
diff --git a/src/views/dayPlan/PngAppro/components/basicForm.vue b/src/views/dayPlan/PngAppro/components/basicForm.vue
index fa889a5..036d99e 100644
--- a/src/views/dayPlan/PngAppro/components/basicForm.vue
+++ b/src/views/dayPlan/PngAppro/components/basicForm.vue
@@ -103,15 +103,15 @@ import { useI18n } from '/@/hooks/web/useI18n';
     
     });
     const columns= ref([
-      { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 100},
-      { title: t('上载点'), dataIndex: 'pointUpName', sorter: true, width:400},
-      { title: t('供应商'), dataIndex: 'suName', sorter: true, width: 400},
-      { title: t('采购合同'), dataIndex: 'kpName', sorter: true, width: 400},
-      { title: t('指定量(吉焦)'), dataIndex: 'qtyDemandGj', sorter: true, width: 300},
-      { title: t('指定量(方)'), dataIndex: 'qtyDemandM3', sorter: true, width: 200},
-      { title: t('批复量(吉焦)'), dataIndex: 'qtySalesGj', sorter: true, width: 200},
-      { title: t('批复量(方)'), dataIndex: 'qtySalesM3', sorter: true, width: 200},
-      { title: t('备注'), dataIndex: 'note', sorter: true, width: 300},
+      { title: t('序号'), dataIndex: 'index', key: 'index', customRender: (column) => `${column.index + 1}` ,width: 100},
+      { title: t('上载点'), dataIndex: 'pointUpName', width:400},
+      { title: t('供应商'), dataIndex: 'suName', width: 400},
+      { title: t('采购合同'), dataIndex: 'kpName', width: 400},
+      { title: t('指定量(吉焦)'), dataIndex: 'qtyDemandGj', width: 300},
+      { title: t('指定量(方)'), dataIndex: 'qtyDemandM3', width: 200},
+      { title: t('批复量(吉焦)'), dataIndex: 'qtySalesGj', width: 200},
+      { title: t('批复量(方)'), dataIndex: 'qtySalesM3', width: 200},
+      { title: t('备注'), dataIndex: 'note', width: 300},
     ]);
     const formState = ref()
     const dataList = ref([])
diff --git a/src/views/dayPlan/PngAppro/components/createForm.vue b/src/views/dayPlan/PngAppro/components/createForm.vue
index 82054c2..5ccb396 100644
--- a/src/views/dayPlan/PngAppro/components/createForm.vue
+++ b/src/views/dayPlan/PngAppro/components/createForm.vue
@@ -22,12 +22,12 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <Card :title="title" :bordered="false" >
-          <basicForm ref="basicFormRef" :formObj="formState" :list="dataList" :disable="currentRoute.query.type"></basicForm>
-        </Card>
         <Card :title="titleNew" :bordered="false" v-if="currentRoute.query.type=='compare'&&titleNew">
           <basicForm ref="basicFormRef" :formObj="formStateNew" :list="dataListNew" :disable="currentRoute.query.type"></basicForm>
         </Card>
+        <Card :title="title" :bordered="false" >
+          <basicForm ref="basicFormRef" :formObj="formState" :list="dataList" :disable="currentRoute.query.type"></basicForm>
+        </Card>
       </a-form>
     </div>
   </a-spin>
@@ -121,23 +121,17 @@
       try {
       let data = await getLngPngApproCompare(id) || []
       spinning.value = false
-      if (data.length == 1) {
-        let obj = changeData(data[0])
-        Object.assign(formState, {...obj.params})
-        Object.assign(dataList.value, obj.list || [{}])
-        title.value = '版本V'+ formState.verNo
-      }
-       if (data.length > 1) {
-        let obj = changeData(data[0])
+     
+        let obj = changeData(data.oldBean)
         Object.assign(formState, {...obj.params})
         Object.assign(dataList.value, obj.list || [{}])
         title.value = '版本V'+ formState.verNo
 
-        let obj1 = changeData(data[1])
+        let obj1 = changeData(data.newBean)
         Object.assign(formStateNew, {...obj1.params})
         Object.assign(dataListNew.value, obj1.list || [{}])
         titleNew.value = '版本V'+ formStateNew.verNo
-      }
+      
 
       } catch (error) {
         spinning.value = false
diff --git a/src/views/sales/Customer/components/createForm.vue b/src/views/sales/Customer/components/createForm.vue
index 1e8defe..5aa7106 100644
--- a/src/views/sales/Customer/components/createForm.vue
+++ b/src/views/sales/Customer/components/createForm.vue
@@ -389,15 +389,15 @@
     }
 
     const columnsCertificate = ref([
-      { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 100},
-      { title: t('资质证书名称'), dataIndex: 'docTypeCode', sorter: true, width:200},
-      { title: t('有效期开始'), dataIndex: 'dateFrom', sorter: true, width: 140},
-      { title: t('有效期结束'), dataIndex: 'dateTo', sorter: true, width: 140},
+      { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 100},
+      { title: t('资质证书名称'), dataIndex: 'docTypeCode',  width:200},
+      { title: t('有效期开始'), dataIndex: 'dateFrom',  width: 140},
+      { title: t('有效期结束'), dataIndex: 'dateTo',  width: 140},
       { title: t('备注'), dataIndex: 'note', sorter: true},
       { title: t('操作'), dataIndex: 'operation', width: 220},
     ]);
     const columnsBank = ref([
-      { title: t('序号'), dataIndex: 'index', sorter: true, customRender: (column) => `${column.index + 1}`},
+      { title: t('序号'), dataIndex: 'index',  customRender: (column) => `${column.index + 1}`},
       { title: t('银行名称'), dataIndex: 'bankName', sorter: true},
       { title: t('联行号'), dataIndex: 'interBankCode', sorter: true},
       { title: t('账号名称'), dataIndex: 'accountName', sorter: true},
@@ -406,7 +406,7 @@
       { title: t('操作'), dataIndex: 'operation', sorter: true},
     ]);
     const columnsContact = ref([
-      { title: t('序号'), dataIndex: 'index', sorter: true, customRender: (column) => `${column.index + 1}`},
+      { title: t('序号'), dataIndex: 'index',  customRender: (column) => `${column.index + 1}`},
       { title: t('姓名'), dataIndex: 'contactName', sorter: true},
       { title: t('联系电话'), dataIndex: 'tel', sorter: true},
       { title: t('电子邮箱'), dataIndex: 'email', sorter: true},
diff --git a/src/views/sales/CustomerGroup/components/Form.vue b/src/views/sales/CustomerGroup/components/Form.vue
index 5119c26..afd3e4e 100644
--- a/src/views/sales/CustomerGroup/components/Form.vue
+++ b/src/views/sales/CustomerGroup/components/Form.vue
@@ -81,12 +81,12 @@
  
 
   const columns= ref([
-    { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 100},
-    { title: t('客户编码'), dataIndex: 'cuCode', sorter: true, width:100},
+    { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 100},
+    { title: t('客户编码'), dataIndex: 'cuCode',  width:100},
     { title: t('客户名称'), dataIndex: 'cuName', sorter: true},
-    { title: t('国内/国际'), dataIndex: 'diName', sorter: true, width: 140},
-    { title: t('客户类别'), dataIndex: 'typeName', sorter: true, width: 140},
-    { title: t('客户分类'), dataIndex: 'className', sorter: true, width: 140},
+    { title: t('国内/国际'), dataIndex: 'diName',  width: 140},
+    { title: t('客户类别'), dataIndex: 'typeName',  width: 140},
+    { title: t('客户分类'), dataIndex: 'className',  width: 140},
     { title: t('操作'), dataIndex: 'operation', width: 120},
   ]);
   const dataList = ref([])
diff --git a/src/views/sales/GradeSystem/components/Form.vue b/src/views/sales/GradeSystem/components/Form.vue
index af83111..f484d97 100644
--- a/src/views/sales/GradeSystem/components/Form.vue
+++ b/src/views/sales/GradeSystem/components/Form.vue
@@ -58,10 +58,10 @@
   const { t } = useI18n();
   const dataList = ref([])
   const columns = ref([
-    { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 100},
-    { title: t('评价事项'), dataIndex: 'itemName', sorter: true, width:200},
-    { title: t('评价标准'), dataIndex: 'itemDesc', sorter: true, },
-    { title: t('评价部门'), dataIndex: 'eDeptName', sorter: true, width: 200},
+    { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 100},
+    { title: t('评价事项'), dataIndex: 'itemName',  width:200},
+    { title: t('评价标准'), dataIndex: 'itemDesc',  },
+    { title: t('评价部门'), dataIndex: 'eDeptName',  width: 200},
     { title: t('操作'), dataIndex: 'operation', width: 120},
   ]);
   const curIdx = ref(null)
diff --git a/src/views/sales/ScoreCustomer/components/createForm.vue b/src/views/sales/ScoreCustomer/components/createForm.vue
index 2cd0352..e98854a 100644
--- a/src/views/sales/ScoreCustomer/components/createForm.vue
+++ b/src/views/sales/ScoreCustomer/components/createForm.vue
@@ -133,15 +133,15 @@
     }
     const gsIdOld = ref()
     const columns = ref([
-      { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 80},
-      { title: t('评价事项'), dataIndex: 'itemName', sorter: true},
-      { title: t('评价标准'), dataIndex: 'itemDesc', sorter: true},
-      { title: t('评价部门'), dataIndex: 'eDeptName', sorter: true},
-      { title: t('评分'), dataIndex: 'score', sorter: true},
-      { title: t('分数说明'), dataIndex: 'scoreDesc', sorter: true},
-      { title: t('评价人'), dataIndex: 'aEmpName', sorter: true},
-      { title: t('评价时间'), dataIndex: 'aTime', sorter: true},
-      { title: t('实际评价部门'), dataIndex: 'aDeptName', sorter: true},
+      { title: t('序号'), dataIndex: 'index', key: 'index', customRender: (column) => `${column.index + 1}` ,width: 80},
+      { title: t('评价事项'), dataIndex: 'itemName', },
+      { title: t('评价标准'), dataIndex: 'itemDesc', },
+      { title: t('评价部门'), dataIndex: 'eDeptName', },
+      { title: t('评分'), dataIndex: 'score', },
+      { title: t('分数说明'), dataIndex: 'scoreDesc', },
+      { title: t('评价人'), dataIndex: 'aEmpName', },
+      { title: t('评价时间'), dataIndex: 'aTime', },
+      { title: t('实际评价部门'), dataIndex: 'aDeptName', },
     ]);
     const dataList= ref([]);
     const dataFile = ref([]);