From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 235 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 157 insertions(+), 78 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
index f61b7c6..08c2315 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
@@ -38,74 +38,107 @@
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浠撳簱浠ｇ爜*</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
+ <input type="hidden" name="HCREATEORGID" id="HCREATEORGID" value="">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浠撳簱鍚嶇О*</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浠撳簱鍦板潃</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HAddress" id="HAddress" lay-verify="HAddress" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HPhone" id="HPhone" lay-verify="HPhone" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囪</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍚敤浠撲綅</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHSPFlag" id="checkboxHSPFlag" lay-skin="primary" lay-filter="checkboxHSPFlag" value="true" title="鏄惁鍚敤">
+ <input type="hidden" value="0" name="HSPFlag" id="HSPFlag">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+ <div class="layui-input-block" style="margin-left: 164px; width: 717px;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+ <div class="layui-tab-item">
+
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浠撳簱绠＄悊鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
</div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍔╄鐮侊細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱绠＄悊鍛�</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱鍦板潃</label>
- <div class="layui-input-inline">
- <input type="text" name="HAddress" id="HAddress" lay-verify="HAddress" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
- <div class="layui-input-inline">
- <input type="text" name="HPhone" id="HPhone" lay-verify="HPhone" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绂佺敤鏍囪</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
- <input type="hidden" value="false" name="HStopflag" id="HStopflag">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
- </div>
+ <input id="HItemID" name="HItemID" type="hidden" value="0" />
+ <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
+ <input id="HParentID" name="HParentID" type="hidden" value="0" />
+ <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
+ <input id="HShortNumber" name="HShortNumber" type="hidden" />
</div>
</div>
</div>
- <input id="HItemID" name="HItemID" type="hidden" value="0" />
- <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
- <input id="HParentID" name="HParentID" type="hidden" value="0" />
- <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
- <input id="HShortNumber" name="HShortNumber" type="hidden" />
</form>
</div>
</div>
@@ -150,11 +183,19 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
+
+ //缁勭粐
+ Organ();
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -168,7 +209,7 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+ $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
//#endregion
@@ -183,6 +224,16 @@
//鏄惁绂佺敤鎸夐挳
form.on('checkbox(checkboxHStopflag)', function (data) {
$("#HStopflag").val(data.elem.checked);
+ });
+
+ //鏄惁鍚敤鎸夐挳
+ form.on('checkbox(checkboxHSPFlag)', function (data) {
+ if (data.elem.checked) {
+ $("#HSPFlag").val(1);
+ } else {
+ $("#HSPFlag").val(0);
+ }
+
});
////閫夋嫨宸ュ簭鎸夐挳
@@ -223,6 +274,28 @@
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
function get_LoginIs() {
if (sessionStorage.login != "login") {
@@ -247,15 +320,20 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
var IsHStopflag = data.绂佺敤鏍囪;
+ var HSPFlag = data.鍚敤浠撲綅;
var IsHTypeFlow = data.鏄庣粏鏍囪;
//绂佺敤鏍囪
if (IsHStopflag) {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
- //鏄庣粏鏍囪
- if (IsHTypeFlow) {
- $("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
+ //鍚敤鏍囪
+ if (HSPFlag=="Y") {
+ $("input[name='checkboxHSPFlag']").attr("checked", true);
}
+ ////鏄庣粏鏍囪
+ //if (IsHTypeFlow) {
+ // $("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
+ //}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HNumber": data.浠撳簱浠ｇ爜
, "HItemID": data.HItemID
@@ -268,17 +346,18 @@
, "HAddress": data.浠撳簱鍦板潃
, "HPhone": data.鑱旂郴鐢佃瘽
, "HStopflag": data.绂佺敤鏍囪
+ , "HSPFlag": data.鍚敤浠撲綅 == "Y" ? 1 : 0
, "HRemark": data.HRemark
- //, "HUseOrg": data.浣跨敤缁勭粐
- ////, "HUseOrgID": data.浣跨敤缁勭粐ID
+ , "HRemark": data.HRemark
//, "HItemID": data.鏉＄爜缂栧彿
, "HBarCode": data.HBarCode
+ , "HUSEORGID": data.HUSEORGID
//, "HCreator": data.鍒涘缓浜�
//, "lngBillKey": data.lngBillKey
//, "lngBillSubKey": data.lngBillSubKey
//, "HMaker": data.HMaker
//, "HCreateDate": data.鍒涘缓鏃ユ湡
- , "HUpDater": data.HUpDater
+ , "HUpDater": sessionStorage["HUserName"]
//, "HUpDateDate": data.淇敼鏃ユ湡
});
layer.close(ajaxLoad);
@@ -298,18 +377,18 @@
function set_SaveBill(data) {
var sMainStr = JSON.stringify(data.field);
- if (!$("#HNumber").val()) {
+ if ($("#HNumber").val()=="") {
layer.msg("璇疯緭鍏ヤ粨搴撲唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!$("#HName").val()) {
+ if ($("#HName").val()=="") {
layer.msg("璇疯緭鍏ヤ粨搴撳悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HEmpID").val() == 0) {
- layer.msg("璇烽�夋嫨绠＄悊鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HEmpID").val() == 0) {
+ // layer.msg("璇烽�夋嫨绠＄悊鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -344,7 +423,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -352,7 +431,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
--
Gitblit v1.9.1