修改审批状态的映射文本

src/locales/lang/en-US/doc/doc.js

@@ -99,6 +99,12 @@ export default {
     'doc.Conditional-Search': 'Conditional Search',
     'doc.Bulk-Operations': 'Bulk Operations',
     'doc.Permissions-Management': 'Permissions Management',
-    'doc.total': 'Total',
-    'doc.data': 'items',
+    'doc.Total': 'Total',
+    'doc.Data': 'items',
+    'doc.NotSubmitted': 'Not Submitted',
+    'doc.Pending': 'Pending for Approval',
+    'doc.Resubmission': "C-Resubmission Reg'd",
+    'doc.A-Approved': 'A-Approved & B-Approved w/comment',
+    'doc.Cancelled': 'Cancelled',
+    'doc.D-Rejected': 'D-Rejected',
 }

src/locales/lang/zh-CN/doc/doc.js

@@ -99,6 +99,12 @@ export default {
     'doc.Conditional-Search': '条件搜索',
     'doc.Bulk-Operations': '批量操作',
     'doc.Permissions-Management': '权限管理',
-    'doc.total': '共',
-    'doc.data': '条数据',
-}
+    'doc.Total': '共',
+    'doc.Data': '条数据',
+    'doc.NotSubmitted': '未提交',
+    'doc.Pending': '待批准',
+    'doc.Resubmission': '需重新提交',
+    'doc.A-Approved': '已批准&已批准带评论',
+    'doc.Cancelled': '已取消',
+    'doc.D-Rejected': '已拒绝',
+}

src/locales/lang/zh-HK/doc/doc.js

@@ -97,6 +97,12 @@ export default {
     'doc.Conditional-Search': '條件搜索',
     'doc.Bulk-Operations': '批量操作',
     'doc.Permissions-Management': '權限管理',
-    'doc.total': '共',
-    'doc.data': '條數據',
+    'doc.Total': '共',
+    'doc.Data': '條數據',
+    'doc.NotSubmitted': '未提交',
+    'doc.Pending': '待批准',
+    'doc.Resubmission': '需重新提交',
+    'doc.A-Approved': '已批准&已批准帶評論',
+    'doc.Cancelled': '已取消',
+    'doc.D-Rejected': '已拒絕',
 }

src/views/document/dashboard.vue

@@ -431,9 +431,9 @@
                             <a-menu-item
                               key="3"
                               v-if="
-                                record.approval_status == 'wait' ||
-                                record.approval_status == 'rejected' ||
-                                record.approval_status == 'canceled'
+                                record.approval_status == $t('doc.NotSubmitted') ||
+                                record.approval_status == $t('doc.D-Rejected') ||
+                                record.approval_status == $t('doc.Cancelled')
                               "
                             >
                               <div @click.stop="approvalClick(record, 'container')">
@@ -441,7 +441,7 @@
                                 <span style="margin-left: 5px">{{ $t('global.Approval') }}</span>
                               </div>
                             </a-menu-item>
-                            <a-menu-item key="4" v-if="record.approval_status == 'doing'">
+                            <a-menu-item key="4" v-if="record.approval_status == $t('doc.Pending')">
                               <div @click.stop="revokeClick(record.id, 'container')">
                                 <a-icon type="audit" />
                                 <span style="margin-left: 5px">{{ $t('Approval.Approval-Revoke') }}</span>
@@ -494,10 +494,10 @@
                               key="4"
                               v-if="
                                 !record.type &&
-                                (record.approval_status == 'wait' ||
-                                  record.approval_status == 'pending' ||
-                                  record.approval_status == 'rejected' ||
-                                  record.approval_status == 'canceled')
+                                ( record.approval_status == $t('doc.NotSubmitted') ||
+                                  record.approval_status == $t('doc.Pending') ||
+                                  record.approval_status == $t('doc.Cancelled') ||
+                                  record.approval_status == $t('doc.D-Rejected'))
                               "
                             >
                               <div
@@ -579,9 +579,9 @@
                           <a-icon
                             v-if="
                               item.type == 'container' &&
-                              (item.approval_status == 'wait' ||
-                                item.approval_status == 'rejected' ||
-                                item.approval_status == 'canceled')
+                              (item.approval_status == $t('doc.NotSubmitted') ||
+                                item.approval_status == $t('doc.D-Rejected') ||
+                                item.approval_status == $t('doc.Cancelled'))
                             "
                             v-hasPermissions:approval.store
                             @click.stop="approvalClick(item, 'container')"
@@ -591,7 +591,7 @@
                         <a-tooltip>
                           <template slot="title">{{ $t('Approval.Approval-Revoke') }}</template>
                           <a-icon
-                            v-if="item.type == 'container' && item.approval_status == 'doing'"
+                            v-if="item.type == 'container' && item.approval_status == $t('doc.Pending')"
                             v-hasPermissions:approval.store
                             @click.stop="revokeClick(item.id, 'container')"
                             type="audit"
@@ -623,9 +623,9 @@
                           <a-icon
                             v-if="
                               !item.type &&
