From cffe311120989c9a3491eb7c10810a0fc1f1a46a Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 08 十一月 2023 00:22:20 +0800
Subject: [PATCH] 销售订单下推特批申请单 特批申请单列表隐藏新增按钮
---
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html | 92 +++++++++++++++++++++++++++++-
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 39 ++++++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 10 +-
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBillList.html | 2
4 files changed, 131 insertions(+), 12 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index b75ab51..16c7beb 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3711,10 +3711,10 @@
<publishTime>10/16/2023 09:58:41</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBill.html">
- <publishTime>11/07/2023 23:25:59</publishTime>
+ <publishTime>11/07/2023 23:27:30</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBillList.html">
- <publishTime>10/30/2023 15:23:27</publishTime>
+ <publishTime>11/07/2023 23:27:00</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -4656,7 +4656,7 @@
<publishTime>10/26/2023 13:27:26</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBill.html">
- <publishTime>11/07/2023 22:34:28</publishTime>
+ <publishTime>11/08/2023 00:21:30</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBillList.html">
<publishTime>10/27/2023 13:46:03</publishTime>
@@ -4677,7 +4677,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>11/07/2023 22:40:00</publishTime>
+ <publishTime>11/07/2023 23:56:08</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
<publishTime>11/03/2023 21:45:51</publishTime>
@@ -4698,7 +4698,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>11/07/2023 22:40:00</publishTime>
+ <publishTime>11/07/2023 23:56:08</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBill.html">
<publishTime>11/07/2023 22:24:13</publishTime>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
index 26bbdd7..8b297ba 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
@@ -177,9 +177,9 @@
<div class="layui-inline">
<label class="layui-form-label">鐗规壒绫诲瀷</label>
<div class="layui-input-inline">
- <select name="" id="" lay-filter="" style="width: 180px; ">
- <option style="color:blue;" selected="selected" value="鍚堝悓鐗规壒">鍚堝悓鐗规壒</option>
- <option style="color:blue;" value=""></option>
+ <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value="1401">閿�鍞鍗�</option>
+ <option style="color:blue;" value="1205">閿�鍞嚭搴撳崟</option>
</select>
</div>
</div>
@@ -255,7 +255,7 @@
</div>
</div>
<!--闅愯棌瀛楁-->
- <div class="layui-row">
+ <div class="layui-row" style="display:none;">
<div class="layui-inline">
<label class="layui-form-label">榛勭嚎棰濆害</label>
<div class="layui-input-inline">
@@ -266,6 +266,14 @@
<label class="layui-form-label">绾㈢嚎棰濆害</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMaxCreditRating_Q" id="HMaxCreditRating_Q" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <input class="layui-input" name="HMainSourceInterID" id="HMainSourceInterID" value="0" autocomplete="off">
+ <input class="layui-input" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" autocomplete="off">
+ <input class="layui-input" name="HMainSourceBillNo" id="HMainSourceBillNo" value="" autocomplete="off">
+ <input class="layui-input" name="HMainSourceBillType" id="HMainSourceBillType" value="" autocomplete="off">
</div>
</div>
</div>
@@ -400,6 +408,11 @@
else if (OperationType == 3) { //缂栬緫
//鍔犺浇缂栬緫椤甸潰
RoadBillMain(linterid);
+ }
+ else if (OperationType == 4) { //涓嬫帹
+ if (params[params[2]] + "" == "1401") {
+ setInit_PushExceptiveCheckRequestBill(linterid);
+ }
}
//#endregion
@@ -707,7 +720,7 @@
function set_AddNew(data) {
//鑾峰彇鎿嶄綔鏂瑰紡
var refSav = "";
- if (OperationType == 1 || OperationType == 2) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
refSav = "Add";
}
if (OperationType == 3) {
@@ -773,6 +786,8 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
+ $("#BillType").val(data.HMainSourceBillType);
+
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
@@ -807,6 +822,10 @@
, "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
, "HDeleteMan": data.浣滃簾浜�
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "HMainSourceInterID": data.HMainSourceInterID
+ , "HMainSourceEntryID": data.HMainSourceEntryID
+ , "HMainSourceBillNo": data.HMainSourceBillNo
+ , "HMainSourceBillType": data.HMainSourceBillType
});
HOrgIDBar = data.HOrgID == null ? 0 : data.HOrgID;
@@ -824,6 +843,69 @@
}
//#endregion
+ //#region (閿�鍞鍗�)涓嬫帹椤甸潰鍒濆鍖�
+ function setInit_PushExceptiveCheckRequestBill(linterid) {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鏃堕棿缁勪欢鍒濆鍖�
+ set_InitDate();
+
+ //鐗规壒绫诲瀷鍒濆鍖�
+ $("#BillType").val(params[params[2]]);
+
+ //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鏌ヨ 閿�鍞鍗� 鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/loadXs_SeOrderBill_Edit",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptID": data.HDeptID
+ , "HDeptName": data.閮ㄩ棬
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.涓氬姟鍛�
+ , "HCurID": data.HCurID
+ , "HCurName": data.甯佸埆
+ , "HExRate": data.姹囩巼
+ , "HCusID": data.HCusID
+ , "HCusName": data.瀹㈡埛
+ , "HManagerID": data.HManagerID
+ , "HManagerName": data.涓荤
+
+ , "HMainSourceInterID": linterid
+ , "HMainSourceBillNo": data.鍗曟嵁鍙�
+ , "HMainSourceBillType": params[params[2]]
+ });
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = data.HOrgID;
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 闈炵┖楠岃瘉
function AllowLoadData(data) {
//#region 鏁版嵁鏍￠獙宸ュ叿
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
index 76c853e..3a1cd29 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
@@ -89,7 +89,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 5402ff8..267c0fc 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -128,6 +128,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="btn-PushSeOrderChangeBill" id="btn-PushSeOrderChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(閿�鍞鍗曞彉鏇村崟)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
@@ -219,6 +220,10 @@
//涓嬫帹(閿�鍞鍗曞彉鏇村崟)
case 'btn-PushSeOrderChangeBill':
set_PushBillSeOrderChangeBill();
+ break;
+ //涓嬫帹(鐗规壒鐢宠鍗�)
+ case 'btn-PushExceptiveCheckRequestBill':
+ set_PushExceptiveCheckRequestBill();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -641,7 +646,7 @@
}
//#endregion
- //#region 涓嬫帹
+ //#region 涓嬫帹(閿�鍞鍗曞彉鏇村崟)
function set_PushBillSeOrderChangeBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -672,6 +677,38 @@
}
//#endregion
+ //#region 涓嬫帹(鐗规壒鐢宠鍗�)
+ function set_PushExceptiveCheckRequestBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '涓嬫帹-鐗规壒鐢宠鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBill.html?OperationType=4&linterid=' + hID + '&HSouceBillType=1401&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+
//#region 鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
--
Gitblit v1.9.1