caipin před 5 roky
rodič
revize
dd50ede350
2 změnil soubory, kde provedl 84 přidání a 13 odebrání
  1. 84 9
      global/css/global.css
  2. 0 4
      protected/view/receipt/receiptFee.html

+ 84 - 9
global/css/global.css

@@ -323,14 +323,14 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span
 .table td.span10,.table th.span10{float:none;width:764px;margin-left:0;}
 .table td.span11,.table th.span11{float:none;width:844px;margin-left:0;}
 .table td.span12,.table th.span12{float:none;width:924px;margin-left:0;}
-.table tbody tr.success>td{background-color:#dff0d8;}
-.table tbody tr.error>td{background-color:#f2dede;}
-.table tbody tr.warning>td{background-color:#fcf8e3;}
-.table tbody tr.info>td{background-color:#d9edf7;}
-.table-hover tbody tr.success:hover>td{background-color:#d0e9c6;}
-.table-hover tbody tr.error:hover>td{background-color:#ebcccc;}
-.table-hover tbody tr.warning:hover>td{background-color:#faf2cc;}
-.table-hover tbody tr.info:hover>td{background-color:#c4e3f3;}
+.table tbody tr.success>td,.table tbody tr.success>th{background-color:#dff0d8;}
+.table tbody tr.error>td.table tbody tr.error>th{background-color:#f2dede;}
+.table tbody tr.warning>td,.table tbody tr.warning>th{background-color:#fcf8e3;}
+.table tbody tr.info>td,.table tbody tr.info>th{background-color:#d9edf7;}
+.table-hover tbody tr.success:hover>td,.table-hover tbody tr.success:hover>th{background-color:#d0e9c6;}
+.table-hover tbody tr.error:hover>td,.table-hover tbody tr.error:hover>th{background-color:#ebcccc;}
+.table-hover tbody tr.warning:hover>td,.table-hover tbody tr.warning:hover>th{background-color:#faf2cc;}
+.table-hover tbody tr.info:hover>td,.table-hover tbody tr.info:hover>th{background-color:#c4e3f3;}
 .modalClientTable th {width:55px}
 .modalClientTable td {padding:5px 0;}
 .modalClientTable tr:nth-child(even){background:#f1f1f1}
@@ -1897,7 +1897,10 @@ a.new-ribbon:before{
 .adminContent{
   margin:0 0 0 160px;
   overflow-y:auto;
-  padding:0 15px 0 0
+  padding:0 15px 0 0;
+}
+.adminContentS{
+  margin: 0 0 0 145px;
 }
 .borad-menu{
   text-align:center;
@@ -2090,6 +2093,16 @@ table .taC{
   height:100%;
   background:#f6f6f6
 }
+.saeaList table .cost-item span{
+  display: inline-block;
+  width:170px;
+  padding:4px 5px;
+  border-right:1px solid #dddddd;
+  border-bottom:1px solid #dddddd;
+}
+.saeaList table .cost-item span:nth-child(3n+3) {
+  border-right:none;
+}
 .mailSpread .mailAutoHeigh{
   overflow-y:auto;
 }
@@ -3531,6 +3544,9 @@ legend .search{
 .sideMnav li:hover{
   background-color: #F7F7F7
 }
+.sideMnavBnone li:hover{
+  background-color:#fff;
+}
 .sideSnav span.icon-:after {
   content: "c"
 }
@@ -3918,4 +3934,63 @@ td div.dlLev3{
   width:60px;
   height:26px;
   line-height: 26px;
+}
+.subMenu li.stockTitle{
+  color: #fff;
+  background: #5E5C91;
+  margin: 0 0 5px 0;
+  padding: 5px 10px 5px 0;
+  text-align: right;
+}
+.borad-menu a.stock{
+  background: #5E5C91;
+}
+.saeaList .stockdemandForm{
+  position: relative;
+  padding: 20px 20px 0px;
+  border: 1px solid #cdcdcd;
+  background: #f6f6f6;
+}
+.stockdemandForm .stockLabel{
+  margin: 0 15px 0 0;
+  width: 60px;
+  height: 20px;
+  line-height: 25px;
+}
+.stockdemandForm .cateList{
+  height: 25px;
+  margin: 0 0 20px 0;
+}
+.stockdemandForm .cateList li {
+  padding: 0 10px 0 0;
+  margin: 0 10px 0 0;
+  border-right: 1px solid #CDCDCD;
+  float: left;
+  height: 25px;
+  line-height: 25px;
+}
+.stockdemandForm .cateList li:after{
+  border-right: none;
+}
+.stockdemandForm .stockdemandBtn{
+  position: absolute;
+  bottom: 20px;
+  right: 20px;
+}
+.stocktableInput{
+  width: 150px;
+}
+.stockContent{
+  margin: 0 0 0 210px;
+}
+.btnMarginL{
+  margin-left: 20px;
+}
+.stock-invoice{
+  color: #fff;
+  vertical-align: top;
+  margin-left: 5px;
+  background: #955251;
+  padding: 0 3px;
+  font-size: 10px;
 }

+ 0 - 4
protected/view/receipt/receiptFee.html

@@ -323,15 +323,11 @@
 							<div class="cost-item">
 							<!-- loop acItem -->
 		  						<!-- if {{acItem' value.category}} =="差旅相关费用" -->
-		  						
 		  							<span>{{acItem' value.name}}</span>
-		  						
 		  						<!-- endif -->
 	  						<!-- endloop -->
 							</div>
 							
-							
-							
 							</tr>
 						</table>
 					</div>