Merge branch 'master' of http://git.cc-lotus.info/free-lab/lab-mobile

src/layout/scientific/paper/search-1.vue

@@ -4,12 +4,12 @@
       <van-col span="24" class="main">
         <van-col span="24" class="one">
           <van-form label-width="4em">
-            <van-field v-model="form.name" name="name" label="论文题目" placeholder="请输入论文题目" />
-            <van-field v-model="form.name" name="name" label="期刊卷号" placeholder="请输入期刊卷号" />
-            <van-field v-model="form.name" name="name" label="起止页码" placeholder="请输入起止页码" />
-            <van-field v-model="form.name" name="name" label="论文类别" placeholder="请输入论文类别" />
-            <van-field v-model="form.name" name="name" label="研究方向" placeholder="请输入研究方向" />
-            <van-field v-model="form.name" name="name" label="作者" placeholder="请输入作者" />
+            <van-field v-model="form.title" name="title" label="论文题目" placeholder="请输入论文题目" />
+            <van-field v-model="form.number" name="number" label="期刊卷号" placeholder="请输入期刊卷号" />
+            <van-field v-model="form.startnum" name="startnum" label="起止页码" placeholder="请输入起止页码" />
+            <van-field v-model="form.type" name="type" label="论文类别" placeholder="请输入论文类别" />
+            <van-field v-model="form.directionName" name="directionName" label="研究方向" placeholder="请输入研究方向" />
+            <van-field v-model="form.userName" name="userName" label="作者" placeholder="请输入作者" />
             <div class="btn">
               <van-button type="info" size="small" @click="reseat">重置条件</van-button>
               <van-button type="primary" size="small" @click="onSubmit">提交查询</van-button>

src/store/index.js

@@ -34,6 +34,12 @@ import assistant from '@common/src/store/assistant';
 import committee from '@common/src/store/committee';
 // 平台活动时间段
 import times from '@common/src/store/times';
+// 其他成果
+import other from '@common/src/store/other';
+// 论文发表
+import paper from '@common/src/store/paper';
+// 获奖情况
+import patent from '@common/src/store/patent';
 
 Vue.use(Vuex);
 
@@ -59,5 +65,8 @@ export default new Vuex.Store({
     times,
     achievement,
     task,
+    other,
+    paper,
+    patent,
   },
 });

src/views/scientific/award/index.vue

@@ -18,6 +18,8 @@ import info1 from '@/layout/scientific/award/info-1.vue';
 import search1 from '@/layout/scientific/award/search-1.vue';
 import adminFrame from '@common/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions } = createNamespacedHelpers('patent');
