zyn / cjs-cms

Go to a project
Toggle navigation Toggle navigation pinning
bruce
af95980a 1 parent e02799b7

快递

Inline Side-by-side
Showing 2 changed files with 58 additions and 3 deletions
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 <th data-options="field:'CREATE_DATE'">申请时间</th> 104 <th data-options="field:'CREATE_DATE'">申请时间</th>
105 <th data-options="field:'ENSURE_DATE'">确认处理日期</th> 105 <th data-options="field:'ENSURE_DATE'">确认处理日期</th>
106 <th data-options="field:'EXPRESS_NO', formatter:PickEnsure.formatExpress">快递单号</th> 106 <th data-options="field:'EXPRESS_NO', formatter:PickEnsure.formatExpress">快递单号</th>
107 - <th data-options="field:'CHECK_STATUS', formatter:PickEnsure.formatCheckStatus">技术审核</th> 107 + <%--<th data-options="field:'CHECK_STATUS', formatter:PickEnsure.formatCheckStatus">技术审核</th>--%>
108 </tr> 108 </tr>
109 </thead> 109 </thead>
110 <tbody></tbody> 110 <tbody></tbody>
...@@ -112,9 +112,10 @@ ...@@ -112,9 +112,10 @@
112 </div> 112 </div>
113 <div id="toolbar"> 113 <div id="toolbar">
114 <a href="javascript:PickEnsure.updateStatus(1)" class="easyui-linkbutton">确认通过</a> 114 <a href="javascript:PickEnsure.updateStatus(1)" class="easyui-linkbutton">确认通过</a>
115 + <a href="javascript:PickEnsure.beforeAddExpress()" class="easyui-linkbutton">快递信息</a>
115 <%--<a href="javascript:PickEnsure.updateStatus(2)" class="easyui-linkbutton">确认否决</a>--%> 116 <%--<a href="javascript:PickEnsure.updateStatus(2)" class="easyui-linkbutton">确认否决</a>--%>
116 <%--<a href="javascript:PickEnsure.updateStatus(5)" class="easyui-linkbutton">过期作废</a>--%> 117 <%--<a href="javascript:PickEnsure.updateStatus(5)" class="easyui-linkbutton">过期作废</a>--%>
117 - <a href="javascript:PickEnsure.updateCheckStatus()" class="easyui-linkbutton">技术审核</a> 118 + <%--<a href="javascript:PickEnsure.updateCheckStatus()" class="easyui-linkbutton">技术审核</a>--%>
118 <a href="javascript:PickEnsure.printApplyList()" class="easyui-linkbutton">打印申请单</a> 119 <a href="javascript:PickEnsure.printApplyList()" class="easyui-linkbutton">打印申请单</a>
119 </div> 120 </div>
120 121
...@@ -141,7 +142,29 @@ ...@@ -141,7 +142,29 @@
141 <div id="pick-detail-dialog-buttons" style="text-align:center;"> 142 <div id="pick-detail-dialog-buttons" style="text-align:center;">
142 <a href="javascript:App.closeDialog('pick-detail-dialog', '')" class="easyui-linkbutton search-button">确定</a> 143 <a href="javascript:App.closeDialog('pick-detail-dialog', '')" class="easyui-linkbutton search-button">确定</a>
143 </div> 144 </div>
144 - 145 +
146 + <!-- 编辑快递信息 -->
147 + <div id="add-express-dialog" class="easyui-dialog" style="padding:10px; width: 400px;"
148 + data-options="closed:true, title:'编辑快递信息', buttons:'#add-express-dialog-buttons'">
149 + <form id="add-express-form" method="post" data-options="novalidate: false">
150 + <input type="hidden" name="pickNo" />
151 + <ul class="simple-ul">
152 + <li>
153 + <label>承运单位：</label>
154 + <input name="express" class="easyui-textbox add-input" value="顺丰" data-options="required:true">
155 + </li>
156 + <li>
157 + <label>运单编号：</label>
158 + <input name="expressNo" class="easyui-textbox add-input" data-options="required:true">
159 + </li>
160 + </ul>
161 + </form>
162 + </div>
163 + <div id="add-express-dialog-buttons" style="text-align:center;">
164 + <a href="javascript:PickEnsure.addExpress()" class="easyui-linkbutton c6 search-button" data-options="iconCls:'icon-ok'">提交</a>
165 + <a href="javascript:App.closeDialog('add-express-dialog', 'add-express-form')"
166 + class="easyui-linkbutton search-button" data-options="iconCls:'icon-cancel'">取消</a>
167 + </div>
145 </div> 168 </div>
146 </body> 169 </body>
147 </html> 170 </html>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -53,6 +53,38 @@ var PickEnsure = function(){ ...@@ -53,6 +53,38 @@ var PickEnsure = function(){
53 } 53 }
54 }, 54 },
55 55
56 + /** 添加快递信息 */
57 + beforeAddExpress : function() {
58 + var row = $('#data-grid').datagrid('getSelected');
59 + if (row) {
60 + $('#add-express-dialog').dialog('open').dialog('setTitle', '编辑');
61 + $('#add-express-form').form('load', '/user/pick/express?pickNo=' + row.PICK_NO);
62 + } else {
63 + $.messager.alert('Warning', '请选择要修改的数据');
64 + }
65 + },
66 +
67 + /** 添加快递信息 */
68 + addExpress : function() {
69 + if ($('#add-express-form').form('validate')) {
70 + $.messager.progress();
71 + $('#add-express-form').form('submit', {
72 + url : '/user/pick/express',
73 + success : function(result) {
74 + $.messager.progress('close');
75 + result = $.parseJSON(result);
76 + if (result.success == true) {
77 + $('#add-express-dialog').dialog('close');
78 + }
79 + $.messager.show({
80 + title : '信息',
81 + msg : result.data
82 + });
83 + }
84 + });
85 + }
86 + },
87 +
56 /** 快递信息 */ 88 /** 快递信息 */
57 formatExpress : function(value, row, index) { 89 formatExpress : function(value, row, index) {
58 var text; 90 var text;
......