修改代码

src/crud/components/DialogChange.operation.vue

@@ -321,8 +321,8 @@ function changeCascaderList(returnData, optionsList) {
 //点击历史记录详情
 function handleInfo(scope: any) {
   console.log(logListData.value[scope.$index], 'errData.functionName')
-  let Data = logListData.value[scope.$index].beforeChangeData
-  let InfoData = logListData.value[scope.$index].afterChangeData
+  let Data =JSON.parse(JSON.stringify(logListData.value[scope.$index].beforeChangeData)) 
+  let InfoData =JSON.parse(JSON.stringify(logListData.value[scope.$index].afterChangeData)) 
 
   Data = functionName(Data) // 已在对比方法中变更成字符串
   InfoData = functionName(InfoData)

src/crud/components/DialogChangeAudit.operation.vue

@@ -1,13 +1,19 @@
 <template>
-  <div class="audit-con">
+  <div class="audit-con" v-loading="tableLoding">
     <div class="audit-con-top" v-if="logListData.length">
-      <el-steps style="flex-wrap: wrap" :active="2" align-center space="120px">
+      <el-steps
+        style="flex-wrap: wrap"
+        :active="logListData.length"
+        align-center
+      >
         <el-step
-          description="Some description"
           v-for="item in logListData"
           :key="item.id"
           :title="item.name"
         >
+          <template v-slot:title>
+            <div class="slot-title">{{ item.name }}</div>
+          </template>
           <template v-slot:description>
             <div class="slot-con">
               <div>
@@ -61,7 +67,7 @@ const props = defineProps({
     type: Array,
   },
 })
-const emit = defineEmits(['handleChangeInfo'])
+const emit = defineEmits(['handleChangeInfoAudit'])
 const dialogInfo = ref(false)
 const tableLoding = ref(false)
 const form = ref({})
@@ -69,32 +75,6 @@ const tableData = ref([])
 const fieldArr = ref(
   unique([...props.tableFrom.field, ...props.tableFrom.dialogArray])
 )
-//过滤字段名称
-let filtration = ['id', 'insertTime', 'updateTime']
-const TabData: any = [
-  // {
-  //   prop: 'beforeChangeData',
-  //   label: '变更前数据',
-  // },
-  // {
-  //   prop: 'afterChangeData',
-  //   label: '变更后数据',
-  // },
-  {
-    prop: 'changeString',
-    label: '变更数据',
-  },
-  {
-    prop: 'changeTo',
-    label: '变更人',
-    width: '120px',
-  },
-  {
-    prop: 'changeTime',
-    label: '变更时间',
-    width: '180px',
-  },
-]
 const errData: any = ref([])
 let pageNo = ref(1)
 let total = ref(0)
@@ -125,9 +105,8 @@ function getLogList() {
         let data = []
         data = res.data.data || []
         data = data.filter((item) => item.id)
-        logListData.value = data
         console.log(data, '变更转涂改记录分页查询数据')
-
+        logListData.value = data
         return
       }
       ElMessage.error(res.message)
@@ -214,7 +193,7 @@ function handleInfo(data) {
         }
       })
       if (dialogInfo.value) {
-        emit('handleChangeInfo', form.value, {})
+        emit('handleChangeInfoAudit', form.value)
       }
       return
     }
