1

src/views/report/talent/components/talentEdit.vue

@@ -153,7 +153,7 @@
             <div class="special-middle">
               <div>
                 <a-form-model-item prop="profession">
-                  <cascader-select v-model="formData.profession" :typeId="69"/>
+                  <cascader-select v-model="formData.profession" :typeId="69" />
                 </a-form-model-item>
               </div>
             </div>
@@ -252,7 +252,7 @@
                 <a-form-model-item prop="honoraryTitle">
                   <a-textarea placeholder="荣誉称号(限1000字)" v-model="formData.honoraryTitle" :maxLength="1000" style="width: 80%; height: 160px; margin-top: 12px" />
                 </a-form-model-item>
-                <span style="color: red;margin-left: 8px;">注：若无相关荣誉称号或职称，请填无</span>
+                <span style="color: red;margin-left: 8px;">注：若无相关荣誉称号请填无</span>
               </div>
             </div>
           </a-col>
@@ -269,7 +269,7 @@
                 <a-form-model-item prop="holdPost1">
                   <a-textarea placeholder="任职情况(限1000字)" v-model="formData.holdPost1" :maxLength="1000" style="width: 80%; height: 160px; margin-top: 12px" />
                 </a-form-model-item>
-                <span style="color: red;margin-left: 8px;">注：若无相关荣誉称号或职称，请填无</span>
+                <span style="color: red;margin-left: 8px;">注：若无相关职称，请填无</span>
               </div>
             </div>
           </a-col>

src/views/report/talent/components/talentInfo.vue

@@ -32,7 +32,7 @@
               {{ value.talentCategoryName }}
             </div>
           </div>
-        </a-col>  
+        </a-col>
       </a-row>
       <a-row type="flex">
         <a-col :span="3" class="bg-gray">
@@ -193,7 +193,12 @@
         <a-col :span="21">
           <div class="special-middle">
             <div>
-              <para-check v-model="value.talentType" :typeId="16" :disabled="true" />
+              <div v-if="value.isProvincialTalent!=null">
+                <span v-if="value.isProvincialTalent==1">是</span><span v-else>否</span>
+                <div v-if="value.isProvincialTalent==1">
+                  <para-check v-model="value.talentType" :typeId="16" :disabled="true" />
+                </div>
+              </div>
             </div>
           </div>
         </a-col>
@@ -311,11 +316,11 @@
     <div v-if="tabsData[3].isShow">
       <scientific-gain-info :scientificList.sync="value.scientificList" />
       <a-row>
-          <a-col :span="24" style="border-top: 0px; text-align: center">
-            <div class="main-title">
-              <span>科学研究规划</span>
-            </div>
-          </a-col>
+        <a-col :span="24" style="border-top: 0px; text-align: center">
+          <div class="main-title">
+            <span>科学研究规划</span>
+          </div>
+        </a-col>
       </a-row>
       <a-row type="flex" class="row_center">
         <a-col :span="24" class="bg-gray">
@@ -487,7 +492,7 @@ export default {
       }
     },
   },
-  data() {
+  data () {
     return {
       talentTraningInfo: {
         HTTalent: null,
@@ -529,7 +534,7 @@ export default {
         }
       })
     },
-    processBudgetType() {
+    processBudgetType () {
       if (this.value.talentCategory === this.talentTraningInfo.HTTalent) {
         this.budgetType = { type: 'HTTalent', trainingYear: this.talentTraningInfo.HTTrainingYear, EveryYearFee: this.talentTraningInfo.HTEveryYearFee }
       } else if (this.formData.talentCategory === this.talentTraningInfo.ALTalent) {