444

src/api/index.js

@@ -853,11 +853,11 @@ export default {
         getKnowledgeInfoList1 () {
             return fetch(`/v1/science-admin/system-parameter/getKnowledgeInfoList1`)
         },
-        getKnowledgeInfoList2 () {
-            return fetch(`/v1/science-admin/system-parameter/getKnowledgeInfoList2`)
+        getKnowledgeInfoList2 (params) {
+            return fetch(`/v1/science-admin/system-parameter/getKnowledgeInfoList2`, params)
         },
-        getSpecArray () {
-            return fetch(`/v1/science-admin/system-parameter/getSpecArray`)
+        getSpecArray (params) {
+            return fetch(`/v1/science-admin/system-parameter/getSpecArray`, params)
         },
     },
     parameterType: {

src/views/basicSetting/person/components/infoEdit.vue

@@ -37,7 +37,7 @@
         </a-col>
         <a-col :span="20">
           <a-form-model-item prop="spec">
-            <cascader-select v-model="formData.spec" />
+            <cascader-select v-model="formData.spec" :typeId="68" />
           </a-form-model-item>
         </a-col>
       </a-row>

src/views/components/common/cascaderSelect.vue

@@ -26,16 +26,21 @@ export default {
         return false
       }
     },
+    typeId: {
+      type: Number,
+      default () {
+        return null
+      }
+    },
   },
   created () {
     this.loadSpecList()
-    //this.selected = getSpecArray(this.value)
-    // this.$emit("change");
-    // this.$emit("input", this.selected)
   },
   methods: {
     loadSpecList () {
-      this.$api.parameter.getKnowledgeInfoList2().then(({ data = {} }) => {
+      console.log(this.typeId)
+      let pars = { typeId: this.typeId }
+      this.$api.parameter.getKnowledgeInfoList2(pars).then(({ data = {} }) => {
         if (data) {
           this.options = data
           this.loadSpecArray()
@@ -44,7 +49,8 @@ export default {
       })
     },
     loadSpecArray () {
-      this.$api.parameter.getSpecArray().then(({ data = {} }) => {
+      let pars = { typeId: this.typeId }
+      this.$api.parameter.getSpecArray(pars).then(({ data = {} }) => {
         if (data) {
           this.specArray = data
           if (!!this.value)
@@ -53,13 +59,11 @@ export default {
       })
     },
     getSpecInfo (key) {
-      //console.log(this.specArray, this.value,1)
       let newArray = this.specArray.filter(
         function (el) {
           return el.key == key
         }
       );
-      //console.log(this.specArray, newArray, this.value,2)
       if (!!newArray && newArray.length > 0)
         return [newArray[0].ppkey, newArray[0].pkey, newArray[0].key]
       else
@@ -86,11 +90,6 @@ export default {
       handler (value) {
         if (!!value) {
           this.loadSpecList()
-          // this.selected = getSpecArray(this.value)
-          // if (!!this.selected && this.selected.length == 3) {
-          //   this.$emit("input", this.selected[2])
-          //   this.$emit("change");
-          // }
         }
       },
     },

src/views/expert/components/specSelect.vue

@@ -5,7 +5,7 @@
         <div class="special-middle">
           <div>
             <a-form-model-item :prop="'specList.' + index + '.specId'" :rules="{ required: true, message: '*', trigger: 'change',}">
-              <cascader-select v-model="item.specId" />
+              <cascader-select v-model="item.specId"  :typeId="68"/>
             </a-form-model-item>
           </div>
         </div>

src/views/expert/evaluationStatistic.vue

@@ -21,7 +21,7 @@
         </a-select>
       </a-form-item>
       <a-form-item>
-        <cascader-select v-model="searchForm.specParentId" :changeOnSelect="true" />
+        <cascader-select v-model="searchForm.specParentId" :changeOnSelect="true" :typeId="68"/>
       </a-form-item>
       <a-form-item>
         <para-multi-select v-model="searchForm.title" @parentChange="titleChange" :title="'职称'" :objType="'project'" :typeId="7" :width="150" />

src/views/expert/index.vue

@@ -21,7 +21,7 @@
         <a-input v-model="searchForm.username" placeholder="用户名" :maxLength="100" style="width: 130px" />
       </a-form-item>
       <a-form-item>
-        <cascader-select v-model="searchForm.specParentId" :changeOnSelect="true" />
+        <cascader-select v-model="searchForm.specParentId" :changeOnSelect="true" :typeId="68"/>
       </a-form-item>
       <a-form-item>
         <para-multi-select v-model="searchForm.title" @parentChange="titleChange" :title="'职称'" :objType="'project'" :typeId="7" :width="150" />

src/views/manager/person/components/personEdit.vue

@@ -78,7 +78,7 @@
           </a-col>
           <a-col :span="20">
             <a-form-model-item ref="spec" prop="spec">
-              <cascader-select v-model="formData.spec" />
+              <cascader-select v-model="formData.spec" :typeId="68"/>
             </a-form-model-item>
           </a-col>
         </a-row>

src/views/peAssign/components/projectSelectIntoGroup.vue

@@ -8,7 +8,7 @@
         <a-input placeholder="申请编号" v-model="searchForm.appNo" :maxLength="100" style="width: 120px" />
       </a-form-item>
       <a-form-item>
-        <cascader-select v-model="searchForm.knowledgeId" :changeOnSelect="true"/>
+        <cascader-select v-model="searchForm.knowledgeId" :changeOnSelect="true" :typeId="68"/>
       </a-form-item>
       <a-form-item>
         <a-select default-value="" placeholder="项目类别" v-model="searchForm.projClass" style="width: 160px">

src/views/person/components/personEdit.vue

@@ -59,7 +59,7 @@
           </a-col>
           <a-col :span="20">
             <a-form-model-item ref="spec" prop="spec" >
-              <cascader-select v-model="formData.spec" />
+              <cascader-select v-model="formData.spec" :typeId="68"/>
             </a-form-model-item>
           </a-col>
         </a-row>

src/views/report/project/components/keyProject/projectEdit.vue

@@ -596,7 +596,7 @@
         </a-col>
         <a-col :span="20">
           <a-form-model-item prop="knowledgeId">
-            <cascader-select v-model="item.spec" />
+            <cascader-select v-model="item.spec" :typeId="68"/>
           </a-form-model-item>
         </a-col>
       </a-row>

src/views/report/project/components/projectEdit.vue

@@ -312,7 +312,7 @@
           </a-col>
           <a-col :span="20">
             <a-form-model-item prop="knowledgeId">
-              <cascader-select v-model="formData.knowledgeId" />
+              <cascader-select v-model="formData.knowledgeId" :typeId="68"/>
             </a-form-model-item>
           </a-col>
         </a-row>

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

@@ -75,7 +75,7 @@
       </a-col>
       <a-col :span="3">
         <a-form-model-item :prop="'membersList.' + index + '.spec'" :rules="{ required: true, message: '*', trigger: 'change',}">
-          <cascader-select v-model="item.spec" />
+          <cascader-select v-model="item.spec" :typeId="69"/>
         </a-form-model-item>
       </a-col>
       <a-col :span="5">

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

@@ -153,7 +153,7 @@
             <div class="special-middle">
               <div>
                 <a-form-model-item prop="spec">
-                  <cascader-select v-model="formData.spec" />
+                  <cascader-select v-model="formData.spec" :typeId="69"/>
                 </a-form-model-item>
               </div>
             </div>
@@ -217,6 +217,7 @@
             </div>
           </a-col>
         </a-row>
+
         <a-row type="flex">
           <a-col :span="3" class="bg-gray">
             <div class="special-middle">
@@ -226,7 +227,13 @@
           <a-col :span="21">
             <div class="special-middle">
               <div>
-                <a-form-model-item prop="talentType">
+                <a-form-model-item prop="isProvincialTalent">
+                  <a-radio-group v-model="formData.isProvincialTalent">
+                    <a-radio :value="1">是</a-radio>
+                    <a-radio :value="0">否</a-radio>
+                  </a-radio-group>
+                </a-form-model-item>
+                <a-form-model-item prop="talentType" v-if="formData.isProvincialTalent!=null&&formData.isProvincialTalent==1">
                   <para-check v-model="formData.talentType" :typeId="talentTypeId" :key="'talent-type-' + talentTypeId" :disabled="false" />
                 </a-form-model-item>
               </div>
@@ -245,6 +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>
               </div>
             </div>
           </a-col>
@@ -261,6 +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>
               </div>
             </div>
           </a-col>
@@ -319,7 +328,7 @@
             </div>
           </a-col>
           <a-col :span="4" class="bg-gray">
-            <div class="required">传真</div>
+            <div>传真</div>
           </a-col>
           <a-col :span="8">
             <div class="special-middle">
@@ -623,7 +632,7 @@ export default {
         holdPost2: [{ required: true, message: '*', trigger: 'blur' },],
         holdPost3: [{ required: true, message: '*', trigger: 'blur' },],
         mobile: [{ required: true, message: '*', trigger: 'blur' }],
-        fax: [{ required: true, message: '*', trigger: 'blur' }],
+        fax: [{ required: false, message: '*', trigger: 'blur' }],
         email: [{ required: true, message: '*', trigger: 'blur' }],
         applyFund: [{ required: true, message: '*', trigger: 'change' }],
         otherFund: [{ required: true, message: '*', trigger: 'change' }],
@@ -636,6 +645,7 @@ export default {
     };
   },
   created () {
+    this.getTalentTraningInfo()
     this.getTalentInfo()
   },
   methods: {
@@ -892,6 +902,7 @@ export default {
       this.talentCategoryHolder(null)
     },
     talentCategoryHolder (talentType) {
+      console.log(this.formData.talentCategory, this.talentTraningInfo.HTTalent)
       if (this.formData.talentCategory === this.talentTraningInfo.HTTalent ||
         this.formData.talentCategory === this.talentTraningInfo.RTTalent) {
         this.talentTypeId = 23