1.修改三期优化点

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

@@ -37,8 +37,29 @@
         </div>
 
         <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24" v-if="whetherDisplay">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('standardDecompositionDocument')">{{$t('standardDecompositionDocument')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="whetherTobring">
+                  <a-radio-group class="box-input"
+                                 v-model="formInline.whetherTobring" @change="onChange">
+                    <a-radio :value="'1'">
+                      {{$t('yes')}}
+                    </a-radio>
+                    <a-radio :value="'2'">
+                      {{$t('notOnlyRz')}}
+                    </a-radio>
+                  </a-radio-group>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
           <a-row :gutter="24" style="margin-bottom: 10px">
-            <a-col :span="24">
+            <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('selectedStandard')">{{$t('selectedStandard')}}</span>
@@ -58,7 +79,7 @@
             </a-col>
           </a-row>
           <a-row :gutter="24">
-            <a-col :span="12">
+            <a-col :span="6">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
@@ -76,7 +97,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
+            <a-col :span="6">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="title-text-text"
@@ -234,6 +255,13 @@
               trigger: 'change'
             }
           ],
+          whetherTobring: [
+            {
+              required: true,
+              message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           evaluatorsName: [
             {
               required: true,
@@ -312,9 +340,13 @@
       document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
       this.getEvaluationMethodTree()
       if (this.$route.query.whetherTobring == '1') {
+        this.formInline.whetherTobring = '1'
+        this.formInline = {...this.formInline}
         this.isTrue = true
       } else {
         this.isTrue = false
+        this.formInline.whetherTobring = '2'
+        this.formInline = {...this.formInline}
       }
       if (this.$route.query.firstInitiation == '1') {
         this.whetherDisplay = true
@@ -400,7 +432,7 @@
         }
         this.loading = true
         let url = ''
-        if (this.$route.query.whetherTobring == '1') {
+        if (this.isTrue) {
           url = this.url.addModelListOne
         } else {
           url = this.url.addModelList
@@ -601,6 +633,9 @@
             this.$message.warning(this.$t('operationFailed'))
           }
         })
+      },
+      onChange(event) {
+        this.isTrue = event.target.value == '1' ? true : false
       }
     }
   }
@@ -634,7 +669,7 @@
   }
 
   .title-text {
-    width: 88px;
+    width: 118px;
     text-align: right;
     display: inline-block;
     font-weight: 500;
@@ -676,7 +711,7 @@
 
   .button-text {
     height: 38px;
-    width: calc(100% - 100px);
+    width: calc(100%);
     line-height: 38px;
     background: #fff;
     border: 1px #00B3BE solid;

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

@@ -428,24 +428,26 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             this.visible = false
-            this.formInline.firstInitiation = '1'
+
-            let newUrl = this.$router.resolve({
-              path: '/evaluationInitiationProcess',
-              query: this.formInline
-            })
-            // let newUrl = this.$router.resolve({
-            //   path: '/evaluationProcess'
-            // })
-            window.open(newUrl.href, '_blank')
           }
         })
       },
       initiatingProcessClick() {
-        this.visible = true
+        // this.visible = true
-        this.formInline = {}
+        // this.formInline = {}
-        this.$nextTick(() => {
+        // this.$nextTick(() => {
-          this.$refs.ruleForm.clearValidate()
+        //   this.$refs.ruleForm.clearValidate()
+        // })
+        this.formInline.firstInitiation = '1'
+        this.formInline.whetherTobring = '1'
+        let newUrl = this.$router.resolve({
+          path: '/evaluationInitiationProcess',
+          query: this.formInline
         })
+        // let newUrl = this.$router.resolve({
+        //   path: '/evaluationProcess'
+        // })
+        window.open(newUrl.href, '_blank')
       },
       viewProcessClick(row) {
         this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row)))