From 01a447f7739391211fcd219997e39ebc61f77181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Wed, 9 Feb 2022 16:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/ExpertForm/index.vue |  38 +----
 src/views/dataList/expert/add.vue         |  85 +++++++++++
 src/views/dataList/expert/index.vue       | 167 ++++++++++++++++++++++
 src/views/dataList/research/add.vue       |  14 +-
 src/views/dataList/research/index.vue     |   2 +-
 5 files changed, 260 insertions(+), 46 deletions(-)
 create mode 100644 src/views/dataList/expert/add.vue
 create mode 100644 src/views/dataList/expert/index.vue

diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue
index 3eeee79..fd054ad 100644
--- a/src/views/components/ExpertForm/index.vue
+++ b/src/views/components/ExpertForm/index.vue
@@ -14,7 +14,7 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="formType == 3 || formType == 2">
+    <el-row v-if="formType == 2">
       <el-col :span="24">
         <el-form-item :label="nameName" prop="name">
           <el-input
@@ -25,7 +25,7 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="formType == 3 || formType == 2">
+    <el-row v-if="formType == 2">
       <el-col :span="24">
         <el-form-item label="组织机构代码:" prop="code">
           <el-row type="flex" justify="space-between">
@@ -203,7 +203,6 @@
     <FieldOptions v-model="value" :labelWidth="labelWidth" ref="fieldForm" />
 
     <InputBoxAdd
-      v-if="formType == 1 || formType == 2"
       :labelWidth="labelWidth"
       v-model="value"
       title="关键词"
@@ -245,7 +244,7 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="formType == 3 || formType == 2">
+    <el-row v-if="formType == 2">
       <el-col :span="24">
         <el-form-item label="营业执照:" prop="license">
           <ImageUpload v-model="value.license" :isShowTip="false" :limit="1" />
@@ -314,15 +313,6 @@ export default {
         case 2:
           str = "单位简介:";
           break;
-        case 3:
-          str = "机构简介:";
-          break;
-        case 4:
-          str = ":";
-          break;
-        case 5:
-          str = ":";
-          break;
         default:
           break;
       }
@@ -337,15 +327,6 @@ export default {
         case 2:
           str = "企业logo:";
           break;
-        case 3:
-          str = "机构logo:";
-          break;
-        case 4:
-          str = ":";
-          break;
-        case 5:
-          str = ":";
-          break;
         default:
           break;
       }
@@ -357,10 +338,6 @@ export default {
         case 2:
           str = "单位名称:";
           break;
-        case 3:
-          str = "机构名称:";
-          break;
-          break;
         default:
           break;
       }
@@ -482,15 +459,6 @@ export default {
             flag = !flag;
           }
         });
-      } else if (this.formType == 3) {
-        this.$refs["form"].validate((valid) => {
-          const cityForm = this.$refs.cityForm.submitForm();
-          const fieldForm = this.$refs.fieldForm.submitForm();
-          const researchsForm = this.$refs.researchsForm.submitForm();
-          if (valid && cityForm && fieldForm && researchsForm) {
-            flag = !flag;
-          }
-        });
       }
       return flag;
     },
