diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index ba5f7819..4e245de0 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -48,7 +48,6 @@
 		initSelectInfo_account();
 		initSupplier(); //供应商
 		initSalesman(); //销售人员
-		initGift(); //初始化礼品卡
 		initOutItemList(); //初始化支出项目
 		initMProperty(); //初始化商品属性
 		initTableData();
@@ -66,7 +65,14 @@
 		var supUrl = "/supplier/findBySelect_sup"; //供应商接口
 		var cusUrl = "/supplier/findBySelect_cus?UBType=UserCustomer&UBKeyId=" + kid; //客户接口
 		var retailUrl = "/supplier/findBySelect_retail"; //散户接口
-		if(listTitle === "采购入库列表"){
+        if(listTitle === "采购订单列表"){
+            listType = "其它";
+            listSubType = "采购订单";
+            payTypeTitle = "隐藏";
+            organUrl = supUrl;
+            amountNum = "CGDD";
+        }
+		else if(listTitle === "采购入库列表"){
 			listType = "入库"; 
 			listSubType = "采购"; 
 			payTypeTitle = "付款";
@@ -101,6 +107,13 @@
 			organUrl = retailUrl;
 			amountNum = "LSCK";
 		}
+        else if(listTitle === "销售订单列表"){
+            listType = "其它";
+            listSubType = "销售订单";
+            payTypeTitle = "隐藏";
+            organUrl = cusUrl;
+            amountNum = "XSDD";
+        }
 		else if(listTitle === "销售出库列表"){
 			listType = "出库"; 
 			listSubType = "销售"; 
@@ -129,20 +142,6 @@
 			organUrl = supUrl;
 			amountNum = "DBCK";
 		}
-		else if(listTitle === "礼品充值列表"){
-			listType = "出库";
-			listSubType = "礼品充值";
-			payTypeTitle = "隐藏";
-			organUrl = supUrl;
-			amountNum = "LPCZ";
-		}
-		else if(listTitle === "礼品销售列表"){
-			listType = "出库";
-			listSubType = "礼品销售";
-			payTypeTitle = "隐藏";
-			organUrl = supUrl;
-			amountNum = "LPXS";
-		}
 		else if(listTitle === "组装单列表"){
 			listType = "其它";
 			listSubType = "组装单";
@@ -310,34 +309,6 @@
 		});
 	}
 
