对接法规意见收集

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue

@@ -107,6 +107,7 @@
         />
       </div>
     </div>
+    <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </div>
 </template>
@@ -140,6 +141,7 @@
           addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy'
         },
         loading: false,
+        JLoading:false,
         dataSource: [],
         selectedRowKeys: [],
         total: 0,
@@ -308,6 +310,7 @@
             if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
               this.$message.warning(this.$t('pleaseSelectStandard'))
             } else {
+              this.JLoading = true
               let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
               value.standId = value.id
               delete value.id
@@ -332,6 +335,8 @@
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
             this.completeTask(value, res.result)
+          }else{
+            this.JLoading = false
           }
         })
       },
@@ -349,12 +354,12 @@
             //   window.close()
             // }, 1000)
             this.$message.success(this.$t('OperationSuccessful'))
-            this.loading = false
+            this.JLoading = false
             this.$router.push({
               path: '/collectionOfRegulatoryOpinions'
             })
           } else {
-            this.loading = false
+            this.JLoading = false
             this.$message.warning(this.$t('operationFailed'))
           }
         })

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -136,7 +136,7 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'technologyTerritory'
+            dataIndex: 'technologyTerritoryShow'
           },
           {
             title: this.$t('collectResults'),