Inicio Explorar Axuda
Iniciar sesión
S.H.I.E.L.D.
/
jiliangzhifu2017
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

变更令表格和审批流程更改 no.2 up

likeku %!s(int64=7) %!d(string=hai) anos
pai
a46be79d90
achega
a19f985a2b
Modificáronse 8 ficheiros con 60 adicións e 26 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 6 5
      global/js/jlzf-change-new.js
  2. 1 0
      global/js/jlzf-change-table.js
  3. 6 5
      global/js/jlzf-change-update.js
  4. 10 8
      protected/controller/ChangeController.php
  5. 8 2
      protected/view/biangeng-approval.html
  6. 10 3
      protected/view/biangeng-detail.html
  7. 9 1
      protected/view/biangeng-new.html
  8. 10 2
      protected/view/biangeng-update.html

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 6 - 5
global/js/jlzf-change-new.js


+ 1 - 0
global/js/jlzf-change-table.js
Ver ficheiro 

@@ -6,6 +6,7 @@ $(function(){
 
         searching: false,
 
         info: false,
 
         scrollX: true,
 
+        scrollY: '500px',
 
         scrollCollapse: true
 
     } );
 
 });

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 6 - 5
global/js/jlzf-change-update.js


+ 10 - 8
protected/controller/ChangeController.php
Ver ficheiro 

@@ -341,9 +341,10 @@ class ChangeController extends DooController
 
                         }
 
                     }
 
                 }
 
-                $this->data['ototalnum'] = $ototalnum;
 
-                $this->data['ctotalnum'] = $ctotalnum;
 
-                $this->data['stotalnum'] = $stotalnum != 0 ? $stotalnum : '';
 
+                include (DOO::conf()->SITE_PATH . 'protected/plugin/TemplateTag.php');
 
+                $this->data['ototalnum'] = tofloat($ototalnum);
 
+                $this->data['ctotalnum'] = tofloat($ctotalnum);
 
+                $this->data['stotalnum'] = $stotalnum != 0 ? tofloat($stotalnum) : '';
 
                 $this->data['clist'] = $clist;
 
 
                 //获取附件
 
@@ -907,14 +908,14 @@ class ChangeController extends DooController
 
                         $listtablehtml = $listtablehtml.$tdhtml.'</tr>';
 
                     }
 
                 }
 
-                $listtablehtml .= '<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td>'.tofloat($ototalnum).'</td><td></td><td>'.tofloat($ctotalnum).'</td>';
 
+                $listtablehtml .= '</tbody><tfoot><tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td>'.tofloat($ototalnum).'</td><td></td><td>'.tofloat($ctotalnum).'</td>';
 
                 foreach($utotalarr as $tk => $tv){
 
                     $addtd = $tv['status'] == 'checking' ? tofloat($stotalnum) : ($tv['usum'] != 0 ? tofloat($tv['usum']) : '');
 
-                    $checkinghtml = $tv['status'] == 'checking' ? ' id="utotalnum"': '';
 
+                    $checkinghtml = $tv['status'] == 'checking' ? ' class="utotalnum"': '';
 
                     $listtablehtml .= '<td></td><td'. $checkinghtml .'>'.$addtd.'</td>';
 
                 }
 
                 $listtablehtml .= '</tr>
 
-								</tbody>
 
+								</tfoot>
 
 							</table>';
 
 
                 $this->data['listtablehtml'] = $listtablehtml;
 
@@ -1199,11 +1200,12 @@ class ChangeController extends DooController
 
                         }
 
                     }
 
                 }
 
+                include (DOO::conf()->SITE_PATH . 'protected/plugin/TemplateTag.php');
 
                 $this->data['changelist'] = implode(',',$changelist);
 
                 $this->data['changewhitelist'] = implode(',',$changewhitelist);
 
                 $this->data['changeidlist'] = implode(',',$changeidlist);
 
