合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!56

jero-web/src/views/parameter/parameterlist/index.vue

@@ -102,6 +102,7 @@
       />
     </div>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList" :certCategoryParamsInfoEOListItem='certCategoryParamsInfoEOList'/>
+    <JLoading :loading="textLoading">{{$t('pleaseWaitWhileRunning')}}</JLoading>
   </a-card>
 </template>
 
@@ -122,6 +123,7 @@ export default {
     return {
       certCategoryParamsInfoEOList: [],
       orderBy: '1',
+      textLoading:false,
       selectedRowKeysArray: '',
       token:Vue.ls.get(ACCESS_TOKEN),
       loading: false,
@@ -235,11 +237,14 @@ export default {
     },
     // 发布版本
     releaseVersion() {
+      this.textLoading = true
       getAction('params/paramsInfo/publish', { paramsTemplateId: this.$route.query.id }).then((res) => {
         if (res.success) {
           this.$message.success(res.result)
+          this.textLoading = false
         } else {
           this.$message.warning(res.message)
+          this.textLoading = false
         }
       })
     },

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -1124,7 +1124,8 @@
         let data = JSON.parse(JSON.stringify(this.dataSource))
         let selectedRowKeysValue = []
         data.forEach(res => {
-          if (res.state == 'Wait Fill' || res.state == '待填写') {
+          if (res.state == 'Wait Fill' || res.state == '待填写' || res.state == '认证工程师退回' ||
+          res.state == 'Cert Back') {
             selectedRowKeysValue.push(res)
           }
         })