From b873ed3c51a37a255f1c62b2f4d3c2ee70c48959 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 13 五月 2024 13:28:04 +0800
Subject: [PATCH] 销售订单：维护页面 定金比例增加%符号 销售订单：编辑页面 客户选择基础资料保存，代码还原 工序流转卡：维护页面将任意字段过滤放入 更多中
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 2
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 42 ++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 150 +++++++++++++++++++------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 8 +-
4 files changed, 122 insertions(+), 80 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 64e5568..0cdc61e 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5502,7 +5502,7 @@
<publishTime>04/10/2024 13:05:53</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <publishTime>05/11/2024 13:26:13</publishTime>
+ <publishTime>05/13/2024 11:14:28</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList_LookDown.html">
<publishTime>01/05/2024 08:43:43</publishTime>
@@ -5937,13 +5937,13 @@
<publishTime>02/06/2024 13:17:49</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">
- <publishTime>05/11/2024 16:30:57</publishTime>
+ <publishTime>05/13/2024 10:36:47</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillDyColList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>05/13/2024 10:25:30</publishTime>
+ <publishTime>05/13/2024 13:14:03</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
<publishTime>03/05/2024 12:29:40</publishTime>
@@ -5964,7 +5964,7 @@
<publishTime>03/27/2024 14:01:41</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>05/13/2024 10:25:30</publishTime>
+ <publishTime>05/13/2024 13:14:03</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBill_LookDown.html">
<publishTime>01/25/2024 15:36:18</publishTime>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 64ffb4d..a75e226 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -117,90 +117,92 @@
</div>
</div>
</div>
- </div>
- <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
</div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
</div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
</div>
</div>
+
</div>
</div>
<!--<div class="layui-tab-item layui-show">-->
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 aab1bfb..f0b3567 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"
@@ -1532,6 +1532,7 @@
//#endregion
//#region 瀹㈡埛閫夋嫨椤甸潰
+ //#region 瀹㈡埛閫夋嫨椤甸潰
function get_checkCus() {
var HEmpID = $("#HEmpID").val();
layer.open({
@@ -1540,7 +1541,7 @@
, area: ['90%', '90%']//澶у皬
, title: '瀹㈡埛鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1557,6 +1558,35 @@
, btn2: function (index, layero) { }
})
}
+ //#endregion
+
+ //#region 瀹㈡埛閫夋嫨椤甸潰-鍩虹璧勬枡
+ //function get_checkCus() {
+ // var HEmpID = $("#HEmpID").val();
+ // layer.open({
+ // type: 2//寮圭獥绫诲瀷
+ // , skin: 'layui-layer-rim' //鍔犱笂杈规
+ // , area: ['90%', '90%']//澶у皬
+ // , title: '瀹㈡埛鍒楄〃'//鏍囬
+ // , shift: 2//寮瑰嚭鍔ㄧ敾
+ // , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
+ // , btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // getCustomerByCusID(checkStatus.data[0].HItemID);
+ // //鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ // getCustomerBalance(checkStatus.data[0].HItemID);
+
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) { }
+ // })
+ //}
+ //#endregion
//#endregion
//#region 缁撶畻鏂归�夋嫨椤甸潰
@@ -3453,6 +3483,16 @@
getCustomerBalance(obj[0].HItemID);
}
+ function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ {
+ //$("#HCusName").val(obj[0].HName);
+ //$("#HCusID").val(obj[0].HItemID);
+ //鏍规嵁瀹㈡埛鑾峰彇鐩稿叧淇℃伅
+ getCustomerByCusID(obj[0].HItemID);
+ //鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+ getCustomerBalance(obj[0].HItemID);
+ }
+
function GetHManagerValue(obj) //杩斿洖涓荤
{
$("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
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 9c0b18b..c018ed4 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"
@@ -572,7 +572,7 @@
get_FastQuery();
//get_Display(sWhere);
DisPlay_HideColumn();
-
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
--
Gitblit v1.9.1