p-honggang.li
2025-09-03 9577bfd83282afad65a758321eec7186a10222f9
修改配置
1个文件已添加
10个文件已修改
74 ■■■■ 已修改文件
src/api/orderApi.ts 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/sysUser.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/workFlowApi.ts 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.ts 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/orderWorkflow.ts 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/approveManage/tradeApproval/list.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/layout/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productManage/productPriceViewer/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tradeManage/buyer/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tradeManage/evaluate/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views_back/layout/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/orderApi.ts
@@ -124,6 +124,16 @@
    }) as ApiPromise
  },
  
  updateOrderStatusToIsEvaluate(orderId: string): ApiPromise {
    return createAxios({
      url: `${url}/status/isEvaluate`,
      method: 'post',
      params: {
        orderId
      }
    }) as ApiPromise
  },
  updateOrderStatusToNext(orderId: string): ApiPromise {
    return createAxios({
      url: `${url}/status/next`,
src/api/sysUser.ts
@@ -26,6 +26,7 @@
    // 获取用户详情
    getUserdetail(data: object = {}): ApiPromise {
        return createAxios({
            baseURL: '/api',
            url: `${url}/detail`,
            headers: {
                'Content-Type': 'application/json;charset=UTF-8'
src/api/workFlowApi.ts
New file
@@ -0,0 +1,15 @@
import createAxios from '@/utils/axios'
const workFlowApi = {
  getWorkFlowParams(data: object = {}) : ApiPromise{
    return createAxios({
        baseURL: '/api',
        url: `/approval/templateRelation/relationByType`,
        headers: {
            'Content-Type': 'application/json;charset=UTF-8'
        },
        data: data
    }) as ApiPromise
  }
}
export default  workFlowApi
src/main.ts
@@ -11,17 +11,17 @@
// import pagination from '@/components/Pagination/index.vue'
import store from '@/stores' // pinia状态管理器全局调用
import directives from '@/directives/index'
import FcDesigner from '@form-create/designer';
import formCreate from '@form-create/element-ui'; // 引入 FormCreate
// import FcDesigner from '@form-create/designer';
// import formCreate from '@form-create/element-ui'; // 引入 FormCreate
const app = createApp(App)
app.use(store)
app.use(router)
app.use(ElementPlus)
app.use(directives)
app.use(FcDesigner);
app.use(FcDesigner.formCreate);
app.use(formCreate);
// app.use(FcDesigner);
// app.use(FcDesigner.formCreate);
// app.use(formCreate);
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
  app.component(key, component)
}
src/utils/orderWorkflow.ts
@@ -20,7 +20,8 @@
  AUTHORIZE = '授权',
  CONFIRM_TRADE = '交易确认',
  EVALUATE = '评价',
  CANCEL_ORDER = '取消订单'
  CANCEL_ORDER = '取消订单',
  COMPLETED = '已完成'
}
// 页面类型枚举
src/views/approveManage/tradeApproval/list.vue
@@ -821,11 +821,15 @@
    align-items: center;
    overflow: hidden;
    
    .status-item{
      flex-direction: row-reverse;
    }
    .order-item {
      display: flex;
      align-items: center;
      gap: 8px;
      flex-shrink: 0;
      flex: 1;
      
      .label {
        color: #909399;
src/views/layout/index.vue
@@ -129,7 +129,7 @@
.content-wrapper {
  width: 100%;
  height: calc(100vh - 70px);
  height: calc(100vh);
  display: flex;
}
.content-wrapperall{
src/views/productManage/productPriceViewer/index.vue
@@ -354,6 +354,7 @@
import { useUserInfo } from '@/stores/modules/userInfo'
import { queryUserDetail } from '@/api/userInfo'
import productApi from '@/api/productApi'
import workFlowApi from '@/api/workFlowApi'
const route = useRoute()
@@ -828,16 +829,25 @@
      // 调用工作流接口发起审批流程,拿到流程实例ID后回写订单workflow_id
      try {
        // 根据是否包含协议明细,配置不同流程定义与业务Key(先用静态值占位)
        const processdefId = hasAGREEMENT ? 'Process_Agreement_Static' : 'Process_Points_Static'
        // const processdefId = hasAGREEMENT ? 'Process_Agreement_Static' : 'Process_Points_Static'
        const businessKey = hasAGREEMENT ? 'agreement_biz_key' : 'points_biz_key'
        const type = hasAGREEMENT ? 'trade_agreement' : 'trade_point';
        // 获取工作流参数
        const  wkParamsRes: any = await workFlowApi.getWorkFlowParams({
          type: type,
          unitId: '1'
        })
        if(wkParamsRes?.code === 200 && wkParamsRes.data?.processTemplateId){
        const wfRes: any = await orderApi.startWorkflowAndComplete({
          processdefId,
            processdefId: wkParamsRes.data.processTemplateId,
          userid: String(currentUserId.value || ''),
          businessKey
            businessKey: businessKey
        })
        if (wfRes?.code === 200 && wfRes.data?.processinstId) {
          await orderApi.updateWorkflowId(data.orderId, wfRes.data.processinstId)
        }
        }
      } catch (e) {
        console.warn('启动工作流失败或更新workflow_id失败', e)
      }
src/views/tradeManage/buyer/index.vue
@@ -227,7 +227,7 @@
                            交易确认
                          </el-button>
                          <el-button
                            v-else-if="action.type === ActionType.EVALUATE"
                            v-else-if="action.type === ActionType.EVALUATE && row.parentOrder.isEvaluate === '未评价'"
                            type="primary"
                            link
                            size="small"
@@ -280,12 +280,10 @@
<script setup lang="ts">
import { onMounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
import { Search, Refresh } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import orderApi from '@/api/orderApi'
import productApi from '@/api/productApi'
import { useUserInfo } from '@/stores/modules/userInfo'
import ProductOrderStatusDialog from '@/views/productManage/productOrderStatusDialog/index.vue'
import { OrderWorkflowController, OrderStatus, ActionType, PageType, StatusMapper } from '@/utils/orderWorkflow'
import { queryUserDetail } from '@/api/userInfo'
@@ -582,7 +580,8 @@
      status: uiStatus,
      statusName: order.orderStatus || '',
      orderStatus: StatusMapper.toUIStatus(order.orderStatus), // 转换为标准状态枚举
      workFlowId: order.workflowId || ''
      workFlowId: order.workflowId || '',
      isEvaluate: order.isEvaluate || ''
    }
    const subOrders: any[] = Array.isArray(order?.orderDetails)
      ? order.orderDetails.map((d: any, i: number) => ({
src/views/tradeManage/evaluate/index.vue
@@ -862,8 +862,8 @@
    })
    if (result && result.code === 200) {
      // 更新订单状态进入下一个状态
      await orderApi.updateOrderStatusToNext(orderId)
      // 更新订单评价状态为已评价
      await orderApi.updateOrderStatusToIsEvaluate(orderId)
      ElMessage.success('评价提交成功')
      router.back()    
      evaluationLoading.value = false
src/views_back/layout/index.vue
@@ -118,7 +118,7 @@
.content-wrapper {
  width: 100%;
  height: calc(100vh - 70px);
  height: calc(100vh);
  display: flex;
}
.content-wrapperall{