From 0344e5d7b97e9452ca98664d9e76a2ac5a631a0b Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Wed, 7 Sep 2022 14:24:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?expertform=20siteoptions=20=E4=BC=A0?=
 =?UTF-8?q?=E5=85=A5=E9=80=89=E9=A1=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                 |   3 +
 src/views/components/ExpertForm/index.vue   |  10 +-
 src/views/components/ResearchForm/index.vue | 189 ++++++++++++--------
 vite.config.js                              |   2 +-
 4 files changed, 124 insertions(+), 80 deletions(-)

diff --git a/src/main.js b/src/main.js
index 28725e7..c9ed4c4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -41,6 +41,8 @@ import ImagePreview from "@/components/ImagePreview"
 import TreeSelect from '@/components/TreeSelect'
 // 字典标签组件
 import DictTag from '@/components/DictTag'
+// wangEditor 富文本编辑器
+import WangEditor from '@/components/WangEditor'
 
 const app = createApp(App)
 
@@ -62,6 +64,7 @@ app.component('FileUpload', FileUpload)
 app.component('ImageUpload', ImageUpload)
 app.component('ImagePreview', ImagePreview)
 app.component('RightToolbar', RightToolbar)
+app.component('WangEditor', WangEditor)
 
 app.use(router)
 app.use(store)
diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue
index 30056d3..eb08ef9 100644
--- a/src/views/components/ExpertForm/index.vue
+++ b/src/views/components/ExpertForm/index.vue
@@ -85,7 +85,7 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="所属站点:" prop="tenantId">
-          <SiteOptions v-model="modelValue.tenantId" />
+          <SiteOptions v-model="modelValue.tenantId" :site-list="siteList" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -411,7 +411,6 @@ const validateForm = async () => {
   }
   const cityFormValid = await cityFormRef.value.validateForm();
   const fieldFormValid = await fieldFormRef.value.validateForm();
-  console.log(fieldFormValid);
   const keywordsFormValid = await keywordsFormRef.value.validateForm();
   if (formType.value == 1) {
     //个人
@@ -437,6 +436,13 @@ const validateForm = async () => {
     throw "未知的formType";
   }
 };
+
+// 获取站点列表
+const getSiteList = async () => {
+  const resp = await tenantSelect();
+  siteList.value = resp.rows;
+};
+getSiteList();
 defineExpose({
   validateForm,
 });
diff --git a/src/views/components/ResearchForm/index.vue b/src/views/components/ResearchForm/index.vue
index 144c149..2a4d027 100644
--- a/src/views/components/ResearchForm/index.vue
+++ b/src/views/components/ResearchForm/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-form
-    ref="form"
-    :model="value"
+    ref="formRef"
+    :model="modelValue"
     :rules="rules"
     :label-width="labelWidth + 'px'"
   >
@@ -9,7 +9,7 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="机构logo" prop="image">
-          <ImageUpload v-model="value.image" :fileSize="2" :limit="1" />
+          <ImageUpload v-model="modelValue.image" :fileSize="2" :limit="1" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -17,7 +17,7 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="机构名称" prop="name">
-          <el-input v-model="value.name" :disabled="!isAdd"></el-input>
+          <el-input v-model="modelValue.name" :disabled="!isAdd"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -27,7 +27,7 @@
         <el-form-item label="组织机构代码:" prop="code">
           <el-row type="flex" justify="space-between">
             <el-col :span="20">
-              <el-input v-model="value.code" :disabled="!isAdd"></el-input>
+              <el-input v-model="modelValue.code" :disabled="!isAdd"></el-input>
             </el-col>
             <el-col :span="3">
               <el-button type="primary" @click="" :disabled="!isAdd"
@@ -42,23 +42,23 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="所属站点:" prop="tenant_id">
-          <SiteOptions :size="''" :limitWidth="false" v-model="value" />
+          <SiteOptions :size="''" :limitWidth="false" v-model="modelValue" />
         </el-form-item>
       </el-col>
     </el-row>
 
