Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO

jero-web/src/common/lang/zh-cn.js

@@ -509,8 +509,8 @@ module.exports = {
   AddProcess: '添加流程',
   RelatedItems: '相关项目',
   Sponsor: '发起人',
-  CurrentProcessor: '当前处理人',
-  LastProcessor: '上一处理人',
+  CurrentProcessor: '当前操作人',
+  LastProcessor: '上一操作人',
   ProcessingTime: '办理时间',
   cutoffTime: '截止时间',
   ProcessStatus: '流程状态',

jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue

@@ -186,10 +186,10 @@
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
           if (res instanceof String) {
-            this.queryBy = JSON.parse(res)
+            this.queryBy = JSON.parse(res) || {}
             callback()
           } else {
-            this.queryBy = res
+            this.queryBy = res || {}
             callback()
           }
         })

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -401,10 +401,10 @@
         this.loading = true
         getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
           if (res instanceof String) {
-            this.queryBy = JSON.parse(res)
+            this.queryBy = JSON.parse(res) || {}
             callback()
           } else {
-            this.queryBy = res
+            this.queryBy = res || {}
             callback()
           }
         })

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

@@ -21,10 +21,10 @@
           <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text" :title="text">
-          {{text}}
+       <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
         </a>
-         <span v-else>--</span>
+        <span v-else>--</span>
       </span>
     </a-table>
     <div class="page" v-if="dataSource && dataSource.length > 0">

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

@@ -19,8 +19,8 @@
           <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text" :title="text">
-          {{text}}
+        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
         </a>
         <span v-else>--</span>
       </span>

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

@@ -23,8 +23,8 @@
           </a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text" :title="text">
-          {{text}}
+        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
         </a>
         <span v-else>--</span>
       </span>

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

@@ -18,7 +18,9 @@
              @click="viewClick(record)">{{$t('view')}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" :title="text">{{text}}</a>
+        <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
       </span>
     </a-table>
     <div class="page" v-if="dataSource && dataSource.length > 0">

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

@@ -16,7 +16,9 @@
              @click="ProcessingClick(record)">{{$t('Processing')}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" :title="text">{{text}}</a>
+        <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
       </span>
     </a-table>
     <div class="page" v-if="dataSource && dataSource.length > 0">

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

@@ -18,7 +18,9 @@
              @click="viewClick(record)">{{$t('view')}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" :title="text">{{text}}</a>
+       <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
+          {{text+'、'+record.title}}
+        </a>
       </span>
     </a-table>
     <div class="page" v-if="dataSource && dataSource.length > 0">

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

@@ -9,6 +9,17 @@
       @ok="handleOk"
       @cancel="handleCancel"
     >
+      <template slot="footer">
+        <a-button key="back" @click="handleCancel">
+          {{$t('cancel')}}
+        </a-button>
+        <a-button type="danger" :loading="confirmLoading" v-if="taskDefinitionKey == 'dreqr'" @click="sendBackClick">
+          {{$t('sendBack')}}
+        </a-button>
+        <a-button type="primary" :loading="confirmLoading" @click="handleOk">
+          {{$t('confirm')}}
+        </a-button>
+      </template>
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
         <a-row :gutter="24" v-if="taskDefinitionKey != 'dreqr'">
           <a-col :span="24">
@@ -68,6 +79,7 @@
           </a-col>
         </a-row>
       </a-form-model>
+
     </a-modal>
   </div>
 </template>
@@ -138,6 +150,10 @@
           this.$refs.ruleForm.clearValidate()
         })
       },
+      sendBackClick() {
+        this.formInline.flag = '1'
+        this.handleOk()
+      },
       flagChange(event) {
         if (event.target.value == 3) {
           this.isTrue = true

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

@@ -181,6 +181,7 @@
         window.open(newUrl.href, '_blank')
       },
       batchProcessingForm() {
+        this.selectedRowKeys = []
         this.getList()
       },
       batchProcessingClick() {
@@ -202,10 +203,12 @@
         }
       },
       searchQuery() {
+        this.selectedRowKeys = []
         this.pageNo = 1
         this.getList()
       },
       searchReset() {
+        this.selectedRowKeys = []
         this.pageNo = 1
         this.queryParam = {}
         this.getList()