From 57e698ff50b2dbd3ca9bb73932fba21dfe828e9a Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 04 九月 2025 11:09:59 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 221 ++++++++++++------------------------------------------
1 files changed, 50 insertions(+), 171 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index b8ef417..ca60ebe 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -12,6 +12,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/xm-select.js"></script>
<!--<script src="../../../layuiadmin/soulTable.slim.js"></script>--> <!--鏍囬绛涢�変笉鑳藉紩鐢ㄦjs鏂囦欢-->
</head>
<body>
@@ -75,9 +76,12 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HORGID" id="HORGID" lay-verify="HORGID">
+ <!--<select name="HORGID" id="HORGID" lay-verify="HORGID">-->
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <!--</select>-->
+ <div id="demo1">
+
+ </div>
</div>
</div>
<div class="layui-inline">
@@ -494,7 +498,8 @@
, { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', sort: true, filter: true }
, { field: '渚涜揣杞﹂棿浠ｇ爜', title: '渚涜揣杞﹂棿浠ｇ爜', sort: true, filter: true }
, { field: '渚涜揣杞﹂棿', title: '渚涜揣杞﹂棿', sort: true, filter: true }
- , { field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��', sort: true, filter: true }
+ , { field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��', sort: true, filter: true }
+ , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', sort: true, filter: true }
, { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', sort: true, totalRow: true, filter: true }
, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true, totalRow: true, filter: true }
, { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺', sort: true, totalRow: true, filter: true }
@@ -515,22 +520,34 @@
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
var Organization = '';
+ var selectDataList = [];
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false,
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
for (var i = 0; i < data.length; i++) {
- Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ /*Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';*/
+ //涓嬫媺澶氶�夋鏁版嵁鍒濆鍖�
+ var selectData = { name: data[i].Name, value: data[i].ID };
+ selectDataList.push(selectData);
}
- $("#HORGID").append(Organization);
- $("#HORGID").val(sessionStorage["OrganizationID"])
+ //$("#HORGID").append(Organization);
+ //$("#HORGID").val(sessionStorage["OrganizationID"]);
+ var demo1 = xmSelect.render({
+ el: '#demo1',
+ language: 'zn',
+ /*initValue: [sessionStorage["OrganizationID"]],*///榛樿閫夐」
+ data: selectDataList
+ })
form.render('select');
}
layer.closeAll("loading");
}
})
+
}
//#region 鏌ヨ
@@ -565,7 +582,14 @@
function getExportData() {
var data;//瀵煎嚭鐨勬暟鎹�
var ajaxLoad = layer.load();
- var HORGID = $("#HORGID").val();//缁勭粐
+ var HORGID = "";//缁勭粐
+ var xmList = xmSelect.get('#demo1', true);//鑾峰彇閫夋嫨妗嗗疄渚�
+ var xmValueStr = xmList.getValue("valueStr")//鑾峰彇鍊煎瓧绗︿覆
+ if (xmValueStr == "") {
+ HORGID = "'0'"//娌￠�夋嫨缁勭粐鍒欏叏閮ㄧ粍缁�
+ } else {
+ HORGID = "'" + xmValueStr + "'"
+ }
var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
var HDeptID = $("#HDeptID").val();//鐢熶骇杞﹂棿
var HSCZYID = $("#HSCZYID").val();//鐢熶骇璧勬簮
@@ -575,80 +599,6 @@
var HEndDate = $("#HEndDate").val();//鑷�
var HMaterAtt = $("#HMaterAtt").val();//鐗╂枡灞炴��
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
-
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
if (HBeginDate > HEndDate) {
layer.close(ajaxLoad);
@@ -688,6 +638,12 @@
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
+ if (itemobj == "璁㈠崟浜ゆ湡") {
+ item[itemobj] = item[itemobj].toString().split('T')[0];
+ }
+ if (itemobj == "鏃ヨ鍒掓棩鏈�") {
+ item[itemobj] = item[itemobj].toString().split('T')[0];
+ }
}
});
@@ -711,11 +667,18 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HORGID = "";
- if (number == 1) {
- HORGID = sessionStorage["OrganizationID"];
- }
- else {
- HORGID = $("#HORGID").val();//缁勭粐
+ //if (number == 1) {
+ // HORGID = sessionStorage["OrganizationID"];
+ //}
+ //else {
+ // HORGID = $("#HORGID").val();//缁勭粐
+ //}
+ var xmList = xmSelect.get('#demo1', true);//鑾峰彇閫夋嫨妗嗗疄渚�
+ var xmValueStr = xmList.getValue("valueStr")//鑾峰彇鍊煎瓧绗︿覆
+ if (xmValueStr == "") {
+ HORGID = "'0'"
+ } else {
+ HORGID = "'" + xmValueStr + "'"
}
var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
var HDeptID = $("#HDeptID").val();//鐢熶骇杞﹂棿
@@ -725,81 +688,6 @@
var HBeginDate = $("#HBeginDate").val();//鎻愭枡鏃ユ湡
var HEndDate = $("#HEndDate").val();//鑷�
var HMaterAtt = $("#HMaterAtt").val();//鐗╂枡灞炴��
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
-
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
if (HBeginDate > HEndDate) {
return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
@@ -827,7 +715,7 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#HORGID").val(sessionStorage["OrganizationID"]);//缁勭粐
+
$("#HMATERIALID").val(0);//鐗╂枡/浜у搧
$("#HMATERIALNAME").val("");
$("#HDeptID").val(0);//鐢熶骇杞﹂棿
@@ -836,15 +724,6 @@
$("#HSCZYName").val("");
$("#HXQD").val("");//闇�姹傚崟鍙�
$("#HMOBILLNO").val("");//鐢熶骇璁㈠崟鍙�
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
$("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
$("#HMaterAtt").val("");
--
Gitblit v1.9.1