From e56c647e1507659d79699a62db33f860803f0934 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 23 二月 2023 17:27:47 +0800
Subject: [PATCH] 结算方式,付款条件,库存状态,税率 --同步基础资料;安瑞采购订单列表新增字段
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 12 ++
WebTM/views/基础资料/基础资料/Gy_TaxRateList.html | 47 +++++++++++
WebTM/views/基础资料/基础资料/Gy_PaymentConditionList.html | 47 +++++++++++
WebTM/views/基础资料/基础资料/Gy_StockStatusList.html | 47 +++++++++++
WebTM/views/基础资料/基础资料/Gy_SettleStyle.html | 43 ++++++++++
5 files changed, 189 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PaymentConditionList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PaymentConditionList.html"
index 202ae33..39d30e6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PaymentConditionList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PaymentConditionList.html"
@@ -32,18 +32,27 @@
<div class="layui-inline">
<label class="layui-form-label" style="width:85px;">浣跨敤鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag" >
+ <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
<option value="鏈娴�">鏈娴�</option>
<option value="鏈娇鐢�" selected>鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
</select>
</div>
-
+
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">浠樻鏉′欢浠g爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-row" style="margin-top:5px">
@@ -169,6 +178,12 @@
get_FastQuery();
});
//#endregion
+
+ //#region 閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+ //#endregion
//#endregion
@@ -316,6 +331,34 @@
}
//#endregion
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HNumber2 = $('#HNumber2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_PaymentCondition/Gy_PaymentConditionViewApi',
+ type: "GET",
+ data: { "Number": HNumber2, "Type": 'FKTJ' },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#region 鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
index 93dcb69..9483358 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
@@ -39,6 +39,15 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撶畻鏂瑰紡浠g爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-row" style="margin-top:5px">
@@ -164,6 +173,12 @@
get_FastQuery();
});
//#endregion
+
+ //#region 閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+ //#endregion
//#endregion
@@ -311,6 +326,34 @@
}
//#endregion
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HNumber2 = $('#HNumber2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SettleStyle/Gy_SettleStyleViewApi',
+ type: "GET",
+ data: { "Number": HNumber2, "Type": 'JSFS' },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#region 鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockStatusList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockStatusList.html"
index a4d7ac0..fce992b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockStatusList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockStatusList.html"
@@ -32,18 +32,27 @@
<div class="layui-inline">
<label class="layui-form-label" style="width:85px;">浣跨敤鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag" >
+ <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
<option value="鏈娴�">鏈娴�</option>
<option value="鏈娇鐢�" selected>鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
</select>
</div>
-
+
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">搴撳瓨鐘舵�佷唬鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-row" style="margin-top:5px">
@@ -169,6 +178,12 @@
get_FastQuery();
});
//#endregion
+
+ //#region 閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+ //#endregion
//#endregion
@@ -316,6 +331,34 @@
}
//#endregion
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HNumber2 = $('#HNumber2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_StockStatus/Gy_StockStatusViewApi',
+ type: "GET",
+ data: { "Number": HNumber2, "Type": 'KCZT' },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#region 鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateList.html"
index 07fd833..d1cf3c4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateList.html"
@@ -32,18 +32,27 @@
<div class="layui-inline">
<label class="layui-form-label" style="width:85px;">浣跨敤鐘舵��</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag" >
+ <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
<option value="鏈娴�">鏈娴�</option>
<option value="鏈娇鐢�" selected>鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
</select>
</div>
-
+
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">绋庣巼浠g爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-row" style="margin-top:5px">
@@ -169,6 +178,12 @@
get_FastQuery();
});
//#endregion
+
+ //#region 閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+ //#endregion
//#endregion
@@ -316,6 +331,34 @@
}
//#endregion
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HNumber2 = $('#HNumber2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_TaxRate/Gy_TaxRateViewApi',
+ type: "GET",
+ data: { "Number": HNumber2, "Type": 'SL' },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#region 鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 5a63d62..2d0d5b2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -350,8 +350,18 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 130 }
, { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
, { field: '鎵撳嵃鏉$爜鏁伴噺', title: '鎵撳嵃鏉$爜鏁伴噺', width: 120 }
+ /* 瀹夌憺鏂板瀛楁 begin */
+ , { field: '鍙墦鍗版潯鐮佹暟閲�', title: '鍙墦鍗版潯鐮佹暟閲�', width: 120 }
+ /* 瀹夌憺鏂板瀛楁 end */
, { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
- , { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
+ , { field: '鏈叧鑱旀暟閲�', title: '鍙彂璐ф暟閲�', width: 120 }
+ /* 瀹夌憺鏂板瀛楁 begin */
+ , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 120 }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 120 }
+ , { field: '鍏ュ簱鏁伴噺', title: '鍏ュ簱鏁伴噺', width: 120 }
+ , { field: '鍓╀綑鍏ュ簱鏁伴噺', title: '鍓╀綑鍏ュ簱鏁伴噺', width: 120 }
+ , { field: '鍓╀綑鏀舵枡鏁伴噺', title: '鍓╀綑鏀舵枡鏁伴噺', width: 120 }
+ /* 瀹夌憺鏂板瀛楁 end */
, { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
--
Gitblit v1.9.1