From a4ec9e91270fdb289ea6e8f96b8911b46773b7a4 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Wed, 22 Apr 2026 11:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicData/jobTransferManagement.vue |  4 +--
 src/views/flowManagement/milestoneDialog.vue  | 30 +++++++++++++++++--
 src/views/flowManagement/projectExecution.vue |  6 ++--
 src/views/workLicense/workLicense.vue         |  2 +-
 src/views/zhgd-work/dacangDispatch/index.vue  | 12 ++++----
 5 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue
index 7cbe35f9..44b3d901 100644
--- a/src/views/basicData/jobTransferManagement.vue
+++ b/src/views/basicData/jobTransferManagement.vue
@@ -41,7 +41,7 @@
       </template>
       <template #menu="scope">
         <el-button type="text" @click="updateFun(scope.row)">修改</el-button>
-        <el-button v-show="scope.row.phStatus == 7" type="text" @click="transferToFun(scope.row)"
+        <el-button v-show="scope.row.phStatus == 6" type="text" @click="transferToFun(scope.row)"
           >转岗</el-button
         >
         <!-- v-show="scope.row.phStatus == 3" -->
@@ -259,7 +259,7 @@ export default {
         editBtnText: '修改',
         viewBtnText: '详情',
         labelWidth: 120,
-        menuWidth: 150,
+        menuWidth: 190,
         dialogWidth: 1200,
         dialogClickModal: false,
         searchEnter: true,
diff --git a/src/views/flowManagement/milestoneDialog.vue b/src/views/flowManagement/milestoneDialog.vue
index 5d6b33ce..9522afc9 100644
--- a/src/views/flowManagement/milestoneDialog.vue
+++ b/src/views/flowManagement/milestoneDialog.vue
@@ -232,7 +232,7 @@
 </template>
 <script>
 import { getRoleUserList } from '@/api/processManagement/taskDispatch';
-import { projectExecute, projectCheck, projectApprove } from '@/api/flowManagement/index';
+import { projectExecute, projectCheck, projectApprove,getProcessDetail } from '@/api/flowManagement/index';
 import { getDictionary } from '@/api/system/dict';
 import jhSelect from '@/components/jh-select/index.vue';
 export default {
@@ -273,15 +273,39 @@ export default {
   },
   mounted() {
     this.openShow = this.showDialog;
-    this.executeForm = this.rowItem;
-    console.log(this.detailForm, 'title');
+    // this.executeForm = this.rowItem;
+    // console.log(this.detailForm, 'title');
     this.detailForm.checkResult = null;
     this.subTitle = this.title;
     console.log(this.rowItem, 'rowItem');
     this.getRoleUserList();
     this.getExecuteResult();
+    this.getDetails();
+
   },
   methods: {
+    // 获取详情数据
+    getDetails() {
+      getProcessDetail(this.rowItem.paId).then(res => {
+        this.$nextTick(() => {
+          // let data = res.data.data;
+          // Object.assign(this.addForm, data);
+
+          this.executeForm = res.data.data;
+          
+          // 安全地处理 memberName 回显
+          if (res.data.data.memberName) {
+            this.executeForm.memberName = String(res.data.data.memberName)
+              .split(',')
+              .map(id => id.trim())
+              .filter(Boolean);
+          } else {
+            this.executeForm.memberName = [];
+          }
+          this.$forceUpdate();
+        });
+      });
+    },
     executeTypeChange() {
       this.detailForm.delayTime = '';
     },
diff --git a/src/views/flowManagement/projectExecution.vue b/src/views/flowManagement/projectExecution.vue
index 9ee6a753..62c0916d 100644
--- a/src/views/flowManagement/projectExecution.vue
+++ b/src/views/flowManagement/projectExecution.vue
@@ -21,19 +21,19 @@
         <el-button
           type="text"
           v-if="scope.row.approvalStatus == '3' && scope.row.checkResult == 0"
-          @click="executeRow(row, scope.row)"
+          @click="executeRow(scope.row, scope.row)"
           >执行</el-button
         >
         <el-button
           type="text"
           v-if="scope.row.checkResult == 1 || scope.row.checkResult == 3"
-          @click="auditRow(row, scope.row)"
+          @click="auditRow(scope.row, scope.row)"
           >核查</el-button
         >
         <el-button
           type="text"
           v-if="scope.row.gradeTitle == '待评价' && scope.row.checkResult == 2"
-          @click="examineRow(row, scope.row)"
+          @click="examineRow(scope.row, scope.row)"
           >核准</el-button
         >
       </template>
diff --git a/src/views/workLicense/workLicense.vue b/src/views/workLicense/workLicense.vue
index 10507930..c219ffa6 100644
--- a/src/views/workLicense/workLicense.vue
+++ b/src/views/workLicense/workLicense.vue
@@ -164,7 +164,7 @@ export default {
             ],
           },
           {
-            label: '所属班组',
+            label: '部门',
             prop: 'deptName',
             span: 24,
             width: 150,
diff --git a/src/views/zhgd-work/dacangDispatch/index.vue b/src/views/zhgd-work/dacangDispatch/index.vue
index f424726a..0f1d3747 100644
--- a/src/views/zhgd-work/dacangDispatch/index.vue
+++ b/src/views/zhgd-work/dacangDispatch/index.vue
@@ -63,9 +63,11 @@ export default {
       };
       yieldOrderConfirm(query).then(res => {
         let data = res.data.data;
-        this.tableData = res.data.data
-        if(this.tableData.length<=0){
-          this.$message.error('订单分派失败，请到异常订单管理页面处理!')
+        this.tableData = res.data.data;
+        this.cardNo = '';
+        this.isAxios = true;
+        if (this.tableData.length <= 0) {
+          this.$message.error('订单分派失败，请到异常订单管理页面处理!');
         }
       });
       //   this.$ajax
@@ -75,8 +77,8 @@ export default {
       //         this.makeTeam = res.data;
       //         this.$message.success(this.$t('workbench.releaseSuccess'));
       //       }
-      //       this.cardNo = '';
-      //       this.isAxios = true;
+      // this.cardNo = '';
+      // this.isAxios = true;
       //     })
       //     .catch(() => {
       //       this.isAxios = true;