From 22c49f22c341f1213fa133220c2dc80ee2ad04df Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Mon, 17 Oct 2022 18:01:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   3 +
 jero-web/src/common/lang/zh-cn.js             |   3 +
 .../components/SentList.vue                   |  23 +-
 .../components/dealtWith.vue                  | 196 +++++++++---------
 .../components/doneList.vue                   |  23 +-
 .../projectRegulationTasks/index.vue          |  41 +++-
 6 files changed, 169 insertions(+), 120 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 327c809ed..0512e7b97 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1327,4 +1327,7 @@ module.exports = {
   completednum: 'Quantity to be filled',
   filledBynum:'Filled by',
   parameterToBeInitiatednum:'Parameter to be initiated',
+  listToConfirm:'List to confirm',
+  toSubmit:'To submit',
+  toAudit:'To audit',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 8ee9717a9..be0b822e1 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1428,4 +1428,7 @@ module.exports = {
   completednum: '待填写数量',
   filledBynum:'待分配填写人数量',
   parameterToBeInitiatednum:'参数待发起数量',
+  listToConfirm:'待确认',
+  toSubmit:'待提交',
+  toAudit:'待审核',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 8e110122d..111ca9a60 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -43,49 +43,49 @@
           {
             title: this.$t('RelatedItems'),
             align: 'center',
-            dataIndex: 'RelatedItems',
+            dataIndex: 'projectName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'standardInformation',
+            dataIndex: 'serialNumber',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('taskType'),
             align: 'center',
-            dataIndex: 'taskType',
+            dataIndex: 'flowTypeShow',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('LastProcessor'),
             align: 'center',
-            dataIndex: 'LastProcessor',
+            dataIndex: 'lastAssigneeName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('CurrentProcessor'),
             align: 'center',
-            dataIndex: 'CurrentProcessor',
+            dataIndex: 'assigneeName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('TaskCutOffTime'),
             align: 'center',
-            dataIndex: 'TaskCutOffTime',
+            dataIndex: 'endTime',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('taskStatus'),
             align: 'center',
-            dataIndex: 'taskStatus',
+            dataIndex: 'statusShow',
             ellipsis: true,
             width: 170
           },
@@ -102,11 +102,14 @@
         pageNo:1,
         total:0,
         url:{
-          list:'',
+          list:'/todoCenter/projectProcess/issuedProcess',
         },
         queryParam:{},
       }
     },
