廖井涛
2025-04-10 9425caa266245d82e7442f93cd47c5e263be2242
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -121,12 +121,18 @@
const route = currentRoute.value
let processId = route.query.processId
let merge = null
//第一次加载数据
request.post(`/processCard/flowCardDetail/${processId}`, filterData.value).then((res) => {
  if (res.code == 200) {
    produceList = produceList.value.concat(deepClone(res.data.data))
    merge = res.data.merge
    console.log(merge)
    if(merge != 0){
      gridOptions.toolbarConfig.buttons[0].name='取消合并'
    }
    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
@@ -273,7 +279,7 @@
                type: 'warning',
              }
          ).then(()=>{
            request.post("/processCard/mergeFlowCard", flowData.value).then((res) => {
            request.post(`/processCard/mergeFlowCard/${merge}`, flowData.value).then((res) => {
              if(res.code==200 && res.data==="true"){
                ElMessage.success(t('basicData.msg.saveSuccess'))
                router.push({path: '/main/processCard/SelectProcessCard', query:{random:Math.random()}})