zymesSrmLayUi.git

			@@ -151,6 +151,17 @@
			</select>
			</div>
			</div>
			<!--瑞琪-->
			<div class="layui-inline">
			<label class="layui-form-label">业务关闭</label>
			<div class="layui-input-block">
			<select id="HIsClose" name="HIsClose" lay-filter="">
			<option value="全部" selected>全部</option>
			<option value="是">是</option>
			<option value="否">否</option>
			</select>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -258,7 +269,7 @@
			//$("#HBeginDate").val("2022-03-14");
			//$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			var columns = [
			{ type: 'checkbox', fixed: 'left' }
			{ type: 'checkbox', fixed: 'left', totalRowText: '合计' }
			//{ type: 'radio', fixed: true }
			, { field: 'sorderid', title: '序号', width: 80/, fixed: true / }
			, { field: 'hmainid', title: 'hmainid', sort: true, /fixed: true,/ hide: true }
			@@ -278,8 +289,8 @@
			, { field: '计量单位', title: '计量单位', width: 80, sort: true }
			, { field: '数量', title: '订单数量', sort: true }
			, { field: '打印条码数量', title: '打印条码数量', sort: true }
			, { field: '已发货数量', title: '已发货数量', sort: true }
			, { field: '可发货数量', title: '可发货数量', sort: true }
			, { field: '已发货数量', title: '已发货数量', sort: true, totalRow: true }
			, { field: '可发货数量', title: '可发货数量', sort: true, totalRow: true}
			, { field: '交货地点', title: '交货地点', sort: true }
			, { field: '交货日期', title: '交货日期', width: 180, sort: true }
			, { field: '日期', title: '日期', width: 120, sort: true/, fixed: 'left' / }
			@@ -434,7 +445,7 @@
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//在列表左边添加勾选框
			col.push({ type: 'checkbox', fixed: 'left' });
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			@@ -451,7 +462,11 @@
			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:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			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 {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			}
			@@ -462,6 +477,7 @@
			, cols: [col]
			, data: data1.data
			, height: 'full-80'
			,totalRow: true
			, page: true
			, cellMinWidth: 90
			, limit: 500
			@@ -523,6 +539,15 @@
			sqlWhere += " and 未关联数量 > 0";
			}
			}
			/瑞琪/
			if ($("#HIsClose").val() != "") {
			if ($("#HIsClose").val() == "是") {
			sqlWhere += " and 业务关闭 = ^^已关闭^^";
			}
			else if ($("#HIsClose").val() == "否") {
			sqlWhere += " and 业务关闭 = ^^未关闭^^";
			}
			}
			var Time = $("#Time").val();
			if (Time > 0) {
			var dd = new Date();
			@@ -578,11 +603,28 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			_cur_page = $(".layui-laypage-em").next().html();

			var HInterIDArr = "";
			var HBillNoArr = "";
			var HBillInter = "";

			for (let i = 0; i < data.length; i++) {
			HInterIDArr += data[i].hmainid.toString() + ",";
			HBillNoArr += "'" + data[i].单据号.toString() + "'" + ",";
			HBillInter += data[i].单据号.toString() + "@" + data[i].hmainid.toString() + ",";
			}

			HInterIDArr = HInterIDArr.substring(0, HInterIDArr.length - 1)//内码
			HBillNoArr = HBillNoArr.substring(0, HBillNoArr.length - 1)//单据号
			HBillInter = HBillInter.substring(0, HBillInter.length - 1)//单据号 + @ + 内码拼接

			var oData = JSON.stringify(HInterIDArr) + ";" + JSON.stringify(HBillInter) + ";" + sessionStorage["HUserName"];

			layer.confirm('是否确认单据?', { icon: 3, title: '提示' }, function (index) {
			$.ajax({
			type: "get",
			type: "post",
			url: GetWEBURL() + "POOrderAccept",
			data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["单据号"].toString(), "HUser": sessionStorage["HUserName"] },
			data: { "oData": oData },
			success: function (result) {
			if (result.count == 1) { // 说明验证成功了，
			layer.msg(result.Message, { icon: 1 });