diff --git a/resource/img/dataicon.png b/resource/img/dataicon.png
new file mode 100644
index 0000000..ce428ee
--- /dev/null
+++ b/resource/img/dataicon.png
diff --git a/resource/img/search-btn.png b/resource/img/search-btn.png
new file mode 100644
index 0000000..a9dc7c9
--- /dev/null
+++ b/resource/img/search-btn.png
diff --git a/topages/workfill/workfill.js b/topages/workfill/workfill.js
index c476b0c..a9cc26a 100644
--- a/topages/workfill/workfill.js
+++ b/topages/workfill/workfill.js
@@ -47,16 +47,21 @@ $('#time-opr-prevbtn').on('click',function () {
$('#time-opr-nextbtn').on('click',function () {
fun.timeoprnextbtn();
});
+
//提交事件
-$('.workfill-list-btn').on('click',function () {
+$(document).on('click','.workfill-list-btn',function () {
var _this=$(this);
- console.log(_this);
- if($('.workfill-projectCon').hasClass('display-none')){
+ if(_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').hasClass('display-none')){
_this.text('提交');
+ _this.parent().parent().find(".workfill-list-container").attr("contenteditable","true");
}else {
_this.text('编辑');
+ _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false");
}
_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').toggleClass('display-none');
+ var projectName=_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon .work-projectName').find("option:selected").text();
_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').toggleClass('display-none');
+ _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName);
+
});
diff --git a/topages/workquery/workquery.css b/topages/workquery/workquery.css
index 6ceb14f..1eec4aa 100644
--- a/topages/workquery/workquery.css
+++ b/topages/workquery/workquery.css
@@ -1,3 +1,7 @@
+.workquery-cardlist{
+ height: 138px;
+ width: 100%;
+}
.workquery-cardlist li{
width:324px ;
height: 136px;
@@ -36,10 +40,75 @@
/*----------------------------------------时间*/
+.workquery-timeopr-wrap{
+ height: 34px;
+ margin-top: 30px;
+ margin-bottom: 30px;
+}
+.workquery-timeopr-wrap .timeopr-text{
+ height: 34px;
+ line-height: 34px;
+ color: #363d5d;
+ font-size: 14px;
+ width: 72px;
+}
+.ITD-daterange-btn {
+ float: left;
+ width: 120px;
+ height: 34px;
+ line-height: 34px;
-
-
-
+ padding-top: 1px !important;
+}
+.ITD-daterange-bg {
+ width: 90px;
+ text-align: left;
+ background: url(../../resource/img/dataicon.png) no-repeat 94% 9px !important;
+ background-color: #fff !important;
+ padding-right: 25px;
+ z-index: 9999;
+ border-radius: 4px !important;
+}
+.ITD-input-bordercolor {
+ color: rgba(0,0,0,0.45);
+ border: 1px solid #d8e2e5 !important;
+ border-radius: 4px !important;
+}
+.ITD-parkinput78 {
+ width: 180px;
+ height: 34px;
+ line-height: 34px;
+}
+.paddingleft-10 {
+ padding-left: 10px;
+}
+.workquery-timeopr-div{
+ width: 200px;
+ height: 34px;
+ line-height: 34px;
+}
+/*input 样式*/
+.bootstrap-select.btn-group .dropdown-toggle .filter-option {
+ text-align: left !important;
+}
+.bootstrap-select.btn-group .dropdown-toggle .caret{
+ position: absolute;
+ top: 50%;
+ left:170px !important;;
+ margin-top: -2px;
+ vertical-align: middle;
+}
+.margin-right-40{
+ margin-right: 40px;
+}
+/*查询按钮*/
+.workquery-searchbtn{
+ background: url("../../resource/img/search-btn.png") no-repeat;
+ width: 66px;
+ height: 66px;
+ top: -12px;
+ right: 0px;
+}
/*----------------------------------------列表*/
.workquery-list-wrap>li{
diff --git a/topages/workquery/workquery.html b/topages/workquery/workquery.html
index b1cd7b2..9105bae 100644
--- a/topages/workquery/workquery.html
+++ b/topages/workquery/workquery.html
@@ -13,11 +13,33 @@
3
-时间操作区域
+
+
+
选择时间
+
+
+
+
-
+
+
+
+
选择项目
+
+
+
+
人员名称
+
+
+
+
-
- 项目1
diff --git a/topages/workquery/workquery.js b/topages/workquery/workquery.js
index e69de29..d40d21f 100644
--- a/topages/workquery/workquery.js
+++ b/topages/workquery/workquery.js
@@ -0,0 +1,49 @@
+/**
+ * Created by mac on 18/7/24.
+ */
+var fun={
+ init:function () {
+ $('#workquery-projectName').selectpicker('render');
+ fun.dateInit();
+ },
+ dateInit:function () {
+ //时间初始化
+ $('#workquery-daterange-btnsta').val(moment().subtract('days', 6).format('YYYY-MM-DD'));
+ $('#workquery-daterange-btnend').val(moment().subtract('days', 0).format('YYYY-MM-DD'));
+ //开始日期
+ $("#workquery-daterange-btnsta").datetimepicker({
+ endDate: moment().subtract('days', 0).format('YYYY-MM-DD'),
+ format: 'yyyy-mm-dd',
+ autoclose: true,
+ startView: 2,
+ //maxDate:moment().subtract('months', 3),
+ minView: 2,
+ forceParse: false,
+ clearBtn: true , //添加清除按钮，可选值：true/false
+ locale: "zh-CN",
+ language: 'zh-CN',
+ pickerPosition: "bottom-right"
+ }).on("change", function () {
+ $("#workquery-daterange-btnend").val('');
+ });
+ //结束日期
+ $("#workquery-daterange-btnend").datetimepicker({
+ endDate: moment().subtract('days', 0).format('YYYY-MM-DD'),
+ //startDate:startVal,
+ format: 'yyyy-mm-dd',
+ weekStart: 1,
+ autoclose: true,
+ clearBtn: true , //添加清除按钮，可选值：true/false
+ startView: 2,
+ minView: 2,
+ forceParse: false,
+ locale: "zh-CN",
+ language: 'zh-CN',
+ pickerPosition: "bottom-right"
+ }).on("click", function () {
+ $("#workquery-daterange-btnend").datetimepicker("setStartDate", $("#workquery-daterange-btnsta").val())
+ });
+ },
+
+}
+fun.init();
\ No newline at end of file