diff --git a/src/views/dataList/expert/add.vue b/src/views/dataList/expert/add.vue
new file mode 100644
index 0000000..a4c45c4
--- /dev/null
+++ b/src/views/dataList/expert/add.vue
@@ -0,0 +1,85 @@
+<template>
+  <div class="app-container">
+    <div style="width: 50%">
+      <ExpertForm
+        v-model="form"
+        :showTitle="true"
+        :formType="formType"
+        ref="expertForm"
+      />
+    </div>
+    <el-button @click="$router.go(-1)">取消</el-button>
+    <el-button type="primary" @click="submitForm">提交</el-button>
+  </div>
+</template>
+<script>
+import ExpertForm from "@/views/components/ExpertForm";
+import {
+  expertAdd,
+  expertDetail,
+  expertEdit,
+  expertExamine,
+} from "@/api/dataList/expert";
+export default {
+  components: {
+    ExpertForm,
+  },
+  data() {
+    return {
+      formType: 1,
+      form: {
+        image: undefined,
+        name: undefined,
+        mobile: undefined,
+        research_id: undefined, // 所属单位
+        laboratory_id: undefined, // 所属实验室
+        tenant_id: undefined,
+        province: undefined, // 省code
+        city: undefined, // 市code
+        district: undefined, // 区code
+        address: undefined, // 详细地址
+        school: undefined,
+        education: undefined,
+        major: undefined,
+        job: undefined,
+        title: undefined,
+        work_at: undefined,
+        gender: 1,
+        industrys: [],
+        keywords: [],
+        researchs: [],
+        introduce: undefined,
+      },
+    };
+  },
+  methods: {
+    submitForm() {
+      if (this.$refs.expertForm.submitForm()) {
+        if (this.form.id != undefined) {
+          expertEdit(this.form).then((response) => {
+            this.$store.dispatch("tagsView/delView", this.$route);
+            this.$router.go(-1);
+            this.$modal.msgSuccess("修改成功");
+          });
+        } else {
+          expertAdd(this.form).then((res) => {
+            this.$store.dispatch("tagsView/delView", this.$route);
+            this.$router.go(-1);
+            this.$modal.msgSuccess("新增成功");
+          });
+        }
+      } else {
+        console.log("校验未通过");
+      }
+    },
+  },
+  created() {
+    const { id } = this.$route.query;
+    if (id) {
+      expertDetail({ id }).then((res) => {
+        this.form = res.data;
+      });
+    }
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/dataList/expert/index.vue b/src/views/dataList/expert/index.vue
new file mode 100644
index 0000000..72fe5ab
--- /dev/null
+++ b/src/views/dataList/expert/index.vue
@@ -0,0 +1,167 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="专家姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入专家姓名"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
+        <SiteOptions v-model="queryParams" />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dataList">
+      <el-table-column label="数据编号" align="center" prop="id" />
+      <el-table-column label="专家姓名" align="center" prop="name" />
+      <el-table-column
+        label="研究领域"
+        align="center"
+        prop="industrys"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.industrys[scope.row.industrys.length - 1] }}</div>
+          <!-- <div v-for="item in scope.row.industrys" :key="item">{{ item }}</div> -->
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="所属科研机构"
+        align="center"
+        prop="research_name"
+      />
+      <el-table-column
+        label="所属实验室"
+        align="center"
+        prop="laboratory_name"
+      />
+      <el-table-column label="站点" align="center" prop="area" />
+      <el-table-column label="所在地" align="center" prop="address" />
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleEdit(scope.row.id)"
+            >修改</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page_num"
+      :limit.sync="queryParams.page_size"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { expertList } from "@/api/dataList/expert";
+
+export default {
+  data() {
+    return {
+      is_super: this.$store.getters.is_super,
+      showSearch: true,
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 机构表格数据
+      dataList: null,
+      // 查询参数
+      queryParams: {
+        page_num: 1,
+        page_size: 10,
+        name: undefined,
+        examine_status: 2,
+        tenant_id: undefined,
+      },
+    };
+  },
+  methods: {
+    /** 查询机构列表 */
+    getList() {
+      this.loading = true;
+      expertList(this.queryParams).then((response) => {
+        this.dataList = response.data.data;
+        this.total = response.data.count;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.page_num = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleAdd() {
+      this.$router.push({
+        path: "/dataList/expertAdd",
+      });
+    },
+    handleEdit(id) {
+      this.$router.push({
+        path: "/dataList/expertAdd",
+        query: {
+          id,
+        },
+      });
+    },
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/dataList/research/add.vue b/src/views/dataList/research/add.vue
index 862def9..5dc039f 100644
--- a/src/views/dataList/research/add.vue
+++ b/src/views/dataList/research/add.vue
@@ -1,19 +1,14 @@
 <template>
   <div class="app-container">
     <div style="width: 50%">
-      <ExpertForm
-        v-model="form"
-        :showTitle="true"
-        :formType="formType"
-        ref="expertForm"
-      />
+      <ResearchForm v-model="form" :showTitle="true" ref="researchForm" />
     </div>
     <el-button @click="$router.go(-1)">取消</el-button>
     <el-button type="primary" @click="submitForm">提交</el-button>
   </div>
 </template>
 <script>
-import ExpertForm from "@/views/components/ExpertForm";
+import ResearchForm from "@/views/components/ResearchForm";
 import {
   researchAdd,
   researchDetail,
@@ -21,11 +16,10 @@ import {
 } from "@/api/dataList/research";
 export default {
   components: {
-    ExpertForm,
+    ResearchForm,
   },
   data() {
     return {
-      formType: 3,
       form: {
         id: undefined,
         image: undefined,
@@ -45,7 +39,7 @@ export default {
   },
   methods: {
     submitForm() {
-      if (this.$refs.expertForm.submitForm()) {
+      if (this.$refs.researchForm.submitForm()) {
         if (this.form.id != undefined) {
           researchEdit(this.form).then((response) => {
             this.$store.dispatch("tagsView/delView", this.$route);
diff --git a/src/views/dataList/research/index.vue b/src/views/dataList/research/index.vue
index f10221b..ee48d99 100644
--- a/src/views/dataList/research/index.vue
+++ b/src/views/dataList/research/index.vue
@@ -144,7 +144,7 @@ export default {
         page_num: 1,
         page_size: 10,
         name: undefined,
-        examine_status: undefined,
+        examine_status: 2,
         tenant_id: undefined,
       },
     };