-    <CityOptions v-model="value" :labelWidth="labelWidth" ref="cityForm" />
+    <CityOptions v-model="modelValue" :labelWidth="labelWidth" ref="cityForm" />
 
     <el-row>
       <el-col :span="24">
         <el-form-item label="详细地址:">
-          <el-input v-model="value.address"></el-input>
+          <el-input v-model="modelValue.address"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
 
     <FieldSingle
-      v-model="value"
+      v-model="modelValue"
       :isAdd="isAdd"
       :labelWidth="labelWidth"
       ref="fieldForm"
@@ -66,7 +66,7 @@
 
     <InputBoxAdd
       :labelWidth="labelWidth"
-      v-model="value"
+      v-model="modelValue"
       title="研究方向"
       placeholder="请输入研究方向"
       fieldKey="researchs"
@@ -76,7 +76,11 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="营业执照:" prop="license">
-          <ImageUpload v-model="value.license" :isShowTip="false" :limit="1" />
+          <ImageUpload
+            v-model="modelValue.license"
+            :isShowTip="false"
+            :limit="1"
+          />
         </el-form-item>
       </el-col>
     </el-row>
@@ -84,92 +88,123 @@
     <el-row>
       <el-col :span="24">
         <el-form-item label="机构简介" prop="introduce">
-          <Editor
+          <WangEditor
+            v-model="modelValue.introduce"
+            :minHeight="150"
+          ></WangEditor>
+          <!-- <Editor
             v-model="value.introduce"
             :minHeight="150"
             ref="introduceRef"
             @click.native="handleEditAble"
-          />
+          /> -->
         </el-form-item>
       </el-col>
     </el-row>
   </el-form>
 </template>
-<script>
+
+<script setup name="ResearchForm">
+import CityOptions from "@/views/components/CityOptions";
+import FieldSingle from "@/views/components/FieldSingle";
+import InputBoxAdd from "@/views/components/InputBoxAdd";
+// import { researchSelect } from "@/api/dataList/research";
+// import { laboratorySelect } from "@/api/dataList/laboratory";
+import { reactive, ref, toRefs } from "vue";
+const props = defineProps({
+  modelValue: Object,
+  isAdd: {
+    type: Boolean,
+    default: true,
+  },
+  showTitle: {
+    type: Boolean,
+    default: false,
+  },
+  labelWidth: {
+    type: Number,
+    default: 120,
+  },
+});
+const { modelValue, isAdd, showTitle, labelWidth } = toRefs(props);
+const data = reactive({
+  rules: {
+    product: [{ required: true, message: "请输入", trigger: "blur" }],
+    name: [{ required: true, message: "请输入", trigger: "blur" }],
+    kind: [{ required: true, message: "请选择", trigger: "change" }],
+    code: [{ required: true, message: "请输入", trigger: "blur" }],
+    mobile: [
+      { required: true, message: "请输入", trigger: "blur" },
+      {
+        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        message: "请输入正确的手机号码",
+        trigger: "blur",
+      },
+    ],
+    research_id: [{ required: true, message: "请选择", trigger: "change" }],
+    tenant_id: [
+      {
+        required: true,
+        message: "请选择",
+        trigger: ["blur", "change"],
+      },
+    ],
+    school: [{ required: true, message: "请输入", trigger: "blur" }],
+    education: [{ required: true, message: "请选择", trigger: "change" }],
+    major: [{ required: true, message: "请输入", trigger: "blur" }],
+    job: [{ required: true, message: "请输入", trigger: "blur" }],
+    title: [{ required: true, message: "请输入", trigger: "blur" }],
+    work_at: [
+      {
+        required: true,
+        message: "从业时间不能为空",
+        trigger: ["change", "blur"],
+      },
+    ],
+    license: [
+      {
+        required: true,
+        message: "请上传",
+        trigger: ["blur", "change"],
+      },
+    ],
+    introduce: [{ required: true, message: "请输入", trigger: "blur" }],
+  },
+});
+const researchOptions = ref([]);
+const options = ref([
+  // { value: "", label: "" }
+]);
+
+const formRef = ref();
+const validateForm = async () => {
+  try {
+    return await formRef.value.validate();
+  } catch (error) {
+    return false;
+  }
+};
+defineExpose({
+  validateForm,
+});
+</script>
+<!-- <script>
 import CityOptions from "@/views/components/CityOptions";
 import FieldSingle from "@/views/components/FieldSingle";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
 import { researchSelect } from "@/api/dataList/research";
 import { laboratorySelect } from "@/api/dataList/laboratory";
