From d1da7df9c1191ca2f4dba70b2ee9d8884adcd714 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期六, 11 五月 2024 16:46:42 +0800
Subject: [PATCH] 销售订单：编辑时 定金比例显示出错问题解决 销售订单维护：增加 定金比例
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 134 ++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 74 deletions(-)
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/Add_Edit_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/Add_Edit_Xs_SeOrderBillList.html"
index 341e4b7..aab1bfb 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/Add_Edit_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/Add_Edit_Xs_SeOrderBillList.html"
@@ -91,7 +91,7 @@
<div class="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="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" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -245,7 +245,7 @@
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -498,14 +498,7 @@
set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
- //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
- setHisStockGoodsByHBillSubType_For_RoadBillMain();
-
- //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
- setHEarnestRateByHisStockGoods();
-
- //璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney($("#HEarnestRate").val() * 1);
+
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -523,14 +516,6 @@
set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
- //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
- setHisStockGoodsByHBillSubType_For_RoadBillMain();
-
- //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
- setHEarnestRateByHisStockGoods();
-
- //璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney($("#HEarnestRate").val() * 1);
}
//#endregion
@@ -543,7 +528,7 @@
//#endregion
//#region 鍒楄缃細瀛愯〃1
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
//#endregion
//#endregion
@@ -1243,7 +1228,7 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;', edit: 'text', event:"HUnitID" }//f7
, { field: 'HRemark_TL', title: '鎶曟枡', width: 100, edit: 'text' }
, { field: 'HRemark_SJG', title: '娣卞姞宸�', width: 100, edit: 'text' }
, { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
@@ -1484,20 +1469,18 @@
}
option.data = rowdata;
- //鍑哄簱鏁伴噺銆佸紑绁ㄦ暟閲忎笉鍙紪杈�
- //option.cols[0][22].edit = null;
- //option.cols[0][23].edit = null;
-
table.render(option);
//鑾峰彇涓存椂瀹氶噾姣斾緥
- HEarnestRateTemp = data.瀹氶噾姣斾緥 + "" == "0" ? "50" : data.瀹氶噾姣斾緥 + "";
+ HEarnestRateTemp = data.瀹氶噾姣斾緥;
- //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
- setSelectHisStockGoodsByTableRender();
+ //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ setHisStockGoodsByHBillSubType_For_RoadBillMain();
//鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
setHEarnestRateByHisStockGoods();
+
+ $("#HEarnestRate").val(data.瀹氶噾姣斾緥);
//璁剧疆琛ㄥご鎵�闇�閲戦
set_HBillMoney($("#HEarnestRate").val() * 1);
@@ -1557,7 +1540,7 @@
, area: ['90%', '90%']//澶у皬
, title: '瀹㈡埛鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1943,6 +1926,7 @@
//#region 瀛愯〃 鏁版嵁妫�楠�
var RowCount = 0;
for (var i = 0; i < option.data.length; i++) {
+
if (option.data[i]["HMaterID"] == "0") {
continue;
}
@@ -2552,10 +2536,6 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- //if (checkStatus.data.length != 1) {
- // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- //}
-
var rowIndex = $(obj.tr).attr("data-index") * 1;
for (var i = 0; i < checkStatus.data.length; i++) {
if (rowIndex + i >= option.data.length) {
@@ -2650,7 +2630,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2708,10 +2688,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWHID": HDataEmp.HItemID
+ , "浠撳簱": HDataEmp.浠撳簱鍚嶇О
+ })
+ HDataEmp = {};
+ }
}
})
@@ -3459,7 +3443,7 @@
getEmpInfoByHEmpID(obj[0].HItemID)
}
- function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ function GetHCusNameValue(obj) //杩斿洖瀹㈡埛
{
//$("#HCusName").val(obj[0].HName);
//$("#HCusID").val(obj[0].HItemID);
@@ -3471,7 +3455,7 @@
function GetHManagerValue(obj) //杩斿洖涓荤
{
- $("#HManagerName").val(obj[0].HName);
+ $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HManagerID").val(obj[0].HItemID);
}
@@ -3493,12 +3477,12 @@
$("#HSellSID").val(obj[0].HItemID);
}
- function GetMaterValue(obj) //鐗╂枡鍚嶇О
+ function GetGyMaterial(obj) //鐗╂枡鍚嶇О
{
- HDataEmp = obj[0];
+ HDataEmp = obj;
}
- function GetUnitValue(obj) //璁￠噺鍗曚綅
+ function GetAuxiliaryUnitValue(obj) //璁￠噺鍗曚綅
{
HDataEmp = obj[0];
}
@@ -3507,6 +3491,39 @@
{
HDataEmp = obj[0];
}
+
+ //椤圭洰浠ｇ爜
+ function GetProjectBillValue(obj) {
+ if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
+ $("#HProjectID").val(obj[0].HInterID);
+ $("#HProjectNumber").val(obj[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
+ }
+
+ //鍙屽嚮杩斿洖浠撳簱
+ function GetHWHSubValue(data) {
+ HDataEmp = data[0]
+ }
+
+ function GetHWHValue(obj) //杩斿洖浠撳簱
+ {
+ $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+ $("#HWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
+ option.data[i]["HWHID"] = obj[0].HItemID;
+ option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
+ }
+
//#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
function getCustomerByCusID(HCusID) {
@@ -3626,38 +3643,7 @@
}
//#endregion
- //椤圭洰浠ｇ爜
- function GetProjectBillValue(obj) {
- if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
- $("#HProjectID").val(obj[0].HInterID);
- $("#HProjectNumber").val(obj[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
- $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
-
- } else {
- layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
- }
- }
-
- //鍙屽嚮杩斿洖浠撳簱
- function GetHWHSubValue(data) {
- OptionData = data[0]
- }
-
- function GetHWHValue(obj) //杩斿洖浠撳簱
- {
- $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
- $("#HWHID").val(obj[0].HItemID);
- if (option.data.length > 0) {
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
- option.data[i]["HWHID"] = obj[0].HItemID;
- option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
- }
- }
- }
- layui.table.render(option);
- }
-
+
//#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
function dealDoubleToFixed(data, num) {
//鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
--
Gitblit v1.9.1