From 6d1b94513b9c83d0a4b8ab00b1a02ab0af083d94 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 20 八月 2021 14:37:12 +0800
Subject: [PATCH] 修改工序进站接收模块
---
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 231 ++++++++++++++++++++++++++++----------
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 80 +++++++++---
WebTM/layuiadmin/PubCustom.js | 2
4 files changed, 232 insertions(+), 85 deletions(-)
diff --git a/WebTM/layuiadmin/PubCustom.js b/WebTM/layuiadmin/PubCustom.js
index 75767e7..ec9209f 100644
--- a/WebTM/layuiadmin/PubCustom.js
+++ b/WebTM/layuiadmin/PubCustom.js
@@ -96,11 +96,13 @@
// var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
// var linterid = params[params[1]];//婧愬崟id
// var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+// var HBillNo = params[params[3]];//鍗曟嵁鍙�
//}
//鍥哄畾鍙傛暟锛�
// var OperationType = params[params[0]];//鎿嶄綔绫诲瀷1.鏃犳簮鍗曟柊澧�2.鏈夋簮鍗曟柊澧�3.缂栬緫4.娴忚5.鍙樻洿
// var linterid = params[params[1]];//婧愬崟id
// var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+// var HBillNo = params[params[3]];//鍗曟嵁鍙�
/**
*淇layui妗嗘灦鏃堕棿鎺т欢鏃犳晥闂锛屽姞杞芥椂闂存帶鍒跺墠鍏堣皟鐢ㄦ鏂规硶锛堝鏋滄椂闂存帶浠舵病闂灏变笉鐢ㄨ皟鐢ㄦ鏂规硶锛�
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7c7f08e..f2d0f60 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,11 +1,11 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 635f771..9e87e5f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -30,11 +30,12 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck">鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">淇敼</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -393,7 +394,8 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
- var HBillNo = params[params[2]]; //鑾峰彇鍗曟嵁鍙�
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillNo = params[params[3]];//鍗曟嵁鍙�
}
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
@@ -417,16 +419,121 @@
layer.msg("鑾峰彇鍗曟嵁鍙峰け璐ワ紝璇峰埛鏂伴噸璇曪紒");
}
});
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
}
else if(OperationType == 3){
$("#eventType").val("Modify");
RoadBillMain(linterid);
+ $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
+ $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
+ //RoadBillSub(linterid);
+ }
+ else if (OperationType == 4) {
+ RoadBillMain(linterid);
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
//RoadBillSub(linterid);
}
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 鏂板鎸夐挳
+ form.on('submit(set_AddNew)', function () {//鎻愪氦
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.location.reload();
+ });
+ })
+ //#endregion
+
+ //#region 淇敼鎸夐挳
+ form.on('submit(set_Modify)', function () {//鎻愪氦
+ //缂栬緫鍓嶅垽鏂�
+ set_ShowBillJudge();
+ })
+ //#endregion
+
+ //#region 鎻愪氦鎸夐挳
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //var tableData = data.field;
+ if ($("#lngBillSubKey").val() == 0) {
+ layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ var oMain = data.field;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_StationInBill/AddBill",
+ async: true,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ //淇濆瓨鍚庢祻瑙�
+ ReRoadBillMain();
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+ //#endregion
+
+ //#region 閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ if (OperationType == 1) {
+ Pub_Close(2);
+ } else if (OperationType == 3) {
+ Pub_Close(1);
+ } else if (OperationType == 4) {
+ Pub_Close(1);
+ }
+ });
+ })
+ //#endregion
+
+ //#region 瀹℃牳鎸夐挳
+ form.on('submit(set_CheckBill)', function () {
+ //瀹℃牳鏂规硶
+ set_CheckBill();
+ })
+ //#endregion
+
+ //#region 鍙嶅鏍告寜閽�
+ form.on('submit(set_AbandonCheck)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+ });
+ })
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+ function ReRoadBillMain() {
+ location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ }
+ //#endregion
+
+ //#region 鍔犺浇琛ㄥご
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
var index = layer.load();
@@ -461,6 +568,62 @@
}
})
}
+ //#endregion
+
+ //#region 缂栬緫鍓嶅垽鏂�
+ function set_ShowBillJudge() {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationInBill/set_ShowBillJudge", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBillNo": HBillNo },
+ success: function (result) {
+ if (result.count == 1) {
+ location.replace('Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillNo=' + HBillNo);
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 瀹℃牳鏂规硶
+ function set_CheckBill() {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill",
+ data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.alert(result.Message, { icon: 6 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+
+ //#endregion
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+
+ //#endregion
+
+ //#endregion
+
//鏂囦欢涓婁紶
function PicUpload() {
@@ -669,62 +832,6 @@
}
});
}
-
- //鏂板
- form.on('submit(set_AddNew)', function () {//鎻愪氦
- layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- window.location.reload();
- });
- })
-
-
- //閫�鍑�-鍏抽棴椤甸潰鏂规硶
- form.on('submit(Cancel)', function () {
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
- });
- })
-
- //鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
- if ($("#lngBillSubKey").val() == 0) {
- layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- var oMain = data.field;
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Cj_StationInBill/AddBill",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
- async: true,
- data: { "oMain": oMain },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
- }
- else {
- layer.close(index);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- });
//閫夋嫨鐢熶骇鐝粍寮圭獥
form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 3ddeb05..9cf037a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -77,8 +77,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
@@ -163,6 +163,56 @@
};
});
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region缂栬緫鍓嶅垽鏂�
+ function set_ShowBillJudge(data) {
+ var HBillNo = data[0].鍗曟嵁鍙�;
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationInBill/set_ShowBillJudge", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBillNo": HBillNo },
+ success: function (result) {
+ if (result.count == 1) {
+ //鎵撳紑缂栬緫椤甸潰
+ set_ShowBill_open(data);
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鎵撳紑缂栬緫椤甸潰
+ function set_ShowBill_open(data) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭杩涚珯鎺ユ敹鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['Cj_StationInBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HSouceBillType=&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
//鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
function btnIs() {
//$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
@@ -235,11 +285,11 @@
url: GetWEBURL() + '/Cj_StationInBill/get_Display',
type: "GET",
data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 0) {
+ success: function (result) {
+ if (result.count == 0) {
option.data = [];
} else {
- option.data = data1.data;
+ option.data = result.data;
}
table.render(option);
btnIs();
@@ -298,22 +348,10 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '宸ュ簭杩涚珯鎺ユ敹鍗�-缂栬緫'
- , shade: 0.6
- , maxmin: false
- , anim: 0
- , content: ['Cj_StationInBill.html?OperationType='+3+'&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
- , resize: false
- , cancel: function () {
- btnIs();
- }
- , end: function () {
- get_FastQuery(table, option);
- }
- })
+ //缂栬緫鍓嶅垽鏂�
+ //set_ShowBillJudge(data);
+ //鎵撳紑缂栬緫椤甸潰
+ set_ShowBill_open(data);
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
--
Gitblit v1.9.1