-                              (item.approval_status == 'wait' ||
-                                item.approval_status == 'rejected' ||
-                                item.approval_status == 'canceled')
+                              (item.approval_status == $t('doc.NotSubmitted') ||
+                                item.approval_status == $t('doc.D-Rejected') ||
+                                item.approval_status == $t('doc.Cancelled'))
                             "
                             v-hasPermissions:approval.store
                             @click.stop="approvalClick(item, 'container_file')"
@@ -636,7 +636,7 @@
                         <a-tooltip>
                           <template slot="title">{{ $t('Approval.Approval-Revoke') }}</template>
                           <a-icon
-                            v-if="!item.type && item.approval_status == 'doing'"
+                            v-if="!item.type && item.approval_status == $t('doc.Pending')"
                             v-hasPermissions:approval.store
                             @click.stop="revokeClick(item.object_id, 'container_file')"
                             type="audit"
@@ -675,9 +675,9 @@
                           <template slot="title">{{ $t('global.Approval') }}</template>
                           <a-icon
                             v-if="
-                              item.approval_status == 'wait' ||
-                              item.approval_status == 'rejected' ||
-                              item.approval_status == 'canceled'
+                              item.approval_status == $t('doc.NotSubmitted') ||
+                              item.approval_status == $t('doc.D-Rejected') ||
+                              item.approval_status == $t('doc.Cancelled')
                             "
                             v-hasPermissions:share-file.store
                             @click.stop="approvalClick(item, 'container_file')"
@@ -692,7 +692,7 @@
                     :current="current"
                     :total="total"
                     @change="onPaginationChange"
-                    :show-total="(total) => `${$t('doc.total')} ${total} ${$t('doc.data')}`"
+                    :show-total="(total) => `${$t('doc.Total')} ${total} ${$t('doc.Data')}`"
                     class="pagination"
                   />
                 </a-card>
@@ -1030,9 +1030,9 @@
               <a-menu-item
                 key="4"
                 v-if="
-                  record.approval_status == 'wait' ||
-                  record.approval_status == 'rejected' ||
-                  record.approval_status == 'canceled'
+                  record.approval_status == $t('doc.NotSubmitted') ||
+                  record.approval_status == $t('doc.D-Rejected') ||
+                  record.approval_status == $t('doc.Cancelled')
                 "
               >
                 <div v-hasPermissions:share-file.store @click.stop="approvalClick(record, 'container_file')">
@@ -3665,7 +3665,7 @@ export default {
         if (this.selectedRow[k].type == 'folder') {
           return this.$message.warning(this.$t('doc.Only-file-approved'))
         }
-        if (this.selectedRow[k].approval_status != 'wait') {
+        if (this.selectedRow[k].approval_status != this.$t('doc.NotSubmitted')) {
           return this.$message.warning(this.$t('doc.attachment-currently-approval'))
         }
       }

src/views/project/detail/Task.vue

@@ -43,11 +43,14 @@
                       @change="handleSelectChange"
                       allowClear
                     >
-                      <a-select-option :value="''">{{ $t('project.All-Task') }}</a-select-option>
-                      <a-select-option :value="'wait'">{{ $t('project.Waiting') }}</a-select-option>
-                      <a-select-option :value="'doing'">{{ $t('project.Doing') }}</a-select-option>
-                      <a-select-option :value="'done'">{{ $t('project.Done') }}</a-select-option>
-                      <a-select-option :value="'closed'">{{ $t('project.Closed') }}</a-select-option>
+                      <a-select-option :value="$t('project.All-Task')">{{ $t('project.All-Task') }}</a-select-option>
+                      <a-select-option :value="'wait'">{{ $t('task.wait') }}</a-select-option>
+                      <a-select-option :value="'doing'">{{ $t('task.doing') }}</a-select-option>
+                      <a-select-option :value="'done'">{{ $t('task.done') }}</a-select-option>
+                      <a-select-option :value="'closed'">{{ $t('task.closed') }}</a-select-option>
+                      <a-select-option :value="'pause'">{{ $t('task.pause') }}</a-select-option>
+                      <a-select-option :value="'cancel'">{{ $t('task.cancel') }}</a-select-option>
+
                     </a-select>
                   </a-form-item>
                 </a-col>
@@ -305,11 +308,12 @@ export default {
       },
       searchAssid: null, //
       statusEnum: {
-        wait: this.$t('requirement.status-wait'),
-        doing: this.$t('requirement.status-doing'),
-        approved: this.$t('requirement.status-approved'),
-        rejected: this.$t('requirement.status-rejected'),
-        canceled: this.$t('requirement.status-canceled'),
+        'Not Submitted': this.$t('doc.NotSubmitted'),
+        'Pending for Approval': this.$t('doc.Pending'),
+        "C-Resubmission Reg'd": this.$t('doc.Resubmission'),
+        'A-Approved & B-Approved w/comment': this.$t('doc.A-Approved'),
+        'Cancelled': this.$t('doc.Cancelled'),
+        'D-Rejected': this.$t('doc.D-Rejected'),
       },
       otherStatusEnum: {
         wait: this.$t('task.wait'),