新需求上线

@@ -7,7 +7,7 @@
 	<sql id="outpropapply_pick_field">
 		PICK_NO, CLIENT_ID, PICK_TYPE, PICK_AMOUNT, DELEGATE_NAME, DELEGATE_ID, 
 		ZHAOONLINE_ID, INSURANCE, EXPORT, PICK_DATE, EXPRESS, EXPRESS_NO, CREATE_DATE, CREATE_TIME, 
-		CHECK_STATUS, PACKAGE_TYPE, AMOUNT_FEE, WAREHOUSE_CODE 
+		CHECK_STATUS, PACKAGE_TYPE, AMOUNT_FEE, WAREHOUSE_CODE, AMOUNT, TRUSTEESHIP_CYCLE
 	</sql>
 	
 	<!-- 修改快递信息 -->
@@ -35,14 +35,15 @@
 	<select id="search" parameterType="map" resultType="map">
 		<include refid="common.pageStart" />
 		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, 
-			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.*
+			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,
+			P.AMOUNT, P.TRUSTEESHIP_CYCLE, B.*
 		FROM (
 			SELECT ROW_NUMBER() OVER(PARTITION BY OP_STATION ORDER BY SERIAL_NO) RN,
 				A.PICKING_NAME, A.PHONE_CODE, A.ID_NO, A.SDCPROPAPPLY_STATUS AS PICK_STATUS,
 				A.PICKING_ADDRESS, A.OP_STATION, A.PICKING_DATE, A.POSITION_STR, A.EXPRESS_ADRESS, 
 				case A.SDCPROPAPPLY_STATUS 
 				when '0' then '已申请'
-				when '1' then '已确定'
+				when '1' then '已确定'z
 				when '2' then '已确定否决'
 				when '3' then '已审核'
 				when '4' then '已审核否决'

@@ -52,10 +52,10 @@
 							</select>
 						</td>
 						<td>
-							网点编号：<input name="code" class="easyui-numberbox search-input">
+							托管周期：<input name="code" class="easyui-numberbox search-input">
 						</td>
 						<td>
-							网点名称：<input name="name" class="easyui-textbox search-input">
+							托管费用：<input name="name" class="easyui-textbox search-input">
 						</td>
 					</tr>
 					<tr>
@@ -97,8 +97,8 @@
 			            <th data-options="field:'PICK_TYPE', formatter:PickAudit.formatPickType">提货方式</th>
 			            <th data-options="field:'PICKING_DATE'">提货日期</th>
 			            <th data-options="field:'PICK_STATUS_NAME'">提货状态</th>
-			            <th data-options="field:'CODE'">网点编号</th>
-			            <th data-options="field:'NAME'">网点名称</th>
+			            <th data-options="field:'TRUSTEESHIP_CYCLE'">托管周期</th>
+			            <th data-options="field:'AMOUNT'">托管费用</th>
 			            <th data-options="field:'EXPRESS_ADRESS'">收货地址</th>
 			            <th data-options="field:'INSURANCE'">保价金额</th>
 			            <th data-options="field:'CREATE_DATE'">申请时间</th>
@@ -111,8 +111,8 @@
 		</div>
 		<div id="toolbar">
 			<a href="javascript:PickAudit.updateStatus(3)" class="easyui-linkbutton">审核通过</a>
-			<a href="javascript:PickAudit.updateStatus(4)" class="easyui-linkbutton">审核否决</a>
-			<a href="javascript:PickAudit.updateStatus(5)" class="easyui-linkbutton">过期作废</a>
+			<%--<a href="javascript:PickAudit.updateStatus(4)" class="easyui-linkbutton">审核否决</a>--%>
+			<%--<a href="javascript:PickAudit.updateStatus(5)" class="easyui-linkbutton">过期作废</a>--%>
 			<a href="javascript:PickAudit.beforeAddExpress()" class="easyui-linkbutton">快递信息</a>
 			<a href="javascript:PickAudit.printExpress()" class="easyui-linkbutton">打印快递单</a>
 		</div>