1

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

 import request from '../../request'
 
 /**
- * 网格列表查询
+ * 订单列表查询
  * @returns {AxiosPromise}
  */
-export function queryAllGridList(data) {
+export function queryOrderList(data) {
   return request({
-    url: '/compass/api/grid/list',
+    url: '/crm/getOrderList',
     data,
   })
 }
 
+/**
+ * 订单列表导出
+ * @returns {AxiosPromise}
+ */
+export function exportOrderList(data) {
+  return request({
+    url: '/crm/exportOrders',
+    data,
+    responseType: 'blob'
+  })
+}
+
+/**
+ * 订单审核
+ * @returns {AxiosPromise}
+ */
+export function audioOrderList(data) {
+  return request({
+    url: '/crm/auditOrder',
+    data,
+  })
+}
+
+/**
+ * 订单金额批量修改
+ * @returns {AxiosPromise}
+ */
+export function updateOrderListMoney(data) {
+  return request({
+    url: '/crm/readExcelModifyOrder',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data,
+  })
+}
+
+/**
+ * 订单金额修改
+ * @returns {AxiosPromise}
+ */
+export function updateOrderMoney(data) {
+  return request({
+    url: '/crm/updateOrderMoney',
+    data,
+  })
+}
 
-/** 
- * 获取该账号下可选的网格列表
+/**
+ * 订单crm修改
+ * @returns {AxiosPromise}
+ */
+export function updateOrderCrm(data) {
+  return request({
+    url: '/crm/updateCrmOrderId',
+    data,
+  })
+}
+
+/**
+ * 订单关闭
+ * @returns {AxiosPromise}
+ */
+export function closeOrder(data) {
+  return request({
+    url: '/crm/closeOrder',
+    data,
+  })
+}
+
+
+/**
+ * 订单日志
+ * @returns {AxiosPromise}
  */
-export function queryGridList(data) {
+export function queryOrderLog(data) {
   return request({
-    url: '/compass/api/grid/options',
+    url: '/crm/getOrderLog',
     data,
   })
 }
\ No newline at end of file

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

@@ -3,10 +3,10 @@ import request from '../../request'
 /** 
  * 业务酬金列表查询
  */
-export function queryAllRewardList(data) {
+export function queryAllRewardList() {
   return request({
     url: '/crm/getJobsList',
-    data,
+    method: 'GET'
   })
 }
 
@@ -16,12 +16,15 @@ export function queryAllRewardList(data) {
 export function uploadReward(formData) {
   return request({
     url: '/crm/readExcelJobs',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
     data: formData
   })
 }
 
 /** 
- * 业务酬金提交
+ * 业务酬金批量上传
  */
 export function uploadRewardSave(data) {
   return request({
@@ -32,11 +35,11 @@ export function uploadRewardSave(data) {
 
 
 /** 
- * 业务酬金修改
+ * 业务酬金新增和修改
  */
 export function updateReward(data) {
   return request({
-    url: '/crm/updateJob',
+    url: data.id?'/crm/updateJob':'/crm/addJobs',
     data,
   })
 }
@@ -47,7 +50,7 @@ export function updateReward(data) {
  */
 export function delReward(data) {
   return request({
-    url: '/crm/updateJob',
+    url: '/crm/delJob',
     data,
   })
 }
\ No newline at end of file

channelBusiManage/src/components/DesktopMain.vue

@@ -224,8 +224,8 @@
         
         <!-- 订单详情页面 -->
         <OrderDetail
-          v-else-if="activeView === 'order-detail' && selectedOrderId && getOrderById(selectedOrderId)"
-          :order="getOrderById(selectedOrderId)!"
+          v-else-if="activeView === 'order-detail' && selectedOrderId"
+          :order="selectedOrder"
           :business-rules="businessRules"
           :current-user="currentUser"
           @update="handleUpdateOrder"
@@ -315,6 +315,7 @@ const isSidebarCollapsed = ref(false)
 const activeMenu = ref<string>('orders') // 当前激活的菜单
 const activeView = ref<string>('orders') // 当前显示的视图
 const selectedOrderId = ref<string | null>(null) // 当前查看的订单ID
+const selectedOrder = ref<{}>(null) // 当前查看的订单ID
 const userInfo = ref(localStorage.getItem('pcUserInfo') ? JSON.parse(localStorage.getItem('pcUserInfo') as string) : {})
 // 菜单配置
 // const businessMenuItems = [
@@ -464,6 +465,7 @@ const handleCommand = (command: string) => {
   }
 }
 const handleViewOrderDetail = (order: any) => {
+  selectedOrder.value = order
   selectedOrderId.value = order.id
   activeView.value = 'order-detail'
 }