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

jero-web/src/views/projectManagement/components/certificationList/components/addConfiguration.vue

@@ -29,6 +29,8 @@
 </template>
 
 <script>
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+
   export default {
     name: 'addConfiguration',
     data() {
@@ -65,7 +67,22 @@
       handleOk() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-
+            let query = {
+              ids: this.ids.join(','),
+              configItem: this.formInline.configItem
+            }
+            this.confirmLoading = true
+            postAction('/project/projectCertificationInventoryEO/addConfigByIds', query).then((res) => {
+              if (res.success) {
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.confirmLoading = false
+                this.visible = false
+                this.$emit('addConfigurationForm')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
           }
         })
       },

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

@@ -11,9 +11,9 @@
       style="height: 100%;overflow: auto;margin-bottom: 436px;">
 
       <JLoading :loading="loading">{{textLoading}}</JLoading>
-      <a-button style="float: right" @click="referenceDeliverablesClick"
+<!--      <a-button style="float: right" @click="referenceDeliverablesClick"-->
-                v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
+<!--                v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"-->
-                type="primary">{{$t('referenceDeliverables')}}</a-button>
+<!--                type="primary">{{$t('referenceDeliverables')}}</a-button>-->
       <projectInformation
         v-if="isDisplay"
         :title="$t('basicInformation')"