zyn / cjs-cms

Go to a project
Toggle navigation Toggle navigation pinning
bruce
118b1748 1 parent 71f3f4f9

新需求上线

Inline Side-by-side
Showing 2 changed files with 10 additions and 9 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <sql id="outpropapply_pick_field"> 7 <sql id="outpropapply_pick_field">
8 PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID, 8 PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID,
9 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME, 9 ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME,
10 - CHECK_STATUS, PACKAGE_TYPE, AMOUNT_FEE, WAREHOUSE_CODE 10 + CHECK_STATUS, PACKAGE_TYPE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE
11 </sql> 11 </sql>
12 12
13 <!-- 修改快递信息 --> 13 <!-- 修改快递信息 -->
...@@ -35,14 +35,15 @@ ...@@ -35,14 +35,15 @@
35 <select id="search" parameterType="map" resultType="map"> 35 <select id="search" parameterType="map" resultType="map">
36 <include refid="common.pageStart" /> 36 <include refid="common.pageStart" />
37 SELECT W.CODE,W.NAME,W.PROVINCE,W.CITY,W.AREA,W.ADDRESS,P.PICK_NO, P.CLIENT_ID, P.PICK_TYPE, P.PICK_DATE, P.INSURANCE, P.AUDIT_DATE, 37 SELECT W.CODE,W.NAME,W.PROVINCE,W.CITY,W.AREA,W.ADDRESS,P.PICK_NO, P.CLIENT_ID, P.PICK_TYPE, P.PICK_DATE, P.INSURANCE, P.AUDIT_DATE,
38 - P.AUDIT_TIME, P.EXPRESS, P.EXPRESS_NO, P.CREATE_DATE, P.ENSURE_DATE, P.ENSURE_TIME, P.CHECK_STATUS, P.PACKAGE_TYPE, P.AMOUNT_FEE, B.* 38 + P.AUDIT_TIME, P.EXPRESS, P.EXPRESS_NO, P.CREATE_DATE, P.ENSURE_DATE, P.ENSURE_TIME, P.CHECK_STATUS, P.PACKAGE_TYPE, P.AMOUNT_FEE,
39 + P.AMOUNT, P.TRUSTEESHIP_CYCLE, B.*
39 FROM ( 40 FROM (
40 SELECT ROW_NUMBER() OVER(PARTITION BY OP_STATION ORDER BY SERIAL_NO) RN, 41 SELECT ROW_NUMBER() OVER(PARTITION BY OP_STATION ORDER BY SERIAL_NO) RN,
41 A.PICKING_NAME, A.PHONE_CODE, A.ID_NO, A.SDCPROPAPPLY_STATUS AS PICK_STATUS, 42 A.PICKING_NAME, A.PHONE_CODE, A.ID_NO, A.SDCPROPAPPLY_STATUS AS PICK_STATUS,
42 A.PICKING_ADDRESS, A.OP_STATION, A.PICKING_DATE, A.POSITION_STR, A.EXPRESS_ADRESS, 43 A.PICKING_ADDRESS, A.OP_STATION, A.PICKING_DATE, A.POSITION_STR, A.EXPRESS_ADRESS,
43 case A.SDCPROPAPPLY_STATUS 44 case A.SDCPROPAPPLY_STATUS
44 when '0' then '已申请' 45 when '0' then '已申请'
45 - when '1' then '已确定' 46 + when '1' then '已确定'z
46 when '2' then '已确定否决' 47 when '2' then '已确定否决'
47 when '3' then '已审核' 48 when '3' then '已审核'
48 when '4' then '已审核否决' 49 when '4' then '已审核否决'
......
...@@ -52,10 +52,10 @@ ...@@ -52,10 +52,10 @@
52 </select> 52 </select>
53 </td> 53 </td>
54 <td> 54 <td>
55 - 网点编号：<input name="code" class="easyui-numberbox search-input"> 55 + 托管周期：<input name="code" class="easyui-numberbox search-input">
56 </td> 56 </td>
57 <td> 57 <td>
58 - 网点名称：<input name="name" class="easyui-textbox search-input"> 58 + 托管费用：<input name="name" class="easyui-textbox search-input">
59 </td> 59 </td>
60 </tr> 60 </tr>
61 <tr> 61 <tr>
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
97 <th data-options="field:'PICK_TYPE', formatter:PickAudit.formatPickType">提货方式</th> 97 <th data-options="field:'PICK_TYPE', formatter:PickAudit.formatPickType">提货方式</th>
98 <th data-options="field:'PICKING_DATE'">提货日期</th> 98 <th data-options="field:'PICKING_DATE'">提货日期</th>
99 <th data-options="field:'PICK_STATUS_NAME'">提货状态</th> 99 <th data-options="field:'PICK_STATUS_NAME'">提货状态</th>
100 - <th data-options="field:'CODE'">网点编号</th> 100 + <th data-options="field:'TRUSTEESHIP_CYCLE'">托管周期</th>
101 - <th data-options="field:'NAME'">网点名称</th> 101 + <th data-options="field:'AMOUNT'">托管费用</th>
102 <th data-options="field:'EXPRESS_ADRESS'">收货地址</th> 102 <th data-options="field:'EXPRESS_ADRESS'">收货地址</th>
103 <th data-options="field:'INSURANCE'">保价金额</th> 103 <th data-options="field:'INSURANCE'">保价金额</th>
104 <th data-options="field:'CREATE_DATE'">申请时间</th> 104 <th data-options="field:'CREATE_DATE'">申请时间</th>
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
111 </div> 111 </div>
112 <div id="toolbar"> 112 <div id="toolbar">
113 <a href="javascript:PickAudit.updateStatus(3)" class="easyui-linkbutton">审核通过</a> 113 <a href="javascript:PickAudit.updateStatus(3)" class="easyui-linkbutton">审核通过</a>
114 - <a href="javascript:PickAudit.updateStatus(4)" class="easyui-linkbutton">审核否决</a> 114 + <%--<a href="javascript:PickAudit.updateStatus(4)" class="easyui-linkbutton">审核否决</a>--%>
115 - <a href="javascript:PickAudit.updateStatus(5)" class="easyui-linkbutton">过期作废</a> 115 + <%--<a href="javascript:PickAudit.updateStatus(5)" class="easyui-linkbutton">过期作废</a>--%>
116 <a href="javascript:PickAudit.beforeAddExpress()" class="easyui-linkbutton">快递信息</a> 116 <a href="javascript:PickAudit.beforeAddExpress()" class="easyui-linkbutton">快递信息</a>
117 <a href="javascript:PickAudit.printExpress()" class="easyui-linkbutton">打印快递单</a> 117 <a href="javascript:PickAudit.printExpress()" class="easyui-linkbutton">打印快递单</a>
118 </div> 118 </div>
......