From 7c134b07b3cbd23d06ae2256a022dee61964745d Mon Sep 17 00:00:00 2001 From: "HDM58\\hdm58" Date: Fri, 12 Jan 2024 10:44:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=201=E3=80=81?= =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=8E=92=E6=9C=9F=E6=97=A5=E5=8E=86=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2=EF=BC=9B=202=E3=80=81=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=A9=BA=E9=97=B4=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=8F=AF=E8=83=BD=E5=85=B3=E9=97=AD=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=BC=B9=E5=B1=82=E7=9A=84=E9=97=AE=E9=A2=98=203=E3=80=81?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E6=8E=A7=E4=BB=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BA=E8=B6=85=E8=BF=87=E4=B8=A4=E4=BA=BA=E5=B0=B1?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=85=A8=E9=80=89=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/oa/view/plan/calendar.html | 1 + public/static/assets/gougu/css/gougu.css | 2 +- .../assets/gougu/module/employeepicker.js | 4 ++-- public/static/assets/gougu/module/oaTool.js | 20 +++++++++---------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/oa/view/plan/calendar.html b/app/oa/view/plan/calendar.html index 96c483b..f1ac2d1 100644 --- a/app/oa/view/plan/calendar.html +++ b/app/oa/view/plan/calendar.html @@ -39,6 +39,7 @@ user-select: none;} background-color: #fafafa; } */ +.fc-v-event .fc-event-title,.fc-timegrid-event .fc-event-time{color:#333} .calendar-select{width:100px; height:38px; position:absolute; top:27px; right:255px; z-index:100;} .calendar-select .layui-input{height: 36px; line-height: 1.2;} .layui-tags-span {padding: 3px 6px;font-size: 12px; background-color:#fff; border-radius: 3px; margin:2px 0; margin-right: 5px; border: 1px solid #e6e6e6; display: inline-block;} diff --git a/public/static/assets/gougu/css/gougu.css b/public/static/assets/gougu/css/gougu.css index 7d59340..69b8a9c 100644 --- a/public/static/assets/gougu/css/gougu.css +++ b/public/static/assets/gougu/css/gougu.css @@ -53,7 +53,7 @@ .layui-letter-span{padding:10px 5px; font-size:15px; display:inline-block; cursor:pointer;} .layui-letter-span.on{color:#FF6347; font-weight:800;} .layui-letter-span:hover{color:#4285f4;} -.layui-tags-all{float: right; font-weight: 200; background-color:#4285f4; color:#fff; border-radius: 3px; padding: 2px 6px; cursor: pointer; display: none;} +.layui-tags-all{float: right; font-weight: 200; font-size:12px; background-color:#4285f4; color:#fff; border-radius: 3px; padding: 2px 6px; cursor: pointer; display: none;} .layui-data-none{padding:12px 0; color:#969696; text-align:center; font-size:12px;} .gougu-data-none{background:url(../images/data-none.png) no-repeat center center; background-size:auto 80%;} diff --git a/public/static/assets/gougu/module/employeepicker.js b/public/static/assets/gougu/module/employeepicker.js index f0ab1c5..39f0fff 100644 --- a/public/static/assets/gougu/module/employeepicker.js +++ b/public/static/assets/gougu/module/employeepicker.js @@ -77,7 +77,7 @@ layui.define(['layer','dtree'],function(exports){ data:{did:obj.param.nodeId}, success:function(res){ dataList=res.data; - if(dataList.length>2 && me.settings.type == 1){ + if(dataList.length>1 && me.settings.type == 1){ $('.layui-tags-all').show(); } else{ @@ -114,7 +114,7 @@ layui.define(['layer','dtree'],function(exports){ } } dataList=letterData; - if(dataList.length>2 && me.settings.type == 1){ + if(dataList.length>1 && me.settings.type == 1){ $('.layui-tags-all').show(); } else{ diff --git a/public/static/assets/gougu/module/oaTool.js b/public/static/assets/gougu/module/oaTool.js index fd7ba29..5c78a53 100644 --- a/public/static/assets/gougu/module/oaTool.js +++ b/public/static/assets/gougu/module/oaTool.js @@ -192,7 +192,7 @@ layui.define(['tool'], function (exports) { //选择岗位 positionPicker:function(type,callback){ let select_type = type==1?'radio':'checkbox',positionTable; - layer.open({ + var positionLayer = layer.open({ title:'选择岗位', type:1, area:['390px','436px'], @@ -216,7 +216,7 @@ layui.define(['tool'], function (exports) { var data = checkStatus.data; if(data.length>0){ callback(data); - layer.closeAll(); + layer.close(positionLayer); }else{ layer.msg('请选择岗位'); return; @@ -228,7 +228,7 @@ layui.define(['tool'], function (exports) { servicePicker:function(type,callback){ let select_type = type==1?'radio':'checkbox',departmentTable; var serviceTable; - layer.open({ + var serviceLayer = layer.open({ title: '选择服务类型', area: ['500px', '536px'], type: 1, @@ -252,7 +252,7 @@ layui.define(['tool'], function (exports) { var data = checkStatus.data; if(data.length>0){ callback(data); - layer.closeAll(); + layer.close(serviceLayer); }else{ layer.msg('请选择服务类型'); return; @@ -263,7 +263,7 @@ layui.define(['tool'], function (exports) { //选择客户 customerPicker:function(callback){ var customeTable; - layer.open({ + var customeLayer = layer.open({ title: '选择客户', area: ['600px', '580px'], type: 1, @@ -305,7 +305,7 @@ layui.define(['tool'], function (exports) { var data = checkStatus.data; if (data.length > 0) { callback(data[0]); - layer.closeAll(); + layer.close(customeLayer); } else { layer.msg('请先选择客户'); @@ -317,7 +317,7 @@ layui.define(['tool'], function (exports) { //选择合同 contractPicker:function(callback){ var contractTable; - layer.open({ + var contractLayer = layer.open({ title: '选择合同', area: ['720px', '580px'], type: 1, @@ -355,7 +355,7 @@ layui.define(['tool'], function (exports) { var data = checkStatus.data; if (data.length > 0) { callback(data[0]); - layer.closeAll(); + layer.close(contractLayer); } else { layer.msg('请先选择合同'); @@ -413,7 +413,7 @@ layui.define(['tool'], function (exports) { }, btn2: function () { callback({'id':0,'title':''}); - layer.closeAll(); + layer.close(projectLayer); } }) }, @@ -470,7 +470,7 @@ layui.define(['tool'], function (exports) { }, btn2: function () { callback({'id':0,'title':''}); - layer.closeAll(); + layer.close(taskLayer); } }) }