Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/components/common/knowledgeSelect.vue

 <template>
   <div>
-    <a-select placeholder="输入学科代码名称" :default-active-first-option="false" showSearch 
-    :show-arrow="false" :filter-option="false" @search="onSearch" @change="handleChange" :style="{width: width + 'px'}">
+    <a-select v-model="selected" placeholder="输入学科代码名称" :default-active-first-option="false" showSearch 
+    :show-arrow="false" :filter-option="false" @search="onSearch" @change="handleChange" :style="{width: width + 'px'}" allowClear>
       <a-select-option v-for="item in selectArray" :key="item.key" :value="item.key"> 
         {{ item.title }}
       </a-select-option>
@@ -40,7 +40,8 @@ export default {
     };
   },
   created() {
-    //this.loadValue()
+    if (this.value)
+      this.selected = this.value
   },
   methods: {
     onSearch(value) {
@@ -87,18 +88,28 @@ export default {
         }
       }
       this.$emit("input", this.selected)
+    },
+    reset() {
+      this.selected = undefined
+      this.selectArray = []
+      this.$nextTick(() => {
+        this.$emit('input', undefined)
+        this.$emit('change')
+      })
     }
   },
   watch: {
     value: {
       handler (value) {
-        if (!!!value) {
-          this.selected = null
-        }
-        else
+        if (!value) {
+          this.selected = undefined
+          this.selectArray = []
+        } else {
           this.selected = value + ''
+        }
         this.$emit("input", this.selected)
       },
+      immediate: true
     },
   }
 };

src/views/expert/components/expertImport.vue

@@ -42,14 +42,13 @@ export default {
       columns: [
         { title: "姓名", dataIndex: "personName", align: 'center' },
         { title: "证件号", dataIndex: "certId", align: 'center' },
-        // { title: "性别", dataIndex: "sex" },
-        // { title: "出生日期", dataIndex: 'birthday' },
         { title: "手机号", dataIndex: "mobile", align: 'center' },
         { title: "邮箱", dataIndex: "email", align: 'center' },
         { title: "职称", dataIndex: "titleName", align: 'center' },
         { title: "学历", dataIndex: "educationName", align: 'center' },
         { title: "专业", dataIndex: "specName", align: 'center' },
         { title: '工作单位', dataIndex: 'unitName', align: 'center' },
+        { title: '是否财务专家', dataIndex: 'isFinance', align: 'center' },
         { title: '验证结果', scopedSlots: { customRender: 'msg' }, align: 'center' },
       ],
       tableData: [],
@@ -102,6 +101,9 @@ export default {
           if (!!!e.工作单位) {
             msg += ';工作单位不能为空！'
           }
+          if (!!!e.是否财务专家) {
+            msg += ';是否财务专家不能为空！'
+          }
           if (!!msg) {
             this.errorState = true
           }
@@ -111,7 +113,7 @@ export default {
             birthday = personBirthday(certId) + ' 00:00:00'
           }
 
-          let expert = { personName: e.姓名, certId: certId, sex: gender, birthday: birthday, mobile: e.手机号, email: e.邮箱, specName: e.专业, educationName: e.学历, titleName: e.职称, unitName: e.工作单位, msg: msg }
+          let expert = { personName: e.姓名, certId: certId, sex: gender, birthday: birthday, mobile: e.手机号, email: e.邮箱, specName: e.专业, educationName: e.学历, titleName: e.职称, unitName: e.工作单位, isFinance: e.是否财务专家 === '是' ? 1 : 0, msg: msg }
           exportList.push(expert)
           certList.push(e.证件号)
           mobileList.push(e.手机号)

src/views/expert/components/projectSelectIntoGroup.vue

+ 
\ No newline at end of file

src/views/peAssign/components/projectSelectIntoGroup.vue

@@ -8,10 +8,8 @@
         <a-input placeholder="申请编号" v-model="searchForm.appNo" :maxLength="100" style="width: 120px" />
       </a-form-item>
       <a-form-item>
-        <!-- <para-multi-select v-model="searchForm.knowledgeId" @parentChange="parChange" :typeId="57" :width="120" /> -->
-        <knowledge-select v-model="searchForm.knowledgeId"></knowledge-select>
+        <knowledge-select ref="knowledgeSelectRef" v-model="searchForm.knowledgeId"></knowledge-select>
       </a-form-item>
-      <!-- <br /> -->
       <a-form-item>
         <a-input v-model="searchForm.certId" placeholder="申报人证件号" :maxLength="100" style="width: 160px" />
       </a-form-item>
@@ -94,7 +92,6 @@ export default {
     getListByPage () {
       this.loading = true
       this.searchForm.knowledgeCode = this.searchForm.knowledgeId
-      this.searchForm.knowledgeId = null
       let pars = isEmptyParams(this.searchForm)
       let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize }
       this.$api.projectAssign.getUnAssignProjectListByPage(par).then(({ data = {} }) => {
@@ -116,7 +113,15 @@ export default {
     reset () {
       this.searchForm.projName = ''
       this.searchForm.appNo = ''
-      this.searchForm.knowledgeId = ''
+      this.searchForm.knowledgeId = undefined
+      this.searchForm.certId = ''
+      this.searchForm.appPersonName = ''
+      this.searchForm.appUnitName = ''
+      
+      if (this.$refs.knowledgeSelectRef) {
+        this.$refs.knowledgeSelectRef.reset()
+      }
+      
       this.pagination.pageIndex = 1
       this.getListByPage()
     },