wms / wms_beijingtianshenghua · Commits

Commit 976d7e3c2a663207910e6f8b9cafa3c49a9bbf5e

Authored by mahuandong
1 parent 36f99e0c

修改波次主表、波次流程头表、波次流程明细页面

Inline Side-by-side
Showing 1 changed file with 362 additions and 42 deletions
src/main/resources/templates/config/waveMaster/waveMaster.html
  View file @976d7e3
... ... @@ -6,61 +6,138 @@
6 6 <div class="container-div">
7 7 <div class="row">
8 8 <div class="col-sm-12 select-info">
9   - <form id="waveMaster-form">
10   - <div class="select-list">
11   - <ul>
12   - <li>
13   - 编码：<input type="text" name="code"/>
14   - </li>
15   - <li>
16   - 出库单条件：<input type="text" name="shipmentFilterCode"/>
17   - </li>
18   - <li>
19   - 波次流程：<input type="text" name="waveFlowCode"/>
20   - </li>
21   - <li class="time">
22   - <label>创建时间： </label>
23   - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
24   - <span>-</span>
25   - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
26   - </li>
27   - <li>
28   - <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
29   - <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('waveMaster-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
30   - <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
31   - </li>
32   - </ul>
  9 + <div class="col-sm-12 select-info">
  10 + <ul id="myTab" class="nav nav-tabs">
  11 + <li class="active"><a href="#tabMaster" data-toggle="tab">波次主表</a></li>
  12 + <li><a href="#tabHeader" data-toggle="tab" onclick="header()">主表</a></li>
  13 + <li><a href="#tabDetail" data-toggle="tab" onclick="detail()">明细</a></li>
  14 + </ul>
  15 + <div id="myTabContent" class="tab-content">
  16 + <div class="tab-pane fade in active" id="tabMaster">
  17 + <div class="col-sm-12 select-info">
  18 + <form id="waveMaster-form">
  19 + <div class="select-list">
  20 + <ul>
  21 + <li>
  22 + 编码：<input type="text" name="code"/>
  23 + </li>
  24 + <li>
  25 + 出库单条件：<input type="text" name="shipmentFilterCode"/>
  26 + </li>
  27 + <li>
  28 + 波次流程：<input type="text" name="waveFlowCode"/>
  29 + </li>
  30 + <li class="time">
  31 + <label>创建时间： </label>
  32 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
  33 + <span>-</span>
  34 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
  35 + </li>
  36 + <li>
  37 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  38 + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('waveMaster-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
  39 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  40 + </li>
  41 + </ul>
  42 + </div>
  43 + </form>
  44 + </div>
  45 +
  46 + <div class="col-sm-12 select-info">
  47 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  48 + </div>
  49 +
  50 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  51 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:waveMaster:add">
  52 + <i class="fa fa-plus"></i> 新增
  53 + </a>
  54 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:waveMaster:remove">
  55 + <i class="fa fa-trash-o"></i> 删除
  56 + </a>
  57 + </div>
  58 + </div>
  59 +
  60 + <div class="tab-pane fade" id="tabHeader">
  61 + <div class="col-sm-12 select-info">
  62 + <form id="waveFlowHeader-form">
  63 + <div class="select-list">
  64 + <ul>
  65 + <li>
  66 + 编码：<input type="text" name="code"/>
  67 + </li>
  68 + <li>
  69 + 出库单条件：<input type="text" name="shipmentFilterCode"/>
  70 + </li>
  71 + <li>
  72 + 波次流程：<input type="text" name="waveFlowCode"/>
  73 + </li>
  74 + <li class="time">
  75 + <label>创建时间： </label>
  76 + <input type="text" class="time-input" id="waveFlowHeaderStartTime" placeholder="开始时间" name="createdBegin"/>
  77 + <span>-</span>
  78 + <input type="text" class="time-input" id="waveFlowHeaderEndTime" placeholder="结束时间" name="createdEnd"/>
  79 + </li>
  80 + <li>
  81 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  82 + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('waveMaster-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
  83 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  84 + </li>
  85 + </ul>
  86 + </div>
  87 + </form>
  88 + </div>
  89 + <div class="btn-group hidden-xs" id="toolbar1" role="group">
  90 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
  91 + shiro:hasPermission="config:waveFlowHeader:add">
  92 + <i class="fa fa-plus"></i> 新增
  93 + </a>
  94 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
  95 + shiro:hasPermission="config:waveFlowHeader:remove">
  96 + <i class="fa fa-trash-o"></i> 删除
  97 + </a>
  98 + </div>
  99 +
  100 + <table id="bootstrap-table1" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  101 +
  102 + </div>
  103 +
  104 + <div class="tab-pane fade" id="tabDetail">
  105 + <table id="bootstrap-table2" data-mobile-responsive="true"
  106 + class="table table-bordered table-hover"></table>
  107 + </div>
33 108 </div>
34   - </form>
35   - </div>
36   - <div class="btn-group hidden-xs" id="toolbar" role="group">
37   - <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:waveMaster:add">
38   - <i class="fa fa-plus"></i> 新增
39   - </a>
40   - <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:waveMaster:remove">
41   - <i class="fa fa-trash-o"></i> 删除
42   - </a>
43   - </div>
44 109  
45   - <div class="col-sm-12 select-info">
46   - <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
47   - </div>
48   - <div>
49 110 </div>
  111 +
  112 +
50 113 <div th:include="include :: footer"></div>
51 114 <script th:inline="javascript">
52 115 var editFlag = [[${@permission.hasPermi('config:waveMaster:edit')}]];
53 116 var removeFlag = [[${@permission.hasPermi('config:waveMaster:remove')}]];
54 117 var prefix = ctx + "config/waveMaster";
55 118 var datas = [[${@dict.getType('sys_normal_disable')}]];
  119 + var code = "";
  120 + var headerId = "";
  121 + var prefix1 = ctx + "config/waveFlowHeader";
  122 + var prefix2 = ctx + "config/waveFlowDetail";
  123 + var editFlag1 = [[${@permission.hasPermi('config:waveFlowHeader:edit')}]];
  124 + var removeFlag1 = [[${@permission.hasPermi('config:waveFlowHeader:remove')}]];
  125 +
56 126 $(function() {
57   - var options = {
  127 + $("#bootstrap-table").bootstrapTable({
58 128 url: prefix + "/list",
59 129 createUrl: prefix + "/add",
60 130 updateUrl: prefix + "/edit/{id}",
61 131 removeUrl: prefix + "/remove",
62 132 modalName: "波次主表",
63 133 search: false,
  134 + showRefresh: true,
  135 + showColumns: true,
  136 + showExport: true,
  137 + smartDisplay:true,
  138 + iconSize: 'outline',
  139 + method: "post",
  140 + toolbar: "#toolbar",
64 141 columns: [{
65 142 checkbox: true
66 143 },
... ... @@ -188,10 +265,253 @@
188 265 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
189 266 return actions.join('');
190 267 }
191   - }]
192   - };
193   - $.table.init(options);
  268 + }],
  269 + onDblClickRow: function (row) {
  270 + headerReg(row.waveFlowCode)
  271 + }
  272 + });
  273 + });
  274 +
  275 + $("#bootstrap-table1").bootstrapTable({
  276 + url: prefix1 + "/list",
  277 + createUrl: prefix1 + "/add",
  278 + updateUrl: prefix1 + "/edit/{id}",
  279 + removeUrl: prefix1 + "/remove",
  280 + modalName: "波次流主表",
  281 + search: false,
  282 + sortName: "id",
  283 + sortOrder: "desc",
  284 + toolbar: "#toolbar1",
  285 + onRefresh: function(){
  286 + loadHeader();
  287 + },
  288 + columns: [{
  289 + checkbox: true
  290 + },
  291 + {
  292 + field : 'id',
  293 + title : 'id'
  294 + },
  295 + {
  296 + field : 'code',
  297 + title : '流程名称'
  298 + },
  299 + {
  300 + field : 'version',
  301 + title : '数据版本',
  302 + visible : false
  303 + },
  304 + {
  305 + field : 'processStamp',
  306 + title : '处理标记',
  307 + visible : false
  308 + },
  309 + {
  310 + field : 'created',
  311 + title : '创建时间'
  312 + },
  313 + {
  314 + field : 'createdBy',
  315 + title : '创建用户'
  316 + },
  317 + {
  318 + field : 'lastUpdated',
  319 + title : '更新时间'
  320 + },
  321 + {
  322 + field : 'lastUpdatedBy',
  323 + title : '更新用户'
  324 + },
  325 + {
  326 + field : 'userDef1',
  327 + title : '自定义字段1',
  328 + visible:false
  329 + },
  330 + {
  331 + field : 'userDef2',
  332 + title : '自定义字段2' ,
  333 + visible:false
  334 + },
  335 + {
  336 + field : 'userDef3',
  337 + title : '自定义字段3' ,
  338 + visible:false
  339 + },
  340 + {
  341 + title: '操作',
  342 + align: 'center',
  343 + formatter: function(value, row, index) {
  344 + var actions = [];
  345 + actions.push('<a class="btn btn-success btn-xs ' + editFlag1 + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  346 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag1 + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  347 + return actions.join('');
  348 + }
  349 + }],
  350 + onDblClickRow: function (row) {
  351 + detailReg(row.id)
  352 + }
194 353 });
  354 +
  355 + $("#bootstrap-table2").bootstrapTable({
  356 + url: prefix + "/list",
  357 + createUrl: prefix + "/add",
  358 + updateUrl: prefix + "/edit/{id}",
  359 + removeUrl: prefix + "/remove",
  360 + modalName: "波次流明细",
  361 + queryParams:function(params) {
  362 + return {
  363 + // 传递参数查询参数
  364 + pageSize: params.limit,
  365 + pageNum: params.offset / params.limit + 1,
  366 + searchValue: params.search,
  367 + orderByColumn: params.sort,
  368 + isAsc: params.order
  369 + };
  370 + },
  371 + onRefresh: function(){
  372 + loadDeatil();
  373 + },
  374 + search: false,
  375 + sortName: "id",
  376 + sortOrder: "desc",
  377 + columns: [{
  378 + checkbox: true
  379 + },
  380 + {
  381 + field : 'id',
  382 + title : 'id'
  383 + },
  384 + {
  385 + field : 'headerId',
  386 + title : '头表id',
  387 + visible: false
  388 + },
  389 + {
  390 + field : 'waveFlowCode',
  391 + title : '波次流程'
  392 + },
  393 + {
  394 + field : 'sequence',
  395 + title : '序号'
  396 + },
  397 + {
  398 + field : 'waveStepCode',
  399 + title : '波次步骤'
  400 + },
  401 + {
  402 + field : 'waveStepName',
  403 + title : '描述'
  404 + },
  405 + {
  406 + field : 'value1',
  407 + title : '参数1',
  408 + visible : false
  409 + },
  410 + {
  411 + field : 'value2',
  412 + title : '参数2',
  413 + visible : false
  414 + },
  415 + {
  416 + field : 'value3',
  417 + title : '参数3',
  418 + visible : false
  419 + },
  420 + {
  421 + field : 'created',
  422 + title : '创建时间'
  423 + },
  424 + {
  425 + field : 'createdBy',
  426 + title : '创建用户'
  427 + },
  428 + {
  429 + field : 'lastUpdated',
  430 + title : '更新时间'
  431 + },
  432 + {
  433 + field : 'lastUpdatedBy',
  434 + title : '更新用户'
  435 + },
  436 + {
  437 + field : 'userDef1',
  438 + title : '自定义字段1' ,
  439 + visible:false
  440 + },
  441 + {
  442 + field : 'userDef2',
  443 + title : '自定义字段2' ,
  444 + visible:false
  445 + },
  446 + {
  447 + field : 'userDef3',
  448 + title : '自定义字段3' ,
  449 + visible:false
  450 + },
  451 + {
  452 + title: '操作',
  453 + align: 'center',
  454 + formatter: function(value, row, index) {
  455 + var actions = [];
  456 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  457 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  458 + return actions.join('');
  459 + }
  460 + }]
  461 + })
  462 +
  463 + function header() {
  464 + $("#myTab li").removeClass("active");
  465 + $("#tabMaster").removeClass("in active");
  466 + $("#myTab li:eq(1)").addClass("active");
  467 + $("#tabHeader").addClass("in active");
  468 + loadHeader();
  469 + }
  470 +
  471 + function detail() {
  472 + $("#myTab li").removeClass("active");
  473 + $("#tabMaster").removeClass("in active");
  474 + $("#tabHeader").removeClass("in active");
  475 + $("#myTab li:eq(2)").addClass("active");
  476 + $("#tabDetail").addClass("in active");
  477 + loadDeatil();
  478 + }
  479 +
  480 + function loadHeader(){
  481 + $.ajax({
  482 + url:prefix1+'/list',
  483 + type:"post",
  484 + data:{
  485 + code: code,
  486 + },
  487 + success:function (value) {
  488 + $("#bootstrap-table1").bootstrapTable('load',value.data);
  489 + }
  490 + });
  491 + }
  492 +
  493 + function loadDeatil() {
  494 + $.ajax({
  495 + url:prefix2+'/list',
  496 + type:"post",
  497 + data:{
  498 + headerId: headerId,
  499 + },
  500 + success:function (value) {
  501 + $("#bootstrap-table2").bootstrapTable('load',value.data);
  502 + }
  503 + });
  504 + }
  505 +
  506 + function headerReg(waveFlowCode) {
  507 + code = waveFlowCode;
  508 + header();
  509 + }
  510 +
  511 + function detailReg(rowId){
  512 + headerId = rowId;
  513 + detail();
  514 + }
195 515 </script>
196 516 </body>
197 517 </html>
198 518 \ No newline at end of file
... ...