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

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

@@ -1317,4 +1317,5 @@ module.exports = {
   viewAll:'View All',
   endProcess:'End Process',
   thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data',
+  secondaryDirectory:'Secondary directory',
 }

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

@@ -1418,4 +1418,5 @@ module.exports = {
   viewAll:'查看全部',
   endProcess:'结束流程',
   thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单',
+  secondaryDirectory:'二级目录',
 }

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue

@@ -144,7 +144,7 @@
             width: 170
           },
           {
-            title: this.$t('chapterContents'),
+            title: this.$t('secondaryDirectory'),
             align: 'center',
             dataIndex: 'memoriesChapterName',
             ellipsis: true,

jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue

@@ -4,8 +4,9 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('title')">{{$t('title')}}</span>
+            <span class="Required" v-if="!disabled">*</span>
+            <span class="title-text-text"
+                  :title="$t('title')">{{$t('title')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="titleCn">
             <a-input class="box-input"
@@ -18,8 +19,9 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
+            <span class="Required" v-if="!disabled">*</span>
+            <span class="title-text-text"
+                  :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="titleEn">
             <a-input class="box-input"
@@ -34,10 +36,11 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('technicalField')">{{$t('technicalField')}}</span>
+            <span class="Required" v-if="!disabled">*</span>
+            <span class="title-text-text"
+                  :title="$t('technicalField')">{{$t('technicalField')}}</span>
           </div>
-          <a-form-model-item class="itemModel-multi" prop="technologyTerritory">
+          <a-form-model-item class="itemModel" prop="technologyTerritory">
             <a-tree-select
               tree-node-filter-prop="title"
               v-model="formInline.technologyTerritory"
@@ -53,20 +56,20 @@
           </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="$t('implementationModel')">{{$t('implementationModel')}}</span>
-          </div>
-          <a-form-model-item class="itemModel" prop="implementCar">
-            <a-input class="box-input"
-                     :disabled="disabled"
-                     v-model.trim="formInline.implementCar"
-                     :placeholder="$t('PleaseEnter')+$t('implementationModel')"/>
-          </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="$t('implementationModel')">{{$t('implementationModel')}}</span>-->
+<!--          </div>-->
+<!--          <a-form-model-item class="itemModel" prop="implementCar">-->
+<!--            <a-input class="box-input"-->
+<!--                     :disabled="disabled"-->
+<!--                     v-model.trim="formInline.implementCar"-->
+<!--                     :placeholder="$t('PleaseEnter')+$t('implementationModel')"/>-->
+<!--          </a-form-model-item>-->
+<!--        </div>-->
+<!--      </a-col>-->
       <!--      <a-col :span="12">-->
       <!--        <div class="box-title-text">-->
       <!--          <div class="title-text">-->
@@ -108,10 +111,10 @@
                     :title="$t('status')">{{$t('status')}}</span>
           </div>
           <a-form-model-item class="itemModel-multi itemModel-multi-one">
-            <j-multi-select-tag class="box-input" v-model="formInline.state"
+            <j-dict-select-tag class="box-input" v-model="formInline.state"
                                 :disabled="disabled"
                                 :placeholder="$t('PleaseSelect')+$t('status')"
-                                :type="'checkbox'"
+                                :type="'radio'"
                                 :triggerChange="false" :dictCode="'state'"/>
           </a-form-model-item>
         </div>
@@ -125,9 +128,9 @@
                     :title="$t('usage')">{{$t('usage')}}</span>
           </div>
           <a-form-model-item class="itemModel-multi itemModel-multi-one">
-            <j-multi-select-tag class="box-input" v-model="formInline.useMethod"
+            <j-dict-select-tag class="box-input" v-model="formInline.useMethod"
                                 :placeholder="$t('PleaseSelect')+$t('usage')"
-                                :type="'checkbox'"
+                                :type="'radio'"
                                 :disabled="disabled"
                                 :triggerChange="false" :dictCode="'yong4_fa3'"/>
           </a-form-model-item>
@@ -156,10 +159,11 @@
                       :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="newCarImplementTime">
+<!--            :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"-->
             <a-input class="box-input"
                      :disabled="disabled"
                      v-model.trim="formInline.newCarImplementTime"
-                     :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"/>
+                     :placeholder="'202X.X.X'"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -170,10 +174,11 @@
                       :title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="productionCarImplementTime">
+<!--            $t('PleaseEnter')+$t('vehicleInProductionDate')-->
             <a-input class="box-input"
                      :disabled="disabled"
                      v-model.trim="formInline.productionCarImplementTime"
-                     :placeholder="$t('PleaseEnter')+$t('vehicleInProductionDate')"/>
+                     :placeholder="'202X.X.X'"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -185,6 +190,7 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="contentCn">
@@ -200,6 +206,7 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="contentEn">
@@ -245,9 +252,10 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('regulatoryContact')">{{$t('regulatoryContact')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="lawsContactName">
             <PersonnelSelection
               :query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
               :personneQuery="formInline"
@@ -290,7 +298,19 @@
     data() {
       return {
         rules: {
+          lawsContactName:[
+            {
+              required: true,
+              message: this.$t('regulatoryContact') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           titleCn: [
+            {
+              required: true,
+              message: this.$t('title') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 500,
               message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -298,6 +318,11 @@
             }
           ],
           titleEn: [
+            {
+              required: true,
+              message: this.$t('englishTitle') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 500,
               message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -354,6 +379,11 @@
             }
           ],
           contentEn: [
+            {
+              required: true,
+              message: this.$t('primaryCoverageEn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
@@ -361,11 +391,23 @@
             }
           ],
           contentCn: [
+            {
+              required: true,
+              message: this.$t('primaryCoverageCn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
               trigger: 'blur'
             }
+          ],
+          technologyTerritory: [
+            {
+              required: true,
+              message: this.$t('technicalField') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
           ]
         },
         formInline: {},

jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue

@@ -4,6 +4,7 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
               <span class="title-text-text"
                     :title="$t('title')">{{$t('title')}}</span>
           </div>
@@ -18,6 +19,7 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
               <span class="title-text-text"
                     :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
           </div>
@@ -110,6 +112,7 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="contentCn">
@@ -125,6 +128,7 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="contentEn">
@@ -165,6 +169,11 @@
       return {
         rules: {
           titleCn: [
+            {
+              required: true,
+              message: this.$t('title') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 500,
               message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -172,6 +181,11 @@
             }
           ],
           titleEn: [
+            {
+              required: true,
+              message: this.$t('englishTitle') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 500,
               message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -221,6 +235,11 @@
             }
           ],
           contentEn: [
+            {
+              required: true,
+              message: this.$t('primaryCoverageEn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
@@ -228,6 +247,11 @@
             }
           ],
           contentCn: [
+            {
+              required: true,
+              message: this.$t('primaryCoverageCn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),

jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue

@@ -6,13 +6,14 @@
       :visible="visible"
       :confirm-loading="confirmLoading"
       :maskClosable="false"
+      :footer="null"
       @cancel="visible = false"
     >
-      <template slot="footer">
-        <a-button key="back" @click="visible = false">
-          {{$t('cancel')}}
-        </a-button>
-      </template>
+<!--      <template slot="footer">-->
+<!--        <a-button key="back" @click="visible = false">-->
+<!--          {{$t('cancel')}}-->
+<!--        </a-button>-->
+<!--      </template>-->
       <div style="margin-bottom: 10px;text-align: center">
         <div @click="handleModule" class="operator-text">
           <a-icon type="download"/>