Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
songwc
2022-11-03 18:06:50 +08:00
12 changed files with 1101 additions and 1036 deletions

View File

@@ -190,7 +190,10 @@
</div>
<!-- 添加讨论侧弹窗 -->
<div>
<add-discuss v-model:adddiscussVisible="adddiscussvisible" />
<add-discuss
v-model:adddiscussVisible="adddiscussvisible"
@changeData="updateTableData"
/>
</div>
<!-- 添加讨论侧弹窗 -->
<div class="lin"></div>
@@ -367,11 +370,17 @@
<div class="modalMain" style="width: 100%">
<div class="name">
<div class="namebox">
<div>
<img
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
</div>
<div class="inname">阶段名称</div>
</div>
<div class="in">
<a-input
v-model:value="valueE"
v-model:value="valuesname"
show-count
:maxlength="20"
placeholder="请输入阶段名称"
@@ -384,7 +393,7 @@
</div>
<div class="intext" style="margin-left: 14px">
<a-textarea
v-model:value="value"
v-model:value="valuesnotice"
style="height: 88px"
show-count
:maxlength="100"
@@ -415,7 +424,7 @@
取消
</button>
<button
@click="closeModal"
@click="editStage"
style="
cursor: pointer;
margin-left: 16px;
@@ -551,6 +560,7 @@ import * as apiactivity from "../../api/indexActivity";
import * as apieval from "../../api/indexEval";
import * as apiinvist from "../../api/indexInvist";
import * as apivote from "../../api/indexVote";
import * as apistage from "../../api/indexStage";
const drawercolumns = [
{
title: "项目名称",
@@ -770,6 +780,8 @@ export default {
addvotevisible: false,
stage: false,
selectedRowKeys: [],
valuesname: "",
valuesnotice: "",
confirmModal: false, //确认添加阶段弹窗
cC: false,
cancelModal: false, //确认取消阶段弹窗
@@ -784,7 +796,6 @@ export default {
deleteActivityID: null, //删除活动id
deleteID: "",
});
const selectProjectName = (value, index) => {
console.log("value", value, index);
};
@@ -794,6 +805,28 @@ export default {
const afterVisibleChange = (bool) => {
console.log("visible", bool);
};
//添加阶段
const editStage = () => {
if (!state.valuesname) {
message.destroy();
return message.warning("请输入阶段名称");
}
let obj = {
name: state.valuesname,
projectId: 28,
remark: state.valuesnotice,
};
apistage
.editStage(obj)
.then((res) => {
console.log("添加阶段成功", res);
message.default();
message.success("添加阶段成功");
})
.catch((err) => {
console.log("添加阶段失败", err);
});
};
// 把数据放到state里
const getTableData = (tableData) => {
let data = tableData;
@@ -1453,6 +1486,7 @@ export default {
state.isactive = index;
state.isActive = !state.isActive;
};
return {
...toRefs(state),
selectProjectName,
@@ -1501,6 +1535,7 @@ export default {
editVotePath,
getTableData,
deleteTask,
editStage,
updateTableData,
};
},
@@ -1508,12 +1543,12 @@ export default {
</script>
<style lang="scss">
.ant-input {
border-radius: 8px;
// height: 120%;
width: 384px;
height: 88px;
}
// .ant-input {
// border-radius: 8px;
// // height: 120%;
// width: 384px;
// height: 88px;
// }
.ConfirmModal {
.ant-modal {
width: 424px !important;