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

src/views/expert/index.vue

@@ -7,19 +7,22 @@
       <a-form-item>
         <a-input v-model="searchForm.certId" placeholder="证件号" :maxLength="100" style="width: 150px" />
       </a-form-item>
-      <a-form-item>
+      <!-- <a-form-item>
         <a-select v-model="searchForm.sex" style="width: 100px">
           <a-select-option value="">--性别--</a-select-option>
           <a-select-option value="男">男</a-select-option>
           <a-select-option value="女">女</a-select-option>
         </a-select>
-      </a-form-item>
+      </a-form-item>  -->
       <a-form-item v-if="isTopGov">
         <a-input v-model="searchForm.unitName" placeholder="单位" :maxLength="100" style="width: 130px" />
       </a-form-item>
       <a-form-item>
         <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" />
+      </a-form-item>
       <a-form-item>
         <para-multi-select v-model="searchForm.title" @parentChange="titleChange" :title="'职称'" :objType="'project'" :typeId="7" :width="150" />
       </a-form-item>
@@ -74,10 +77,11 @@ import moment from 'moment';
 import expertView from './components/expertView'
 import expertEdit from './components/expertEdit';
 import expertImport from './components/expertImport';
+import cascaderSelect from '@/views/components/common/cascaderSelect'
 
 export default {
   name: 'expertManager',
-  components: { expertView, expertEdit, expertImport },
+  components: { expertView, expertEdit, expertImport, cascaderSelect },
   data () {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
@@ -92,7 +96,6 @@ export default {
         { title: '单位', dataIndex: 'unitName', align: 'center' },
         { title: '用户名', dataIndex: 'username', align: 'center' },
         { title: '密码', dataIndex: 'password', align: 'center' },
-        { title: '状态', scopedSlots: { customRender: 'stateSwitch' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: '180px', },
       ],
       excelCol: [
@@ -121,6 +124,7 @@ export default {
     if (user && user.roles) {
       if (user.roles.indexOf("0") != -1) {
         this.isTopGov = true
+        this.columns.splice(8, 0, { title: '状态', scopedSlots: { customRender: 'stateSwitch' }, align: 'center' },)
       }
       else {
         this.columns.splice(8, 0, { title: '上报状态', scopedSlots: { customRender: 'reportState' }, align: 'center' })