From 69d6c487acf58279767393e1af0e2f280ce961b2 Mon Sep 17 00:00:00 2001
From: cxc <quantulr@outlook.com>
Date: Tue, 22 Nov 2022 17:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=20=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/approval/dataList/add.vue           | 36 ++++++------
 src/views/approval/dataList/index.vue         | 19 +++---
 src/views/components/ExpertForm/index.vue     |  8 +--
 .../Enterpriseproducts/approval.vue           | 58 ++++++++++++++-----
 src/views/dataAuditList/achievement/index.vue |  2 +-
 src/views/dataList/enterprise/index.vue       | 20 +++++--
 src/views/expert/dataList/approval.vue        | 32 +++++-----
 src/views/userAuditList/enterprise/add.vue    |  2 +-
 8 files changed, 110 insertions(+), 67 deletions(-)

diff --git a/src/views/approval/dataList/add.vue b/src/views/approval/dataList/add.vue
index 7829408..8816a9e 100644
--- a/src/views/approval/dataList/add.vue
+++ b/src/views/approval/dataList/add.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div style="width: 50%">
-      <ExpertForm
+      <expert-form
         :isAdd="false"
         v-model="form"
         :showTitle="true"
@@ -69,23 +69,23 @@ const cancel = () => {
 };
 
 const submitForm = async (state) => {
-  const valid = await expertFormRef.value.validateForm();
-  if (valid) {
-    if (form.value.id != undefined) {
-      form.value.examineStatus = state;
-      await companyEdit(form.value);
-      useUserStore().getApprovalCount();
-      cancel();
-      ElMessage.success("修改成功");
-    } else {
-      await companyAdd(form.value);
-      useUserStore().getApprovalCount();
-      cancel();
-      ElMessage.success("新增成功");
-    }
-  } else {
-    console.log("校验未通过");
-  }
+  // const valid = await expertFormRef.value.validateForm();
+  // if (valid) {
+  // if (form.value.id != undefined) {
+  form.value.examineStatus = state;
+  await companyEdit(form.value);
+  useUserStore().getApprovalCount();
+  cancel();
+  ElMessage.success("已审核");
+  // } else {
+  //   await companyAdd(form.value);
+  //   useUserStore().getApprovalCount();
+  //   cancel();
+  //   ElMessage.success("新增成功");
+  // }
+  // } else {
+  //   console.log("校验未通过");
+  // }
 };
 
 const getDetailById = async () => {
diff --git a/src/views/approval/dataList/index.vue b/src/views/approval/dataList/index.vue
index 24e3e4f..1ea8b22 100644
--- a/src/views/approval/dataList/index.vue
+++ b/src/views/approval/dataList/index.vue
@@ -33,7 +33,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="站点">
-        <SiteOptions
+        <site-options
           v-model="queryData.tenantId"
           :site-list="siteList"
           style="width: 160px"
@@ -109,7 +109,7 @@
     <!-- 设置企业类型弹框 -->
     <el-dialog title="设置企业类型" v-model="isShow">
       <el-row type="flex" justify="center" style="height: 100px">
-        <el-radio-group v-model="radioList">
+        <el-radio-group v-model="setTypeRow.kind">
           <el-radio
             v-for="{ key, value } in enterpriseOptions"
             :key="key"
@@ -136,6 +136,7 @@ import { tenantSelect } from "@/api/subPlatform/tenant";
 import { enterpriseOptions } from "@/utils/parameter";
 import { reactive, ref } from "vue";
 import { ElMessageBox } from "element-plus";
+import { cloneDeep } from "lodash";
 import { useRouter } from "vue-router";
 const data = reactive({
   queryData: {
@@ -143,11 +144,12 @@ const data = reactive({
     pageSize: 10,
     examineStatus: "",
   },
+  setTypeRow: {},
 });
 const router = useRouter();
 const total = ref(0);
 const dataList = ref([]);
-const { queryData } = toRefs(data);
+const { queryData, setTypeRow } = toRefs(data);
 const siteList = ref([]);
 const isShow = ref(false);
 const radioList = ref("");
@@ -184,16 +186,15 @@ const resetQuery = () => {
 };
 // 企业类型弹框
 const setType = (row) => {
-  radioList.value = row.kind;
+  // radioList.value = row.kind;
   isShow.value = true;
-  id.value = row.id;
+  // id.value = row.id;
+  setTypeRow.value = cloneDeep(row);
 };
 // 发送修改类型请求
+
 const btnType = async () => {
-  await editType({
-    kind: radioList.value,
-    id: id.value,
-  });
+  await editType({ id: setTypeRow.value.id, kind: setTypeRow.value.kind });
   getList();
   isShow.value = false;
 };
diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue
index 32e18ea..00c3d7a 100644
--- a/src/views/components/ExpertForm/index.vue
+++ b/src/views/components/ExpertForm/index.vue
@@ -50,16 +50,16 @@
 
     <el-row v-if="formType == 2">
       <el-col :span="24">
-        <el-form-item label="联系人" prop="contact">
-          <el-input v-model="modelValue.contact"></el-input>
+        <el-form-item label="联系人" prop="username">
+          <el-input v-model="modelValue.username"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row v-if="formType == 2">
       <el-col :span="24">
-        <el-form-item label="联系方式" prop="mobilephone">
+        <el-form-item label="联系方式" prop="phone">
           <el-input
-            v-model="modelValue.mobilephone"
+            v-model="modelValue.phone"
             :maxlength="11"
             oninput="
                 value = value
diff --git a/src/views/dataAuditList/Enterpriseproducts/approval.vue b/src/views/dataAuditList/Enterpriseproducts/approval.vue
index fda57f1..700f3a2 100644
--- a/src/views/dataAuditList/Enterpriseproducts/approval.vue
+++ b/src/views/dataAuditList/Enterpriseproducts/approval.vue
@@ -18,16 +18,37 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="24">
-            <el-form-item label="联系方式:" prop="title">
+            <el-form-item label="联系人:" prop="username">
               <el-input
-                v-model="form.title"
-                placeholder="请输入企业名称"
+                v-model="form.username"
+                placeholder="请输入联系人"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="联系方式:" prop="phone">
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入联系方式"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="邮箱:" prop="email">
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入邮箱"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="24">
             <el-form-item label="产品名称:" prop="title">
@@ -38,7 +59,12 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+        <city-options
+          disabled
+          v-model="form"
+          :labelWidth="labelWidth"
+          ref="cityFormRef"
+        ></city-options>
         <FieldOptions
           v-model="form"
           :labelWidth="labelWidth"
@@ -58,11 +84,11 @@
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="成果成熟度:" prop="maturity">
+            <el-form-item label="产品成熟度:" prop="maturity">
               <el-select
                 v-model="form.maturity"
                 clearable
-                placeholder="请选择成果成熟度"
+                placeholder="请选择产品成熟度"
               >
                 <el-option
                   v-for="item in maturityOptions"
@@ -77,11 +103,11 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="成果领先性:" prop="leadStandard">
+            <el-form-item label="产品领先性:" prop="leadStandard">
               <el-select
                 v-model="form.leadStandard"
                 clearable
-                placeholder="请选择成果领先性"
+                placeholder="请选择产品领先性"
               >
                 <el-option
                   v-for="item in leadOptions"
@@ -98,8 +124,9 @@
           <el-col :span="24">
             <el-form-item label="合作模式:">
               <el-select
-                v-model="form.cooperationMode"
+                v-model="form.cooperationModeArr"
                 clearable
+                multiple
                 placeholder="请选择合作模式"
               >
                 <el-option
@@ -124,7 +151,7 @@
           :disabled="true"
         />
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="成果简介:" prop="description">
               <el-input
@@ -133,11 +160,11 @@
                 :autosize="{ minRows: 2, maxRows: 8 }"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
+          </el-col> -->
+        <!-- </el-row> -->
         <el-row>
           <el-col :span="24">
-            <el-form-item label="成果来源:">
+            <el-form-item label="成果简介:">
               <WangEditor
                 v-model="form.introduce"
                 minHeight="150"
@@ -240,6 +267,9 @@ const { form } = toRefs(data);
 const getDetail = async (id) => {
   const { data } = await getProductApprovalInfo(id);
   form.value = data;
+  form.value.cooperationModeArr = data.cooperationMode
+    ? data.cooperationMode.split(",")
+    : [];
 };
 if (route.query.id) {
   getDetail(route.query.id);
diff --git a/src/views/dataAuditList/achievement/index.vue b/src/views/dataAuditList/achievement/index.vue
index 185d302..8adce7f 100644
--- a/src/views/dataAuditList/achievement/index.vue
+++ b/src/views/dataAuditList/achievement/index.vue
@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="所属站点" prop="tenantId">
-            <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
+            <site-options v-model="queryParams.tenantId" :site-list="siteList" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
diff --git a/src/views/dataList/enterprise/index.vue b/src/views/dataList/enterprise/index.vue
index 558bf80..5e21800 100644
--- a/src/views/dataList/enterprise/index.vue
+++ b/src/views/dataList/enterprise/index.vue
@@ -275,7 +275,11 @@
             <el-radio label="2">SVIP</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="到期时间" prop="expireTime">
+        <el-form-item
+          v-if="vipForm.vipType != '0'"
+          label="到期时间"
+          prop="expireTime"
+        >
           <el-date-picker
             v-model="vipForm.expireTime"
             type="datetime"
@@ -286,7 +290,12 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitVip">确 定</el-button>
+          <el-button
+            type="primary"
+            @click="submitVip"
+            :disabled="vipForm.vipType == 0"
+            >确 定</el-button
+          >
           <el-button @click="closeVip">取 消</el-button>
         </div>
       </template>
@@ -472,12 +481,14 @@ const handleOpenVip = async (id) => {
       showOpenVip.value = true;
     } else {
       vipForm.value.userId = userId;
+      vipForm.value.vipType = "0";
       showOpenVip.value = true;
     }
   } else {
     ElMessageBox.alert(`尚未分配账号，请先分配账号`, "尚未分配账号");
   }
 };
+
 const submitVip = async () => {
   await vipFormRef.value.validate();
   if (vipForm.value.id) {
@@ -489,13 +500,14 @@ const submitVip = async () => {
   }
   showOpenVip.value = false;
 };
+
 const resetVipForm = () => {
-  vipForm.value.vipType = undefined;
-  vipForm.value.expireTime = undefined;
+  vipForm.value = { userType: "1" };
   if (vipFormRef.value) {
     vipFormRef.value.resetFields();
   }
 };
+
 const closeVip = () => {
   resetVipForm();
   showOpenVip.value = false;
diff --git a/src/views/expert/dataList/approval.vue b/src/views/expert/dataList/approval.vue
index ae199f5..b7c13c0 100644
--- a/src/views/expert/dataList/approval.vue
+++ b/src/views/expert/dataList/approval.vue
@@ -57,22 +57,22 @@ const cancel = () => {
   tab.closeOpenPage();
 };
 const submitForm = async (state) => {
-  const valid = await expertFormRef.value.validateForm();
-  if (valid) {
-    if (form.value.id != undefined) {
-      form.value.examineStatus = state;
-      await companyEdit(form.value);
-      cancel();
-      ElMessage.success("修改成功");
-    } else {
-      await companyAdd(form.value);
-      useUserStore().getApprovalCount();
-      cancel();
-      ElMessage.success("新增成功");
-    }
-  } else {
-    console.log("校验未通过");
-  }
+  // const valid = await expertFormRef.value.validateForm();
+  // if (valid) {
+  //   if (form.value.id != undefined) {
+  form.value.examineStatus = state;
+  await companyEdit(form.value);
+  cancel();
+  ElMessage.success("已审核");
+  //   } else {
+  //     await companyAdd(form.value);
+  //     useUserStore().getApprovalCount();
+  //     cancel();
+  //     ElMessage.success("新增成功");
+  //   }
+  // } else {
+  //   console.log("校验未通过");
+  // }
 };
 
 const getDetailById = async () => {
diff --git a/src/views/userAuditList/enterprise/add.vue b/src/views/userAuditList/enterprise/add.vue
index 7ffaf82..d58b80c 100644
--- a/src/views/userAuditList/enterprise/add.vue
+++ b/src/views/userAuditList/enterprise/add.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div style="width: 50%">
-      <ExpertForm
+      <expert-form
         :isAdd="false"
         v-model="form"
         :showTitle="true"