1

src/views/service/patent/admin/examine/analysis.vue

@@ -58,6 +58,7 @@ export default {
     },
     // 查看
     view(data) {
+      if (!data.questions) data.questions = {};
       this.$set(this, `info`, data);
       this.show = true;
     },

src/views/service/patent/admin/examine/analysis/list-1.vue

@@ -48,9 +48,9 @@ export default {
     },
     // 整理状态
     getStu(status) {
-      if (status == '0') return '已提交给相应机构，请等待审核';
-      else if (status == '1') return '管理员审核通过！';
-      else if (status == '-1') return '管理员审核未通过，请查看审核意见，并重新提交申请';
+      if (status == '0') return '待审核';
+      else if (status == '1') return '审核通过';
+      else if (status == '-1') return '审核拒绝';
     },
   },
   computed: {

src/views/service/patent/admin/message/examine.vue

@@ -2,7 +2,7 @@
   <div id="read">
     <admin-frame @search="search" :limit="limit" :total="total" topType="2" @back="back" :rightArrow="false" :useNav="false">
       <template v-slot:info>
-        <list-3 :list="list"></list-3>
+        <list-3 :list="list" @update="toUpdate"></list-3>
       </template>
     </admin-frame>
   </div>
@@ -31,7 +31,7 @@ export default {
     this.search();
   },
   methods: {
-    ...patentexamine(['query']),
+    ...patentexamine(['query', 'update']),
     async search({ skip = 0, limit = this.limit, ...info } = {}) {
       info.to = this.user.id;
       let res = await this.query({ skip, limit, ...info });
@@ -40,6 +40,14 @@ export default {
         this.$set(this, `total`, res.total);
       }
     },
+    async toUpdate(data) {
+      data.is_read = true;
+      let res = await this.update(data);
+      if (this.$checkRes(res)) {
+        this.$toast({ type: 'success', message: '取消提醒成功' });
+        this.search();
+      }
+    },
     // 返回
     back() {
       this.$router.push({ path: '/service/patent/index' });

src/views/service/patent/admin/message/parts/list-3.vue

@@ -14,7 +14,7 @@
           </van-col>
         </van-col>
         <van-col span="24" class="btn" v-if="item.is_read == false">
-          <van-button size="small" type="info" @click="update(item)">取消提醒</van-button>
+          <van-button size="small" type="info" @click="update(item)">消息已读</van-button>
         </van-col>
       </van-col>
     </van-col>

src/views/service/patent/admin/patent/trans/list-1.vue

@@ -14,7 +14,7 @@
               交易类型：<span>{{ item.type || '暂无' }}</span>
             </van-col>
             <van-col span="24" class="otherInfo">
-              投资预算：<span>{{ item.budget || '暂无' }}</span>
+              投资预算：<span>{{ item.budget || '暂无' }}万元</span>
             </van-col>
           </van-col>
         </van-col>

src/views/service/patent/market/parts/list-2.vue

@@ -14,7 +14,7 @@
               交易类型：<span>{{ item.type || '暂无' }}</span>
             </van-col>
             <van-col span="12" class="otherInfo">
-              投资预算：<span>{{ item.budget || '暂无' }}</span>
+              投资预算：<span>{{ item.budget || '暂无' }}万元</span>
             </van-col>
           </van-col>
         </van-col>

src/views/service/patent/mech/examine/contract/list-1.vue

@@ -14,7 +14,7 @@
               交易类型：<span>{{ item.type || '暂无' }}</span>
             </van-col>
             <van-col span="12" class="otherInfo">
-              投资预算：<span>{{ item.budget || '暂无' }}</span>
+              投资预算：<span>{{ item.budget || '暂无' }}万元</span>
             </van-col>
           </van-col>
           <van-col span="24" class="btn">

src/views/service/patent/mech/mechBtn.vue

@@ -27,17 +27,17 @@
           <van-col span="24" class="one_1">
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/examine', 'patent')">
               <van-goods-action-icon text="专利审核">
-                <template #icon><i class="iconfont icon-xiaoxi"></i></template>
+                <template #icon><i class="iconfont icon-jiaodi"></i></template>
               </van-goods-action-icon>
             </van-col>
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/examine', 'contract')">
               <van-goods-action-icon text="合同审核">
-                <template #icon><i class="iconfont icon-xiaoxi"></i></template>
+                <template #icon><i class="iconfont icon-pinggu"></i></template>
               </van-goods-action-icon>
             </van-col>
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/examine', 'trans')">
               <van-goods-action-icon text="交易审核">
-                <template #icon><i class="iconfont icon-tongzhi"></i></template>
+                <template #icon><i class="iconfont icon-pinggu"></i></template>
               </van-goods-action-icon>
             </van-col>
           </van-col>
@@ -47,17 +47,17 @@
           <van-col span="24" class="one_1">
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/patent', 'information')">
               <van-goods-action-icon text="专利信息">
-                <template #icon><i class="iconfont icon-xiaoxi"></i></template>
+                <template #icon><i class="iconfont icon-jiaodi"></i></template>
               </van-goods-action-icon>
             </van-col>
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/patent', 'navigation')">
               <van-goods-action-icon text="专利分析">
-                <template #icon><i class="iconfont icon-xiaoxi"></i></template>
+                <template #icon><i class="iconfont icon-pinggu"></i></template>
               </van-goods-action-icon>
             </van-col>
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/patent', 'early')">
               <van-goods-action-icon text="专利预警">
-                <template #icon><i class="iconfont icon-tongzhi"></i></template>
+                <template #icon><i class="iconfont icon-pinggu"></i></template>
               </van-goods-action-icon>
             </van-col>
           </van-col>
@@ -67,17 +67,17 @@
           <van-col span="24" class="one_1">
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/transaction', 'index', 'type=转让')">
               <van-goods-action-icon text="专利转让">
-                <template #icon><i class="iconfont icon-xiaoxi"></i></template>
+                <template #icon><i class="iconfont icon-jiaodi"></i></template>
               </van-goods-action-icon>
             </van-col>
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/transaction', 'index', 'type=合作')">
               <van-goods-action-icon text="专利合作">
-                <template #icon><i class="iconfont icon-xiaoxi"></i></template>
+                <template #icon><i class="iconfont icon-pinggu"></i></template>
               </van-goods-action-icon>
             </van-col>
             <van-col span="8" class="one_1action" @click.native="pathBtn('mech/transaction', 'index', 'type=招商')">
               <van-goods-action-icon text="专利招商">
-                <template #icon><i class="iconfont icon-tongzhi"></i></template>
+                <template #icon><i class="iconfont icon-pinggu"></i></template>
               </van-goods-action-icon>
             </van-col>
           </van-col>

src/views/service/patent/mech/message/parts/list-1.vue

@@ -14,7 +14,7 @@
           </van-col>
         </van-col>
         <van-col span="24" class="btn" v-if="item.is_read == false">
-          <van-button size="small" type="info" @click="update(item)">取消提醒</van-button>
+          <van-button size="small" type="info" @click="update(item)">消息已读</van-button>
         </van-col>
       </van-col>
     </van-col>

src/views/service/patent/mech/message/unRead.vue

@@ -2,7 +2,7 @@
   <div id="unRead">
     <admin-frame @search="search" :limit="limit" :total="total" topType="2" @back="back" :rightArrow="false" :useNav="false">
       <template v-slot:info>
-        <list-1 :list="list" @update="update"></list-1>
+        <list-1 :list="list" @update="toUpdate"></list-1>
       </template>
     </admin-frame>
   </div>
@@ -41,7 +41,7 @@ export default {
         this.$set(this, `total`, res.total);
       }
     },
-    async update(data) {
+    async toUpdate(data) {
       data.is_read = true;
       let res = await this.update(data);
       if (this.$checkRes(res)) {

src/views/service/patent/mech/transaction/parts/list-1.vue

@@ -14,7 +14,7 @@
               交易类型：<span>{{ item.type || '暂无' }}</span>
             </van-col>
             <van-col span="12" class="otherInfo">
-              投资预算：<span>{{ item.budget || '暂无' }}</span>
+              投资预算：<span>{{ item.budget || '暂无' }}万元</span>
             </van-col>
             <van-col span="24" class="otherInfo">
               状态：<span>{{ getStu(item.status) }}</span>

src/views/service/patent/user/apply/apply/gzjDetail.vue

@@ -33,7 +33,7 @@ export default {
   methods: {
     ...patentwarning(['query']),
     async search({ skip = 0, limit = this.limit, ...info } = {}) {
-      info.patnet_id = this.id;
+      info.patent_id = this.id;
       let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);

src/views/service/patent/user/apply/assessment/parts/detail-3.vue

@@ -65,7 +65,7 @@ export default {
       // 搜索专利
       searchName: '',
       list: [],
-      limit: 4,
+      limit: 6,
       total: 0,
     };
   },
@@ -74,7 +74,7 @@ export default {
   },
   methods: {
     ...patentinfo(['query', 'fetch']),
-    async search() {
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
       if (this.patent_id) {
         let res = await this.fetch(this.patent_id);
         if (this.$checkRes(res)) {
@@ -82,6 +82,12 @@ export default {
           this.$set(this.form, `patent_id`, res.data._id);
         }
       }
+      info.user_id = this.user.id;
+      let res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.data);
+        this.$set(this, `total`, res.total);
+      }
     },
     onSubmit(values) {
       this.$emit('onSubmit', values);

src/views/service/patent/user/message/parts/list-1.vue

@@ -14,7 +14,7 @@
           </van-col>
         </van-col>
         <van-col span="24" class="btn" v-if="item.is_read == false">
-          <van-button size="small" type="info" @click="update(item)">取消提醒</van-button>
+          <van-button size="small" type="info" @click="update(item)">消息已读</van-button>
         </van-col>
       </van-col>
     </van-col>

src/views/service/patent/user/message/read.vue

@@ -2,14 +2,7 @@
   <div id="index">
     <admin-frame @search="search" :limit="limit" :total="total" topType="2" @back="back" :rightArrow="false" :useNav="false">
       <template v-slot:info>
-        <van-tabs v-model="active" @change="change">
-          <van-tab title="审核信息" name="1">
-            <list-1 :list="oneList"></list-1>
-          </van-tab>
-          <van-tab title="国知局通知信息" name="2">
-            <list-3 :list="thrList"></list-3>
-          </van-tab>
-        </van-tabs>
+        <list-1 :list="oneList"></list-1>
       </template>
     </admin-frame>
   </div>
@@ -17,7 +10,6 @@
 
 <script>
 import list1 from './parts/list-1.vue';
-import list3 from './parts/list-3.vue';
 import adminFrame from '@frame/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: patentexamine } = createNamespacedHelpers('patentexamine');
@@ -27,17 +19,13 @@ export default {
   components: {
     adminFrame,
     list1,
-    list3,
   },
   data: function () {
     return {
-      active: '1',
       limit: 5,
       total: 0,
       // 审核信息
       oneList: [],
-      // 国知局信息
-      thrList: [],
     };
   },
   async created() {
@@ -46,22 +34,14 @@ export default {
   methods: {
     ...patentexamine(['query', 'update']),
     async search({ skip = 0, limit = this.limit, ...info } = {}) {
-      if (this.active == '1') {
-        info.to = this.user.id;
-        info.is_read = true;
-        let res = await this.query({ skip, limit, ...info });
-        if (this.$checkRes(res)) {
-          this.$set(this, `oneList`, res.data);
-          this.$set(this, `total`, res.total);
-        }
-      } else if (this.active == '2') {
-        console.log('国知局通知信息');
+      info.to = this.user.id;
+      info.is_read = true;
+      let res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `oneList`, res.data);
+        this.$set(this, `total`, res.total);
       }
     },
-    change(name) {
-      this.$set(this, `active`, name);
-      this.search();
-    },
     // 返回
     back() {
       this.$router.push({ path: '/service/patent/index' });

src/views/service/patent/user/message/unRead.vue

@@ -2,14 +2,7 @@
   <div id="unRead">
     <admin-frame @search="search" :limit="limit" :total="total" topType="2" @back="back" :rightArrow="false" :useNav="false">
       <template v-slot:info>
-        <van-tabs v-model="active" @change="change">
-          <van-tab title="审核信息" name="1">
-            <list-1 :list="oneList" @update="oneUpdate"></list-1>
-          </van-tab>
-          <van-tab title="国知局通知信息" name="2">
-            <list-3 :list="thrList" @update="thrUpdate"></list-3>
-          </van-tab>
-        </van-tabs>
+        <list-1 :list="oneList" @update="oneUpdate"></list-1>
       </template>
     </admin-frame>
   </div>
@@ -17,7 +10,6 @@
 
 <script>
 import list1 from './parts/list-1.vue';
-import list3 from './parts/list-3.vue';
 import adminFrame from '@frame/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: patentexamine } = createNamespacedHelpers('patentexamine');
@@ -27,17 +19,13 @@ export default {
   components: {
     adminFrame,
     list1,
-    list3,
   },
   data: function () {
     return {
-      active: '1',
       limit: 5,
       total: 0,
       // 审核信息
       oneList: [],
-      // 国知局信息
-      thrList: [],
     };
   },
   async created() {
@@ -46,16 +34,12 @@ export default {
   methods: {
     ...patentexamine(['query', 'update']),
     async search({ skip = 0, limit = this.limit, ...info } = {}) {
-      if (this.active == '1') {
-        info.to = this.user.id;
-        info.is_read = false;
-        let res = await this.query({ skip, limit, ...info });
-        if (this.$checkRes(res)) {
-          this.$set(this, `oneList`, res.data);
-          this.$set(this, `total`, res.total);
-        }
-      } else if (this.active == '2') {
-        console.log('国知局通知信息');
+      info.to = this.user.id;
+      info.is_read = false;
+      let res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `oneList`, res.data);
+        this.$set(this, `total`, res.total);
       }
     },
     async oneUpdate(data) {
@@ -69,13 +53,6 @@ export default {
     twoUpdate(data) {
       this.$router.push({ path: '/service/patent/user/message/read_chat', query: { id: data.id } });
     },
-    thrUpdate(data) {
-      this.$toast({ type: 'success', message: '国知局通知信息' });
-    },
-    change(name) {
-      this.$set(this, `active`, name);
-      this.search();
-    },
     // 返回
     back() {
       this.$router.push({ path: '/service/patent/index' });

src/views/service/patent/user/patent/information/parts/trans-1.vue

@@ -2,7 +2,7 @@
   <div id="trans-1">
     <van-row>
       <van-col span="24" class="main">
-        <van-form @submit="onSubmit" label-width="8em">
+        <van-form @submit="onSubmit">
           <van-field v-model="form.user_id" name="user_id" label="用户id" readonly style="display: none" />
           <van-field v-model="form.patent_id" name="patent_id" label="专利id" readonly style="display: none" />
           <van-field v-model="form.create_number" name="create_number" label="申请号" readonly />
@@ -10,7 +10,7 @@
           <van-field v-model="form.contact" name="contact" label="联系人" :rules="[{ required: true, message: '联系人' }]" />
           <van-field v-model="form.phone" name="phone" label="联系电话" :rules="[{ required: true, message: '联系电话' }]" />
           <van-field v-model="form.email" name="email" label="电子邮箱" :rules="[{ required: true, message: '电子邮箱' }]" />
-          <van-field v-model="form.budget" name="budget" type="digit" label="投资预算" :rules="[{ required: true, message: '投资预算' }]" />
+          <van-field v-model="form.budget" name="budget" type="digit" label="投资预算(万元)" :rules="[{ required: true, message: '投资预算' }]" />
           <van-field name="type" label="交易类型">
             <template #input>
               <van-radio-group v-model="form.type" direction="horizontal">

src/views/service/patent/user/patent/information/trans_create.vue

@@ -51,6 +51,7 @@ export default {
           patent_id: this.info._id,
           create_number: this.info.create_number,
           patent_name: this.info.name,
+          contact: this.user.name,
         };
         let arr = await this.assessQuery({ patent_id: this.info._id, user_id: this.user._id });
         if (this.$checkRes(arr)) {

src/views/service/patent/user/transaction/parts/list-1.vue

@@ -14,7 +14,7 @@
               交易类型：<span>{{ item.type || '暂无' }}</span>
             </van-col>
             <van-col span="12" class="otherInfo">
-              投资预算：<span>{{ item.budget || '暂无' }}</span>
+              投资预算：<span>{{ item.budget || '暂无' }}万元</span>
             </van-col>
             <van-col span="24" class="otherInfo">
               状态：<span>{{ getStu(item.status) }}</span>

src/views/service/patent/user/userBtn.vue

@@ -11,12 +11,12 @@
               </van-goods-action-icon>
             </van-col>
             <van-col span="8" class="one_1action" @click.native="pathBtn('user/message', 'read')">
-              <van-goods-action-icon text="已读" badge="0">
+              <van-goods-action-icon text="已读" badge="">
                 <template #icon><i class="iconfont icon-xiaoxi"></i></template>
               </van-goods-action-icon>
             </van-col>
             <van-col span="8" class="one_1action" @click.native="pathBtn('user/message', 'notice')">
-              <van-goods-action-icon text="通知" badge="0">
+              <van-goods-action-icon text="通知" badge="">
                 <template #icon><i class="iconfont icon-tongzhi"></i></template>
               </van-goods-action-icon>
             </van-col>