From 2ecf34f3aaa4c41db111cab9064e1874da8d66aa 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, 19 Jan 2022 13:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=AE=A1=E6=A0=B8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/expert/detail.vue | 430 +++++++++++++++++++++++++++-
 src/views/examine/expert/index.vue  |  70 ++---
 2 files changed, 458 insertions(+), 42 deletions(-)

diff --git a/src/views/examine/expert/detail.vue b/src/views/examine/expert/detail.vue
index 19c6b83..79df5d9 100644
--- a/src/views/examine/expert/detail.vue
+++ b/src/views/examine/expert/detail.vue
@@ -1,8 +1,421 @@
 <template>
-  <div>detail</div>
+  <div class="app-container">
+    <el-form
+      style="width: 50%"
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="100px"
+    >
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="专家头像:" prop="image">
+            <ImageUpload
+              v-model="form.image"
+              :isShowTip="true"
+              :fileSize="2"
+              :limit="1"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="姓名:" prop="name">
+            <el-input v-model="form.name"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="手机号:" prop="mobile">
+            <el-input v-model="form.mobile"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="所属单位:">
+            <el-select v-model="form.field" filterable placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属实验室:">
+            <el-select v-model="form.field2" filterable placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="所属站点:" prop="tenant_id">
+            <SiteOptions
+              :size="''"
+              :limitWidth="false"
+              v-model="form.tenant_id"
+              @handleChange="form.tenant_id = $event"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="所在地:" required>
+            <el-row type="flex" justify="space-between">
+              <el-col :span="7">
+                <el-form-item prop="province">
+                  <el-select
+                    v-model="form.province"
+                    clearable
+                    placeholder="请选择"
+                    @change="provinceCodeChange()"
+                  >
+                    <el-option
+                      v-for="(key, value) in provinceSelectList"
+                      :key="value"
+                      :label="key"
+                      :value="value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item prop="city">
+                  <el-select
+                    v-model="form.city"
+                    clearable
+                    placeholder="请选择"
+                    @change="cityCodeChange()"
+                  >
+                    <el-option
+                      v-for="(key, value) in citySelectList"
+                      :key="value"
+                      :label="key"
+                      :value="value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item prop="district">
+                  <el-select
+                    v-model="form.district"
+                    clearable
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="(key, value) in districtSelectList"
+                      :key="value"
+                      :label="key"
+                      :value="value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="详细地址:">
+            <el-input v-model="form.address"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="毕业院校:" prop="school">
+            <el-input v-model="form.school"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="最高学历:">
+            <el-select v-model="form.education" placeholder="请选择">
+              <el-option
+                v-for="item in educationOptions"
+                :key="item.text"
+                :label="item.text"
+                :value="item.text"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="主修专业:" prop="major">
+            <el-input v-model="form.major"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="职务:" prop="job">
+            <el-input v-model="form.job"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="职称:" prop="title">
+            <el-input v-model="form.title"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="从业时间:" prop="work_at">
+            <el-date-picker
+              v-model="form.work_at"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="性别:" prop="gender">
+            <el-radio v-model="form.gender" :label="1">男</el-radio>
+            <el-radio v-model="form.gender" :label="2">女</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="所属领域:" prop="industrys">
+            <el-row type="flex" justify="space-between">
+              <el-col :span="6">
+                <el-select
+                  v-model="fields[0]"
+                  placeholder="请选择"
+                  @change="levelIChange()"
+                >
+                  <el-option
+                    v-for="item in levelI"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="6">
+                <el-select
+                  v-model="fields[1]"
+                  placeholder="请选择"
+                  @change="levelIIChange()"
+                >
+                  <el-option
+                    v-for="item in levelII"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="6">
+                <el-select
+                  v-model="fields[2]"
+                  placeholder="请选择"
+                  @change="levelIIIChange()"
+                >
+                  <el-option
+                    v-for="item in levelIII"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="3">
+                <el-button type="primary" @click="fieldAdd()">添加</el-button>
+              </el-col>
+            </el-row>
+            <div class="e_tag">
+              <el-tag
+                v-for="(tag, index) in this.industrysName"
+                :key="index"
+                closable
+                @close="handleFieldClose('industrys', index)"
+              >
+                <span v-for="(item, i) in tag" :key="i">
+                  {{ item.name }} <span v-if="tag.length != i + 1">></span>
+                </span>
+              </el-tag>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="关键词:">
+            <el-row type="flex" justify="space-between">
+              <el-col :span="20">
+                <el-input
+                  v-model="keywords"
+                  placeholder="应用场景关键词+技术产品关键词"
+                ></el-input>
+              </el-col>
+              <el-col :span="3">
+                <el-button type="primary" @click="keyWordAdd()">添加</el-button>
+              </el-col>
+            </el-row>
+            <div class="e_tag">
+              <el-tag
+                v-for="(tag, index) in this.form.keywords"
+                :key="index"
+                closable
+                @close="handleFieldClose('keywords', index)"
+              >
+                {{ tag }}
+              </el-tag>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="研究方向:">
+            <el-row type="flex" justify="space-between">
+              <el-col :span="20">
+                <el-input
+                  v-model="keywords"
+                  placeholder="请输入研究方向"
+                ></el-input>
+              </el-col>
+              <el-col :span="3">
+                <el-button type="primary" @click="keyWordAdd()">添加</el-button>
+              </el-col>
+            </el-row>
+            <div class="e_tag">
+              <el-tag
+                v-for="(tag, index) in this.form.researchs"
+                :key="index"
+                closable
+                @close="handleFieldClose('keywords', index)"
+              >
+                {{ tag }}
+              </el-tag>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="个人简介:">
+            <el-input
+              v-model="form.introduce"
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 6 }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item>
+        <el-button>审核拒绝</el-button>
+        <el-button type="primary" @click="submitForm">审核通过</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 <script>
 export default {
+  data() {
+    return {
+      options: [
+        {
+          value: "选项1",
+          label: "黄金糕",
+        },
+        {
+          value: "选项2",
+          label: "双皮奶",
+        },
+      ],
+      keywords: "",
+      provinceSelectList: [],
+      citySelectList: [],
+      districtSelectList: [],
+      levelI: [],
+      levelII: [],
+      levelIII: [],
+      fields: [],
+      industrysName: [],
+      form: {
+        image: undefined,
+        name: undefined,
+        mobile: 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,
+      },
+      rules: {
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  methods: {
+    submitForm() {
+      console.log(this.form);
+      // this.$refs["form"].validate((valid) => {
+      //   if (valid) {
+      //     if (this.form.id != undefined) {
+      //       serviceEdit(this.form).then((response) => {
+      //         this.$modal.msgSuccess("修改成功");
+      //         this.open = false;
+      //         this.getList();
+      //       });
+      //     } else {
+      //       serviceAdd(this.form).then((response) => {
+      //         this.$modal.msgSuccess("新增成功");
+      //         this.open = false;
+      //         this.getList();
+      //       });
+      //     }
+      //   }
+      // });
+    },
+  },
   created() {
     let { id } = this.$route.query;
     if (!id) {
@@ -15,4 +428,17 @@ export default {
     // this.getReportDetail();
   },
 };
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+// 上传图片框限制
+// ::v-deep .el-upload--picture-card {
+//   width: 120px;
+//   height: 120px;
+//   line-height: 120px;
+// }
+.el-select,
+.el-date-editor {
+  display: block;
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/examine/expert/index.vue b/src/views/examine/expert/index.vue
index c425d51..7dcf633 100644
--- a/src/views/examine/expert/index.vue
+++ b/src/views/examine/expert/index.vue
@@ -16,17 +16,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核状态" prop="status">
+      <el-form-item label="审核状态" prop="examine_status">
         <el-select
-          v-model="queryParams.status"
+          v-model="queryParams.examine_status"
           placeholder="审核状态"
           clearable
           size="small"
           style="width: 240px"
-          @clear="delete queryParams.status"
+          @clear="delete queryParams.examine_status"
         >
-          <el-option label="已通过" :value="1" />
-          <el-option label="未通过" :value="2" />
+          <el-option label="审核中" :value="1" />
+          <el-option label="审核通过" :value="2" />
+          <el-option label="审核拒绝" :value="3" />
         </el-select>
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
@@ -48,20 +49,26 @@
     </el-form>
 
     <el-table v-loading="loading" :data="userList">
-      <el-table-column label="数据编号" align="center" width="120" prop="id" />
-      <el-table-column label="站点---需去除" align="center" prop="area" />
+      <el-table-column label="数据编号" align="center" width="150" prop="id" />
       <el-table-column label="专家姓名" align="center" prop="name" />
-      <el-table-column label="研究领域" align="center" prop="name" />
-      <el-table-column label="所属科研机构" align="center" prop="name" />
-      <el-table-column label="所属实验室" align="center" prop="name" />
-      <el-table-column label="成果数量" align="center" prop="name" />
-      <el-table-column label="专利数量" align="center" prop="name" />
-      <el-table-column label="站点" align="center" prop="name" />
-      <el-table-column label="所在地" align="center" prop="name" />
-      <el-table-column label="审核状态" align="center">
+      <el-table-column label="研究领域" align="center" prop="industry" />
+      <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" prop="examine_status">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == 1">已通过</span>
-          <span v-else>未通过</span>
+          <span v-if="scope.row.examine_status == 1">审核中</span>
+          <span v-else-if="scope.row.examine_status == 2">审核通过</span>
+          <span v-else>审核拒绝</span>
         </template>
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="created_at">
@@ -78,13 +85,6 @@
             @click="handleDetail(scope.row.id)"
             >审核</el-button
           >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            >删除</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -100,9 +100,10 @@
 </template>
 
 <script>
-import { serviceList as listUser } from "@/api/website/solution";
 import { delUser } from "@/api/system/user";
 
+import { expertList } from "@/api/examine/expert";
+
 export default {
   data() {
     return {
@@ -117,6 +118,9 @@ export default {
       queryParams: {
         page_num: 1,
         page_size: 10,
+        name: undefined,
+        examine_status: undefined,
+        tenant_id: undefined,
       },
     };
   },
@@ -124,7 +128,7 @@ export default {
     /** 查询专家列表 */
     getList() {
       this.loading = true;
-      listUser(this.queryParams).then((response) => {
+      expertList(this.queryParams).then((response) => {
         this.userList = response.data.data;
         this.total = response.data.count;
         this.loading = false;
@@ -148,20 +152,6 @@ export default {
         query: { id },
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const userIds = row.id || this.ids;
-      this.$modal
-        .confirm('是否确认删除数据编号为"' + userIds + '"的数据项？')
-        .then(function () {
-          return delUser({ id: userIds });
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
   },
   created() {
     this.getList();