guhongwei 3 лет назад
Родитель
Сommit
47ce0a67eb

+ 16 - 7
src/layout/scientific/task/info-1.vue

@@ -3,13 +3,22 @@
     <van-row>
       <van-col span="24" class="main">
         <van-col span="24" class="one">
-          <van-form label-width="4em">
-            <van-field v-model="info.name" name="name" label="姓名" readonly />
-            <van-field v-model="info.age" name="age" label="年龄" readonly />
-            <van-field v-model="info.unit" name="unit" label="单位" type="textarea" autosize rows="1" readonly />
-            <van-field v-model="info.job" name="job" label="职务" readonly />
-            <van-field v-model="info.title" name="title" label="职称" readonly />
-            <van-field v-model="info.directionId" name="directionId" label="研究方向" autosize rows="1" readonly />
+          <van-form label-width="5em">
+            <van-field v-model="info.name" name="name" label="项目名称" readonly />
+            <van-field v-model="info.time" name="time" label="起止时间" readonly />
+            <van-field v-model="info.laiyuancontent" name="laiyuancontent" label="项目来源" type="textarea" autosize rows="1" readonly />
+            <van-field v-model="info.projectlevelone" name="projectlevelone" label="项目编号" readonly />
+            <van-field v-model="info.money" name="money" label="经费(万元)" readonly />
+            <van-field v-model="info.userName" name="userName" label="负责人" readonly />
+            <van-field v-model="info.persons" name="persons" label="主要参加人" type="textarea" autosize rows="1" readonly />
+            <van-field v-model="info.userproportion" name="userproportion" label="核心成员比例(%)" readonly />
+            <van-field v-model="info.directionName" name="directionName" label="研究方向" type="textarea" autosize rows="1" readonly />
+            <van-field v-model="info.cooperativeunit" name="cooperativeunit" label="合作单位" type="textarea" autosize rows="1" readonly />
+            <van-field v-model="info.projectsource" name="projectsource" label="转态/转化效益(万元)" readonly />
+            <van-field v-model="info.projectsourcetwo" name="projectsourcetwo" label="项目来源2" type="textarea" autosize rows="1" readonly />
+            <van-field v-model="info.usernum" name="usernum" label="项目总人数" readonly />
+            <van-field v-model="info.laiyuancontent" name="laiyuancontent" label="项目来源文本" type="textarea" autosize rows="1" readonly />
+            <van-field v-model="info.labname" name="labname" label="立项标准部门(单位)" type="textarea" autosize rows="1" readonly />
           </van-form>
         </van-col>
       </van-col>

+ 5 - 2
src/layout/scientific/task/list-1.vue

@@ -8,10 +8,13 @@
           </van-col>
           <van-col span="24" class="other">
             <van-col span="24" class="otherInfo">
-              单位:<span>{{ item.unit || '暂无' }}</span>
+              项目(课题)编号:<span>{{ item.projectlevelone || '暂无' }}</span>
             </van-col>
             <van-col span="24" class="otherInfo">
-              研究方向:<span>{{ item.directionId || '暂无' }}</span>
+              起止时间:<span>{{ item.time || '暂无' }}</span>
+            </van-col>
+            <van-col span="24" class="otherInfo">
+              项目来源:<span>{{ item.laiyuancontent || '暂无' }}</span>
             </van-col>
           </van-col>
           <van-col span="24" class="btn">

+ 7 - 7
src/layout/scientific/task/search-1.vue

@@ -5,13 +5,13 @@
         <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.name" name="name" label="合作单位" placeholder="请输入合作单位" />
-            <van-field v-model="form.name" name="name" label="转化效益(万元)" placeholder="请输入转化效益(万元)" />
+            <van-field v-model="form.laiyuancontent" name="laiyuancontent" label="项目来源" placeholder="请输入项目来源" />
+            <van-field v-model="form.projectlevelone" name="projectlevelone" label="项目(课题)编号" placeholder="请输入项目(课题)编号" />
+            <van-field v-model="form.money" name="money" type="number" label="经费(万元)" placeholder="请输入经费(万元)" />
+            <van-field v-model="form.userName" name="userName" label="负责人" placeholder="请输入负责人" />
+            <van-field v-model="form.directionName" name="directionName" label="所属研究方向" placeholder="请输入所属研究方向" />
+            <van-field v-model="form.cooperativeunit" name="cooperativeunit" label="合作单位" placeholder="请输入合作单位" />
+            <van-field v-model="form.projectsource" name="projectsource" type="number" 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>

+ 76 - 1
src/views/scientific/task/index.vue

@@ -29,7 +29,81 @@ export default {
   },
   data: function () {
     return {
-      list: [],
+      list: [
+        {
+          cooperativeunit: '中心',
+          createBy: '1',
+          createTime: '2021-09-23 10:30:01',
+          delFlag: '0',
+          direction: 'direction001',
+          directionName: '开创视觉光刺激治疗癫痫研究',
+          fzuser: 'person001',
+          id: '6db0514ae17443e0a6017a30381df660',
+          labname: null,
+          laiyuancontent: '横向合作<横向合作',
+          money: 105,
+          name: '名称',
+          params: {},
+          participants: null,
+          persons: [
+            {
+              createBy: null,
+              createTime: '2021-10-09 09:52:14',
+              delFlag: '0',
+              id: '30501382e525433bba47df3ecc0789db',
+              params: {},
+              projectid: '6db0514ae17443e0a6017a30381df660',
+              remark: null,
+              searchValue: null,
+              updateBy: null,
+              updateTime: null,
+              userName: '张彤',
+              userid: 'person004',
+            },
+            {
+              createBy: null,
+              createTime: '2021-10-09 09:52:14',
+              delFlag: '0',
+              id: '4637ac39b76545dfb27718e9d8d169a0',
+              params: {},
+              projectid: '6db0514ae17443e0a6017a30381df660',
+              remark: null,
+              searchValue: null,
+              updateBy: null,
+              updateTime: null,
+              userName: '王江涛',
+              userid: 'person001',
+            },
+            {
+              createBy: null,
+              createTime: '2021-10-09 09:52:14',
+              delFlag: '0',
+              id: '98953aab18c04f3499ca6fafcb823c8d',
+              params: {},
+              projectid: '6db0514ae17443e0a6017a30381df660',
+              remark: null,
+              searchValue: null,
+              updateBy: null,
+              updateTime: null,
+              userName: '刘光耀',
+              userid: 'person002',
+            },
+          ],
+          projectlevelone: 'xm666sss',
+          projectsource: '5',
+          projectsourcetwo: '21',
+          remark: null,
+          searchValue: null,
+          state: null,
+          statemoney: 5,
+          time: '2021-09-22',
+          updateBy: null,
+          updateTime: '2021-10-09 09:52:14',
+          userName: '王江涛',
+          usernum: '10',
+          userproportion: '30%',
+        },
+      ],
       total: 0,
       limit: 5,
       // 查询
@@ -50,6 +124,7 @@ export default {
     },
     // 查看信息
     async toView(data) {
+      data.persons = JSON.stringify(data.persons.map((i) => i.userName));
       this.$set(this, `info`, data);
       this.dialog = { show: true, title: '详细信息', type: '1' };
     },