From f30713785d5db5d1b27bb463be41776c929154ea Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期六, 15 一月 2022 11:04:57 +0800
Subject: [PATCH] nothing
---
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html | 57 +++++++++++++++++++---------
WebTM/views/IpadStepIndex.html | 3 +
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 2
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html | 5 ++
4 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 40e8b9b..74f9879 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -725,7 +725,8 @@
"HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
"Czybm": sessionStorage["Czybm"],
//"HEmpID": "0", //sessionStorage["HEmpID"]
- "HSourceBillType": HSourceBillType
+ "HSourceBillType": HSourceBillType,
+ "HProcID": HProcID
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
index acf9ccc..71c0604 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
@@ -126,6 +126,7 @@
var HICMOInterID = ""; //鐢熶骇璁㈠崟涓籌D
var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
var HSourceBillType = ""; //婧愬崟绫诲瀷
+ var HProcID = ""; //宸ュ簭ID
var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
var edit = function (data) {
workcode = data[0].workcode;
@@ -136,6 +137,7 @@
HMaker = data[0].HMaker;
Czybm = data[0].Czybm;
HSourceBillType = data[0].HSourceBillType;
+ HProcID = data[0].HProcID;
}
//鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
var params = get_UrlVars();
@@ -205,6 +207,7 @@
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
+ , { field: 'HProcID', title: '宸ュ簭ID', width: 200, hide: true }
, { field: 'HProcNumber', title: '宸ュ簭缂栫爜', width: 200 }
, { field: 'HProcName', title: '宸ュ簭鍚嶇О', width: 200 }
, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
@@ -320,7 +323,7 @@
type: "Get",
url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESProductReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm },
+ data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm, "HProcID": HProcID },
dataType: "json",
beforeSend: function () {
$('#AskReport').addClass("layui-btn-disabled").attr("disabled", true);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
index 3f1021f..62977fd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
@@ -35,9 +35,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HDate1" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -96,6 +102,7 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
var table = null;
@@ -122,12 +129,20 @@
var pageIndex = 1;//褰撳墠椤电爜鍊�
//#region 杩涘叆椤甸潰鏃㈠姞杞�
- //鍒濆鍖栬〃鍗曟彃浠�
- set_InitFrom();
//鍒濆鍖栫晫闈�
set_ClearBill(sWhere);
//#endregion
+ //#region 鍒濆鍖栬〃鍗�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HDate'
+ });
+ laydate.render({
+ elem: '#HDate1'
+ });
+ }
+ //#endregion
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -176,17 +191,15 @@
get_FastQuery();
});
- //鍒濆鍖栬〃鍗�
- function set_InitFrom() {
- laydate.render({
- elem: '#HDate'
- });
- }
//鍒濆鍖栫晫闈�
function set_ClearBill(sWhere) {
resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
//鍒濆鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ get_FastQuery();
+
}
//鍔犺浇缃戞牸
function get_Display(sWhere) {
@@ -194,7 +207,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
type: "GET",
- data: { "sWhere": sWhere, "page": 1, "limit": 10 },
+ data: { "page": 1, "limit": 10, "sWhere": sWhere },
datatype: "json",
success: function (data1) {
console.log(data1);
@@ -209,6 +222,7 @@
}
//鍒濆鍖栬〃鏍�
function set_InitGrid(sWhere) {
+
//濉厖琛ㄦ牸澶存暟缁�
var data = resultTableHead;
cols_arr[0] = [];
@@ -221,22 +235,22 @@
switch (data[i].Type) {
//int
case 'Int32':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 100 };
break;
//Decimal
case 'Decimal':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
break;
default:
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };
}
}
}
//濉厖琛ㄦ牸鏁版嵁
table.render({
elem: '#mainTable',
- url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
toolbar: '#toolbarDemo',
+ url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
title: '缁勬墭鍗曞垪琛�',
cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
id: 'mainTable', //琛ㄦ牸id
@@ -297,6 +311,7 @@
//蹇�熻繃婊�
function get_FastQuery() {
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HDepartName = $("#HDepartName").val();
var HMaterNumber = $("#HMaterNumber").val();
@@ -304,6 +319,9 @@
var HMakerMan = $("#HMakerMan").val();
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -320,19 +338,20 @@
if (HMakerMan) {
sWhere += " and 鍒跺崟浜� like '%" + HMakerMan + "%'";
}
- set_ClearBill(sWhere);
+ get_Display(sWhere);
sWhere = "";
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");
$("#HDepartName").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
$("#HMakerMan").val("");
- sWhere = "";
- get_Display(sWhere);
+ sWhere = " ";
+ get_FastQuery();
}
//鍒锋柊
function set_Refresh() {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 8708c97..4a851bd 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -223,7 +223,7 @@
//#region 鏌ヨ
function get_Display(sWhere) {
- sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
+ //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
--
Gitblit v1.9.1