对接待办中心

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue

@@ -156,5 +156,9 @@
 </script>
 
 <style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
 </style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue

@@ -150,5 +150,9 @@
 </script>
 
 <style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
 </style>

jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue

@@ -156,5 +156,9 @@
 </script>
 
 <style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
 </style>

jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue

@@ -115,8 +115,8 @@
         issue: false,
         isTrue: false,
         taskDefinitionKey: '',
-        taskIds:[],
+        taskIds: [],
-        projectLawsInventoryIds:[],
+        projectLawsInventoryIds: []
       }
     },
     methods: {
@@ -126,12 +126,10 @@
         this.taskDefinitionKey = this.selectedRowKeys[0].taskDefinitionKey
         this.taskIds = []
         this.projectLawsInventoryIds = []
-        this.selectedRowKeys.forEach(res=>{
+        this.selectedRowKeys.forEach(res => {
-            if (res.taskIds.indexOf(',') != '-1'){
+          res.taskIds = res.actiProcInstId
-              res.taskIds = res.taskIds.slice(0,res.taskIds.indexOf(','))
+          this.taskIds.push(res.taskIds)
-            }
+          this.projectLawsInventoryIds.push(res.projectLawsInventoryId)
-            this.taskIds.push(res.taskIds)
-            this.projectLawsInventoryIds.push(res.projectLawsInventoryId)
         })
         this.confirmLoading = false
         this.visible = true
@@ -152,14 +150,14 @@
         this.formInline[value] = id
         this.formInline = { ...this.formInline }
       },
-      addBatch(){
+      addBatch() {
         let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         let query = {
-          rejectUserId:this.userInfo().id,
+          rejectUserId: this.userInfo().id,
-          rejectTime:rejectTime,
+          rejectTime: rejectTime,
-          rejectCause:this.formInline.approvalOpinion,
+          rejectCause: this.formInline.approvalOpinion,
-          taskIds:this.taskIds.join(','),
+          taskIds: this.taskIds.join(','),
-          rejectType:'1',
+          rejectType: '1'
         }
         postAction('/project/projectLawsInventoryRejectCauseEO/addBatch', query).then((res) => {
 
@@ -171,16 +169,16 @@
             let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             let query = {
               ...this.formInline,
-              taskIds:this.taskIds.join(','),
+              taskIds: this.taskIds.join(','),
-              userId:this.userInfo().id,
+              userId: this.userInfo().id,
-              taskDefinitionKey:this.taskDefinitionKey,
+              taskDefinitionKey: this.taskDefinitionKey,
-              handlingTime:handlingTime,
+              handlingTime: handlingTime,
-              projectLawsInventoryIds:this.projectLawsInventoryIds.join(',')
+              projectLawsInventoryIds: this.projectLawsInventoryIds.join(',')
             }
-            if (this.formInline.flag == '1'){
+            if (this.formInline.flag == '1') {
-               this.addBatch()
+              this.addBatch()
             }
-            if (!this.formInline.flag){
+            if (!this.formInline.flag) {
               query.flag = '0'
             }
             this.confirmLoading = true

jero-web/src/views/toDoCenter/taskConfirmation/index.vue

@@ -9,7 +9,7 @@
                 <span>{{$t('RelatedItems')}}</span>
               </div>
               <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('RelatedItems')"
-                       v-model="queryParam.title"></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.standardInformation"></j-input>
+                       v-model="queryParam.serialNumber"></j-input>
             </div>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -86,46 +86,46 @@
         dataSource:[],
         queryParam:{},
         loading:false,
-        columns:[
+        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: 'createBy',
             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
           },
@@ -142,10 +142,13 @@
         pageNo:1,
         total:0,
         url:{
-          list:'',
+          list:'/todoCenter/projectProcess/todoTaskList',
         },
       }
     },
+    mounted() {
+      this.getList()
+    },
     methods:{
       batchProcessingForm() {
         this.pageNo = 1
@@ -186,7 +189,7 @@
         if (value && value.length > 0) {
           value.forEach(res => {
             res = JSON.parse(res)
-            if (res.prcType == '1') {
+            if (res.flowType == '1') {
               this.selectedRowKeys.push(JSON.stringify(res))
             } else {
               this.$message.warning(this.$t('onlyDataTaskConfirmationProcessSelected'))
@@ -213,6 +216,7 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          flowType:'1',
           ...queryParam
         }
         this.loading = true
@@ -295,4 +299,9 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
 </style>