-                $this->data['ototalnum'] = $ototalnum;
 
-                $this->data['ctotalnum'] = $ctotalnum;
 
+                $this->data['ototalnum'] = tofloat($ototalnum);
 
+                $this->data['ctotalnum'] = tofloat($ctotalnum);
 
                 $this->data['clist'] = $clist;
 
 
                 //获取已添加的附件列表

+ 8 - 2
protected/view/biangeng-approval.html
Ver ficheiro 

@@ -30,6 +30,12 @@
 
 			/*width: 5% !important;*/
 
 			max-width: 100px !important;
 
 		}
 
+		div.DTFC_LeftFootWrapper table, div.DTFC_RightFootWrapper table{
 
+			border-top: 1px solid #ddd;
 
+		}
 
+		div.dataTables_scrollFootInner table{
 
+			margin-top: 0 !important;
 
+		}
 
 	</style>
 
 </head>
 
 <body>
 
@@ -162,7 +168,7 @@
 
 						<table class="table table-bordered">
 
 							<!-- loop auditlist -->
 
 							<tr>
 
-								<td width="100"><!-- if {{auditlist' value.usite}} == 0 -->提交人<!-- else -->第{{auditlist' value.usite}}个审批人<!-- endif --></td>
 
+								<td width="100"><!-- if {{auditlist' value.usite}} == 0 -->提交人<!-- else -->{{auditlist' value.usite}} 审<!-- endif --></td>
 
 								<td width="250"><h4 class="media-heading">{{auditlist' value.jobs}} {{auditlist' value.name}}</h4>
 
 									{{auditlist' value.company}}</td>
 
 								<!-- if {{auditlist' value.usite}} == 0 -->
 
@@ -341,7 +347,7 @@
 
 				var utotal = $(this).find('.cnum').text();
 
 				utotalnum = utotal != '' ? parseFloat(utotalnum)+parseFloat(utotal) : parseFloat(utotalnum);
 
 			});
 
-			$('#utotalnum').text(parseFloat(utotalnum).toFixed(2));
 
+			$('.utotalnum').eq(1).text(parseFloat(utotalnum).toFixed(2));
 
 		});
 
 
 		$('.showapproval').on('click',function(){

+ 10 - 3
protected/view/biangeng-detail.html
Ver ficheiro 

@@ -30,7 +30,12 @@
 
 			 /*width: 5% !important;*/
 
 			 max-width: 100px !important;
 
 		}
 
-
 
+		div.DTFC_LeftFootWrapper table, div.DTFC_RightFootWrapper table{
 
+			border-top: 1px solid #ddd;
 
+		}
 
+		div.dataTables_scrollFootInner table{
 
+			margin-top: 0 !important;
 
+		}
 
 	</style>
 
 </head>
 
 <body>
 
@@ -148,8 +153,10 @@
 
 							<!-- loop clist -->
 
 							<tr><td>{{clist' value.lnum}}</td><td>{{clist' value.lname}}</td><td>{{clist' value.unit}}</td><td>{{tofloat(clist' value.unitprice)}}</td><td>{{clist' value.oamount}}</td><td>{{tofloat(clist' value.osum)}}</td><td>{{clist' value.camount}}</td><td>{{tofloat(clist' value.csum)}}</td><td>{{clist' value.samount}}</td><td><!-- if {{clist' value.ssum}} != '' --> {{tofloat(clist' value.ssum)}}<!-- endif --></td></tr>
 
 							<!-- endloop -->
 
-							<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td>{{tofloat(ototalnum)}}</td><td></td><td>{{tofloat(ctotalnum)}}</td><td></td><td><!-- if {{stotalnum}} != '' -->{{tofloat(stotalnum)}}<!-- endif --></td></tr>
 
 							</tbody>
 
+							<tfoot>
 
+								<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td>{{tofloat(ototalnum)}}</td><td></td><td>{{tofloat(ctotalnum)}}</td><td></td><td><!-- if {{stotalnum}} != '' -->{{tofloat(stotalnum)}}<!-- endif --></td></tr>
 
+							</tfoot>
 
 						</table>
 
 					</div>
 
 					<div class="bg-con-warp">
 
@@ -172,7 +179,7 @@
 
 						<table class="table table-bordered">
 
 							<!-- loop auditlist -->
 
 							<tr>
 
-								<td width="100"><!-- if {{auditlist' value.usite}} == 0 -->提交人<!-- else -->第{{auditlist' value.usite}}个审批人<!-- endif --></td>
 
+								<td width="100"><!-- if {{auditlist' value.usite}} == 0 -->提交人<!-- else -->{{auditlist' value.usite}} 审<!-- endif --></td>
 
 								<td width="250"><h4 class="media-heading">{{auditlist' value.jobs}} {{auditlist' value.name}}</h4>
 
 									{{auditlist' value.company}}</td>
 
 								<!-- if {{auditlist' value.usite}} == 0 -->

+ 9 - 1
protected/view/biangeng-new.html
Ver ficheiro 

@@ -33,6 +33,12 @@
 
 			width: 10% !important;
 
 			max-width: 150px !important;
 
 		}
 
+		div.DTFC_LeftFootWrapper table, div.DTFC_RightFootWrapper table{
 
+			border-top: 1px solid #ddd;
 
+		}
 
+		div.dataTables_scrollFootInner table{
 
+			margin-top: 0 !important;
 
+		}
 
 	</style>
 
 </head>
 
 <body>
 
@@ -182,8 +188,10 @@
 
 								<tr><th class="text-center">数量</th><th class="text-center">金额</th><th class="text-center">数量</th><th class="text-center">金额</th></tr>
 
 								</thead>
 
 								<tbody id="list">
 
-								<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td id="otatalamount"></td><td></td><td id="ctatalamount"></td></tr>
 
 								</tbody>
 
+								<tfoot>
 
+									<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td class="otatalamount"></td><td></td><td class="ctatalamount"></td></tr>
 
+								</tfoot>
 
 							</table>
 
 						</div>
 
 						<div class="bg-con-warp">

+ 10 - 2
protected/view/biangeng-update.html
Ver ficheiro 

@@ -33,6 +33,12 @@
 
 			width: 10% !important;
 
 			max-width: 150px !important;
 
 		}
 
+		div.DTFC_LeftFootWrapper table, div.DTFC_RightFootWrapper table{
 
+			border-top: 1px solid #ddd;
 
+		}
 
+		div.dataTables_scrollFootInner table{
 
+			margin-top: 0 !important;
 
+		}
 
 	</style>
 
 </head>
 
 <body>
 
@@ -210,8 +216,10 @@
 
 								</tr>
 
 								<!-- endif -->
 
 								<!-- endloop -->
 
-								<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td id="otatalamount">{{ototalnum}}</td><td></td><td id="ctatalamount">{{ctotalnum}}</td></tr>
 
 								</tbody>
 
+								<tfoot>
 
+									<tr class="info"><td>合计</td><td></td><td></td><td></td><td></td><td class="otatalamount">{{ototalnum}}</td><td></td><td class="ctatalamount">{{ctotalnum}}</td></tr>
 
+								</tfoot>
 
 							</table>
 
 						</div>
 
 						<div class="bg-con-warp">
 
@@ -242,7 +250,7 @@
 
 								<tbody id="usertableshow">
 
 								<!-- loop auditlist -->
 
 								<tr>
 
-									<td width="100">第{{auditlist' value.usite}}个审批人</td>
 
+									<td width="100">{{auditlist' value.usite}} 审</td>
 
 									<td width="250"><h4 class="media-heading">{{auditlist' value.jobs}} {{auditlist' value.name}}</h4>
 
 										{{auditlist' value.company}}</td>
 
 									<td width="100"></td><td></td>