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

src/views/expert/components/expertEdit.vue

@@ -64,6 +64,26 @@
             </a-form-model-item>
           </a-col>
         </a-row>
+        <a-row>
+          <a-col :span="4" class="bg-gray">
+            <div class="required">学历</div>
+          </a-col>
+          <a-col :span="20">
+            <a-form-model-item ref="education" prop="education">
+              <para-select v-model="formData.education" :typeId="8" :width="180" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <!-- <a-row>
+          <a-col :span="4" class="bg-gray">
+            <div class="required">学位</div>
+          </a-col>
+          <a-col :span="20">
+            <a-form-model-item prop="degree">
+              <para-select v-model="formData.degree" :width="180" :typeId="9" />
+            </a-form-model-item>
+          </a-col>
+        </a-row> -->
         <a-row type="flex">
           <a-col :span="4" class="bg-gray">
             <div class="special-middle">
@@ -125,7 +145,7 @@ export default {
     return {
       loading: true,
       isShow: false,
-      formData: { id: null, personName: null, sex: '', birthday: null, certId: null, mobile: null, remark: null, email: null, title: null, specList: [], treeCode: null },
+      formData: { id: null, personName: null, sex: '', birthday: null, certId: null, mobile: null, remark: null, email: null, education: null, degree: null, title: null, specList: [], treeCode: null },
       rules: {
         certId: [
           { required: true, message: '请输入证件号', trigger: 'blur' },
@@ -162,6 +182,8 @@ export default {
         ],
         personName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         workUnit: [{ required: false, message: '请输入工作单位', trigger: 'blur' }],
+        education: [{ required: true, message: '请选择学历', trigger: 'change' }],
+        // degree: [{ required: true, message: '请选择学位', trigger: 'change' }],
         sex: [{ required: true, message: '请选择性别', trigger: 'change' }],
         title: [{ required: true, message: '请选择职称', trigger: 'change' }],
         treeCode: [{ required: false, message: '请选择单位', trigger: 'change' }],

src/views/expert/components/expertImport.vue

@@ -22,7 +22,7 @@
         </a-table>
       </div>
       <div style="text-align:center;width:100%; height: 36px;">
-        <a :href="url" download="expertTemplate.xlsx" style="margin-right: 30px;">
+        <a :href="'/downloadFile/expertTemplate.xlsx'" download="expertTemplate.xlsx" style="margin-right: 30px;">
           <a-icon type="download"></a-icon>&nbsp;<span style="color:green;text-decoration:underline;">模板下载</span>
         </a>
         <a-button type="primary" @click="dataImport" :disabled="disabled">导入</a-button>
@@ -47,6 +47,7 @@ export default {
         { 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: '验证结果', scopedSlots: { customRender: 'msg' }, align: 'center' },
@@ -55,9 +56,6 @@ export default {
       disabled: true,
       errorState: false,
       loading: false,
-      url: {
-        downloadUrl: '/downloadFile/expertTemplate.xlsx',
-      }
     };
   },
   created () {
@@ -95,6 +93,9 @@ export default {
           if (!!!e.专业) {
             msg += ';专业不能为空！'
           }
+          if (!!!e.学历) {
+            msg += ';学历不能为空！'
+          }
           if (!!!e.职称) {
             msg += ';职称不能为空！'
           }
@@ -110,7 +111,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.专业, 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.工作单位, msg: msg }
           exportList.push(expert)
           certList.push(e.证件号)
           mobileList.push(e.手机号)

src/views/expert/components/expertView.vue

@@ -29,6 +29,20 @@
           {{expertInfo.titleName}}
         </a-col>
       </a-row>
+      <a-row>
+        <a-col :span="4" class="bg-gray">
+          学历：
+        </a-col>
+        <a-col :span="20">
+          {{expertInfo.educationName}}
+        </a-col>
+        <!-- <a-col :span="4" class="bg-gray">
+          学位：
+        </a-col>
+        <a-col :span="8">
+          {{expertInfo.degreeName}}
+        </a-col> -->
+      </a-row>
       <a-row>
         <a-col :span="4" class="bg-gray">
           联系电话：

src/views/expert/index.vue

@@ -31,7 +31,7 @@
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <div class="submit-btn">
       <a-button type="primary" @click="addExpert">添加</a-button>
-      <a-button type="primary" @click="importExcel" v-if="isTopGov">导入</a-button>
+      <a-button type="primary" @click="importExcel">导入</a-button>
       <a-button type="primary" @click="exporExcel">导出excel</a-button>
     </div>
     <a-table :dataSource="tableData" :columns="columns" rowKey="id" :pagination="false" :loading="loading">
@@ -266,7 +266,7 @@ export default {
       let self = this
       this.$confirm({
         title: '管理员删除',
-        content: '确定要删除该管理员？',
+        content: '确定要删除？',
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',

src/views/report/project/components/edit/projectCreate.vue

@@ -43,10 +43,6 @@ export default {
         { status: "wait", title: '绩效指标', showStatus: false },
         { status: "wait", title: '附件', showStatus: false }
       ],
-      stepStyle: {
-        marginBottom: '60px',
-        boxShadow: '0px -1px 0 0 #e8e8e8 inset',
-      },
       completeStatus: "0,0,0,0,0,0"
     }
   },