演示测试

src/api/dataList/patent.js

@@ -40,7 +40,7 @@ export function patentDelete(data) {
 		data,
 	})
 }
-// 专利上下架
+// 专利上下架... 不用了
 export function patentShelf(data) {
 	return request({
 		url: '/admin/v1/technology/patent/shelf',
@@ -48,3 +48,27 @@ export function patentShelf(data) {
 		data,
 	})
 }
+// 认领专利列表
+export function expertPatent(data) {
+	return request({
+		url: '/admin/v1/manage/expert/patent',
+		method: 'post',
+		data,
+	})
+}
+// 认领
+export function expertPatentBind(data) {
+	return request({
+		url: '/admin/v1/manage/expert/patent/bind',
+		method: 'post',
+		data,
+	})
+}
+// 取消认领
+export function expertPatentUnbind(data) {
+	return request({
+		url: '/admin/v1/manage/expert/patent/unbind',
+		method: 'post',
+		data,
+	})
+}

src/views/components/ResearchForm/index.vue

@@ -173,7 +173,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.$refs.introduceRef.Quill.enable(false);
+      // this.$refs.introduceRef.Quill.enable(false);
     });
   },
   methods: {

src/views/dataList/expert/claim.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="专利名称" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入专利名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="getList"
+        />
+      </el-form-item>
+      <el-form-item label="申请人" prop="apply_name">
+        <el-input
+          v-model="queryParams.apply_name"
+          placeholder="请输入申请人"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="getList"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="发明人" prop="inventor">
+        <el-input
+          v-model="queryParams.inventor"
+          placeholder="请输入发明人"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="getList"
+        />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="getList"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="dataList">
+      <el-table-column label="数据编号" align="center" prop="id" />
+      <el-table-column label="专利名称" align="center" prop="title" />
+      <el-table-column label="申请号" align="center" prop="apply_code" />
+      <el-table-column
+        label="申请（专利权）人"
+        align="center"
+        prop="apply_name"
+      />
+      <el-table-column label="发明人" align="center" prop="inventor" />
+      <el-table-column label="申请日" align="center" prop="apply_at" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.is_bind">已认领</el-tag>
+          <el-tag type="danger" v-else>未认领</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button
+            v-if="!scope.row.is_bind"
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleBind(scope.row.id)"
+            >认领机构</el-button
+          >
+          <el-button
+            v-else
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleUnbind(scope.row.id)"
+            >取消认领</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  expertPatent,
+  expertPatentBind,
+  expertPatentUnbind,
+} from "@/api/dataList/patent";
+export default {
+  data() {
+    return {
+      showSearch: true,
+      loading: true,
+      dataList: null,
+      queryParams: {
+        id: undefined,
+        title: undefined,
+        apply_name: undefined,
+        // inventor: undefined,
+      },
+    };
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      expertPatent(this.queryParams).then((response) => {
+        this.dataList = response.data;
+        this.loading = false;
+      });
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.getList();
+    },
+    handleBind(id) {
+      expertPatentBind({ id: this.queryParams.id, patent_ids: [id] }).then(
+        (res) => {
+          this.$modal.msgSuccess("修改成功");
+          this.getList();
+        }
+      );
+    },
+    handleUnbind(id) {
+      expertPatentUnbind({ id: this.queryParams.id, patent_ids: [id] }).then(
+        (res) => {
+          this.$modal.msgSuccess("修改成功");
+          this.getList();
+        }
+      );
+    },
+  },
+  created() {
+    let { id } = this.$route.query;
+    if (!id) {
+      this.$message.error("无ID");
+      this.$router.go(-1);
+      return;
+    }
+    console.log(id);
+    this.queryParams.id = id;
+    this.getList();
+  },
+};
+</script>

src/views/dataList/expert/index.vue

@@ -87,6 +87,13 @@
             @click="handleEdit(scope.row.id)"
             >修改</el-button
           >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleClaim(scope.row.id)"
+            >认领专利</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -159,6 +166,14 @@ export default {
         },
       });
     },
+    handleClaim(id) {
+      this.$router.push({
+        path: "/dataList/claimPatent",
+        query: {
+          id,
+        },
+      });
+    },
   },
   created() {
     this.getList();

src/views/dataList/patent/index.vue

@@ -119,7 +119,7 @@
         <el-form-item label="申请人:" prop="apply_name">
           <el-input
             v-model="form.apply_name"
-            placeholder="请输入申请（专利权）人"
+            placeholder="请输入申请（专利权）人（多个请以 , 分割）"
           />
         </el-form-item>
         <el-form-item label="申请人地址:" prop="apply_address">
@@ -129,8 +129,10 @@
           />
         </el-form-item>
         <el-form-item label="发明人:" prop="inventor">
-          <el-input v-model="form.inventor" placeholder="请输入发明人" />
-          <!-- （多个请以 ; 隔开） -->
+          <el-input
+            v-model="form.inventor"
+            placeholder="请输入发明人（多个请以 , 分割）"
+          />
         </el-form-item>
         <el-form-item label="专利名称:" prop="title">
           <el-input v-model="form.title" placeholder="请输入专利名称" />
@@ -450,7 +452,8 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          // this.form.inventor = this.form.inventor.replace(/；/g, ";");
+          this.form.inventor = this.form.inventor.replace(/，/g, ",");
+          this.form.apply_name = this.form.apply_name.replace(/，/g, ",");
           if (this.form.id != undefined) {
             patentEdit(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");

src/views/website/activity/active/index.vue

@@ -363,7 +363,7 @@
         </el-form-item>
         <el-form-item label="活动简介:" prop="description">
           <el-input
-            v-model.number="form.description"
+            v-model="form.description"
             placeholder="请输入活动简介"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 4 }"

src/views/website/siteSet/banner/index.vue

@@ -212,7 +212,7 @@ export default {
         tenant_id: [
           {
             required: true,
-            message: "归属导航不能为空",
+            message: "所属站点不能为空",
             trigger: ["blur", "change"],
           },
         ],

src/views/website/solution/service/index.vue

@@ -144,6 +144,14 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="服务介绍:" prop="description">
+          <el-input
+            v-model="form.description"
+            placeholder="请输入服务介绍"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }"
+          />
+        </el-form-item>
         <el-form-item label="图片:" prop="image">
           <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
         </el-form-item>
@@ -219,6 +227,9 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
+        description: [
+          { required: true, message: "服务介绍不能为空", trigger: "blur" },
+        ],
       },
     };
   },
@@ -253,6 +264,7 @@ export default {
         title: undefined,
         image: undefined,
         mode: undefined,
+        description: undefined,
       };
       this.resetForm("form");
     },

src/views/website/solution/serviceCase/index.vue

@@ -53,7 +53,7 @@
 
     <el-table v-loading="loading" :data="dataList">
       <el-table-column label="数据编码" prop="id" align="center" />
-      <el-table-column label="案例标题" prop="title" width="120" />
+      <el-table-column label="案例标题" prop="title" align="center" />
       <el-table-column label="图片" prop="image" align="center" width="120">
         <template slot-scope="scope">
           <div>
@@ -126,7 +126,7 @@
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
           <SiteOptions v-model="form" />
         </el-form-item>
-        <el-form-item label="案例类型:" prop="kind_id">
+        <el-form-item label="所属服务:" prop="kind_id">
           <el-cascader
             v-model="form.kind_id"
             clearable
@@ -202,7 +202,7 @@ export default {
         kind_id: [
           {
             required: true,
-            message: "案例类型不能为空",
+            message: "所属服务不能为空",
             trigger: ["blur", "change"],
           },
         ],