开发完成提交

channelBusiManage/src/assets/js/api/interface/order/index.js

@@ -35,7 +35,7 @@ export function audioOrderList(data) {
 }
 }
 
 
 /**
 /**
- * 订单金额批量修改
+ * 订单金额批量修改:表格上传
  * @returns {AxiosPromise}
  * @returns {AxiosPromise}
  */
  */
 export function updateOrderListMoney(data) {
 export function updateOrderListMoney(data) {

channelBusiManage/src/components/OrderDetail.vue

@@ -129,7 +129,7 @@
                   <span class="text-neutral-900">{{ log.functionName }}</span>
                   <span class="text-neutral-900">{{ log.functionName }}</span>
                   <el-tag size="small" type="info">{{ log.operatorName }}</el-tag>
                   <el-tag size="small" type="info">{{ log.operatorName }}</el-tag>
                 </div>
                 </div>
-                <p class="text-sm text-neutral-600 mb-1">{{ log.detail.memo }}</p>
+                <p class="text-sm text-neutral-600 mb-1">{{ log.detail.memo || log.detail.auditMemo}}</p>
                 <p class="text-xs text-neutral-500">{{ $utils.detailTime(log.createTime) }}</p>
                 <p class="text-xs text-neutral-500">{{ $utils.detailTime(log.createTime) }}</p>
               </div>
               </div>
             </div>
             </div>
@@ -401,26 +401,22 @@ onMounted(()=>{
 const logData = ref([])
 const logData = ref([])
 const queryLog = async ()=>{
 const queryLog = async ()=>{
   try {
   try {
-    try {
     const response = await $api.queryOrderLog({
     const response = await $api.queryOrderLog({
       id: props.order.id
       id: props.order.id
     })
     })
     
     
     if (response.c === 0) {
     if (response.c === 0) {
-        response.d.forEach(item=>{
-          item.detail = JSON.parse(item.parameter)
-        })
+      response.d.forEach(item=>{
+        item.detail = JSON.parse(item.parameter)
+      })
 
 
-        logData.value = response.d
+      logData.value = response.d
     } else {
     } else {
       ElMessage.error(response.m)
       ElMessage.error(response.m)
     }
     }
   } catch (error) {
   } catch (error) {
     
     
   }
   }
-  } catch (error) {
-    
-  }
 }
 }
 
 
 // 对话框状态
 // 对话框状态
@@ -571,57 +567,61 @@ const handleSubmitReview = () => {
 }
 }
 
 
 // 审核通过
 // 审核通过
-const handleApprove = () => {
-  const currentTime = new Date().toLocaleString('zh-CN')
-  const newLog = {
-    id: `LOG${Date.now()}`,
-    time: currentTime,
-    operator: '主管理员',
-    action: '审核通过',
-    details: `主管审核通过，金额：¥${props.order.realMoney?.toFixed(2)}`
-  }
-
-  emit('update', {
-    auditStatus: '1',
-    paymentTime: currentTime,
-    operationLogs: [...(props.order.operationLogs || []), newLog]
-  })
+const handleApprove = async () => {
+  try {
+    const response = await $api.audioOrderList({
+      list:[{
+        id: props.order.id,
+        auditStatus: '1'
+      }]
+    })
+    
+    if (response.c === 0) {
+      ElMessage.success('审核通过！')
 
 
-  ElMessage.success('审核通过！')
-  
-  setTimeout(() => {
-    emit('back')
-  }, 1000)
+      setTimeout(() => {
+        emit('back')
+      }, 1000)
+    } else {
+      ElMessage.error(response.m)
+    }
+  } catch (error) {
+    
+  }
 }
 }
 
 
 // 审核驳回
 // 审核驳回
-const handleReject = () => {
+const handleReject = async () => {
   if (!rejectReason.value.trim()) {
   if (!rejectReason.value.trim()) {
     ElMessage.error('请填写驳回原因')
     ElMessage.error('请填写驳回原因')
     return
     return
   }
   }
 
 
-  const newLog = {
-    id: `LOG${Date.now()}`,
-    time: new Date().toLocaleString('zh-CN'),
-    operator: '主管理员',
-    action: '审核驳回',
-    details: `驳回原因：${rejectReason.value}`
+  try {
+    const response = await $api.audioOrderList({
+      list:[{
+        id: props.order.id,
+        auditStatus: '2',
+        auditMemo: rejectReason.value
+      }]
+    })
+    
+    if (response.c === 0) {
+      ElMessage.success('已驳回订单')
+      isRejectDialogOpen.value = false
+      setTimeout(()=>{
+        rejectReason.value = ''
+      },0)
+
+      setTimeout(() => {
+        emit('back')
+      }, 1000)
+    } else {
+      ElMessage.error(response.m)
+    }
+  } catch (error) {
+    
   }
   }
-
-  emit('update', {
-    auditStatus: '2',
-    rejectReason: rejectReason.value,
-    operationLogs: [...(props.order.operationLogs || []), newLog]
-  })
-
-  ElMessage.success('已驳回订单')
-  isRejectDialogOpen.value = false
-  rejectReason.value = ''
-  
-  setTimeout(() => {
-    emit('back')
-  }, 1000)
 }
 }
 
 
 // 关闭订单
 // 关闭订单