提交 fa173bf1 编写于 作者: alex.zhang's avatar alex.zhang

导出弹窗调整

上级 e46a35f6
...@@ -44,11 +44,13 @@ ...@@ -44,11 +44,13 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="block" style="margin-bottom:20px"> <div class="block" style="margin-bottom:20px;display: flex;">
<el-button @click="showProjectTag">项目标签设置</el-button> <el-button @click="showProjectTag">项目标签设置</el-button>
<el-button @click="showProjectStatus">项目标记状态设置</el-button> <el-button @click="showProjectStatus">项目标记状态设置</el-button>
<el-button @click="queryDataListByClick">数据查询</el-button> <el-button @click="queryDataListByClick">数据查询</el-button>
<el-button @click="showExportModal">导出</el-button> <el-button @click="showExportModal">导出</el-button>
<div style="margin-left:20px;margin-top:5px">备注:请使用谷歌浏览器导出</div>
<a :href="'http://www.google.cn/chrome/'" class="href-link">点击下载</a>
</div> </div>
<template> <template>
<el-table :data="dataList" style="width: 100%"> <el-table :data="dataList" style="width: 100%">
...@@ -84,7 +86,8 @@ ...@@ -84,7 +86,8 @@
v-model="labelProjectMainId" v-model="labelProjectMainId"
@change="handleLabelchange" @change="handleLabelchange"
placeholder="请选择项目" placeholder="请选择项目"
style="margin-left: 110px"> style="margin-left: 110px"
>
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
<div style="margin-top: 20px; margin-left: 110px"> <div style="margin-top: 20px; margin-left: 110px">
...@@ -156,7 +159,12 @@ ...@@ -156,7 +159,12 @@
<el-dialog :visible.sync="setStatusVisible" :close-on-click-modal="false" width="500px"> <el-dialog :visible.sync="setStatusVisible" :close-on-click-modal="false" width="500px">
<p class="dialog-title">项目标记状态设置</p> <p class="dialog-title">项目标记状态设置</p>
<el-select v-model="statusProjectMainId" placeholder="请选择项目" @change="handleStatuschange" style="margin-left: 110px"> <el-select
v-model="statusProjectMainId"
placeholder="请选择项目"
@change="handleStatuschange"
style="margin-left: 110px"
>
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
...@@ -301,7 +309,9 @@ export default { ...@@ -301,7 +309,9 @@ export default {
}, },
rules: { rules: {
pName: [{ required: true, message: "请选择项目名称", trigger: "blur" }], pName: [{ required: true, message: "请选择项目名称", trigger: "blur" }],
labelProjectMainId: [{ required: true, message: "请选择项目名称", trigger: "blur" }], labelProjectMainId: [
{ required: true, message: "请选择项目名称", trigger: "blur" },
],
// dingdingNumber: [ // dingdingNumber: [
// { // {
// required: true, // required: true,
...@@ -432,9 +442,11 @@ export default { ...@@ -432,9 +442,11 @@ export default {
this.labelList = data.data; this.labelList = data.data;
if (this.labelList && this.labelList.length > 0) { if (this.labelList && this.labelList.length > 0) {
this.labelCount = this.labelList.length; this.labelCount = this.labelList.length;
console.log("getHistoryLabel() : this.labelCount = " + this.labelCount); console.log(
"getHistoryLabel() : this.labelCount = " + this.labelCount
);
if (this.labelCount > 0) { if (this.labelCount > 0) {
for(let item in this.labelList) { for (let item in this.labelList) {
if (item == 0) { if (item == 0) {
this.tag01 = this.labelList[item]; this.tag01 = this.labelList[item];
} else if (item == 1) { } else if (item == 1) {
...@@ -499,7 +511,7 @@ export default { ...@@ -499,7 +511,7 @@ export default {
]; ];
let checkTagValid = false; let checkTagValid = false;
for(let item = 0; item < this.labelList.length; item++) { for (let item = 0; item < this.labelList.length; item++) {
if (this.labelList[item] != null && this.labelList[item] != "") { if (this.labelList[item] != null && this.labelList[item] != "") {
checkTagValid = true; checkTagValid = true;
break; break;
...@@ -579,9 +591,11 @@ export default { ...@@ -579,9 +591,11 @@ export default {
this.statusList = data.data; this.statusList = data.data;
if (this.statusList && this.statusList.length > 0) { if (this.statusList && this.statusList.length > 0) {
this.statusCount = this.statusList.length; this.statusCount = this.statusList.length;
console.log("getHistoryStatus() : this.statusCount = " + this.statusCount); console.log(
"getHistoryStatus() : this.statusCount = " + this.statusCount
);
if (this.statusCount > 0) { if (this.statusCount > 0) {
for(let item in this.statusList) { for (let item in this.statusList) {
if (item == 0) { if (item == 0) {
this.status01 = this.statusList[item]; this.status01 = this.statusList[item];
} else if (item == 1) { } else if (item == 1) {
...@@ -633,10 +647,16 @@ export default { ...@@ -633,10 +647,16 @@ export default {
]; ];
let checkStatusValid = false; let checkStatusValid = false;
for(let item = 0; item < this.statusList.length; item++) { for (let item = 0; item < this.statusList.length; item++) {
console.log("setStatusSave() : this.statusList[item].value = " + this.statusList[item].value); console.log(
if (this.statusList[item].value != null && this.statusList[item].value != "" && "setStatusSave() : this.statusList[item].value = " +
this.statusList[item].value != undefined) { this.statusList[item].value
);
if (
this.statusList[item].value != null &&
this.statusList[item].value != "" &&
this.statusList[item].value != undefined
) {
checkStatusValid = true; checkStatusValid = true;
break; break;
} }
...@@ -668,7 +688,7 @@ export default { ...@@ -668,7 +688,7 @@ export default {
}, },
queryDataListByClick() { queryDataListByClick() {
this.currentPage=1; this.currentPage = 1;
this.queryDataList(); this.queryDataList();
}, },
...@@ -870,4 +890,9 @@ export default { ...@@ -870,4 +890,9 @@ export default {
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
} }
.href-link {
color: red;
margin-top:5px;
margin-left:10px;
}
</style> </style>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册