@@ -227,6 +206,18 @@ function handleInfo(data) {
 .audit-con {
 }
 .audit-con-top {
+  overflow: hidden;
+  :deep(.el-step) {
+    max-width: none !important;
+  }
+  :deep(.el-step__description) {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
+.slot-title {
+  font-size: 18px;
+  margin-right: 10px;
 }
 .slot-con {
   font-size: 14px;

src/crud/index.vue

@@ -266,9 +266,11 @@
       :width="tableFrom.dialogAuditChange.width || '80%'"
     >
       <dialogChangeAuditOperation
-        @handleChangeInfo="handleChangeInfo"
+        @handleChangeInfoAudit="handleChangeInfoAudit"
         v-if="ChangeOperationAudit"
         :tableFrom="tableFrom"
+        :slotInfoDialogArray="slotInfoDialogArray"
+
       >
         <template v-for="slotName in slotInfoDialogArray" #[slotName]>
           <slot :name="slotName"></slot>
@@ -437,6 +439,7 @@ const emit = defineEmits([
   'handleChangeRecordAudit', // 审核记录'
   'handleChangeRecordSettle', // 结算变更记录
   'handleChangeInfo', // 变更记录详情
+  'handleChangeInfoAudit', //审核状态变更记录
   'selectionChangeHandle', //选中
   'generateAeport', // 发起审批流程生成报表
 ])
@@ -652,6 +655,10 @@ const importData = (url, originalFileName) => {
 const handleChangeInfo = (form, afterForm) => {
   emit('handleChangeInfo', form, afterForm)
 }
+// 审核状态变更记录详情
+const handleChangeInfoAudit = (form) => {
+  emit('handleChangeInfoAudit', form)
+}
 // 上传文件
 function uploadSuccess(res, item) {
   console.log(res, item)

src/views/onlineBusinessHall/orderManagement/index.vue

@@ -1368,14 +1368,14 @@
           return !money || money === 0 ? '---' : money / 100 + ' 元'
         },
       },
-      {
-        prop: 'isMigrateData',
-        label: '系统来源',
-        funRuleStarts: true,
-        funRule: (isMigrateData: any) => {
-          return (isMigrateData == '0' ? '新系统订单' : '老系统订单')
-        },
-      },
+      // {
+      //   prop: 'isMigrateData',
+      //   label: '系统来源',
+      //   funRuleStarts: true,
+      //   funRule: (isMigrateData: any) => {
+      //     return (isMigrateData == '0' ? '新系统订单' : '老系统订单')
+      //   },
+      // },
       {
         prop: 'orderStatus', //1 - 已取消 0 - 正常
         label: '订单状态',

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

@@ -583,6 +583,13 @@ const findData = {
     list: '/managew/api/product/productStandards/queryInfo', //列表
     info: '/managew/api/product/productStandards/detail', //详情
   },
+  dialogAuditChange: {
+    id: 'proStaId',
+    list: '/managew/api/product/productStandards/queryStatusInfo', //列表
+    info: '/managew/api/product/productStandards/detailStatusInfo', //列表
+    width: '40%',
+    parameter: {},
+  },
   paging: {
     currentPage: 1, //当前页
     pageSize: 10, //每页显示条目
@@ -597,6 +604,7 @@ const findData = {
     edit: IsPermission(route, 'EDIT_LIST'), //编辑
     info: IsPermission(route, 'INFO_LIST'), //详情
     changeRecord: IsPermission(route, 'CHANGE_LIST'), //变更记录
+    changeRecordAudit: IsPermission(route, 'CHANGE_LIST'), //状态变更记录
     delete: IsPermission(route, 'DEL_LIST'), //是否删除(默认true)
     remark: false,
   },
@@ -623,6 +631,7 @@ const findData = {
       prop: 'releaseId',
       label: '发行产品',
       listData:ReleaseIdIdList,
+      span:2,
       form: {
         hideEdit: false,
         width: '45%',

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

@@ -18,6 +18,7 @@
       @add="add"
       @handleChangeRecord="handleChangeRecord"
       @handleChangeInfo="handleChangeInfo"
+      @handleChangeInfoAudit="handleChangeInfo"
     >
       <template #search>
         <el-input
@@ -226,9 +227,7 @@ function handleEdit(idx: any, row: any) {
     isFeeListTitle.value = '使用费'
   }
   nextTick(() => {
-    issueScopeData.value = Array.prototype.concat
-      .apply([], row.issueScope)
-      .map((item) => item + '')
+    issueScopeData.value = JSON.parse(JSON.stringify(row.issueScope))
   })
 
   feeListData.value = [] //改为空
@@ -240,6 +239,18 @@ function handleEdit(idx: any, row: any) {
   handleEditKou(row)
   handleAfterFee(row)
 }
+function handleNumToStr(arr: any) {
+  let newArr: any = []
+  if (typeof arr === 'number') {
+    return arr.toString()
+  }
+  if (Array.isArray(arr)) {
+    arr.forEach((item) => {
+      newArr.push(handleNumToStr(item) || '')
+    })
+  }
+  return newArr
+}
 function handleAfterFee(data) {
   data.afterSaleFees.forEach((item) => {
     item.fee = item.fee / 100
@@ -355,8 +366,6 @@ function submit(data: any) {
           ElMessage.success('操作成功')
           getList()
           cancel()
-        } else {
-          ElMessage.error(res.message || res.errorMsg)
         }
       })
     })
@@ -582,7 +591,7 @@ onActivated(() => {
 
   getReleaseIdIdList()
   getmerchantList()
-  getmerchantListTx() 
+  getmerchantListTx()
 })
 const ReleaseIdIdList = ref()
 function getReleaseIdIdList() {
@@ -660,7 +669,7 @@ function getmerchantListTx() {
           value: item.channelId,
         }
       })
-      
+
       console.log(bizContent, 'getmerchantListTx')
     } else {
       ElMessage.error(res.message || res.errorMsg)
@@ -714,13 +723,20 @@ let field = ref({
     edit: IsPermission(route, 'EDIT_LIST'), //是否编辑(默认true)
     delete: IsPermission(route, 'DEL_LIST'), //是否删除(默认true)
     changeRecord: IsPermission(route, 'CHANGE_LIST'), //变更记录
+    changeRecordAudit: IsPermission(route, 'CHANGE_LIST'), //变更记录
     remark: false, // 详情
   },
   dialogChange: {
     //变更记录
     id: 'promoteId', //proStaId logproStaId
     list: '/managew/api/product/promoteDistribute/queryInfo', //列表
-    info: '/managew/api/product/promoteDistribute/detailInfo', //详情
+  },
+  dialogAuditChange: {
+    id: 'promoteId',
+    list: '/managew/api/product/promoteDistribute/queryStatusInfo', //列表
+    info: '/managew/api/product/promoteDistribute/detailStatusInfo', //列表
+    width: '60%',
+    parameter: {},
   },
   crud: {
     add: IsPermission(route, 'ADD_BASE'),

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

@@ -20,6 +20,7 @@
       @handleChangeRecord="handleChangeRecord"
       @handleInfo="handleInfo"
       @handleChangeInfo="handleChangeInfo"
+      @handleChangeInfoAudit="handleChangeInfo"
       :isEditCollapse="true"
       :editCollapseArray="editCollapseArray"
     >
@@ -596,12 +597,14 @@
         </el-form>
         <div
           v-show="
-            afterAfterSaleFees && afterAfterSaleFees.length !== 0 && isChangeInfoShow
+            afterAfterSaleFees &&
+            afterAfterSaleFees.length !== 0 &&
+            isChangeInfoShow
           "
         >
           <span class="changeFont">变更后：</span>
           <el-form :model="dataForm" ref="ruleFormRef3">
-            <el-table :data="dataForm.afterSaleFees" :border="true">
+            <el-table :data="afterAfterSaleFees" :border="true">
               <el-table-column label="售后类型">
                 <template #header>
                   <span class="red">*</span>
@@ -609,16 +612,7 @@
                 </template>
                 <template v-slot="scope">
                   <div class="input-wrap">
-                    <el-form-item
-                      :prop="`afterSaleFees.${scope.$index}.afterSaleFeeType`"
-                      :rules="[
-                        {
-                          required: true,
-                          message: '请选择售后类型',
-                          trigger: 'blur',
-                        },
-                      ]"
-                    >
+                    <el-form-item>
                       <el-select
                         :disabled="isInfo"
                         @change="
@@ -646,12 +640,7 @@
                 </template>
                 <template v-slot="scope">
                   <div class="input-wrap">
-                    <el-form-item
-                      :prop="`afterSaleFees.${scope.$index}.fee`"
-                      :rules="[
-                        { required: true, message: '请输入', trigger: 'bulr' },
-                      ]"
-                    >
+                    <el-form-item>
                       <el-input
                         maxlength="60"
                         :disabled="isInfo"
@@ -1306,9 +1295,9 @@ function handleChangeInfo(row, afterForm) {
 
   dataForm.afterSaleFees = row.afterSaleFees
 
-  afterProcessingFeeList.value = afterForm.processingFeeList ?? []
-  afterUseFeeList.value = afterForm.useFeeList ?? []
-  afterAfterSaleFees.value = afterForm.afterSaleFees ?? []
+  afterProcessingFeeList.value = afterForm?.processingFeeList ?? []
+  afterUseFeeList.value = afterForm?.useFeeList ?? []
+  afterAfterSaleFees.value = afterForm?.afterSaleFees ?? []
   // 处理变更前数据
   if (dataForm.processingFeeList) {
     dataForm.processingFeeList.forEach((item) => {
@@ -1820,8 +1809,8 @@ let field = ref<any>({
     id: 'releaseId',
     list: '/managew/api/product/releaseProductStandards/queryStatusInfo', //列表
     info: '/managew/api/product/releaseProductStandards/detailStatusInfo', //列表
-    width:"40%",
-    parameter:{}
+    width: '60%',
+    parameter: {},
   },
   crud: {
     add: IsPermission(route, 'ADD_BASE'),
@@ -2359,7 +2348,7 @@ let field = ref<any>({
     // },
     {
       prop: 'afterSaleFees',
-      label: '', //售后类型
+      label: '售后费', //售后类型
       span: 3,
       form: {
         width: '95%',