From 43e741c8377b555f4e5ed287bee724e71a11540f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 22 一月 2024 12:41:01 +0800
Subject: [PATCH] 期初余额报表：查询过滤报错“客户名称无效”问题解决
---
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html | 379 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 276 insertions(+), 103 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index 5f0167a..b35cdf0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -14,6 +14,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/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
.layui-form-label {
@@ -87,6 +88,7 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -211,7 +213,7 @@
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇璁㈠崟:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HICMOBillNo " lay-verify="HICMOBillNo " id="HICMOBillNo " autocomplete="off">
+ <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
<input id="HICMOInterID" name="HICMOInterID" type="hidden" />
<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
</div>
@@ -315,20 +317,16 @@
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
var HSourceBillNo = ""; //婧愬崟鍗曞彿
var HSourceBillType = ""; //婧愬崟绫诲瀷
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
+ var refSav = ""; //鎻愪氦绫诲瀷
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSBillType = params[params[2]];//婧愬崟绫诲瀷
}
-
- var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
- var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
var edit = function (data) {
HBillType = data[0].HBillType;
@@ -345,6 +343,7 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -352,67 +351,86 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+ //#endregion
- //鏃ユ湡鏃堕棿閫夋嫨鍣�
- laydate.render({
- elem: '#HEndWorkTime'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HMakeDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HUpDateDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HCheckDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HCloseDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HDeleteDate'
- , type: 'datetime'
- });
+ // #region 椤甸潰鍒濆鍖�
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
- //鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //瀹屽伐鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ set_AddFNew();
+ }
+ else if (OperationType == 2) {//鏈夋簮鍗�
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ set_AddNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
- //鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3788' },
- success: function (d) {
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(0);
- }
+ set_EditFromGrid();
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+
+ // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉�
+ //鍒濆鍖栨彃浠�
+ function set_InitFrom() {
+ //鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HEndWorkTime'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HMakeDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HUpDateDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCheckDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCloseDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDeleteDate'
+ , type: 'datetime'
});
}
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
+
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+
}
-
//鏈夋簮鍗曟柊澧�
- if (Type == 2) {
+ function set_AddNew() {
+ refSav = "Add";
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //瀹屽伐鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
$('#HProcName').attr("disabled", true);
@@ -438,13 +456,13 @@
"HSourceInterID": HSourceInterID,
"HSourceEntryID": HSourceEntryID,
"HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HSourceBillType
+ "HSourceBillType": HBillType
},
dataType: "json",
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
- var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
+ var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
$("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
$("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
$("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
@@ -453,8 +471,8 @@
$("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
$("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
$("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
- $("#HMainSourceBillNo").val(LoadData[0].HSourceBillNo); //婧愬崟鍗曞彿
- $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�
+ $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+ $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
$("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
$("#HMainSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
$("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
@@ -474,43 +492,100 @@
});
}
+ //缂栬緫
+ function set_EditFromGrid() {
+ refSav = "Update";
+ //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+ $('#HProcName').attr("disabled", true);
+ $('#HMaterCode').attr("disabled", true);
+ $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMaterName').attr("disabled", true);
+ $('#HMaterSpec').attr("disabled", true);
+ $('#HEndWorkTime').attr("disabled", true);
+ $('#HSourceName').attr("disabled", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMainSourceBillNo').attr("disabled", true);
+ $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HICMOBillNo').attr("disabled", true);
+ $('#HDeptName').attr("disabled", true);
+ $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
- //淇濆瓨鎻愪氦
- form.on('submit(Saver)', function (data) {
- var sMainStr = JSON.stringify(data.field);
- if (!AllowLoadData())//鏁版嵁楠岃瘉
- {
- return false;
- }
$.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sc_MESEndWorkBill/SaveGetMESEndFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainStr },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- layer.close(layer.index);
- window.parent.location.reload();
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 })
- }
+ url: GetWEBURL() + "Sc_MESEndWorkBill/Sc_MESEndWorkBillListCheckDetai",
+ type: "GET",
+ data: {
+ "HID": linterid
},
- error: function (err) {
- layer.alert(err, { icon: 5 })
+ success: function (result) {
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_MESEndWorkBillList_NEW[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInterID": data.hmainid
+ , "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HProcID": data.HProcID
+ , "HProcName": data.宸ュ簭鍚嶇О
+ , "HMaterID": data.HMaterID
+ , "HMaterCode": data.浜у搧浠ｇ爜
+ , "HMaterName": data.浜у搧鍚嶇О
+ , "HMaterSpec": data.瑙勬牸鍨嬪彿
+ , "HEndWorkTime": data.瀹屽伐鏃堕棿
+ , "HSourceID": data.HSourceID //璧勬簮ID
+ , "HSourceName": data.璧勬簮鍚嶇О //璧勬簮鍚嶇О
+ , "HEmpID": data.HEmpID //鎿嶄綔鍛業D
+ , "HEmpName": data.鎿嶄綔鍛� //鎿嶄綔鍛�
+ , "HMainSourceInterID": data.HMainSourceInterID //婧愬崟ID
+ , "HMainSourceEntryID": data.HMainSourceEntryID //婧愬崟瀛怚D(琛屽彿)
+ , "HMainSourceBillNo": data.HMainSourceBillNo //婧愬崟鍗曞彿
+ , "HMainSourceBillType": data.HMainSourceBillType //婧愬崟绫诲瀷
+ , "HGroupID": data.HGroupID //鐝粍ID
+ , "HGroupName": data.鐝粍鍚嶇О //鐝粍鍚嶇О
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬鍚嶇О //閮ㄩ棬鍚嶇О
+ , "HICMOInterID": data.HICMOInterID //鐢熶骇璁㈠崟涓籌D
+ , "HICMOEntryID": data.HICMOEntryID //鐢熶骇璁㈠崟瀛怚D
+ , "HICMOBillNo": data.HICMOBillNo //鐢熶骇璁㈠崟
+ , "HRemark": data.澶囨敞 //澶囨敞
+ , "HMaker": data.鍒跺崟浜� //鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 //鍒跺崟鏃ユ湡
+ , "HUpDater": sessionStorage["HUserName"] //淇敼浜�
+ , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+ , "HChecker": data.瀹℃牳浜� //瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 //瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜� //鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 //鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜� //浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 //浣滃簾鏃ユ湡
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
- })
- });
+ });
+ }
- //閫�鍑�
- form.on('submit(Exit)', function (data) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- });
-
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3788' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(0);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ }
//琛ㄥご淇℃伅浜у搧寮圭獥
form.on('submit(HMaterList)', function () {
@@ -707,6 +782,104 @@
+
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(Saver)', function (data) {
+ var sMainStr = JSON.stringify(data.field);
+ var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESEndWorkBill/SaveGetMESEndFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ //layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
+
+ //});
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
+ //layer.confirm(data.Message, {
+ // btn: ['纭']
+ //}, function (index) {
+ // if (data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // layer.close(index);
+ // SaveVerify(); //瀹℃牳
+ // }
+ // else {
+ // layer.close(index);
+ // }
+ //});
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ });
+
+ //瀹℃牳鎸夐挳鎻愪氦
+ form.on('submit(VerIfySaver)', function (data) {
+ SaveVerify();
+ });
+
+ //瀹℃牳鎻愪氦
+ function SaveVerify() {
+ var InterID = $("#HInterID").val();
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESEndWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ window.parent.location.reload();
+ });
+
+ //#endregion
+
//浠ヤ笂涓簂ayui妯″潡
});
--
Gitblit v1.9.1