-	//初始化-礼品卡
-	function initGift(){
-		if(listSubType == "礼品充值"|| listSubType == "礼品销售"){
-			$('#GiftId').combobox({
-				url: "/depot/findGiftByType?type=1",
-				valueField:'id',
-				textField:'name'
-			});
-			$('#searchGiftId').combobox({
-				url: "/depot/findGiftByType?type=1",
-				valueField:'id',
-				textField:'name'
-			});
-		}
-		if(listSubType == "礼品销售"){
-			$.ajax({
-				type:"post",
-				url: "/supplier/findBySelectRetailNoPeople.action", //散户接口
-				dataType: "json",
-				success: function (res){
-					if(res && res[0]){
-						orgDefaultId = res[0].id;
-					}
-				}
-			});
-		}
-	}
-
 	//初始化收入项目列表
 	function initOutItemList(){
 		$.ajax({
@@ -525,19 +496,19 @@
 			isHiddenStatus = true; //隐藏
 		}
 		var isShowLastMoneyColumn = false; //是否显示优惠后金额和价税合计,true为隐藏,false为显示
-		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "礼品充值" || listSubType == "礼品销售" || listSubType == "组装单" || listSubType == "拆卸单"){
+		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "采购订单" || listSubType == "销售订单" || listSubType == "组装单" || listSubType == "拆卸单"){
 			isShowLastMoneyColumn = true; //隐藏
 		}
 		var isShowOrganNameColumn = false; //是否显示供应商、客户等信息,true为隐藏,false为显示
 		var organNameTitle = ""; //组织名称标题
-		if(listSubType == "调拨" || listSubType == "礼品充值" || listSubType == "礼品销售" || listSubType == "组装单" || listSubType == "拆卸单"){
+		if(listSubType == "调拨" || listSubType == "组装单" || listSubType == "拆卸单"){
 			isShowOrganNameColumn = true; //隐藏
 		}
 		else {
-			if(listTitle == "采购入库列表" || listTitle == "采购退货列表" || listTitle == "其它入库列表"){
+			if(listTitle == "采购订单列表" || listTitle == "采购入库列表" || listTitle == "采购退货列表" || listTitle == "其它入库列表"){
 				organNameTitle = "供应商名称";
 			}
-			else if(listTitle == "销售退货列表" || listTitle == "销售出库列表" || listTitle == "其它出库列表"){
+			else if(listTitle == "销售订单列表" || listTitle == "销售退货列表" || listTitle == "销售出库列表" || listTitle == "其它出库列表"){
 				organNameTitle = "客户名称";
 			}
 			else if(listTitle == "零售出库列表" || listTitle == "零售退货列表"){
@@ -637,7 +608,7 @@
 						var basicUnit = unitArr[0]; //基础单位
 						var otherUnit = unitArr[1]; //副单位
 						var unitSetInput =""; //单位
-						if(listSubType === "采购" || listSubType === "采购退货"){
+						if(listSubType === "采购订单" || listSubType === "采购" || listSubType === "采购退货"){
 							unitSetInput = rec.data[0].firstinunit;
 							if(basicUnit==unitSetInput){ //基础单位等于选择的单位
 								loadRatio = 1;
@@ -646,7 +617,7 @@
 								loadRatio = thisRatio;
 							}
 						}
-						else if(listSubType === "销售" || listSubType === "销售退货" || listTitle == "礼品充值" || listTitle == "礼品销售" || listSubType === "零售" || listSubType === "零售退货"){
+						else if(listSubType === "销售订单" || listSubType === "销售" || listSubType === "销售退货" || listSubType === "零售" || listSubType === "零售退货"){
 							unitSetInput = rec.data[0].firstoutunit;
 							if(basicUnit==unitSetInput){ //基础单位等于选择的单位
 								loadRatio = 1;
@@ -757,30 +728,11 @@
 			anotherDepotUrl = '/depot/findDepotByUserId?UBType=UserDepot&UBKeyId='+kid;
 			anotherDepotTextField = "depotName";
 		}
-		if(listSubType == "礼品充值"){
-			/**
-			 * who added the .action
-			 * */
-			isShowAnotherDepot = false; //礼品充值时候显示礼品卡
-			anotherDepotHeadName = "礼品卡";
-			anotherDepotUrl = "/depot/findGiftByType?type=1";
-			anotherDepotTextField = "name";
-		}
-		if(listSubType == "礼品销售"){
-			/**
-			 * who added the .action
-			 * */
-			depotHeadName = "礼品卡";
-			depotUrl = "/depot/findGiftByType?type=1";
-			depotTextField = "name";
-		}
-		else {
-			depotHeadName = "仓库名称";
-			depotUrl = '/depot/findDepotByUserId?UBType=UserDepot&UBKeyId='+kid;
-			depotTextField = "depotName";
-		}
+		depotHeadName = "仓库名称";
+		depotUrl = '/depot/findDepotByUserId?UBType=UserDepot&UBKeyId='+kid;
+		depotTextField = "depotName";
 		var isShowTaxColumn = false; //是否显示税率相关的列,true为隐藏,false为显示
-		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "礼品充值" || listSubType == "礼品销售" || listSubType == "组装单" || listSubType == "拆卸单"){
+		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "采购订单" || listSubType == "销售订单" || listSubType == "组装单" || listSubType == "拆卸单"){
 			isShowTaxColumn = true; //隐藏
 		}
 		var isShowMaterialTypeColumn = true; //是否显示商品类型相关的列,true为隐藏,false为显示
@@ -911,7 +863,7 @@
 													var unitSetInput =""; //单位
 													body.find("[field='Unit']").find(input).prop("readonly","readonly"); //设置计量单位为只读
 													var loadRatio = 1; //在单位输入框上面加载比例字段
-													if(listSubType === "采购" || listSubType === "采购退货"){
+													if(listSubType === "采购" || listSubType === "采购退货" || listSubType === "采购订单"){
 														unitSetInput = res.data[0].firstinunit; //给单位文本框赋值
 														if(basicUnit==unitSetInput){ //基础单位等于选择的单位
 															loadRatio = 1;
@@ -920,7 +872,7 @@
 															loadRatio = ratio;
 														}
 													}
-													else if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "礼品充值" || listSubType === "礼品销售" || listSubType === "零售" || listSubType === "零售退货"){
+													else if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单" || listSubType === "零售" || listSubType === "零售退货"){
 														unitSetInput = res.data[0].firstoutunit; //给单位文本框赋值
 														if(basicUnit==unitSetInput){ //基础单位等于选择的单位
 															loadRatio = 1;
@@ -958,10 +910,10 @@
 																var type = $(this).attr("data-type");
 																var UnitPrice = 0;
 																if(type === "basic"){
-																	if(listTitle == "采购入库列表" || listTitle == "销售退货列表" || listTitle == "其它入库列表") {
+																	if(listTitle == "采购订单列表" || listTitle == "采购入库列表" || listTitle == "销售退货列表" || listTitle == "其它入库列表") {
 																		UnitPrice = basicPresetPriceOne;
 																	}
-																	else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表" || listTitle == "礼品充值列表" || listTitle == "礼品销售列表") {
+																	else if(listTitle == "销售订单列表" || listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表") {
 																		UnitPrice = basicPresetPriceTwo;
 																	}
 																	else if(listTitle == "零售出库列表" || listTitle == "零售退货列表"){
@@ -970,10 +922,10 @@
 																	body.find("[field='Stock']").find(input).val(stock); //修改库存
 																}
 																else if(type === "other"){
-																	if(listTitle == "采购入库列表" || listTitle == "销售退货列表" || listTitle == "其它入库列表") {
+																	if(listTitle == "采购订单列表" || listTitle == "采购入库列表" || listTitle == "销售退货列表" || listTitle == "其它入库列表") {
 																		UnitPrice = otherPresetPriceOne;
 																	}
-																	else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表" || listTitle == "礼品充值列表" || listTitle == "礼品销售列表") {
+																	else if(listTitle == "销售订单列表" || listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表") {
 																		UnitPrice = otherPresetPriceTwo;
 																	}
 																	else if(listTitle == "零售出库列表" || listTitle == "零售退货列表"){
@@ -1011,7 +963,7 @@
 														}
 													}
 												}
-												else if(listTitle == "采购入库列表" || listTitle == "销售退货列表" || listTitle == "其它入库列表") {
+												else if(listTitle == "采购订单列表" || listTitle == "采购入库列表" || listTitle == "销售退货列表" || listTitle == "其它入库列表") {
 													if(res.data[0].unit) { //如果存在计量单位信息
 														detailPrice = presetPriceOne;
 													}
@@ -1024,7 +976,7 @@
 														}
 													}
 												}
-												else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表" || listTitle == "礼品充值列表" || listTitle == "礼品销售列表") {
+												else if(listTitle == "销售订单列表" || listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表") {
 													if(res.data[0].unit) { //如果存在计量单位信息
 														detailPrice = presetPriceTwo;
 													}
@@ -1175,18 +1127,9 @@
 			isShowAnotherDepot = false; //调拨时候显示对方仓库
 			anotherDepotHeadName = "调入仓库";
 		}
-		if(listSubType == "礼品充值"){
-			isShowAnotherDepot = false; //礼品充值时候显示礼品卡
-			anotherDepotHeadName = "礼品卡";
-		}
-		if(listSubType == "礼品销售"){
-			depotHeadName = "礼品卡";
-		}
-		else {
-			depotHeadName = "仓库名称";
-		}
+		depotHeadName = "仓库名称";
 		var isShowTaxColumn = false; //是否显示税率相关的列,true为隐藏,false为显示
-		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "礼品充值" || listSubType == "礼品销售" || listSubType == "组装单" || listSubType == "拆卸单"){
+		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "采购订单" || listSubType == "销售订单" || listSubType == "组装单" || listSubType == "拆卸单"){
 			isShowTaxColumn = true; //隐藏
 		}
 		var isShowMaterialTypeColumn = true; //是否显示商品类型相关的列,true为隐藏,false为显示
@@ -1623,15 +1566,9 @@
 			return;
 		}
 		var depotHeadInfo = depotHeadTotalInfo.split("AaBb");
-		if(listSubType==="礼品销售"){
-			$("#GiftId").combobox('setValue',depotHeadInfo[1]);
-		}
-		else{
-			$("#ProjectId").focus().val(depotHeadInfo[1]);
-		}
+		$("#ProjectId").focus().val(depotHeadInfo[1]);
 	    var ProjectId=depotHeadInfo[1];
-		if(ProjectId!='')
-		{
+		if(ProjectId!='') {
 			initSystemData_person(ProjectId);
 			initSelectInfo_person();
 		}
@@ -1651,9 +1588,6 @@
 	    var TotalPrice = depotHeadInfo[14];
 		preTotalPrice = depotHeadInfo[14]; //记录前一次合计金额，用于扣预付款
 	    $("#AllocationProjectId").val(depotHeadInfo[15]);
-		if(listSubType==="礼品充值"){
-			$("#GiftId").combobox('setValue', depotHeadInfo[15]);
-		}
 	    oldNumber = depotHeadInfo[2]; //记录编辑前的单据编号
 		oldId = depotHeadInfo[0]; //记录单据Id
 	    var editTitle = listTitle.replace("列表","信息");
@@ -1933,7 +1867,13 @@
 					}
 				}
 				//输入框提示
-				if(listTitle === "采购入库列表"){
+                if(listTitle === "采购订单列表"){
+                    if(!$('#OrganId').combobox('getValue')){
+                        $.messager.alert('提示','请选择供应商！','warning');
+                        return;
+                    }
+                }
+				else if(listTitle === "采购入库列表"){
 					if(!$('#OrganId').combobox('getValue')){
 						$.messager.alert('提示','请选择供应商！','warning');
 						return;
@@ -1984,6 +1924,12 @@
 					}
 
 				}
+                else if(listTitle === "销售订单列表"){
+                    if(!$('#OrganId').combobox('getValue')){
+                        $.messager.alert('提示','请选择购买单位！','warning');
+                        return;
+                    }
+                }
 				else if(listTitle === "销售出库列表"){
 					if(!$('#OrganId').combobox('getValue')){
 						$.messager.alert('提示','请选择购买单位！','warning');
@@ -2040,7 +1986,7 @@
 					accountMoneyList = accountMoneyList.replace(reg,""); //替换所有的双引号
 					accountMoneyArr = accountMoneyList.split(","); //转为数组
 				}
-				if(listSubType === "采购"||listSubType === "零售退货"||listSubType === "销售退货"){
+				if(listSubType === "采购订单"||listSubType === "采购"||listSubType === "零售退货"||listSubType === "销售退货"){
 					//付款为负数
 					ChangeAmount = 0 - ChangeAmount;
 					TotalPrice = 0 - TotalPrice;
diff --git a/erp_web/pages/manage/depotGift.html b/erp_web/pages/manage/depotGift.html
deleted file mode 100644
index 3b0bb1b7..00000000
--- a/erp_web/pages/manage/depotGift.html
+++ /dev/null
@@ -1,462 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>礼品卡管理</title>
-    <meta charset="utf-8">
-    <!-- 指定以IE8的方式来渲染 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
-    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-    <script type="text/javascript" src="/js/common/common.js"></script>
-</head>
-<body>
-<!-- 查询 -->
-<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
-     closable="false">
-    <table id="searchTable">
-        <tr>
-            <td>礼品卡名称：</td>
-            <td>
-                <input type="text" name="searchName" id="searchName" style="width:150px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td id="searchRemarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：</td>
-            <td>
-                <input type="text" name="searchRemark" id="searchRemark" style="width:150px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="礼品卡列表" iconCls="icon-list"
-     collapsible="true" closable="false">
-    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-</div>
-
-<div id="depotDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
-     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-    <form id="depotFM" method="post" novalidate>
-        <table>
-            <tr>
-                <td><label id="nameLabel">礼品卡名称&nbsp;&nbsp;</label></td>
-                <td style="padding:5px"><input name="name" id="name" class="easyui-validatebox"
-                   data-options="required:true,validType:'length[2,30]'"
-                   style="width: 230px;height: 20px"/></td>
-            </tr>
-            <tr>
-                <td><label id="sortLabel">排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;</label></td>
-                <td style="padding:5px"><input name="sort" id="sort" class="easyui-textbox"
-                           style="width: 230px;height: 20px"/></td>
-            </tr>
-            <tr>
-                <td><label id="remarkLabel">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;</label></td>
-                <td style="padding:5px"><textarea name="remark" id="remark" rows="2" cols="2" style="width: 230px;"></textarea></td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="dlg-buttons">
-    <a href="javascript:void(0)" id="saveDepot" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
-</div>
-
-<script type="text/javascript">
-    //初始化界面
-    $(function () {
-        initTableData();
-        ininPager();
-        initForm();
-        browserFit();
-    });
-
-    //浏览器适配
-    function browserFit() {
-        if (getOs() == 'MSIE') {
-            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述：");
-            $("#nameLabel").empty().append("礼品卡名称&nbsp;&nbsp;");
-            $("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;");
-            $("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;");
-        }
-        else {
-            $("#searchRemarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述：");
-            $("#nameLabel").empty().append("礼品卡名称&nbsp;");
-            $("#sortLabel").empty().append("排&nbsp;&nbsp;&nbsp;&nbsp;序&nbsp;");
-            $("#remarkLabel").empty().append("描&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;");
-        }
-    }
-
-    //防止表单提交重复
-    function initForm() {
-        $('#depotFM').form({
-            onSubmit: function () {
-                return false;
-            }
-        });
-    }
-
-    //初始化表格数据
-    function initTableData() {
-        $('#tableData').datagrid({
-            //title:'仓库列表',
-            //iconCls:'icon-save',
-            //width:700,
-            height: heightInfo,
-            nowrap: false,
-            rownumbers: false,
-            //动画效果
-            animate: false,
-            //选中单行
-            singleSelect: true,
-            collapsible: false,
-            selectOnCheck: false,
-            //fitColumns:true,
-            //单击行是否选中
-            checkOnSelect: false,
-            pagination: true,
-            //交替出现背景
-            striped: true,
-            //loadFilter: pagerFilter,
-            pageSize: initPageSize,
-            pageList: initPageNum,
-            columns: [[
-                {field: 'id', width: 35, align: "center", checkbox: true},
-                {title: '礼品卡名称', field: 'name', width: 200},
-                {title: '排序', field: 'sort', width: 200},
-                {title: '描述', field: 'remark', width: 200},
-                {
-                    title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
-                        var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark;
-                        str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editDepot(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-                        str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>&nbsp;<a onclick="deleteDepot(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-                        return str;
-                    }
-                }
-            ]],
-            toolbar: [
-                {
-                    id: 'addDepot',
-                    text: '增加',
-                    iconCls: 'icon-add',
-                    handler: function () {
-                        addDepot();
-                    }
-                },
-                {
-                    id: 'deleteDepot',
-                    text: '删除',
-                    iconCls: 'icon-remove',
-                    handler: function () {
-                        batDeleteDepot();
-                    }
-                }
-            ],
-            onLoadError: function () {
-                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-        showDepotDetails(1, initPageSize);
-    }
-
-    //初始化键盘enter事件
-    $(document).keydown(function (event) {
-        //兼容 IE和firefox 事件
-        var e = window.event || event;
-        var k = e.keyCode || e.which || e.charCode;
-        //兼容 IE,firefox 兼容
-        var obj = e.srcElement ? e.srcElement : e.target;
-        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
-        if (k == "13" && (obj.id == "name" || obj.id == "sort" || obj.id == "remark")) {
-            $("#saveDepot").click();
-        }
-        //搜索按钮添加快捷键
-        if (k == "13" && (obj.id == "searchName" || obj.id == "searchRemark")) {
-            $("#searchBtn").click();
-        }
-    });
-
-    //分页信息处理
-    function ininPager() {
-        try {
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            pager.pagination({
-                onSelectPage: function (pageNum, pageSize) {
-                    opts.pageNumber = pageNum;
-                    opts.pageSize = pageSize;
-                    pager.pagination('refresh',
-                        {
-                            pageNumber: pageNum,
-                            pageSize: pageSize
-                        });
-                    showDepotDetails(pageNum, pageSize);
-                }
-            });
-        }
-        catch (e) {
-            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
-        }
-    }
-
-    //删除礼品卡信息
-    function deleteDepot(depotID) {
-        $.messager.confirm('删除确认', '确定要删除此礼品卡信息吗？', function (r) {
-            if (r) {
-                $.ajax({
-                    type: "post",
-                    url: "/depot/" + depotID + "/delete",
-                    dataType: "json",
-                    success: function (res) {
-                        if(res && res.code == 200) {
-                            $("#searchBtn").click();
-                        } else {
-                            $.messager.alert('删除提示', '删除礼品卡信息失败，请稍后再试！', 'error');
-                        }
-                    },
-                    //此处添加错误处理
-                    error: function () {
-                        $.messager.alert('删除提示', '删除礼品卡信息异常，请稍后再试！', 'error');
-                        return;
-                    }
-                });
-            }
-        });
-    }
-
-    //批量删除礼品卡
-    function batDeleteDepot() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('删除提示', '没有记录被选中！', 'info');
-            return;
-        }
-        if (row.length > 0) {
-            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条礼品卡信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
-                        }
-                        //alert(row[i].id);
-                        ids += row[i].id + ",";
-                    }
-                    $.ajax({
-                        type: "post",
-                        url: "/depot/batchDelete",
-                        dataType: "json",
-                        async: false,
-                        data: ({
-                            ids: ids
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200) {
-                                $("#searchBtn").click();
-                                $(":checkbox").attr("checked", false);
-                            } else {
-                                $.messager.alert('删除提示', '删除礼品卡信息失败，请稍后再试！', 'error');
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('删除提示', '删除礼品卡信息异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-            });
-        }
-    }
-
-    //增加
-    var url;
-    var depotID = 0;
-    //保存编辑前的名称
-    var oldDepot = "";
-
-    function addDepot() {
-        $("#sort").val("");
-        $("#remark").val("");
-        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
-        $(".window-mask").css({width: webW, height: webH});
-        $("#name").val("").focus();
-        //$('#depotFM').form('clear');
-
-        oldDepot = "";
-        depotID = 0;
-        url = '/depot/add';
-    }
-
-    //保存信息
-    $("#saveDepot").off("click").on("click", function () {
-        var infoObj = $("#depotFM").serializeObject();
-        infoObj.type = 1;
-        if (checkDepotName()) {
-            return;
-        }
-        $.ajax({
-            url: url,
-            type: "post",
-            dataType: "json",
-            data: ({
-                info: JSON.stringify(infoObj)
-            }),
-            success: function(res) {
-                if(res && res.code === 200) {
-                    $('#depotDlg').dialog('close');
-                    //加载完以后重新初始化
-                    var opts = $("#tableData").datagrid('options');
-                    showDepotDetails(opts.pageNumber, opts.pageSize);
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    });
-
-    //编辑信息
-    function editDepot(depotTotalInfo) {
-        var depotInfo = depotTotalInfo.split("AaBb");
-
-        $("#name").focus().val(depotInfo[1]);
-        $("#sort").val(depotInfo[2]);
-        $("#remark").val(depotInfo[3]);
-
-        oldDepot = depotInfo[1];
-        $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
-        $(".window-mask").css({width: webW, height: webH});
-        depotID = depotInfo[0];
-        //焦点在名称输入框==定焦在输入文字后面
-        $("#name").val("").focus().val(depotInfo[1]);
-        url = '/depot/update?id=' + depotInfo[0];
-    }
-
-    //检查名称是否存在 ++ 重名无法提示问题需要跟进
-    function checkDepotName() {
-        var name = $.trim($("#name").val());
-        //表示是否存在 true == 存在 false = 不存在
-        var flag = false;
-        //开始ajax名称检验，不能重名
-        if (name.length > 0 && (oldDepot.length == 0 || name != oldDepot)) {
-            $.ajax({
-                type: "get",
-                url: "/depot/checkIsNameExist",
-                dataType: "json",
-                async: false,
-                data: ({
-                    id: depotID,
-                    name: name
-                }),
-                success: function (res) {
-                    if(res && res.code === 200) {
-                        if(res.data && res.data.status) {
-                            flag = res.data.status;
-                            if (flag) {
-                                $.messager.alert('提示', '礼品卡名称已经存在', 'info');
-                                return;
-                            }
-                        }
-                    }
-                },
-                //此处添加错误处理
-                error: function () {
-                    $.messager.alert('提示', '检查礼品卡名称是否存在异常，请稍后再试！', 'error');
-                    return;
-                }
-            });
-        }
-        return flag;
-    }
-
-    //搜索处理
-    $("#searchBtn").unbind().bind({
-        click: function () {
-            showDepotDetails(1, initPageSize);
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            opts.pageNumber = 1;
-            opts.pageSize = initPageSize;
-            pager.pagination('refresh',
-                {
-                    pageNumber: 1,
-                    pageSize: initPageSize
-                });
-        }
-    });
-
-    function showDepotDetails(pageNo, pageSize) {
-        var name = $.trim($("#searchName").val());
-        var type = 1; // 礼品卡
-        var remark = $.trim($("#searchRemark").val());
-        $.ajax({
-            type: "get",
-            url: "/depot/list",
-            dataType: "json",
-            data: ({
-                search: JSON.stringify({
-                    name: name,
-                    type: type,
-                    remark: remark
-                }),
-                currentPage: pageNo,
-                pageSize: pageSize
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        $("#tableData").datagrid('loadData', res.data.page);
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //重置按钮
-    $("#searchResetBtn").unbind().bind({
-        click: function () {
-            $("#searchName").val("");
-            $("#searchRemark").val("");
-
-            //加载完以后重新初始化
-            $("#searchBtn").click();
-        }
-    });
-
-    //查看单元（设置）
-    $('#setBuilding').click(function () {
-        var currentRow = $("#tableData").datagrid("getChecked");
-        if (currentRow.length == 0) {
-            $.messager.alert('提示',"请选择一条数据再操作！",'warning');
-            return false;
-        }
-        parent.addTab(currentRow[0].id + "单元", "/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, "");
-
-    });
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/gift_recharge_list.html b/erp_web/pages/materials/gift_recharge_list.html
deleted file mode 100644
index 93541e34..00000000
--- a/erp_web/pages/materials/gift_recharge_list.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>礼品充值</title>
-    <meta charset="utf-8">
-    <!-- 指定以IE8的方式来渲染 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
-    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
-    <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-    <script src="/js/My97DatePicker/WdatePicker.js"></script>
-    <script src="/js/common/common.js"></script>
-    <script src="/js/pages/materials/in_out.js"></script>
-</head>
-<body>
-<!-- 查询 -->
-<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
-     closable="false">
-    <table id="searchTable">
-        <tr>
-            <td>单据编号：</td>
-            <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
-            </td>
-            <td>商品信息：</td>
-            <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
-            </td>
-            <td>单据日期：</td>
-            <td>
-                <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
-            </td>
-            <td>-</td>
-            <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="礼品充值列表" iconCls="icon-list"
-     collapsible="true" closable="false">
-    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-</div>
-
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:50px"
-     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-    <form id="depotHeadFM" method="post" novalidate>
-        <table>
-            <tr>
-                <td style="width:70px;">单据日期：</td>
-                <td style="padding:5px">
-                    <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
-                           style="width: 140px;" readonly/>
-                </td>
-                <td style="width:70px;">单据编号：</td>
-                <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
-                </td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td style="width:100px;"></td>
-            </tr>
-            <tr>
-                <td colspan="9">
-                    <!-- 商品列表table -->
-                    <table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
-                </td>
-            </tr>
-        </table>
-        <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
-    </form>
-</div>
-<div id="dlg-buttons">
-    <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
-</div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
-     closed="true" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
-        <tr>
-            <td style="width:70px;">单据日期：</td>
-            <td style="padding:5px;width:140px;">
-                <span id="OperTimeShow"></span>
-            </td>
-            <td style="width:70px;">单据编号：</td>
-            <td style="padding:5px;width:140px;">
-                <span id="NumberShow"></span>
-            </td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td style="width:100px;"></td>
-        </tr>
-        <tr>
-            <td colspan="9" style="width: 1130px;">
-                <!-- 商品列表table -->
-                <table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
-            </td>
-        </tr>
-        <tr>
-            <td style="width:60px;">单据备注：</td>
-            <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
-            </td>
-        </tr>
-    </table>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html
new file mode 100644
index 00000000..ada1eb90
--- /dev/null
+++ b/erp_web/pages/materials/purchase_orders_list.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>采购订单</title>
+    <meta charset="utf-8">
+    <!-- 指定以IE8的方式来渲染 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
+    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
+    <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
+    <script src="/js/jquery-1.8.0.min.js"></script>
+    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
+    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/My97DatePicker/WdatePicker.js"></script>
+    <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/in_out.js"></script>
+</head>
+<body>
+<!-- 查询 -->
+<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
+     closable="false">
+    <table id="searchTable">
+        <tr>
+            <td>单据编号：</td>
+            <td>
+                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+            </td>
+            <td>商品信息：</td>
+            <td>
+                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+            </td>
+            <td>单据日期：</td>
+            <td>
+                <input type="text" name="searchBeginTime" id="searchBeginTime"
+                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+            </td>
+            <td>-</td>
+            <td>
+                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
+                       class="txt Wdate" style="width:100px;"/>
+            </td>
+            <td>&nbsp;</td>
+            <td>
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;
+                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<!-- 数据显示table -->
+<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="采购订单列表" iconCls="icon-list"
+     collapsible="true" closable="false">
+    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
+</div>
+
+<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+     closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
+    <form id="depotHeadFM" method="post" novalidate>
+        <table>
+            <tr>
+                <td style="width:60px;">供应商：</td>
+                <td style="padding:5px;width:170px;">
+                    <div class="org-list">
+                        <input id="OrganId" name="OrganId" style="width:130px;"/>
+                    </div>
+                    <div class="add-org-btn">
+                        <img id="addOrgan" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                             style="cursor: pointer;" alt="增加供应商" title="增加供应商"/>
+                    </div>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px">
+                    <input type="text" name="OperTime" id="OperTime"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           style="width:140px;" readonly/>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px">
+                    <input name="Number" id="Number" class="easyui-validatebox"
+                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                </td>
+                <td style="width:70px;"></td>
+                <td style="padding:5px">
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9">
+                    <!-- 商品列表table -->
+                    <table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="9">
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                              style="width: 1130px; height:35px;"></textarea>
+                </td>
+            </tr>
+        </table>
+        <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+    </form>
+</div>
+<div id="dlg-buttons">
+    <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
+</div>
+<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+     closed="true" modal="true" cache="false" collapsible="false" closable="true">
+    <table>
+        <tr>
+            <td style="width:60px;">供应商：</td>
+            <td style="padding:5px;width:130px;">
+                <span id="OrganIdShow"></span>
+            </td>
+            <td style="width:70px;">单据日期：</td>
+            <td style="padding:5px;width:130px;">
+                <span id="OperTimeShow"></span>
+            </td>
+            <td style="width:80px;">单据编号：</td>
+            <td style="padding:5px;width:140px;">
+                <span id="NumberShow"></span>
+            </td>
+            <td style="width:70px;"></td>
+            <td style="padding:5px;width:140px;"></td>
+            <td style="width:100px;"></td>
+        </tr>
+        <tr>
+            <td colspan="9" style="width: 1130px;">
+                <!-- 商品列表table -->
+                <table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+            </td>
+        </tr>
+        <tr>
+            <td style="width:60px;">单据备注：</td>
+            <td colspan="8" style="height:35px;">
+                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+            </td>
+        </tr>
+    </table>
+</div>
+<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+     closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
+    <table class="account-dlg">
+        <tr class="account-head-tmp">
+            <td style="width:30px;"></td>
+            <td style="width:140px; padding:5px;">结算账户</td>
+            <td style="width:100px; padding:5px;">金额</td>
+        </tr>
+        <tr>
+            <td style="width:30px;"></td>
+            <td style="width:140px;text-align: center;">合计：</td>
+            <td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
+        </tr>
+    </table>
+    <table class="tabs-tmp">
+        <tr class="account-content-tmp">
+            <td style="width:30px;"></td>
+            <td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
+            <td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;"/></td>
+        </tr>
+    </table>
+</div>
+<div id="accountDlgButtons">
+    <a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+</div>
+<div id="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+     closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true">
+    <table class="money-dlg">
+        <tr class="money-head-tmp">
+            <td style="width:30px;"></td>
+            <td style="width:140px; padding:5px;">结算账户</td>
+            <td style="width:100px; padding:5px;">金额</td>
+        </tr>
+        <tr>
+            <td style="width:30px;"></td>
+            <td style="width:140px;text-align: center;">合计：</td>
+            <td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td>
+        </tr>
+    </table>
+    <table class="tabs-tmp">
+        <tr class="money-content-tmp">
+            <td style="width:30px;"></td>
+            <td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td>
+            <td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;"/></td>
+        </tr>
+    </table>
+</div>
+<div id="otherMoneyDlgBtn">
+    <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+</div>
+<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
+     closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
+    <form id="supplierFM">
+        <table>
+            <tr>
+                <td style="width: 80px;height: 20px">名称</td>
+                <td style="width: 180px;padding:1px">
+                    <input name="supplier" id="supplier" class="easyui-validatebox"
+                           data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
+                </td>
+                <td style="width: 60px;height: 20px">联系人</td>
+                <td style="width:180px;padding:1px;">
+                    <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>手机号码</td>
+                <td style="padding:1px;">
+                    <input name="telephone" id="telephone" class="easyui-validatebox"
+                           style="width: 160px;height: 20px"/>
+                </td>
+                <td>电子邮箱</td>
+                <td style="padding:1px">
+                    <input name="email" id="email" class="easyui-validatebox" validType="email"
+                           style="width: 160px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>联系电话</td>
+                <td style="padding:1px;">
+                    <input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                </td>
+                <td>传真</td>
+                <td style="padding:1px">
+                    <input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>期初应收</td>
+                <td style="padding:1px">
+                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
+                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+                </td>
+                <td>期初应付</td>
+                <td style="padding:1px">
+                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
+                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+                </td>
+            </tr>
+            <tr>
+                <td>累计应收</td>
+                <td style="padding:1px">
+                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
+                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+                </td>
+                <td>累计应付</td>
+                <td style="padding:1px">
+                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
+                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+                </td>
+            </tr>
+            <tr>
+                <td>纳税人识别号</td>
+                <td style="padding:1px">
+                    <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                </td>
+                <td>税率</td>
+                <td style="padding:1px">
+                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>开户行</td>
+                <td style="padding:1px">
+                    <input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                </td>
+                <td>账号</td>
+                <td style="padding:1px">
+                    <input name="accountNumber" id="accountNumber" class="easyui-validatebox"
+                           style="width: 160px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>地址</td>
+                <td style="padding:1px" colspan="3">
+                    <input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
+                </td>
+            </tr>
+            <tr>
+                <td>备注</td>
+                <td style="padding:1px" colspan="3">
+                    <textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
+                </td>
+            </tr>
+        </table>
+    </form>
+</div>
+<div id="supplierDlgBtn">
+    <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
+</div>
+</body>
+</html>
diff --git a/erp_web/pages/materials/gift_out_list.html b/erp_web/pages/materials/sale_orders_list.html
similarity index 59%
rename from erp_web/pages/materials/gift_out_list.html
rename to erp_web/pages/materials/sale_orders_list.html
index 2d577861..9295ce9f 100644
--- a/erp_web/pages/materials/gift_out_list.html
+++ b/erp_web/pages/materials/sale_orders_list.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>礼品销售</title>
+    <title>销售订单</title>
     <meta charset="utf-8">
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -51,17 +51,25 @@
 </div>
 
 <!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="礼品销售列表" iconCls="icon-list"
+<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="销售订单列表" iconCls="icon-list"
      collapsible="true" closable="false">
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:50px"
+<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:60px;">客户：</td>
+                <td style="padding:5px">
+                    <input id="OrganId" name="OrganId" style="width:130px;"/>
+                </td>
+                <td style="width:70px;">销售人员：</td>
+                <td style="padding:5px">
+                    <input id="Salesman" name="Salesman" style="width:130px;"/>
+                </td>
+                <td style="width:80px;">单据日期：</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
                            onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
@@ -70,12 +78,8 @@
                 <td style="width:70px;">单据编号：</td>
                 <td style="padding:5px">
                     <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
+                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
                 <td style="width:100px;"></td>
             </tr>
             <tr>
@@ -102,7 +106,15 @@
      closed="true" modal="true" cache="false" collapsible="false" closable="true">
     <table>
         <tr>
-            <td style="width:70px;">单据日期：</td>
+            <td style="width:60px;">客户：</td>
+            <td style="padding:5px;width:130px;">
+                <span id="OrganIdShow"></span>
+            </td>
+            <td style="width:70px;">销售人员：</td>
+            <td style="padding:5px;width:130px;">
+                <span id="SalesmanShow"></span>
+            </td>
+            <td style="width:80px;">单据日期：</td>
             <td style="padding:5px;width:140px;">
                 <span id="OperTimeShow"></span>
             </td>
@@ -110,10 +122,6 @@
             <td style="padding:5px;width:140px;">
                 <span id="NumberShow"></span>
             </td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
             <td style="width:100px;"></td>
         </tr>
         <tr>
@@ -130,5 +138,58 @@
         </tr>
     </table>
 </div>
+<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+     closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
+    <table class="account-dlg">
+        <tr class="account-head-tmp">
+            <td style="width:30px;"></td>
+            <td style="width:140px; padding:5px;">结算账户</td>
+            <td style="width:100px; padding:5px;">金额</td>
+        </tr>
+        <tr>
+            <td style="width:30px;"></td>
+            <td style="width:140px;text-align: center;">合计：</td>
+            <td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
+        </tr>
+    </table>
+    <table class="tabs-tmp">
+        <tr class="account-content-tmp">
+            <td style="width:30px;"></td>
+            <td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
+            <td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;"/></td>
+        </tr>
+    </table>
+</div>
+<div id="accountDlgButtons">
+    <a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+</div>
+<div id="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
+     closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true">
+    <table class="money-dlg">
+        <tr class="money-head-tmp">
+            <td style="width:30px;"></td>
+            <td style="width:140px; padding:5px;">结算账户</td>
+            <td style="width:100px; padding:5px;">金额</td>
+        </tr>
+        <tr>
+            <td style="width:30px;"></td>
+            <td style="width:140px;text-align: center;">合计：</td>
+            <td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td>
+        </tr>
+    </table>
+    <table class="tabs-tmp">
+        <tr class="money-content-tmp">
+            <td style="width:30px;"></td>
+            <td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td>
+            <td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;"/></td>
+        </tr>
+    </table>
+</div>
+<div id="otherMoneyDlgBtn">
+    <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+    <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
+</div>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/reports/gift_manage_report.html b/erp_web/pages/reports/gift_manage_report.html
deleted file mode 100644
index f7e43d7a..00000000
--- a/erp_web/pages/reports/gift_manage_report.html
+++ /dev/null
@@ -1,270 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>礼品卡统计</title>
-    <meta charset="utf-8">
-    <!-- 指定以IE8的方式来渲染 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
-    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-    <script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
-    <script type="text/javascript" src="/js/common/common.js"></script>
-</head>
-<body>
-<!-- 查询 -->
-<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
-     closable="false">
-    <table id="searchTable">
-        <tr>
-            <td>礼品卡：</td>
-            <td>
-                <input id="searchGiftId" name="searchGiftId" style="width:110px;"/>
-            </td>
-            <td>&nbsp;</td>
-            <td>
-                <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="礼品卡统计列表" iconCls="icon-list"
-     collapsible="true" closable="false">
-    <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-</div>
-
-<script type="text/javascript">
-    var mPropertyList = ""; //商品属性列表
-    //初始化界面
-    $(function () {
-        var userBusinessList = null;
-        var userdepot = null;
-        initGift();
-        initMProperty(); //初始化商品属性
-        initTableData();
-        ininPager();
-    });
-
-    //初始化-礼品卡
-    function initGift() {
-        $('#searchGiftId').combobox({
-            url: "/depot/findGiftByType?type=1",
-            valueField: 'id',
-            textField: 'name'
-        });
-
-        //当会员卡号长度超过10位后，自动点击下拉框，用于兼容刷卡器
-        $("#searchGiftId").next().find("input").off("keyup").on("keyup", function () {
-            var self = this;
-            if ($(this).val().length === 10) {
-                setTimeout(function () {
-                    $(".combo-panel .combobox-item-selected").click();
-                    search();
-                }, 500);
-            }
-        });
-    }
-
-    //初始化商品属性
-    function initMProperty() {
-        $.ajax({
-            type: "get",
-            url: "/materialProperty/list",
-            dataType: "json",
-            data: ({
-                search: JSON.stringify({
-                    name: ""
-                }),
-                currentPage: 1,
-                pageSize: 100
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    var thisRows = res.data.page.rows;
-                    for (var i = 0; i < thisRows.length; i++) {
-                        if (thisRows[i].enabled) {
-                            mPropertyList += thisRows[i].nativename + ",";
-                        }
-                    }
-                    if (mPropertyList) {
-                        mPropertyList = mPropertyList.substring(0, mPropertyList.length - 1);
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询信息异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //初始化表格数据
-    function initTableData() {
-        $('#tableData').datagrid({
-            height: heightInfo,
-            nowrap: false,
-            rownumbers: true,
-            //动画效果
-            animate: false,
-            //选中单行
-            singleSelect: true,
-            pagination: true,
-            //交替出现背景
-            striped: true,
-            pageSize: 10,
-            pageList: [10, 50, 100],
-            columns: [[
-                {title: '名称', field: 'MaterialName', width: 60},
-                {title: '型号', field: 'MaterialModel', width: 80},
-                {title: '扩展信息', field: 'MaterialOther', width: 150},
-                {title: '单位', field: 'MaterialUnit', width: 80},
-                {title: '结存数量', field: 'thisSum', width: 80}
-            ]],
-            onLoadError: function () {
-                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //初始化键盘enter事件
-    $(document).keydown(function (event) {
-        //兼容 IE和firefox 事件
-        var e = window.event || event;
-        var k = e.keyCode || e.which || e.charCode;
-        //兼容 IE,firefox 兼容
-        var obj = e.srcElement ? e.srcElement : e.target;
-        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
-        if (k == "13" && (obj.id == "Type" || obj.id == "Name")) {
-            $("#savePerson").click();
-        }
-        //搜索按钮添加快捷键
-        if (k == "13" && (obj.id == "searchType")) {
-            $("#searchBtn").click();
-        }
-    });
-
-    //分页信息处理
-    function ininPager() {
-        try {
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            pager.pagination({
-                onSelectPage: function (pageNum, pageSize) {
-                    opts.pageNumber = pageNum;
-                    opts.pageSize = pageSize;
-                    pager.pagination('refresh', {
-                        pageNumber: pageNum,
-                        pageSize: pageSize
-                    });
-                    showPersonDetails(pageNum, pageSize);
-                }
-            });
-        }
-        catch (e) {
-            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
-        }
-    }
-
-    //搜索处理
-    function search() {
-        showPersonDetails(1, initPageSize);
-        var opts = $("#tableData").datagrid('options');
-        var pager = $("#tableData").datagrid('getPager');
-        opts.pageNumber = 1;
-        opts.pageSize = initPageSize;
-        pager.pagination('refresh', {
-            pageNumber: 1,
-            pageSize: initPageSize
-        });
-    }
-
-    $("#searchBtn").unbind().bind({
-        click: function () {
-            var giftId = $('#searchGiftId').combobox('getValue'); //礼品卡Id
-            if (giftId) {
-                search();
-            }
-            else {
-                $.messager.alert('查询提示', '请选择一张礼品卡！', 'warning');
-            }
-        }
-    });
-
-    function showPersonDetails(pageNo, pageSize) {
-        var searchGiftId = $("#searchGiftId").combobox("getValue");
-        $.ajax({
-            type: "get",
-            url: "/depotHead/findGiftReport?projectId=" + searchGiftId,
-            dataType: "json",
-            success: function (res) {
-                if(res && res.code === 200 && res.data) {
-                    var HeadIds = res.data.HeadIds;
-                    if (HeadIds) {
-                        //获取排序后的产品ID
-                        $.ajax({
-                            type: "get",
-                            url: "/material/findByOrder",
-                            dataType: "json",
-                            success: function (res) {
-                                if (res && res.code === 200 && res.data) {
-                                    var mIds = res.data.mIds;
-                                    if (mIds) {
-                                        $.ajax({
-                                            type: "get",
-                                            url: "/depotItem/findGiftByAll",
-                                            dataType: "json",
-                                            data: ({
-                                                currentPage: pageNo,
-                                                pageSize: pageSize,
-                                                projectId: searchGiftId,
-                                                headIds: HeadIds,
-                                                materialIds: mIds,
-                                                mpList: mPropertyList
-                                            }),
-                                            success: function (res) {
-                                                if(res && res.code === 200 && res.data) {
-                                                    $("#tableData").datagrid('loadData', res.data.rows);
-                                                }
-                                            },
-                                            //此处添加错误处理
-                                            error: function () {
-                                                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                                                return;
-                                            }
-                                        });
-                                    }
-                                    else {
-                                        $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                                    }
-                                }
-                            },
-                            //此处添加错误处理
-                            error: function () {
-                                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                                return;
-                            }
-                        });
-                    }
-                    else {
-                        $.messager.alert('查询提示', '该礼品卡无数据！', 'warning');
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql
index e49423cd..3c0aaa1f 100644
--- a/sql/jsh_erp.sql
+++ b/sql/jsh_erp.sql
@@ -5339,3 +5339,14 @@ ALTER TABLE jsh_materialcategory DROP FOREIGN KEY FK3EE7F725237A77D8;
 -- 修改根目录父节点id为-1
 -- ----------------------------
 update jsh_materialcategory set ParentId='-1' where id='1'
+
+-- ----------------------------
+-- 删除礼品卡管理、礼品充值、礼品销售、礼品卡统计的功能数据
+-- ----------------------------
+delete from jsh_functions where id in (213,214,215,216)
+
+-- ----------------------------
+-- 新增采购订单、销售订单的功能数据
+-- ----------------------------
+insert into `jsh_functions` values ('242', '050202', '采购订单', '0502', '../materials/purchase_orders_list.html', b'0', '0335',b'1', '电脑版', '');
+insert into `jsh_functions` values ('243', '060301', '销售订单', '0603', '../materials/sale_orders_list.html', b'0', '0392', b'1', '电脑版', '');
\ No newline at end of file
diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx
index 634e8785..8a9e3ebf 100644
Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