zymesSrmLayUi.git

			@@ -127,6 +127,16 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">业务终止</label>
			<div class="layui-input-block">
			<select id="HIsStop" name="HIsStop" lay-filter="">
			<option value="全部">全部</option>
			<option value="是">是</option>
			<option value="否" selected>否</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -248,7 +258,7 @@
			});

			//不需要显示的字段可扩展
			var titleData = ["HItemID", "HParentID", "单据号", "日期", "数量", "状态", "单位", "金额"];
			var titleData = ["HItemID", "HParentID", "单位", "金额"];
			var option = [];
			var HModName = "SRM_POOrderBillList";
			var sqlWhere = "";
			@@ -472,7 +482,7 @@
			var wait = layer.load();//遮罩
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "GetPOOrderBill",
			url: GetWEBURL() + "GetPOOrderBill", //H_p_SRM_POOrderBillList
			async: true,
			data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
			success: function (data1) {
			@@ -501,7 +511,7 @@
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == '订单数量' \|\| data[i].name == '已发货数量' \|\| data[i].name == '未发货数量') {
			if (data[i].name == '订单数量' \|\| data[i].name == '已发货数量' \|\| data[i].name == '未发货数量' \|\| data[i].name == '剩余收料数量' \|\| data[i].name == '未到货数量' \|\| data[i].name == '累计收料数量' \|\| data[i].name == '剩余入库数量' \|\| data[i].name == '入库数量') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
			} else if (data[i].name == '供应商交期回复') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
			@@ -567,10 +577,10 @@
			if ($("#HPURCHASEORGID").val() != "" && $("#HPURCHASEORGID option:selected").text() != "安瑞集团")
			sqlWhere += " and HPURCHASEORGID = ^^" + $("#HPURCHASEORGID").val() + "^^";
			if ($("#HDate1").val() != "") {
			sqlWhere += " and 采购日期 >= ^^" + $("#HDate1").val() + "^^";
			sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
			}
			if ($("#HDate2").val() != "") {
			sqlWhere += " and 采购日期 <= ^^" + $("#HDate2").val() + "^^";
			sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
			}
			if ($("#HISGenerate").val() != "") {
			if ($("#HISGenerate").val() == "是") {
			@@ -596,7 +606,16 @@
			else if ($("#HIsFreeze").val() == "业务冻结") {
			sqlWhere += " and 业务冻结 = ^^业务冻结^^";
			}
			}
			if ($("#HIsStop").val() != "") {
			if ($("#HIsStop").val() == "是") {
			sqlWhere += " and 业务终止 = ^^业务终止^^";
			}
			else if ($("#HIsStop").val() == "否") {
			sqlWhere += " and 业务终止 = ^^正常^^";
			}
			}

			var Time = $("#Time").val();
			if (Time > 0) {
			var dd = new Date();
			@@ -786,22 +805,31 @@
			break;
			case 'btn-generate':
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			, data = checkStatus.data;
			if (data.length == 0) {
			layer.alert("请选择数据", { icon: 5 });
			return;
			}
			if (data[0].完成状态 == "已完成") {
			return layer.msg('订单已完成！')
			}
			}
			ajaxLabelData = data;
			//根据选中的采购订单，重新从金蝶云同步采购订单关联数量过来。考虑采购订单删除和关闭状态，同步状态
			var ids = "";
			var entryids = "";
			var HBillType = data[0].订单类型
			var HErr = "";
			$.each(data, function (obj) {
			ids += data[obj].hmainid + ",";
			entryids += data[obj].hsubid + ",";
			if (HBillType != data[obj].订单类型) {
			HErr += data[obj].订单类型;
			}
			})
			if (HErr != "") {
			return layer.msg('采购订单订单类型不同，不允许合并下推生成送货单！')
			}

			ids = ids.substring(0, ids.length - 1);
			entryids = entryids.substring(0, entryids.length - 1);
			var hasPrivileage = true;