+import { reactive, toRefs } from "vue";
 export default {
   components: {
     CityOptions,
     FieldSingle,
     InputBoxAdd,
   },
-  props: {
-    value: Object,
-    isAdd: {
-      type: Boolean,
-      default: true,
-    },
-    showTitle: {
-      type: Boolean,
-      default: false,
-    },
-    labelWidth: {
-      type: Number,
-      default: 120,
-    },
-  },
+
   data() {
     return {
-      researchOptions: [],
-      options: [
-        // { value: "", label: "" }
-      ],
-      rules: {
-        product: [{ required: true, message: "请输入", trigger: "blur" }],
-        name: [{ required: true, message: "请输入", trigger: "blur" }],
-        kind: [{ required: true, message: "请选择", trigger: "change" }],
-        code: [{ required: true, message: "请输入", trigger: "blur" }],
-        mobile: [
-          { required: true, message: "请输入", trigger: "blur" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
-        ],
-        research_id: [{ required: true, message: "请选择", trigger: "change" }],
-        tenant_id: [
-          {
-            required: true,
-            message: "请选择",
-            trigger: ["blur", "change"],
-          },
-        ],
-        school: [{ required: true, message: "请输入", trigger: "blur" }],
-        education: [{ required: true, message: "请选择", trigger: "change" }],
-        major: [{ required: true, message: "请输入", trigger: "blur" }],
-        job: [{ required: true, message: "请输入", trigger: "blur" }],
-        title: [{ required: true, message: "请输入", trigger: "blur" }],
-        work_at: [
-          {
-            required: true,
-            message: "从业时间不能为空",
-            trigger: ["change", "blur"],
-          },
-        ],
-        license: [
-          {
-            required: true,
-            message: "请上传",
-            trigger: ["blur", "change"],
-          },
-        ],
-        introduce: [{ required: true, message: "请输入", trigger: "blur" }],
-      },
+
     };
   },
   mounted() {
@@ -201,7 +236,7 @@ export default {
     },
   },
 };
-</script>
+</script> -->
 <style lang="scss" scoped>
 .form_title {
   font-weight: 700;
@@ -218,4 +253,4 @@ export default {
   display: block;
   width: 100%;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/vite.config.js b/vite.config.js
index b2e95be..8b6f631 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -31,7 +31,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://192.168.31.162:1618',
+          target: 'http://120.26.107.74:1618',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }

From cb011831ac6dfd4175d892e5b550e069d148bcdc Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Wed, 7 Sep 2022 14:27:09 +0800
Subject: [PATCH 2/2] fixed

---
 src/views/components/ExpertForm/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue
index eb08ef9..7f98461 100644
--- a/src/views/components/ExpertForm/index.vue
+++ b/src/views/components/ExpertForm/index.vue
@@ -294,6 +294,7 @@ import CityOptions from "@/views/components/CityOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
 import { researchSelect } from "@/api/dataList/research";
 import { laboratorySelect } from "@/api/dataList/laboratory";
+import { tenantSelect } from "@/api/subPlatform/tenant";
 import { enterpriseOptions } from "@/utils/parameter";
 import { reactive, ref, toRefs } from "vue";
 import WangEditor from "../../../components/WangEditor/index.vue";