From 03ee83be7323b13373b180bf836a04d07102bc39 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 30 七月 2025 20:52:30 +0800
Subject: [PATCH] 乔一样品：样品销售出库、其他入库 功能调整
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html | 5 +++--
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 6 +++---
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_YP_QiaoYi_PDA.html | 30 +++++++++++++++++++++---------
WebTM/views/index_QiaoYi.html | 2 +-
4 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index add030a..c9adf5a 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -2400,7 +2400,7 @@
<publishTime>10/11/2024 11:32:36</publishTime>
</File>
<File Include="views/index_QiaoYi.html">
- <publishTime>07/29/2025 13:34:10</publishTime>
+ <publishTime>07/30/2025 17:17:53</publishTime>
</File>
<File Include="views/IpadIndex.html">
<publishTime>03/18/2025 09:33:56</publishTime>
@@ -3107,7 +3107,7 @@
<publishTime>07/29/2025 13:10:58</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBill_YP_QiaoYi_PDA.html">
- <publishTime>07/29/2025 23:31:51</publishTime>
+ <publishTime>07/30/2025 19:31:21</publishTime>
</File>
<File Include="views/涓嶈壇姹囨姤/Xs_SeOrderPickUp.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -8698,7 +8698,7 @@
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>06/07/2024 15:42:08</publishTime>
+ <publishTime>07/30/2025 20:12:58</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_CheckList_New.html">
<publishTime>04/11/2023 16:34:43</publishTime>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_YP_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_YP_QiaoYi_PDA.html"
index 80b9b01..8eab890 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_YP_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_YP_QiaoYi_PDA.html"
@@ -64,7 +64,7 @@
<div class="layui-col-xs2">
<button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
</div>
- <div class="layui-col-xs4">
+ <div class="layui-col-xs4" style="display:none;">
<button type="button" lay-submit="" style="width: 120px; float: right" lay-filter="cmdChaoBao" class="layui-btn" id="cmdChaoBao">鎵嬪伐鎶勫寘</button>
</div>
</div>
@@ -86,12 +86,10 @@
<div class="layui-col-xs10">
<select name="HMainSourceBillType" id="HMainSourceBillType">
<option value="-1">鎵嬪伐褰曞叆</option>
- <option value="1401">閿�鍞鍗�</option>
- <option value="1402">鍙戣揣閫氱煡鍗�</option>
</select>
</div>
</div>
- <div class="layui-row">
+ <div class="layui-row" style="display:none;">
<div class="layui-col-xs2">
<label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
</div>
@@ -216,6 +214,12 @@
<input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-input-block" style="margin-left: 0px;">
+ <input type="checkbox" name="checkboxHIsTaxRate" id="checkboxHIsTaxRate" lay-skin="primary" lay-filter="checkboxHIsTaxRate" title="鏄惁鍚◣">
+ <input type="hidden" value="0" name="HIsTaxRate" id="HIsTaxRate" lay-verify="HIsTaxRate">
+ </div>
+ </div>
</div>
</div>
<!--鐗╂枡娓呭崟-->
@@ -299,7 +303,7 @@
var listOption = [];
var BarCodelistOption = [];
var columns = "";
- var HModName = "Kf_SellOutBill_QiaoYi_PDA";
+ var HModName = "Kf_SellOutBill_YP_QiaoYi_PDA";
var ModRightName = "CE_SellOut"; //妯″潡鏉冮檺鍙傛暟
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
var params = get_UrlVars();
@@ -559,6 +563,14 @@
//#endregion
//#region 鍩虹璧勬枡閫夋嫨
+ //鏄惁鍚◣
+ form.on('checkbox(checkboxHIsTaxRate)', function (data) {
+ if (data.elem.checked) {
+ $("#HIsTaxRate").val(1);
+ } else {
+ $("#HIsTaxRate").val(0);
+ }
+ });
//#region 浠撳簱
//鎵弿浠撳簱鏉＄爜
@@ -954,7 +966,7 @@
//#region 鏂板
form.on('submit(cmdAdd)', function (data) {
- location.replace('Kf_SellOutBill_QiaoYi_PDA.html?OperationType=1&HInterID=0');
+ location.replace('Kf_SellOutBill_YP_QiaoYi_PDA.html?OperationType=1&HInterID=0');
});
//#endregion
@@ -980,7 +992,7 @@
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "/WEBSController/set_SaveSellOutBill_Json",
+ url: GetWEBURL() + "/WEBSController/set_SaveSellOutBill_Json_YP",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "oMain": sMainStr },
dataType: "json",
@@ -990,7 +1002,7 @@
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
btn2: function () {
if (OperationType == 2) {
- parent.location.href = "../../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_QiaoYi_PDA.html";
+ parent.location.href = "../../WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBillList_YP_QiaoYi_PDA.html";
}
else {
parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
@@ -998,7 +1010,7 @@
}//鍏抽棴
}
, function () {
- location.replace('Kf_SellOutBill_QiaoYi_PDA.html?OperationType=1&HInterID=0');
+ location.replace('Kf_SellOutBill_YP_QiaoYi_PDA.html?OperationType=1&HInterID=0');
});//鏂板
}
else {
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index a1dc913..61c6d43 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -733,7 +733,7 @@
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">鐗╂枡鍒嗙被鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">浠撳簱鍒楄〃</a></dd>
<!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html">宸ヤ綅鍒楄〃</a></dd> -->
- <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">浠撲綅鍒楄〃</a></dd> -->
+ <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">浠撲綅鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">鑱屽憳鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">閮ㄩ棬鍒楄〃</a></dd>
<!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">杈呭姪灞炴�у垪琛�</a></dd> -->
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
index f958ccf..da77443 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
@@ -279,7 +279,7 @@
{
type: "Get",
url: GetWEBURL() + "/Web/Rescind_Json",
- async: true,
+ async: false,
data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
dataType: "json",
success: function (data) {
@@ -322,7 +322,7 @@
{
type: "Get",
url: GetWEBURL() + "/Web/Delete_Json",
- async: true,
+ async: false,
data: { "sHInterID": sInterID },
dataType: "json",
success: function (data) {
@@ -412,6 +412,7 @@
$.ajax({
url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
type: "GET",
+ async:false,
data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
success: function (data1) {
if (data1.count == 1) {
--
Gitblit v1.9.1