Skip to content

P
pica.cloud.web-education-admin
提交 8f73e1be 编写于 作者: zhentian.jia's avatar zhentian.jia
浏览文件
操作

fix bug 3-20

上级 88f86be8
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 218 行增加 和 144 行删除
src/views/education/add-manager.vue
浏览文件 @ 8f73e1be
此差异已折叠。
src/views/education/item-manager.vue
浏览文件 @ 8f73e1be
......@@ -30,6 +30,7 @@
type="date"
placeholder="请选择开始时间"
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions0"
></el-date-picker>
</el-form-item>
</el-col>
......@@ -40,8 +41,8 @@
size="mini"
type="date"
placeholder="请选择结束时间"
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd 23:59:59"
:picker-options="pickerOptions1"
></el-date-picker>
</el-form-item>
</el-col>
......@@ -217,15 +218,22 @@ export default {
projectEndtime: "",
projectStatus: "",
pageNo: 1,
pageSize: 10
pageSize: 10,
},
pickerBeginDateAfter: {
pickerOptions0: {
disabledDate: time => {
let beginDateVal = this.formInline.projectBegintime;
if (beginDateVal) {
return time.getTime() < beginDateVal;
if (this.formInline.projectEndtime != "") {
return time.getTime() > new Date(this.formInline.projectEndtime).getTime();
}
}
},
pickerOptions1: {
disabledDate: time => {
return (
time.getTime() <
new Date(this.formInline.projectBegintime).getTime()
); //减去一天的时间代表可以选择同一天;
}
}
};
},
......@@ -237,29 +245,6 @@ export default {
toPage() {
this.$router.push("add-manager");
},
setParam(data) {
let param = {};
if (
data.duringTime !== null &&
data.duringTime !== "" &&
data.duringTime[0] !== null &&
data.duringTime[1] !== null
) {
param.projectBegintime = data.duringTime[0];
param.projectEndtime = data.duringTime[1];
}
for (let key in data) {
if (
key !== "duringTime" &&
key !== "projectBegintime" &&
key !== "projectEndtime"
) {
param[key] = data[key];
}
}
console.log(param);
return param;
},
//查询项目列表
getProjectList() {
let req = {};
......
src/views/system/item-role.vue
浏览文件 @ 8f73e1be
......@@ -87,8 +87,8 @@
<el-button
type="primary"
size="small"
v-show="showButton(scope.row,'L4')"
@click="openDialog(scope.row,'L4')"
v-show="showButton(scope.row,'L0')"
@click="openDialog(scope.row,'L0')"
>降为普通用户</el-button>
</template>
</el-table-column>
......@@ -142,7 +142,7 @@ export default {
const item = {
userId: "298490",
userName: "李雪",
projeceRole: "L4",
projeceRole: "L0",
organizationName: "浙江省人民医院",
departmentsName: "外科"
};
......@@ -181,7 +181,7 @@ export default {
},
{
label: "普通用户",
value: "L4"
value: "L0"
}
],
numL2: 0,
......@@ -214,8 +214,8 @@ export default {
req = this.formInline;
openLoading(vm);
vm.GET("portalProjectOrRole/queryRoleList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
closeLoading(vm);
vm.tableData = res.data.projectRoleInfoModels;
vm.totalRows = res.data.total;
......@@ -273,14 +273,14 @@ export default {
let flag = false;
//console.log("当前等级 " + row.projeceRole + " 改变成等级 " + projeceRole);
if (row.projeceRole == "L2") {
if (projeceRole == "L4") {
if (projeceRole == "L0") {
flag = true;
}
} else if (row.projeceRole == "L3") {
if (projeceRole == "L2" || projeceRole == "L4") {
if (projeceRole == "L2" || projeceRole == "L0") {
flag = true;
}
} else if (row.projeceRole == "L4") {
} else if (row.projeceRole == "L0") {
if (projeceRole == "L2" || projeceRole == "L3") {
flag = true;
}
......@@ -300,17 +300,17 @@ export default {
this.scopeRow.updateL = projeceRole;
if (row.projeceRole == "L2") {
this.dialog.role = "项目负责人";
if (projeceRole == "L4") {
if (projeceRole == "L0") {
this.dialog.option = "降级为普通用户";
}
} else if (row.projeceRole == "L3") {
this.dialog.role = "次级负责人";
if (projeceRole == "L2") {
this.dialog.option = "升级为项目负责人";
} else if (projeceRole == "L4") {
} else if (projeceRole == "L0") {
this.dialog.option = "降级为普通用户";
}
} else if (row.projeceRole == "L4") {
} else if (row.projeceRole == "L0") {
this.dialog.role = "普通用户";
if (projeceRole == "L2") {
this.dialog.option = "升级为项目负责人";
......
src/views/system/role.vue
浏览文件 @ 8f73e1be
......@@ -13,16 +13,28 @@
<el-col :span="6">
<el-form-item label="项目时间：">
<el-date-picker
v-model="formInline.projectBegintime"
size="mini"
type="daterange"
start-placeholder="请选择项目开始时间"
end-placeholder="请选择项目结束时间"
v-model="formInline.duringTime"
type="date"
placeholder="请选择开始时间"
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions0"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" style="padding:0;text-align:right;padding-right:15px;">
<el-col :span="4">
<el-form-item label="~">
<el-date-picker
v-model="formInline.projectEndtime"
size="mini"
type="date"
placeholder="请选择结束时间"
value-format="yyyy-MM-dd 23:59:59"
:picker-options="pickerOptions1"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" style="padding:0;text-align:right;padding-right:15px;">
<el-button type="primary" size="small" @click="search">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
</el-col>
......@@ -87,9 +99,24 @@ export default {
projectName: "",
projectBegintime: "",
projectEndtime: "",
duringTime: "",
pageNo: 1,
pageSize: 10
pageSize: 10,
type: 2,
},
pickerOptions0: {
disabledDate: time => {
if (this.formInline.projectEndtime != "") {
return time.getTime() > new Date(this.formInline.projectEndtime).getTime();
}
}
},
pickerOptions1: {
disabledDate: time => {
return (
time.getTime() <
new Date(this.formInline.projectBegintime).getTime()
); //减去一天的时间代表可以选择同一天;
}
}
};
},
......@@ -98,37 +125,14 @@ export default {
this.search();
},
methods: {
setParam(data) {
let param = {};
if (
data.duringTime !== null &&
data.duringTime !== "" &&
data.duringTime[0] !== null &&
data.duringTime[1] !== null
) {
param.projectBegintime = data.duringTime[0];
param.projectEndtime = data.duringTime[1];
}
for (let key in data) {
if (
key !== "duringTime" &&
key !== "projectBegintime" &&
key !== "projectEndtime"
) {
param[key] = data[key];
}
}
console.log(param);
return param;
},
search() {
let req = {};
console.log(this.formInline);
req = this.setParam(this.formInline);
//console.log(this.formInline);
req = this.formInline;
openLoading(vm);
vm.GET("portalInfo/getProjectList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
closeLoading(vm);
vm.tableData = res.data.data;
vm.totalRows = res.data.totalRows;
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或