+
 export default {
   name: 'index',
   props: {},
@@ -29,75 +31,7 @@ export default {
   },
   data: function () {
     return {
-      list: [
-        {
-          createBy: '1',
-          createTime: '2021-10-11 23:11:01',
-          delFlag: '0',
-          direction: 'direction001',
-          directionName: '开创视觉光刺激治疗癫痫研究',
-          id: '45b54288eb0c40abbf6b123735da1445',
-          level: '1',
-          name: '这里是成果名称',
-          params: {},
-          person: [
-            {
-              createBy: '1',
-              createTime: '2021-10-11 23:53:48',
-              delFlag: '0',
-              id: '66da7d92145748f0a8a7b04b8cad4180',
-              level: '1',
-              params: {},
-              patentId: '45b54288eb0c40abbf6b123735da1445',
-              remark: null,
-              searchValue: null,
-              updateBy: null,
-              updateTime: null,
-              userId: 'person003',
-              userName: '付学奇',
-            },
-            {
-              createBy: '1',
-              createTime: '2021-10-11 23:53:48',
-              delFlag: '0',
-              id: '848422552bdc4bcda6e24897c1311362',
-              level: '2',
-              params: {},
-              patentId: '45b54288eb0c40abbf6b123735da1445',
-              remark: null,
-              searchValue: null,
-              updateBy: null,
-              updateTime: null,
-              userId: 'person001',
-              userName: '王江涛',
-            },
-            {
-              createBy: '1',
-              createTime: '2021-10-11 23:53:48',
-              delFlag: '0',
-              id: '109e43caf78d4fe3ae977c2467926548',
-              level: '3',
-              params: {},
-              patentId: '45b54288eb0c40abbf6b123735da1445',
-              remark: null,
-              searchValue: null,
-              updateBy: null,
-              updateTime: null,
-              userId: 'person002',
-              userName: '刘光耀',
-            },
-          ],
-          personlevel: null,
-          remark: null,
-          resulnumber: '这里是成果编号',
-          searchValue: null,
-          type: '2',
-          updateBy: null,
-          updateTime: '2021-10-11 23:53:48',
-          userId: null,
-          userName: null,
-        },
-      ],
+      list: [],
       total: 0,
       limit: 5,
       // 查询
@@ -112,9 +46,13 @@ export default {
     await this.search();
   },
   methods: {
-    async search({ skip = 0, limit = this.limit, searchName, ...info } = {}) {
-      if (searchName) info.name = searchName;
-      console.log(this.searhForm);
+    ...mapActions(['query', 'fetch']),
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
+      const res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.rows);
+        this.$set(this, `total`, res.total);
+      }
     },
     // 查看信息
     async toView(data) {

src/views/scientific/otherachieve/index.vue

@@ -18,6 +18,8 @@ import info1 from '@/layout/scientific/otherachieve/info-1.vue';
 import search1 from '@/layout/scientific/otherachieve/search-1.vue';
 import adminFrame from '@common/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions } = createNamespacedHelpers('other');
+
 export default {
   name: 'index',
   props: {},
@@ -29,24 +31,7 @@ export default {
   },
   data: function () {
     return {
-      list: [
-        {
-          content: '啊吧啊吧',
-          createBy: '1',
-          createTime: '2021-09-16 10:45:35',
-          delFlag: '0',
-          direction: '173d667ff2c04aa68390fefef2519f95',
-          directionName: null,
-          id: '80624b94ad0d4827b7f15699febe5a2c',
-          name: '成果名称',
-          params: {},
-          remark: null,
-          searchValue: null,
-          type: '1',
-          updateBy: null,
-          updateTime: '2021-09-22 20:07:11',
-        },
-      ],
+      list: [],
       total: 0,
       limit: 5,
       // 查询
@@ -61,9 +46,13 @@ export default {
     await this.search();
   },
   methods: {
-    async search({ skip = 0, limit = this.limit, searchName, ...info } = {}) {
-      if (searchName) info.name = searchName;
-      console.log(this.searhForm);
+    ...mapActions(['query', 'fetch']),
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
+      const res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.rows);
+        this.$set(this, `total`, res.total);
+      }
     },
     // 查看信息
     async toView(data) {

src/views/scientific/paper/index.vue

@@ -18,6 +18,8 @@ import info1 from '@/layout/scientific/paper/info-1.vue';
 import search1 from '@/layout/scientific/paper/search-1.vue';
 import adminFrame from '@common/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions } = createNamespacedHelpers('paper');
+
 export default {
   name: 'index',
   props: {},
@@ -29,27 +31,7 @@ export default {
   },
   data: function () {
     return {
-      list: [
-        {
-          createBy: '1',
-          createTime: '2021-09-16 10:08:17',
-          delFlag: '0',
-          direction: '338fa9ec011644778ffc28040c835f2a',
-          directionName: null,
-          id: '1846e091f4eb4b028ef2219a22fd2fc3',
-          number: '这里是卷号',
-          params: {},
-          remark: null,
-          searchValue: null,
-          startnum: '1-25',
-          title: '这里是题目',
-          type: '2',
-          updateBy: null,
-          updateTime: '2021-09-22 20:05:03',
-          userId: 'person001',
-          userName: '王江涛',
-        },
-      ],
+      list: [],
       total: 0,
       limit: 5,
       // 查询
@@ -64,9 +46,13 @@ export default {
     await this.search();
   },
   methods: {
-    async search({ skip = 0, limit = this.limit, searchName, ...info } = {}) {
-      if (searchName) info.name = searchName;
-      console.log(this.searhForm);
+    ...mapActions(['query', 'fetch']),
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
+      const res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.rows);
+        this.$set(this, `total`, res.total);
+      }
     },
     // 查看信息
     async toView(data) {