From b0d43cad5c645be2ae77d0acedc71b05160fbe3c Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 16 九月 2021 22:14:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html | 162 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 91 insertions(+), 71 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
index 80a829d..23b7ad9 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
@@ -76,8 +76,8 @@
<div class="layui-inline">
<label class="layui-form-label">楠屾敹鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSecManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -248,36 +248,67 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
//鍒ゆ柇鏄惁鏂板
+ //if (hID == null || hID == 0) {
+ // //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
+ // option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "","HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
+ // table.render(option);
+ //}
+ //else {
+ // $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ // //缂栬緫鍔犺浇鏁版嵁
+ // var ajaxLoad = layer.load();
+ // $.ajax({
+ // url: GetWEBURL() + 'Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai',
+ // type: "GET",
+ // data: { "HID": hID },
+ // success: function (result) {
+ // //console.log(result);
+ // //console.log('gouba' + result);
+ // if (result.code == 1) {
+ // option.data = result.data;
+ // layer.close(ajaxLoad);
+
+ // } else {
+ // layer.close(ajaxLoad);
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(ajaxLoad);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ //}
+
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ //鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
- //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "","HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
table.render(option);
- }
- else {
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + 'Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListProjectDetai',
+ url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "sqlWhere": "and hmainid=" + hID },
- success: function (result) {
- //console.log(result);
- //console.log('gouba' + result);
- if (result.count == 1) {
- option.data = result.data;
- table.render(option);
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ data: { "HBillType": '3828' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(0);
}
});
-
}
-
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(hID);
+ /* RoadBillSub(linterid);*/
+ }
//澶村伐鍏锋爮浜嬩欢
var rowid = 0;
@@ -2282,7 +2313,8 @@
function RoadBillMain(hID)//鍔犺浇琛ㄥご
{
- alert(hID);
+ $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ //alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai",
@@ -2290,29 +2322,44 @@
data: {
"HID": hID
},
+
success: function (result) {
-
+ option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
+ table.render(option);
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Sc_MouldOtherOutBillList[0];
- form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHID //浠撳簱ID
- , "HWHName": data.浠撳簱鍚嶇О //浠撳簱鍚嶇О
- , "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
- , "HSecManagerName": data.楠屾敹浜� //楠屾敹鍛樺悕绉�
- , "HKeeperID": data.HKeeperID //淇濈鍛業D
- , "HKeeperName": data.淇濈鍛� //淇濈鍛樺悕绉�
- , "HManagerName": data.璐熻矗浜哄悕绉� //璐熻矗浜哄悕绉�
- , "HDeptID": data.HDeptID //閮ㄩ棬ID
- , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
- , "HSourceBillType":"" //婧愬崟绫诲瀷
- , "XDH": "" //閫夊崟鍙�
- , "HExplanation": data.鎽樿 //鎽樿
- , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
- });
+ //form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ // "HBillNo": data.鍗曟嵁鍙�
+ // , "HDate": formatDate(data.鏃ユ湡)
+ // , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ // , "HWHID": data.HWHID //浠撳簱ID
+ // , "HWHName": data.浠撳簱鍚嶇О //浠撳簱鍚嶇О
+ // , "HSecManagerID": data.HSecManagerID //楠屾敹鍛業D
+ // , "HSecManagerName": data.楠屾敹浜� //楠屾敹鍛樺悕绉�
+ // , "HKeeperID": data.HKeeperID //淇濈鍛業D
+ // , "HKeeperName": data.淇濈鍛� //淇濈鍛樺悕绉�
+ // , "HManagerName": data.璐熻矗浜哄悕绉� //璐熻矗浜哄悕绉�
+ // , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ // , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ // , "HSourceBillType":"" //婧愬崟绫诲瀷
+ // , "XDH": "" //閫夊崟鍙�
+ // , "HExplanation": data.鎽樿 //鎽樿
+ // , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ //});
+ $("#HBillNo").val(data.鍗曟嵁鍙�);
+ $("#HDate").val(formatDate(data.鏃ユ湡));
+ $("#HInnerBillNo").val(data.鍐呴儴鍗曟嵁鍙�);
+ $("#HWHID").val(data.HWHID);
+ $("#HWHName").val(data.浠撳簱);
+ $("#HManagerID").val(data.HManagerID);
+ $("#HManagerName").val(data.楠屾敹浜�);
+ $("#HKeeperID").val(data.HKeeperID);
+ $("#HKeeperName").val(data.淇濈鍛�);
+ $("#HDeptID").val(data.HDeptID);
+ $("#HDeptName").val(data.閮ㄩ棬);
+ $("#HExplanation").val(data.鎽樿);
+ $("#HRemark").val(data.琛ㄥご澶囨敞);
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -2323,33 +2370,6 @@
}
- var date = new Date();
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var shijian = year + "-" + month + "-" + day;
-
- //鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3828' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(0);
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
- }
//琛ㄥご淇℃伅浠撳簱寮圭獥
form.on('submit(WareHouse)', function () {
--
Gitblit v1.9.1