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_Xt_ORGANIZATIONSList.html | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 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_Xt_ORGANIZATIONSList.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_Xt_ORGANIZATIONSList.html"
index d54face..3b4d183 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_Xt_ORGANIZATIONSList.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_Xt_ORGANIZATIONSList.html"
@@ -13,6 +13,8 @@
<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>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -52,10 +54,10 @@
<input class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
+ <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMakeTime" id="HMakeTime" autocomplete="off">
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HMakeTime" id="HMakeTime" style="width:190px;">
</div>
</div>
</div>
@@ -110,6 +112,8 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+ var ItemID;
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
@@ -124,7 +128,26 @@
}
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
- $("#HItemID").val(0);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Xt_ORGANIZATIONS/GetMaxHItemID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HItemID").val(data.data[0].Column1 + 1); //鑾峰彇鏈�澶ItemID 骞朵笖+1
+ ItemID = data.data[0].Column1 + 1;
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -200,28 +223,37 @@
function RoadBillMain(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
+
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+
$.ajax({
- url: GetWEBURL() + "Xt_ORGANIZATIONS/list",
+ url: GetWEBURL() + "Xt_ORGANIZATIONS/cx",
type: "GET",
- data: {
- "sWhere": "and HItemID=" + linterid
- },
+ //data: {
+ // "sWhere": linterid,
+ // "user": sessionStorage["HUserName"],
+ // "Organization": sessionStorage["Organization"]
+ //},
+ data: { "HInterID": linterid },
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
- var IsHStopflag = data.绂佺敤鏍囪;
+ var IsHStopflag = data.绂佺敤鐘舵��;
//绂佺敤鏍囪
- if (IsHStopflag) {
+ if (IsHStopflag == "鏄�") {
+ IsHStopflag = true;
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HNumber": data.缁勭粐浠ｇ爜
, "HItemID": data.HItemID
, "HName": data.缁勭粐鍚嶇О
- , "HMakeTime": data.鏃ユ湡
- , "HStopflag": data.绂佺敤鏍囪
+ //, "HMakeTime": data.鏃ユ湡
+ , "HStopflag": data.绂佺敤鐘舵��
, "HRemark": data.澶囨敞
});
+ $("#HMakeTime").val(Format(data.鏃ユ湡, "yyyy-MM-dd"));
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -237,19 +269,24 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+ if (data.field.HStopflag == true) {
+ data.field.HStopflag = 1
+ } else {
+ data.field.HStopflag = 0
+ }
var sMainStr = JSON.stringify(data.field);
$.ajax({
type: "POST",
url: GetWEBURL() + "Xt_ORGANIZATIONS/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "oMain": sMainStr },
+ data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ';' + OperationType},
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
+ //ReRoadBillMain();
}
else {
layer.alert(data.Message, { icon: 5 });
--
Gitblit v1.9.1