From b8d8550609fa60ad45252c7b82d7ac8adf6a6c64 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 21 八月 2023 17:28:41 +0800
Subject: [PATCH] 工序流转卡维护，生产订单维护，还有投产计划报表都要加上这个筛选条件：滨海TIT车间只显示 ，1，水箱一条流 2、卡车水箱一条流3、部件油冷器巴 4、小车装芯巴小车总成巴 6、卡车装芯巴7、卡车总成巴
---
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 50 +++++++++++++++++++++----
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 49 ++++++++++++++++++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 21 ++++++++--
3 files changed, 107 insertions(+), 13 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 310fd12..4ad9c91 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -255,16 +255,27 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
- for (var i = 0; i < data.length; i++) {
- if (i == 0)
- HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
- else
- HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ if (sessionStorage["OrganizationID"] == 100014) {
+ HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
+ HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+ HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+ } else {
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
}
$("#HDeptName").append(HDeptName);
if (!isNaN(HDeptID)) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 5d2ae52..ef92c37 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -94,6 +94,16 @@
<input type="text" class="layui-input" name="HErpID" id="HErpID">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
@@ -411,6 +421,7 @@
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
+ get_Dept();
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栦富琛ㄥ垪琛�
@@ -460,6 +471,7 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var HDeptName = $("#HDeptName").val();//杞﹂棿
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -514,6 +526,9 @@
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+ }
+ if (HDeptName!="0") {
+ sWhere += " and HWorkShopID like '%" + HDeptName + "%'"
}
if (HErpID) {
sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
@@ -707,6 +722,40 @@
}
//#endregion
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ if (sessionStorage["OrganizationID"] == 100014) {
+ HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
+ HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+ HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+ } else {
+ for (var i = 0; i < data.length; i++) {
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ }
+
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
function check_row(obj) {
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 0d5e6d9..00312e9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -81,13 +81,12 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐝粍</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShopList" id="HWorkShopList" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
</div>
</div>
</div>
@@ -259,6 +258,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
+ get_Dept();
//鍒濆鍖栨椂闂�
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
@@ -362,13 +362,47 @@
});
}
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ if (sessionStorage["OrganizationID"] == 100014) {
+ HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
+ HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+ HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+ } else {
+ for (var i = 0; i < data.length; i++) {
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ }
+
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//蹇�熻繃婊�
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//娴佽浆鍗″彿
var HICMOBillNo = $("#HICMOBillNo").val(); //鎵瑰彿
- var HWorkShopID = $("#HWorkShopID").val();//鐝粍
+ var HWorkShopID = $("#HDeptName").val();//杞﹂棿
var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HState = $("#HState").val();//鐘舵��
--
Gitblit v1.9.1