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

jero-web/src/common/lang/en-us.js

@@ -1271,7 +1271,7 @@ module.exports = {
   turnOnAutoMatch:'Turn On Auto Match',
   Adjustareasofresponsibility:'Adjust areas of responsibility',
   regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
-  punctuationmark:'You can only enter English punctuation marks except the # sign and commas',
+  punctuationmark:'You can only enter English punctuation marks except the # sign',
   created: 'Time of Creation',
   updated:'Last Updated',
   OpenOne:'Open',
@@ -1839,4 +1839,6 @@ module.exports = {
   toResubmit:'To Resubmit',
   selectDesignConformanceAsConformance:'Select Design Conformance verification process state as Conformance or Verify conformance verification process state as conformance obtained data',
   submissionProcess:'Submission Process',
+  localapproval1:'Local Approval1',
+  localapproval2:'Local Approval2',
 }

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

@@ -1376,7 +1376,7 @@ module.exports = {
   regulatoryTechnicalAssessment: '法规技术评估',
   OpenOne: '公开',
   Privacy: '私密',
-  punctuationmark: '只能输入除#号和逗号外的英文标点符号',
+  punctuationmark: '只能输入除#号外的英文标点符号',
   created: '创建时间',
   updated: '更新时间',
   optionDropDownBox: '下拉选择',
@@ -1940,4 +1940,6 @@ module.exports = {
   toResubmit:'重新提交',
   selectDesignConformanceAsConformance:'请选择设计符合性确认流程状态为符合或验证符合性确认流程状态为符合的数据',
   submissionProcess:'提交流程',
+  localapproval1:'地方批准1',
+  localapproval2:'地方批准2',
 }

jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue

@@ -152,7 +152,7 @@ export default {
           { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' },
           { min:1, max: 1, message: this.$t('onlyone'), trigger: 'blur' },
           {
-            pattern: /^[\`\~\!\@\$\%\^\&\*\(\)\_\+\-\= \[\]\{\}\\\|\;\'\'\:\"\"\\.\/\<\>\?]+$/,
+            pattern: /^[\`\~\!\@\$\%\^\&\*\(\)\_\+\-\= \[\]\{\}\\\|\;\'\'\:\"\"\\.\/\<\>\?\,]+$/,
             message: this.$t('punctuationmark'),
             trigger: 'blur'
           }

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

@@ -92,6 +92,11 @@
         <a-icon type="check-circle"/>
         {{$t('preservation')}}
       </div>
+      <!--      导出-->
+      <div @click="handleExport" class="operator-text" v-has="'report:detail:export:normal'">
+        <a-icon type="export"/>
+        {{$t('dataExport')}}
+      </div>
       <div @click="ConventionalExport" class="operator-text" v-has="'report:detail:export:normal'">
         <a-icon type="export" :rotate="-90"/>
         {{$t('ConventionalExport')}}
@@ -182,7 +187,7 @@
 </template>
 
 <script>
-  import { getAction, postAction } from '../../../api/manage'
+import { downloadFile, getAction, postAction } from '../../../api/manage'
   import axios from 'axios'
   import TableCollection from '@/components/tableCollection/index1'
   import conventionalModel from './commponts/conventionalmodle'
@@ -668,6 +673,27 @@
       listReset() {
         this.formInline = {}
       },
+      //导出
+      handleExport() {
+        this.$message.success(this.$t('Intheexport'))
+        let long = localStorage.getItem('language')
+        this.cut = ''
+        if (long && long === 'zh-cn') {
+          this.cut = 'cn'
+        } else if (long && long === 'en-us') {
+          this.cut = 'en'
+        }
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          paramsTemplateId: this.$route.query.paramsTemplateId,
+          paramsTemplatePublishVersion: 1,
+          cut: this.cut,
+          userTypes: this.currentPersonRole,
+          exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        }
+        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+        downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+      },
       ConventionalExport() {
         this.$refs.conventionalModel.addModel()
       },

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

@@ -47,6 +47,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
+          </a-row>
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -83,6 +85,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
+          </a-row>
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -119,6 +123,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
+          </a-row>
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -137,6 +143,26 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" title="MP">
+                  MP</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="mp">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+'MP'"
+                                 @change="dateChange({db_field_name:'mp'})"
+                                 format="YYYY-MM-DD"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 v-model="formInline.mp"
+                                 :disabled="false"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -155,7 +181,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
-
+          </a-row>
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -194,6 +221,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
+          </a-row>
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -232,6 +261,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
+          </a-row>
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -271,6 +302,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
+          </a-row>
+          <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -311,6 +344,46 @@
               </div>
             </a-col>
           </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('localapproval1')">
+                  {{$t('localapproval1')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="attestationEndTime">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('localapproval1')+$t('time')"
+                               @change="dateChange({db_field_name:'localapproval1'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.localapproval1"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <!--              <span class="Required">*</span>-->
+                <span class="title-text-text" :title="$t('localapproval2')">
+                  {{$t('localapproval2')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="verifyDeadline">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('localapproval2')+$t('time')"
+                               @change="dateChange({db_field_name:'localapproval2'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.localapproval2"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
       </a-form-model>
     </a-spin>
     <div class="drawer-bootom-button">