提交 8a2481c3 编写于 作者: zhentian.jia's avatar zhentian.jia

table空状态 时间组件

上级 fd31c18d
...@@ -28,26 +28,28 @@ ...@@ -28,26 +28,28 @@
</el-form-item> </el-form-item>
<el-form-item label="项目时间:" required> <el-form-item label="项目时间:" required>
<el-col :span="3"> <el-col :span="3">
<el-form-item label> <el-form-item prop="projectBegintime">
<el-date-picker <el-date-picker
v-model="formData.projectBegintime" v-model="formData.projectBegintime"
size="mini" size="mini"
type="date" type="datetime"
placeholder="请选择开始时间" placeholder="请选择开始时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col class="line" :span="0"></el-col>
<el-form-item label="~"> <el-col :span="4">
<el-form-item label=" " prop="projectEndtime">
<el-date-picker <el-date-picker
v-model="formData.projectEndtime" v-model="formData.projectEndtime"
size="mini" size="mini"
type="date" type="datetime"
placeholder="请选择结束时间" placeholder="请选择结束时间"
value-format="yyyy-MM-dd 23:59:59" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions1" :picker-options="pickerOptions1"
default-time="23:59:59"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -254,6 +256,12 @@ ...@@ -254,6 +256,12 @@
<el-table-column prop="cityName" label="所属城市" align="center"></el-table-column> <el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
<el-table-column prop="countyName" label="所属区县" align="center"></el-table-column> <el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
<el-table-column prop="townName" label="所属街道" align="center"></el-table-column> <el-table-column prop="townName" label="所属街道" align="center"></el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<p>没有查询到相关结果</p>
</div>
</div>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination <el-pagination
...@@ -280,6 +288,12 @@ ...@@ -280,6 +288,12 @@
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="科室名称" align="center"></el-table-column> <el-table-column prop="name" label="科室名称" align="center"></el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<p>没有查询到相关结果</p>
</div>
</div>
</el-table> </el-table>
</el-col> </el-col>
</el-tab-pane> </el-tab-pane>
...@@ -338,6 +352,12 @@ ...@@ -338,6 +352,12 @@
<el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column> <el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column>
<el-table-column prop="cityName" label="所属城市" align="center"></el-table-column> <el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
<el-table-column prop="countyName" label="所属区县" align="center"></el-table-column> <el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<p>没有查询到相关结果</p>
</div>
</div>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination <el-pagination
...@@ -601,7 +621,6 @@ export default { ...@@ -601,7 +621,6 @@ export default {
], ],
projectBegintime: [ projectBegintime: [
{ {
type: "date",
required: true, required: true,
message: "请选择时间", message: "请选择时间",
trigger: "change" trigger: "change"
...@@ -609,7 +628,6 @@ export default { ...@@ -609,7 +628,6 @@ export default {
], ],
projectEndtime: [ projectEndtime: [
{ {
type: "date",
required: true, required: true,
message: "请选择时间", message: "请选择时间",
trigger: "change" trigger: "change"
...@@ -1010,7 +1028,6 @@ export default { ...@@ -1010,7 +1028,6 @@ export default {
}); });
} }
}); });
} else { } else {
//没有选择范围 //没有选择范围
vm.$message({ vm.$message({
...@@ -1225,7 +1242,7 @@ export default { ...@@ -1225,7 +1242,7 @@ export default {
if (this.idType == 1) { if (this.idType == 1) {
this.getAdministrative(); this.getAdministrative();
} else { } else {
this.activeName = 'second'; this.activeName = "second";
this.getOrganization(); this.getOrganization();
} }
} }
...@@ -1612,7 +1629,7 @@ export default { ...@@ -1612,7 +1629,7 @@ export default {
} }
} else if (type == "administrativeUpdate") { } else if (type == "administrativeUpdate") {
//console.log(this.allSelectedKeys.length); //console.log(this.allSelectedKeys.length);
if(this.allSelectedKeys.length > 0) { if (this.allSelectedKeys.length > 0) {
for (let i = 0; i < this.allSelectedKeys.length; i++) { for (let i = 0; i < this.allSelectedKeys.length; i++) {
scope += scope +=
this.allSelectedKeys[i].key + ":" + this.allSelectedKeys[i].type; this.allSelectedKeys[i].key + ":" + this.allSelectedKeys[i].type;
...@@ -1624,8 +1641,7 @@ export default { ...@@ -1624,8 +1641,7 @@ export default {
let noChangeTree = this.getTreeCheck(); let noChangeTree = this.getTreeCheck();
console.log(noChangeTree); console.log(noChangeTree);
for (let i = 0; i < noChangeTree.length; i++) { for (let i = 0; i < noChangeTree.length; i++) {
scope += scope += noChangeTree[i].key + ":" + noChangeTree[i].type;
noChangeTree[i].key + ":" + noChangeTree[i].type;
if (i < noChangeTree.length - 1) { if (i < noChangeTree.length - 1) {
scope += "|"; scope += "|";
} }
...@@ -2019,6 +2035,14 @@ export default { ...@@ -2019,6 +2035,14 @@ export default {
.second-step { .second-step {
margin: 10px 0 0 20px; margin: 10px 0 0 20px;
//隐藏树展开 //隐藏树展开
.table-empty {
img {
width: 100px;
}
p {
margin-top: -50px;
}
}
.el-tree-node__expand-icon { .el-tree-node__expand-icon {
display: none; display: none;
} }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-date-picker <el-date-picker
v-model="formInline.projectBegintime" v-model="formInline.projectBegintime"
size="mini" size="mini"
type="date" type="datetime"
placeholder="请选择开始时间" placeholder="请选择开始时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
...@@ -39,14 +39,15 @@ ...@@ -39,14 +39,15 @@
<el-date-picker <el-date-picker
v-model="formInline.projectEndtime" v-model="formInline.projectEndtime"
size="mini" size="mini"
type="date" type="datetime"
placeholder="请选择结束时间" placeholder="请选择结束时间"
value-format="yyyy-MM-dd 23:59:59" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions1" :picker-options="pickerOptions1"
default-time="23:59:59"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9" style="padding:0;text-align:right;padding-right:15px;"> <el-col :span="8" style="padding:0;text-align:right;padding-right:15px;">
<el-button type="primary" size="small" @click="getProjectList">查询</el-button> <el-button type="primary" size="small" @click="getProjectList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button> <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
</el-col> </el-col>
...@@ -149,6 +150,12 @@ ...@@ -149,6 +150,12 @@
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<p>没有查询到相关结果</p>
</div>
</div>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination <el-pagination
...@@ -277,8 +284,8 @@ export default { ...@@ -277,8 +284,8 @@ export default {
let typeStr = parseInt(type); let typeStr = parseInt(type);
//console.log("状态:"+projectStatus+ "等级:" + level + " 按钮类型:" + type); //console.log("状态:"+projectStatus+ "等级:" + level + " 按钮类型:" + type);
//console.log('idType',idType); //console.log('idType',idType);
let buttonStatus = ''; let buttonStatus = "";
if(idType == 1) { if (idType == 1) {
//内部项目 //内部项目
buttonStatus = returnData().buttonStatusIn; buttonStatus = returnData().buttonStatusIn;
} else { } else {
...@@ -404,6 +411,14 @@ export default { ...@@ -404,6 +411,14 @@ export default {
.add-button { .add-button {
float: right; float: right;
} }
.table-empty {
img {
width: 100px;
}
p {
margin-top: -50px;
}
}
} }
} }
</style> </style>
\ No newline at end of file
...@@ -57,10 +57,7 @@ ...@@ -57,10 +57,7 @@
</el-col> </el-col>
</el-form> </el-form>
</el-row> </el-row>
<el-table <el-table :data="tableData" style="width: 100%">
:data="tableData"
style="width: 100%"
>
<el-table-column prop="userId" label="用户ID" align="center"></el-table-column> <el-table-column prop="userId" label="用户ID" align="center"></el-table-column>
<el-table-column prop="userName" label="姓名" align="center"></el-table-column> <el-table-column prop="userName" label="姓名" align="center"></el-table-column>
<el-table-column prop="projeceRole" label="角色" align="center"> <el-table-column prop="projeceRole" label="角色" align="center">
...@@ -92,6 +89,12 @@ ...@@ -92,6 +89,12 @@
>降为普通用户</el-button> >降为普通用户</el-button>
</template> </template>
</el-table-column> </el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<p>没有查询到相关结果</p>
</div>
</div>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination <el-pagination
...@@ -342,6 +345,14 @@ export default { ...@@ -342,6 +345,14 @@ export default {
color: #449284; color: #449284;
} }
} }
.table-empty {
img {
width: 100px;
}
p {
margin-top: -50px;
}
}
} }
} }
</style> </style>
\ No newline at end of file
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<el-date-picker <el-date-picker
v-model="formInline.projectBegintime" v-model="formInline.projectBegintime"
size="mini" size="mini"
type="date" type="datetime"
placeholder="请选择开始时间" placeholder="请选择开始时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
<el-date-picker <el-date-picker
v-model="formInline.projectEndtime" v-model="formInline.projectEndtime"
size="mini" size="mini"
type="date" type="datetime"
placeholder="请选择结束时间" placeholder="请选择结束时间"
value-format="yyyy-MM-dd 23:59:59" value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions1" :picker-options="pickerOptions1"
default-time="23:59:59"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -40,9 +41,7 @@ ...@@ -40,9 +41,7 @@
</el-col> </el-col>
</el-form> </el-form>
</el-row> </el-row>
<el-table <el-table :data="tableData" style="width: 100%">
:data="tableData" style="width: 100%"
>
<el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column> <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
<el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column> <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="createdName" label="创建人" align="center"></el-table-column> <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
...@@ -59,6 +58,12 @@ ...@@ -59,6 +58,12 @@
<el-button type="primary" size="small" @click="toPage(scope.row)">查看项目人员</el-button> <el-button type="primary" size="small" @click="toPage(scope.row)">查看项目人员</el-button>
</template> </template>
</el-table-column> </el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<p>没有查询到相关结果</p>
</div>
</div>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination <el-pagination
...@@ -100,12 +105,15 @@ export default { ...@@ -100,12 +105,15 @@ export default {
projectEndtime: "", projectEndtime: "",
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
type: 2, type: 2
}, },
pickerOptions0: { pickerOptions0: {
disabledDate: time => { disabledDate: time => {
if (this.formInline.projectEndtime != "") { if (this.formInline.projectEndtime != "") {
return time.getTime() > new Date(this.formInline.projectEndtime).getTime(); return (
time.getTime() >
new Date(this.formInline.projectEndtime).getTime()
);
} }
} }
}, },
...@@ -180,13 +188,14 @@ export default { ...@@ -180,13 +188,14 @@ export default {
.add-button { .add-button {
float: right; float: right;
} }
// .el-table .cell { .table-empty {
// color: #929292; img {
// } width: 100px;
// .el-table th > .cell { }
// font-weight: bold; p {
// color: #000; margin-top: -50px;
// } }
}
} }
} }
</style> </style>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册