+    mounted() {
+      this.getList()
+    },
     methods:{
       viewClick(val){
 
@@ -163,5 +166,9 @@
 </script>
 
 <style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 101a5c019..7edbe9926 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -1,107 +1,111 @@
 <template>
-<div class="box">
-  <a-table
-    ref="table"
-    size="middle"
-    :loading="loading"
-    :pagination="false"
-    :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
-    rowKey="id"
-    :data-source="dataSource"
-    :columns="columns"
-  >
-    <!--         -->
-    <span slot="operation" slot-scope="text,record">
+  <div class="box">
+    <a-table
+      ref="table"
+      size="middle"
+      :loading="loading"
+      :pagination="false"
+      :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+      rowKey="id"
+      :data-source="dataSource"
+      :columns="columns"
+    >
+      <!--         -->
+      <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
              @click="ProcessingClick(record)">{{$t('Processing')}}</a>
         </span>
-  </a-table>
-  <div class="page" v-if="dataSource && dataSource.length > 0">
-    <a-pagination
-      :show-total="total => $t('total')+` ${total} `+$t('strip')"
-      show-quick-jumper
-      show-size-changer
-      :page-size.sync="pageSize"
-      :total="total"
-      :current="pageNo"
-      @change="pageOnChange"
-      @showSizeChange="SizeChange"
-    />
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
   </div>
-</div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction } from '@/api/manage'
+
   export default {
     name: 'dealtWith',
-    data(){
-       return{
-         dataSource:[],
-         loading:false,
-         columns:[
-           {
-             title: this.$t('RelatedItems'),
-             align: 'center',
-             dataIndex: 'RelatedItems',
-             ellipsis: true,
-             width: 170
-           },
-           {
-             title: this.$t('standardInformation'),
-             align: 'center',
-             dataIndex: 'standardInformation',
-             ellipsis: true,
-             width: 170
-           },
-           {
-             title: this.$t('taskType'),
-             align: 'center',
-             dataIndex: 'taskType',
-             ellipsis: true,
-             width: 170
-           },
-           {
-             title: this.$t('Sponsor'),
-             align: 'center',
-             dataIndex: 'Sponsor',
-             ellipsis: true,
-             width: 170
-           },
-           {
-             title: this.$t('TaskCutOffTime'),
-             align: 'center',
-             dataIndex: 'TaskCutOffTime',
-             ellipsis: true,
-             width: 170
-           },
-           {
-             title: this.$t('taskStatus'),
-             align: 'center',
-             dataIndex: 'taskStatus',
-             ellipsis: true,
-             width: 170
-           },
-           {
-             title: this.$t('operation'),
-             align: 'center',
-             fixed: 'right',
-             width: 120,
-             scopedSlots: { customRender: 'operation' }
-           }
-         ],
-         selectedRowKeys:[],
-         pageSize:10,
-         pageNo:1,
-         total:0,
-         url:{
-            list:'',
-         },
-         queryParam:{},
-       }
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        columns: [
+          {
+            title: this.$t('RelatedItems'),
+            align: 'center',
+            dataIndex: 'projectName',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('standardInformation'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskType'),
+            align: 'center',
+            dataIndex: 'flowTypeShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'createBy',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('TaskCutOffTime'),
+            align: 'center',
+            dataIndex: 'endTime',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('taskStatus'),
+            align: 'center',
+            dataIndex: 'statusShow',
+            ellipsis: true,
+            width: 170
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 120,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        selectedRowKeys: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+        url: {
+          list: '/todoCenter/projectProcess/todoTaskList'
+        },
+        queryParam: {}
+      }
     },
-    methods:{
-      ProcessingClick(val){
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      ProcessingClick(val) {
 
       },
       searchQuery(value) {
@@ -123,7 +127,7 @@
         this.pageSize = pageSize
         this.getList()
       },
-      getList(){
+      getList() {
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
         Object.keys(queryParam).forEach(val => {
           if (queryParam[val] instanceof Array) {
@@ -150,11 +154,15 @@
             this.loading = false
           }
         })
-      },
+      }
     }
   }
 </script>
 
 <style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index a12ef8680..4b9bacacb 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -40,56 +40,56 @@
         dataSource:[],
         loading:false,
         url:{
-          list:'',
+          list:'/todoCenter/projectProcess/doneProcess',
         },
         queryParam:{},
         columns:[
           {
             title: this.$t('RelatedItems'),
             align: 'center',
-            dataIndex: 'RelatedItems',
+            dataIndex: 'projectName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'standardInformation',
+            dataIndex: 'serialNumber',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('taskType'),
             align: 'center',
-            dataIndex: 'taskType',
+            dataIndex: 'flowTypeShow',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('Sponsor'),
             align: 'center',
-            dataIndex: 'Sponsor',
+            dataIndex: 'assigneeName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('CurrentProcessor'),
             align: 'center',
-            dataIndex: 'CurrentProcessor',
+            dataIndex: 'assigneeName',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('TaskCutOffTime'),
             align: 'center',
-            dataIndex: 'TaskCutOffTime',
+            dataIndex: 'endTime',
             ellipsis: true,
             width: 170
           },
           {
             title: this.$t('taskStatus'),
             align: 'center',
-            dataIndex: 'taskStatus',
+            dataIndex: 'statusShow',
             ellipsis: true,
             width: 170
           },
@@ -107,6 +107,9 @@
         total:0,
       }
     },
+    mounted() {
+      this.getList()
+    },
     methods:{
       viewClick(val){
 
@@ -163,5 +166,9 @@
 </script>
 
 <style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index ac1792af7..8975a4fcb 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -9,7 +9,7 @@
                 <span>{{$t('RelatedItems')}}</span>
               </div>
               <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
-                       v-model="queryParam.serialNumber"></j-input>
+                       v-model="queryParam.projectName"></j-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -18,7 +18,7 @@
                 <span>{{$t('standardInformation')}}</span>
               </div>
               <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
-                       v-model="queryParam.title"></j-input>
+                       v-model="queryParam.serialNumber"></j-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -30,7 +30,7 @@
                         class="box-input"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         allowClear
-                        v-model="queryParam.taskType">
+                        v-model="queryParam.flowType">
                 <a-select-option v-for="(item, key) in taskTypeList"
                                  :key="key"
                                  :value="item.value">
@@ -51,7 +51,7 @@
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
-                          v-model="queryParam.flowStatus">
+                          v-model="queryParam.status">
                   <a-select-option v-for="(item, key) in taskStatusList"
                                    :key="key"
                                    :value="item.value">
@@ -117,26 +117,47 @@
         taskTypeList: [
           {
             name:this.$t('confirmationOfRegulationsList'),
-            value:'1',
+            value:'10',
           },
           {
             name:this.$t('listTaskConfirmation'),
-            value:'2',
+            value:'1',
           },
           {
             name:this.$t('designComplianceReview'),
-            value:'3',
+            value:'2',
           },
           {
             name:this.$t('preHomeConfirmation'),
-            value:'4',
+            value:'3',
           },
           {
             name:this.$t('verificationComplianceReview'),
-            value:'5',
+            value:'4',
+          },
+        ],
+        taskStatusList: [
+          {
+            name:this.$t('listToConfirm'),
+            value:'List to confirm',
+          },
+          {
+            name:this.$t('Finished'),
+            value:'Completed',
+          },
+          {
+            name:this.$t('inquiry'),
+            value:'Inquiry',
+          },
+          {
+            name:this.$t('toSubmit'),
+            value:'To submit',
+          },
+          {
+            name:this.$t('toAudit'),
+            value:'To audit',
           },
         ],
-        taskStatusList: [],
         tabActive: this.$t('toDoProcess')
       }
     },