调整产品页面

src/crud/components/DialogChange.operation.vue

@@ -146,7 +146,7 @@ function getLogList() {
         }
 
         let endData: any = []
-        console.log(data, 'datadatadata')
+        console.log(data, '变更记录分页查询数据')
         data.forEach((element) => {
           //全部转换为字符串格式
           let datas = element.beforeChangeData //修改前的数据

src/crud/components/UD.operation.vue

@@ -135,6 +135,7 @@ const handleAuditCentre = (idx: number, row: any) => {
 };
 //变更记录
 const handleChangeRecord = (idx: number, row: any) => {
+  console.log('handleChangeRecord');
   emit("handleChangeRecord", idx, row);
 };
 //变更记录结算

src/utils/dataUtil.js

@@ -23,7 +23,8 @@ export function compareObjects(obj1, obj2) {
     }
     // 补充obj1没有字段
     for (let key in obj2) {
-      if (!obj1.hasOwnProperty(key)) {
+      console.log(obj1,key,obj2,'对比');
+      if (obj1 && !obj1.hasOwnProperty(key)) {
         result[key] = obj2[key];
       }
     }

src/views/onlineBusinessHall/productManagement/equityProduct/index.vue

@@ -723,7 +723,7 @@ let field = ref({
         formLabelWidth: formLabelWidth,
         type: 'input',
         funRuleStarts: true,
-        // required: true,
+        required: true,
       },
     },
     {

src/views/onlineBusinessHall/productManagement/promoteAnd/index.vue

@@ -189,9 +189,11 @@ function handleEdit(idx: any, row: any) {
   if (row.processingFeeList) {
     isFeeListType.value = 1
     feeListData.value = row.processingFeeList
+    isFeeListTitle.value = '办理费'
   } else {
     isFeeListType.value = 2
     feeListData.value = row.useFeeList
+    isFeeListTitle.value = '使用费'
   }
 
   feeListData.value = [] //改为空
@@ -467,6 +469,7 @@ const handleEditKou = (data) => {
 const isInfo = ref(false) //是否当前点击详情
 const feeListData = ref([]) //发行产品信息
 const isFeeListType = ref(1) //1办理费2.使用费
+const isFeeListTitle = ref('办理费')
 const getFeeListData = (releaseId) => {
   BaseService.postN('/managew/api/product/releaseProductStandards/detail', {
     releaseId,
@@ -477,9 +480,11 @@ const getFeeListData = (releaseId) => {
       if (data.processingFeeList) {
         isFeeListType.value = 1
         feeListData.value = data.processingFeeList
+        isFeeListTitle.value = '办理费'
       } else {
         isFeeListType.value = 2
         feeListData.value = data.useFeeList
+        isFeeListTitle.value = '使用费'
       }
 
       console.log(feeListData.value, 'getFeeListData')
@@ -623,6 +628,7 @@ let field = ref({
       prop: 'releaseId',
       label: '发行产品',
       listData: selectAll,
+      span:3,
       form: {
         width: '45%',
         formLabelWidth: formLabelWidth,
@@ -729,7 +735,7 @@ let field = ref({
     {
       prop: 'contract',
       label: '附件',
-      span: 2,
+      span: 3,
       form: {
         width: '90%',
         formLabelWidth: formLabelWidth,
@@ -745,6 +751,7 @@ let field = ref({
     {
       hide: true,
       label: '注销违约金',
+      span:3,
       form: {
         width: '90%',
         type: 'title',
@@ -951,9 +958,9 @@ let field = ref({
       },
     },
     {
-      poop: 'isFeeListTitle',
+      prop: 'isFeeListTitle',
       hide: true,
-      label: '通行费',
+      label: isFeeListTitle,
       form: {
         width: '90%',
         type: 'title',