ccsens_zhengzhichuan
/
research
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

成员类型改为单选，课题详情-研究内容，预期结果改为竖向

master
lzp 2 months ago
parent
241aa741c3
commit
436fe5dd4a
3 changed files with 143 additions and 155 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      ruoyi-ui/kygx科研admin-1.zip
  2. 24
      ruoyi-ui/src/views/member/index.vue
  3. 274
      ruoyi-ui/src/views/researchGroup/detail.vue

BIN
ruoyi-ui/kygx科研admin-1.zip
View File

Binary file not shown.

24
ruoyi-ui/src/views/member/index.vue
View File

@ -310,12 +310,8 @@
show-overflow-tooltip
>
<template slot-scope="scope">
{{
memberTypeList
.filter((item) => scope.row.type.includes(item.value))
.map((item) => item.label)
.join("、") || "-"
}}
<span v-if="scope.row.type == 1">课题组负责人</span>
<span v-if="scope.row.type == 2">参与人员</span>
</template>
</el-table-column>
@ -560,7 +556,7 @@
v-if="!this.form.disabled"
prop="type"
>
<el-select v-model="form.type" multiple filterable>
<el-select v-model="form.type" filterable>
<el-option
v-for="item in form.category === 0
? memberTypeList
@ -899,17 +895,17 @@ export default {
// label: "合作单位负责人",
// },
{
value: 1,
value: "1",
label: "课题组负责人",
},
{
value: 2,
value: "2",
label: "参与人员",
},
],
memberTypeList1: [
{
value: 2,
value: "2",
label: "参与人员",
},
],
@ -1086,9 +1082,9 @@ export default {
// 身份类型改变时，成员类型改变
handleCategoryChange() {
if (this.form.category === 0) {
this.form.type = [];
this.form.type = "";
} else {
this.form.type = [2];
this.form.type = "2";
}
},
// 职称
@ -1276,7 +1272,7 @@ export default {
handleAdd(row) {
this.reset();
if (row.id) {
this.form.type = [2];
this.form.type = "2";
this.form.ktGroupId = row.ktGroupId;
this.form.parentMemberId = row.id;
this.form.disabled = true;
@ -1293,8 +1289,6 @@ export default {
} else {
this.form.title = [];
}
console.log(this.form.type);
this.form.radio = 0; // 0-关联已有账号 1-新增账号
this.form.ktGroupType = 0; // 0-关联已有课题组 1-新增课题组
this.open = true;

274
ruoyi-ui/src/views/researchGroup/detail.vue
View File

@ -57,81 +57,76 @@
>
</el-input>
</el-form-item>
<!-- <el-alert
:title="config.promptResearchGoal || '-'"
type="info"
:closable="false"
>
</el-alert> -->
</div>
<div class="div-card">
<el-form-item label="研究内容" prop="nrList">
<div class="card-table1 card-table2">
<div class="card-table1-left">
<div class="card-table1-item">
<div class="item-title item-title1">内容</div>
<div class="item-title item-title1">状态</div>
</div>
</div>
<div class="card-table1-content">
<div
class="card-table1-content1"
:style="{ 'padding-right': groupDisable ? '0px' : '150px' }"
>
<div
class="card-table1-item"
v-for="(item, index) in groupDetail.nrList"
:key="index"
<div style="opacity: 0">研究内容</div>
<div style="width: 100%; margin-bottom: 16px">
<el-button
type="primary"
@click="handleAddNrList"
size="small"
:disabled="groupDisable"
>
新增
</el-button>
</div>
<el-table v-loading="loading" :data="groupDetail.nrList" border>
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column
label="内容"
align="center"
prop="nr"
minWidth="140"
>
<template slot-scope="scope">
<span
style="color: #409eff; cursor: pointer"
@click="handleEdit('nrList', scope.$index, scope.row)"
>
<div class="item-title">
<span
style="color: #409eff; cursor: pointer"
@click="handleEdit('nrList', index)"
>
编辑
</span>
</div>
<div class="item-title">
<el-select
class="div-select"
:disabled="groupDisable"
v-model="item.status"
placeholder="请选择状态"
style="width: 100%; height: 100%"
>
<el-option label="完成" :value="1" />
<el-option label="未完成" :value="0" />
</el-select>
</div>
</div>
<div
class="zwsj"
v-if="groupDetail.nrList && !groupDetail.nrList.length"
编辑/查看
</span>
</template>
</el-table-column>
<el-table-column
label="状态"
align="center"
prop="status"
minWidth="140"
>
<template slot-scope="scope">
<el-select
v-model="scope.row.status"
:disabled="groupDisable"
>
暂无数据
</div>
</div>
</div>
<!-- 添加、拟合项 -->
<div class="card-table1-right" v-if="!groupDisable">
<div class="card-table1-item">
<div
class="item-title"
style="height: 108px"
@click="handleAddNrList"
<el-option label="完成" :value="1" />
<el-option label="未完成" :value="0" />
</el-select>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="280"
fixed="right"
>
<template slot-scope="scope">
<el-button
type="danger"
size="mini"
:disabled="groupDisable"
@click="handleDelete('nrList', scope.$index)"
>
<i class="el-icon-plus"></i>
</div>
</div>
</div>
</div>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
<!-- <el-alert
:title="config.promptResearchContent || '-'"
type="info"
:closable="false"
>
</el-alert> -->
</div>
<div class="div-card">
<el-form-item label="研究方案" prop="fa">
@ -146,81 +141,76 @@
>
</el-input>
</el-form-item>
<!-- <el-alert
:title="config.promptResearchPlan || '-'"
type="info"
:closable="false"
>
</el-alert> -->
</div>
<div class="div-card">
<el-form-item label="预期成果" prop="yqcgList">
<div class="card-table1 card-table2">
<div class="card-table1-left">
<div class="card-table1-item">
<div class="item-title item-title1">内容</div>
<div class="item-title item-title1">状态</div>
</div>
</div>
<div class="card-table1-content">
<div
class="card-table1-content1"
:style="{ 'padding-right': groupDisable ? '0px' : '150px' }"
>
<div
class="card-table1-item"
v-for="(item, index) in groupDetail.yqcgList"
:key="index"
<div style="opacity: 0">预期成果</div>
<div style="width: 100%; margin-bottom: 16px">
<el-button
type="primary"
@click="handleAddyqcgList"
size="small"
:disabled="groupDisable"
>
新增
</el-button>
</div>
<el-table v-loading="loading" :data="groupDetail.yqcgList" border>
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column
label="内容"
align="center"
prop="nr"
minWidth="140"
>
<template slot-scope="scope">
<span
style="color: #409eff; cursor: pointer"
@click="handleEdit('yqcgList', scope.$index, scope.row)"
>
<div class="item-title">
<span
style="color: #409eff; cursor: pointer"
@click="handleEdit('yqcgList', index)"
>
编辑
</span>
</div>
<div class="item-title">
<el-select
class="div-select"
:disabled="groupDisable"
v-model="item.status"
placeholder="请选择状态"
>
<el-option label="完成" :value="1" />
<el-option label="未完成" :value="0" />
</el-select>
</div>
</div>
<div
class="zwsj"
v-if="groupDetail.yqcgList && !groupDetail.yqcgList.length"
编辑/查看
</span>
</template>
</el-table-column>
<el-table-column
label="状态"
align="center"
prop="status"
minWidth="140"
>
<template slot-scope="scope">
<el-select
v-model="scope.row.status"
:disabled="groupDisable"
>
暂无数据
</div>
</div>
</div>
<!-- 添加、拟合项 -->
<div class="card-table1-right" v-if="!groupDisable">
<div class="card-table1-item">
<div
class="item-title"
style="height: 108px"
@click="handleAddyqcgList"
<el-option label="完成" :value="1" />
<el-option label="未完成" :value="0" />
</el-select>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="280"
fixed="right"
>
<template slot-scope="scope">
<el-button
type="danger"
size="mini"
:disabled="groupDisable"
@click="handleDelete('yqcgList', scope.$index)"
>
<i class="el-icon-plus"></i>
</div>
</div>
</div>
</div>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
<!-- <el-alert
:title="config.promptExpectedResults || '-'"
type="info"
:closable="false"
>
</el-alert> -->
</div>
</el-form>
<div style="text-align: center; margin-top: 50px" v-if="!groupDisable">
@ -311,20 +301,20 @@ export default {
});
},
// 编辑研究内容
handleEdit(_name, _index) {
handleEdit(_name, _index, row) {
console.log("row", row);
if (this.groupDisable) return;
this.contentName = {
name: _name,
index: _index,
content: "",
content: row.content,
};
let content = this.groupDetail[_name][_index].content;
let content = this.contentName.content;
content =
content?.replace(
new RegExp(this.VUE_APP_IMG_VAR, "g"),
process.env.VUE_APP_BASE_API
) || "";
console.log("content1", content);
this.contentName.content = JSON.parse(JSON.stringify(content));
this.open = true;
},
@ -336,6 +326,10 @@ export default {
status: "",
});
},
// 删除研究内容
handleDelete(_name, _index) {
this.groupDetail[_name].splice(_index, 1);
},
// 添加预期成果
handleAddyqcgList() {
this.groupDetail.yqcgList.push({

Write Preview
Loading…
Cancel
Save