提交代码

mobile/src/components/Process/submitVerify.vue

@@ -614,7 +614,7 @@ export default {
 
                     if (response.code === 200) {
                         this.visible = false;
-                        this.$emit('submitCallback');
+                        this.$emit('submit-callback');
                         uni.showToast({
                             title: '操作成功',
                             icon: 'success',
@@ -698,7 +698,7 @@ export default {
             this.backForm.taskId = this.taskId;
 
             try {
-                const result = await this.showConfirm('是否确认驳回到申请人？');
+                const result = await this.showConfirm('是否确认驳回？');
                 if (result.confirm) {
                     this.loading = true;
                     this.backLoading = true;
@@ -713,7 +713,8 @@ export default {
                     if (response.code === 200) {
                         this.visible = false;
                         this.closeBackDialog();
-                        this.$emit('submitCallback');
+                        console.log('驳回成功');
+                        this.$emit('submit-callback');
                         uni.showToast({
                             title: '操作成功',
                             icon: 'success',
@@ -789,7 +790,7 @@ export default {
 
                         if (response.code === 200) {
                             this.visible = false;
-                            this.$emit('submitCallback');
+                            this.$emit('submit-callback');
                             uni.showToast({
                                 title: '操作成功',
                                 icon: 'success',
@@ -842,7 +843,7 @@ export default {
                     if (response.code === 200) {
                         this.visible = false;
                         this.deleteSignatureVisible = false;
-                        this.$emit('submitCallback');
+                        this.$emit('submit-callback');
                         uni.showToast({
                             title: '操作成功',
                             icon: 'success',
@@ -894,7 +895,7 @@ export default {
 
                         if (response.code === 200) {
                             this.visible = false;
-                            this.$emit('submitCallback');
+                            this.$emit('submit-callback');
                             uni.showToast({
                                 title: '操作成功',
                                 icon: 'success',
@@ -952,7 +953,7 @@ export default {
 
                         if (response.code === 200) {
                             this.visible = false;
-                            this.$emit('submitCallback');
+                            this.$emit('submit-callback');
                             uni.showToast({
                                 title: '操作成功',
                                 icon: 'success',
@@ -1003,7 +1004,7 @@ export default {
 
                     if (response.code === 200) {
                         this.visible = false;
-                        this.$emit('submitCallback');
+                        this.$emit('submit-callback');
                         uni.showToast({
                             title: '操作成功',
                             icon: 'success',

mobile/src/pages/xg/xsjcxx/xsqj/leave/index.vue

@@ -92,7 +92,9 @@
                         <view class="right-section">
                             <view class="status-section">
                                 <u-tag
-                                    :text="getStatusText(item.approvalStatus)"
+                                    :text="
+                                        $getDictLabel(xg_xsqj_cancel_status, item.approvalStatus)
+                                    "
                                     :type="getStatusType(item.approvalStatus)"
                                     size="mini"
                                 ></u-tag>
@@ -252,7 +254,6 @@
 
         <!-- 分页加载 -->
 
-
         <view v-if="leaveList.length > 0" class="pagination-container">
             <u-loadmore
                 :status="loadStatus"
@@ -591,6 +592,12 @@ export default {
                 reject: 'error',
                 cancel: 'info',
             };
+            // console.log('this.student_leave_approval_status:', this.student_leave_approval_status);
+            // console.log('status', status);
+            // console.log(
+            //     'getDictTagType(this.student_leave_approval_status, status, fallbackMap)',
+            //     getDictTagType(this.student_leave_approval_status, status, fallbackMap),
+            // );
             return getDictTagType(this.student_leave_approval_status, status, fallbackMap);
         },
 

mobile/src/pages/xg/xsjcxx/xsqj/leaveEdit/index.vue

@@ -3225,6 +3225,7 @@ export default {
 
         // 提交回调
         handleSubmitCallback() {
+            console.log('handleSubmitCallback 回调成功');
             // 审批提交成功提示
             uni.showToast({
                 title: '提交成功',