Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/api/exemption/exemption.js

@@ -22,11 +22,19 @@ export const saveItem = params => {
 };
 export const updateItem = params => {
   return request({
-    url: '/blade-desk/QA/RaiseHand/update',
+    url: '/blade-desk/QA/RaiseHand/updateSubmit',
     method: 'post',
     data: params,
   });
 };
+//修改接口
+// export const updateItem = params => {
+//   return request({
+//     url: '/blade-desk/QA/RaiseHand/update',
+//     method: 'post',
+//     data: params,
+//   });
+// };
 export const detailItem = id => {
   return request({
     url: '/blade-desk/QA/RaiseHand/detail',

src/views/exemption/components/addDialog.vue

@@ -117,7 +117,7 @@ export default {
             prop: 'postName',
             span: 24,
             disabled: true,
-            rules: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
+            rules: [{ required: false, message: '请输入岗位', trigger: 'blur' }],
           },
           {
             label: '发生时间',
@@ -311,7 +311,7 @@ export default {
 
           try {
             let res;
-            if (this.infoTitle === '修改') {
+            if (this.infoTitle === '重新提交') {
               console.log('修改模式，需要调用修改接口');
               // 调用修改接口
               res = await updateItem(params);

src/views/exemption/components/detailsDialog.vue

@@ -12,14 +12,14 @@
     >
       <el-descriptions-item label="提出人">
         <span v-if="userListData && userListData.length > 0">{{ reportUserName }}</span>
-        <span v-else>{{ detailData.reportUserId || '-' }}</span>
+        <span v-else>{{ detailData.reportUserId || ' ' }}</span>
       </el-descriptions-item>
-      <el-descriptions-item label="岗位">{{ detailData.postName || '-' }}</el-descriptions-item>
-      <el-descriptions-item label="免责问题描述">{{ detailData.notes || '-' }}</el-descriptions-item>
-      <el-descriptions-item label="原因">{{ detailData.reason || '-' }}</el-descriptions-item>
-      <el-descriptions-item label="措施">{{ detailData.measure || '-' }}</el-descriptions-item>
-      <el-descriptions-item label="免责理由">{{ detailData.raiseHandReason || '-' }}</el-descriptions-item>
-      <el-descriptions-item label="免责金额">{{ detailData.amount || '-' }}</el-descriptions-item>
+      <el-descriptions-item label="岗位">{{ detailData.postName || ' ' }}</el-descriptions-item>
+      <el-descriptions-item label="免责问题描述">{{ detailData.notes || ' ' }}</el-descriptions-item>
+      <el-descriptions-item label="原因">{{ detailData.reason || ' ' }}</el-descriptions-item>
+      <el-descriptions-item label="措施">{{ detailData.measure || ' ' }}</el-descriptions-item>
+      <el-descriptions-item label="免责理由">{{ detailData.raiseHandReason || ' ' }}</el-descriptions-item>
+      <el-descriptions-item label="免责金额">{{ detailData.amount || ' ' }}</el-descriptions-item>
     </el-descriptions>
    
    <el-steps :active="active" finish-status="success" class="center-steps" align-center>
@@ -105,7 +105,7 @@ export default {
     reportUserName() {
       const userId = this.detailData.reportUserId;
       if (!userId || Object.keys(this.userMapObj).length === 0) {
-        return userId || '-';
+        return userId || ' ';
       }
       return this.userMapObj[userId] || userId;
     },
@@ -131,7 +131,7 @@ export default {
     getApprovalData(index, field) {
       const all = this.detailData.all || [];
       const item = all[index];
-      return item ? (item[field] || '-') : '-';
+      return item ? (item[field] || ' ') : ' ';
     },
     closeDialog() {
       this.openShow = false;
@@ -170,12 +170,12 @@ export default {
           this.active = 3; // 待业务主管审批 - 第3步激活
           break;
         case 3:
-        case 4:
-          this.active = 3; // 驳回/退回 - 显示到当前步骤
+          this.active = 4; // 驳回/退回 - 显示到当前步骤
           break;
-        case 5:
-          this.active = 3; // 业务主管审批通过 - 第3步完成
+        case 4:
+            this.active = 5; // 业务主管审批通过 - 第3步完成
           break;
+        
         default:
           this.active = 0; // 初始状态 - 第0步
       }

src/views/exemption/index.vue

@@ -37,13 +37,14 @@
           <el-button
           type="text"
           @click="updateDialog(row)"
-          v-if="row.status == '3' || row.status == '4' || row.status == '5'"
-          >修改</el-button
+          v-if=" row.status == '0'"
+          >重新提交</el-button
         >
+        
         <el-button
           type="text"
           @click="review(row)"
-          v-if="row.status == '1' || row.status == '2' || row.status == '0'"
+          v-if="row.status == '1' || row.status == '2' ||row.status == '3'  "
           >审核</el-button
         >
         <el-button type="text" @click="removeLog(row)">删除</el-button>
@@ -297,7 +298,7 @@ export default {
     // 修改
     updateDialog(row) {
       this.infoShow = true;
-      this.infoTitle = '修改';
+      this.infoTitle = '重新提交';
       this.rowItem = row;
     },
     // 关闭