From 5e6845bbc68fa625908247cf81148f3faf22a726 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 12 八月 2024 08:52:54 +0800
Subject: [PATCH] 1
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 63 +
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBill.html | 35
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 238 +++
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 268 +++
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 106 +
WebTM/views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html | 205 ++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 37
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 144 ++
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html | 209 ++
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 156 +
WebTM/views/采购管理/采购申请单/Cg_PORequestBill.html | 227 +++
WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html | 316 ++++
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 478 ++++---
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 153 ++
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 206 ++
WebTM/views/销售管理/销售合同/Add_Edit_Xs_ContractBillList.html | 209 ++
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 270 +++
WebTM/views/销售管理/销售订单变更单/Xs_SeOrderChangeBill.html | 4
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/采购管理/询价单/Sup_AskPriceBillEdit.html | 39
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 280 +++
21 files changed, 3,049 insertions(+), 600 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ddc4838..83a9149 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- /* var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
+ /*var WEBURL = "http://localhost/API/"; */ //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost:8082/API/"; *//*//寮犵憺骞挎湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index a431536..aa46c20 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -411,6 +411,24 @@
<input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鏁伴噺绮惧害锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HQtyDec" lay-verify="HQtyDec" id="HQtyDec" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鍗曚环绮惧害锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPriceDec" lay-verify="HPriceDec" id="HPriceDec" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 閲戦绮惧害锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMoneyDec" lay-verify="HMoneyDec" id="HMoneyDec" autocomplete="off" value="0">
+ </div>
+ </div>
</div>
<div class="layui-inline">
<!--<label class="layui-form-label"> 璁￠噺鍗曚綅缁勶細</label>
@@ -990,7 +1008,9 @@
, "HTaxCost": data.鍚◣鎴愭湰浠�
, "HNoTaxCost": data.涓嶅惈绋庢垚鏈环
, "HOnceRightRate": data.涓�娆″悎鏍肩巼鏍囧噯鍊�
-
+ , "HQtyDec": data.鏁伴噺绮惧害 == null ? "0" : data.鏁伴噺绮惧害
+ , "HPriceDec": data.鍗曚环绮惧害 == null ? "0" : data.鍗曚环绮惧害
+ , "HMoneyDec": data.閲戦绮惧害 == null ? "0" : data.閲戦绮惧害
, "HHeight_M": data.姣涢珮
, "HInches_M": data.瀵告暟缁勭粐
@@ -1285,12 +1305,23 @@
return;
}
}
-
if (!ref.test($("#HOnceRightRate").val())) {
layer.msg("涓�娆″悎鏍肩巼鏍囧噯鍊硷紝璇疯緭鍏�0-9姝ｇ‘鏁板瓧", { time: 3000, });
return;
}
-
+ var ref2 = /^[0-9]$/
+ if (!ref2.test($("#HQtyDec").val())) {
+ layer.msg("鏁伴噺绮惧害锛岃杈撳叆0-9姝ｇ‘鏁板瓧", { time: 3000, });
+ return;
+ }
+ if (!ref2.test($("#HPriceDec").val())) {
+ layer.msg("鍗曚环绮惧害锛岃杈撳叆0-9姝ｇ‘鏁板瓧", { time: 3000, });
+ return;
+ }
+ if (!ref2.test($("#HMoneyDec").val())) {
+ layer.msg("閲戦绮惧害锛岃杈撳叆0-9姝ｇ‘鏁板瓧", { time: 3000, });
+ return;
+ }
//if ($("#HUnitGroupName").val() == 0) {
// layer.msg("璇烽�夋嫨璁￠噺鍗曚綅缁勶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 107778b..2b2fb3c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -8,16 +8,20 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
<script src="../../../layuiadmin/HideButton.js"></script>
-
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
</head>
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
-
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
@@ -86,7 +90,7 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"> </table>
+ <!--<table class="" id="mainTable" lay-filter="mainTable"> </table>-->
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
@@ -102,28 +106,48 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
</div>
</script>
</form>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(50vh);"></div>
+ <div style="width:99.5%;height:calc(35vh);position: relative;">
+ <!--//杞挱鍥�-->
+ <div class="layui-carousel" id="test1" style="position:absolute;">
+ <!--閫忔槑搴� opacity: 0.2-->
+ <div carousel-item id="file">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>-->
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree', 'carousel'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -133,6 +157,8 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , tree = layui.tree
+ , carousel = layui.carousel
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
@@ -147,7 +173,7 @@
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
+ //杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
window.HModuleName = "渚涘簲鍟嗗垪琛ㄧ淮鎶�";
@@ -262,8 +288,12 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
+
//鏌ヨ
get_Display(sWhere);
+
+ //鏍戠姸鍥剧敓鎴�
+ get_Display_Tree();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -291,7 +321,7 @@
//鏌ヨ
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Gy_Supplier/list',
type: "GET",
@@ -605,6 +635,92 @@
//#endregion
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BadReason/Gy_SupTypeTreeListByLevel',
+ type: "GET",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ if (data.id == "100") {
+ sql = " and HSupTypeID = 0 ";
+ HSupTypeID = 0;
+ } else if (data.id == "0") {
+ sql = "";
+ HMaterTypeID = 0;
+ } else {
+ sql = " and HSupTypeID = '" + data.id + "' ";
+ HSupTypeID = data.id;
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }1
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
//#endregion
//#region 闅愯棌鍒楄缃�
@@ -815,7 +931,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 696b17b..a2ba012 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <!--<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>瀹㈡埛璁剧疆</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,8 +9,28 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>-->
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>瀹㈡埛璁剧疆</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
<script src="../../../layuiadmin/HideButton.js"></script>
-
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -88,7 +108,7 @@
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"> </table>
+ <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
<div class="layui-tab layui-tab-card" style="margin-top:40px;">
<ul class="layui-tab-title">
<li class="layui-this">鍏宠仈鐢ㄦ埛</li>
@@ -126,21 +146,40 @@
</form>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(50vh);"></div>
+ <div style="width:99.5%;height:calc(35vh);position: relative;">
+ <!--//杞挱鍥�-->
+ <div class="layui-carousel" id="test1" style="position:absolute;">
+ <!--閫忔槑搴� opacity: 0.2-->
+ <div carousel-item id="file">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+
</div>
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree', 'carousel'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -150,6 +189,8 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , tree = layui.tree
+ , carousel = layui.carousel
var sWhere = "";
var option = [];
var option1 = "";
@@ -164,7 +205,7 @@
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
+ //杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
window.HModuleName = "瀹㈡埛鍒楄〃缁存姢";
@@ -300,7 +341,9 @@
//鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
addSWhereByOpenType();
get_Display(sWhere);
-
+ //鏍戠姸鍥剧敓鎴�
+ get_Display_Tree();
+
}
//#endregion
@@ -348,7 +391,7 @@
//#region 鏌ヨ
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -1016,6 +1059,94 @@
}
//#endregion
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + 'Gy_BadReason/Gy_CusTypeTreeListByLevel',
+ type: "GET",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ if (data.id == "100") {
+ sql = " and HCusTypeID=0 ";
+ HSupTypeID = 0;
+ } else if (data.id == "0") {
+ sql = "";
+ HMaterTypeID = 0;
+ } else {
+ sql = " and HCusTypeID='" + data.id + "' ";
+ HCusTypeID = data.id;
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ } 1
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
+ //#endregion
+
//#region 鍙嶇鐢�/绂佺敤鏁版嵁
function set_De_Stop(num) {
var checkStatus = table.checkStatus('mainTable')
@@ -1174,7 +1305,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
@@ -1359,6 +1490,6 @@
}
//#endregion
</script>
-
+
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 709beb7..61b091d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -660,19 +660,6 @@
});
//#endregion
- //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
- table.on('edit(mainTable)', function (obj) {
- //鏁板�兼牸寮忔牎楠屽伐鍏�
- var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
- var temp = "";
-
- // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
- var oldText = $(this).prev().text();
- var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
- , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
- });
- //#endregion
//#endregion
//#endregion
@@ -1050,7 +1037,7 @@
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
- , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
+ , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
@@ -1382,6 +1369,45 @@
});
break;
table.render(option);
+ case "HTaxPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HTaxPrice: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HTaxPrice = value * 1; //鍚◣鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HPrice = Number((HTaxPrice / (1 + HTaxRate)).toFixed(4)); //鍗曚环 = 鍚◣鍗曚环/(1+绋庣巼)
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ });
+ break;
default:
}
});
@@ -1932,26 +1958,61 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
OptionData = checkStatus.data[0];
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
- , "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
- })
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HMaterID": OptionData.HItemID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
}
})
}
@@ -1995,7 +2056,88 @@
return false;
}
- })
+ })
+
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val(); //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+ }
+ })
+ });
}
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index 8930c63..dfb574f 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -419,25 +419,62 @@
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index];
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
+ if (checkStatus.data.length != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
}
- obj.update({
- HMaterName: checkStatus.data[0].HName
- , HMaterID: checkStatus.data[0].HItemID
- , HMaterNumber: checkStatus.data[0].HNumber
- , HMaterModel: checkStatus.data[0].HModel
- , HUnitID: checkStatus.data[0].HUnitID
- , HUnitNumber: checkStatus.data[0].HUnitNumber
- , HUnitName: checkStatus.data[0].HUnitName
- });
+ OptionData = checkStatus.data[0];
layer.close(layer.index);
}
, btn2: function (index, layero) {
},
end: function () {
-
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.HNumber
+ , "鐗╂枡鍚嶇О": OptionData.HName
+ , "瑙勬牸鍨嬪彿": OptionData.HModel
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.HUnitName
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.HNumber
+ , "鐗╂枡鍚嶇О": OptionData.HName
+ , "瑙勬牸鍨嬪彿": OptionData.HModel
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.HUnitName
+ })
+ }
}
});
}
@@ -481,56 +518,235 @@
})
//#endregion
+ $('.layui-table-box tbody td[data-field="HMaterNumber"]').off('dblclick').on('dblclick', function () {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜у搧鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length != 1) {
+ return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+ }
+ OptionData = checkStatus.data[0];
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.HNumber
+ , "鐗╂枡鍚嶇О": OptionData.HName
+ , "瑙勬牸鍨嬪彿": OptionData.HModel
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.HUnitName
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.HNumber
+ , "鐗╂枡鍚嶇О": OptionData.HName
+ , "瑙勬牸鍨嬪彿": OptionData.HModel
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.HUnitName
+ })
+ }
+ }
+ });
+ });
+
});
table.on('edit(mainTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
, field = obj.field; //寰楀埌瀛楁
-
- var HQty = 0; //鏁伴噺
- var HPrice = 0; //鍗曚环
- var HMoney = 0; //閲戦
- var HTaxRate = 0; //绋庣巼
- var HTaxMoney = 0; //绋庨
- var HTaxPrice = 0; //鍚◣鍗曚环
- var HlineTotal = 0; //浠风◣鍚堣
- var HlineTotalBB = 0; //鏈綅甯佷环绋庡悎璁�
-
- if (obj.data.HQty != undefined) {
- HQty = parseFloat(obj.data.HQty);
- }
- if (obj.data.HPrice != undefined) {
- HPrice = parseFloat(obj.data.HPrice);
- }
- if (obj.data.HMoney != undefined) {
- HMoney = parseFloat(obj.data.HMoney);
- }
-
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = ""; //瀹氫箟涓�涓┖瀛楃涓插彉閲� temp
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
switch (field) {
- case "HQty":
- console.log(obj.data.HMoney);
- obj.update({
- HMoney: Math.ceil(parseFloat(obj.value) * parseFloat(obj.data.HPrice)),
- });
- console.log(obj.data.HMoney);
- obj.update({
- HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+ case "HQty": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ if (!ref.test(temp) || temp == 0) { //浣跨敤琛ㄨ揪寮忔潵鍒ゆ柇瀛楃涓叉槸鍚︿负0 // 瀹氫箟鐨勬鍒欒〃杈惧紡ref锛堢敤浜庡尮閰嶉潪璐熸暟鐨勫瓧绗︿覆琛ㄧず锛屼絾娉ㄦ剰瀹冧笉浼氬尮閰嶅崟鐙殑0浣滀负鏈夋晥杈撳叆锛屽洜涓�.\d+閮ㄥ垎鏄彲閫夌殑锛屼笖鍓嶉潰娌℃湁鍏佽0浣滀负鏁存暟閮ㄥ垎鐨勫崟鐙儏鍐碉級鏉ユ祴璇晅emp瀛楃涓�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //浣跨敤obj.update鏂规硶鏇存柊琛ㄦ牸涓煇涓�琛岀殑鏁版嵁
+ HQty: oldText //灏唄qty瀛楁鎭㈠鍒颁繚瀛樺崟鍏冩牸鐨勫��
+ });
+ table.render(option); //娓叉煋琛ㄦ牸
+
+ layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!"); //鎻愮ず鏁伴噺璇疯緭鍏ュぇ浜�
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = value * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ //var HExRate = $("#HExRate").val(); //姹囩巼
+ //var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: HQty //鏇存柊HQty瀛楁锛屽叾鍊兼潵鑷彉閲廐Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛屽叾鍊兼潵鑷彉閲廐Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotal
+ /*, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB*/
});
break;
- case "HPrice":
- obj.update({
- HMoney: Math.ceil(parseFloat(obj.value) * parseFloat(obj.data.HQty)),
- });
- obj.update({
- HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
+ case "HPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HPrice: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("鍗曚环璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = value * 1;
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ //var HExRate = $("#HExRate").val(); //姹囩巼
+ //var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ /*, HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB*/
});
break;
- case "HTaxRate":
- obj.update({
- HTaxMoney: Math.ceil(parseFloat(obj.value) / 100 * parseFloat(obj.data.HMoney)),
- });
+ case "HTaxRate": //绋庣巼
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ if (!ref.test(temp)) { //鍒ゆ柇绋庣巼瀛楃涓叉槸鍚︾鍚堥鏈熸牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HTaxRate: oldText // 灏嗗瓧娈礖TaxRate鐨勬暟鎹仮澶嶅埌鏇存柊涔嬪墠鐨勬暟鎹�
+ });
+ table.render(option);
+ layer.msg("绋庣巼璇疯緭鍏ユ暟瀛�!"); //鎻愮ず璇疯緭鍏ョ◣鐜囩殑鏁板��
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ //var HExRate = $("#HExRate").val(); //姹囩巼
+ //var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ HTaxRate: HTaxRate * 100
+ , HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ , HTaxMoney: HTaxMoney
+ , HTaxPrice: HTaxPrice
+ , HlineTotal: HlineTotal
+ , HTaxPrice, HTaxPrice
+ });
break;
+ case "HTaxPrice": //鍚◣鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HTaxPrice: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HTaxPrice = value * 1; //鍚◣鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HPrice = Number((HTaxPrice / (1 + HTaxRate)).toFixed(4)); //鍗曚环 = 鍚◣鍗曚环/(1+绋庣巼)
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ });
+ break;
+ default:
}
});
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 60f47b7..ae30934 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -728,6 +728,38 @@
});
break;
table.render(option);
+ case "HTaxPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HTaxPrice: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HTaxPrice = value * 1; //鍚◣鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HPrice = Number((HTaxPrice / (1 + HTaxRate)).toFixed(4)); //鍗曚环 = 鍚◣鍗曚环/(1+绋庣巼)
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ });
+ break;
default:
}
});
@@ -1547,43 +1579,45 @@
// return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
//}
OptionData = checkStatus.data[0];
- var rowIndex = $(obj.tr).attr("data-index") * 1;
- for (var i = 0; i < checkStatus.data.length; i++) {
- if (rowIndex + i >= option.data.length) {
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "鏀舵枡浠撳簱": "",
- "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": "", "杈呭姪鍗曚綅": "", "HQty": "0", "HRemark": ""
- , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0"
- };
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "鏀舵枡浠撳簱": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": "", "杈呭姪鍗曚綅": "", "HQty": "0", "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0"
+ };
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
- table.render(option);
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ //})
+ //layer.close(index);//鍏抽棴寮圭獥
}
-
-
-
- var HMaterID = checkStatus.data[i].HItemID;
- var resultData = getMaterialByMaterID(HMaterID);
- option.data[rowIndex + i].HMaterID = resultData.HMaterID;
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
- option.data[rowIndex + i].HUnitID = resultData.HUnitID;
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
- ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- //obj.update({
- // "HMaterID": checkStatus.data[0].HItemID
- // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
- // , "HUnitID": checkStatus.data[0].HUnitID
- // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
- //})
- //layer.close(index);//鍏抽棴寮圭獥
+ table.render(option);
}
- table.render(option);
layer.closeAll();
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1592,14 +1626,50 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HMaterID" :OptionData.HItemID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
}
});
}
@@ -1748,7 +1818,121 @@
return false;
}
- })
+ })
+
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val(); //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
+ layer.open({ //鎵撳紑灞�
+ type: 2 // //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'] //椤甸潰鍔犺浇
+ , btn: ["纭畾", "鍙栨秷"] //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
+ , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "鏀舵枡浠撳簱": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": "", "杈呭姪鍗曚綅": "", "HQty": "0", "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0"
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ //})
+ //layer.close(index);//鍏抽棴寮圭獥
+ }
+ table.render(option);
+ }
+ layer.closeAll(); //鍏抽棴鎵�鏈夐�氳繃layer
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { //褰撶偣鍑烩�滃彇娑堚�濇寜閽椂浼氳璋冪敤
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�)*0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate*100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
+ }
+ });
+ });
}
//鍔ㄦ�佸脊鍑洪〉闈�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
index 630644e..c1e7e19 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
@@ -479,6 +479,45 @@
})
//#endregion
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="HMaterNumber"]').off('dblclick').on('dblclick', function () {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜у搧鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HMaterName: checkStatus.data[0].HName
+ , HMaterID: checkStatus.data[0].HItemID
+ , HMaterNumber: checkStatus.data[0].HNumber
+ , HMaterModel: checkStatus.data[0].HModel
+ , HUnitID: checkStatus.data[0].HUnitID
+ , HUnitNumber: checkStatus.data[0].HUnitNumber
+ , HUnitName: checkStatus.data[0].HUnitName
+ });
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ });
+
});
//淇濆瓨鎻愪氦
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index 5f18345..a614a1e 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -1332,36 +1332,39 @@
//if (checkStatus.data.length != 1) {
// return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
//}
+ OptionData = checkStatus.data[0];
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "閫�鏂欎粨搴�": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": 0, "杈呭姪鍗曚綅": "", "HQty": "0"
+ , "HPrice": "0", "HMoney": "0", "HTaxRate": "0", "HTaxMoney": "0", "HBatChNo": "", "HRemark": ""
+ };
- var rowIndex = $(obj.tr).attr("data-index") * 1;
- for (var i = 0; i < checkStatus.data.length; i++) {
- if (rowIndex + i >= option.data.length) {
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "閫�鏂欎粨搴�": "",
- "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": 0, "杈呭姪鍗曚綅": "", "HQty": "0"
- , "HPrice": "0", "HMoney": "0", "HTaxRate": "0", "HTaxMoney": "0", "HBatChNo": "", "HRemark": ""
- };
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
+ table.render(option);
+ }
- table.render(option);
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+
+
}
-
-
-
- var HMaterID = checkStatus.data[i].HItemID;
- var resultData = getMaterialByMaterID(HMaterID);
- option.data[rowIndex + i].HMaterID = resultData.HMaterID;
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
- option.data[rowIndex + i].HUnitID = resultData.HUnitID;
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
-
-
+ table.render(option);
}
- table.render(option);
+
layer.closeAll();
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1370,14 +1373,48 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HMaterID" :OptionData.HMaterID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
}
});
}
@@ -1525,6 +1562,112 @@
return false;
}
})
+
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val(); //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
+ layer.open({ //鎵撳紑灞�
+ type: 2 // //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'] //椤甸潰鍔犺浇
+ , btn: ["纭畾", "鍙栨秷"] //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
+ , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ //閫変腑澶氳鏃�
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "閫�鏂欎粨搴�": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": 0, "杈呭姪鍗曚綅": "", "HQty": "0"
+ , "HPrice": "0", "HMoney": "0", "HTaxRate": "0", "HTaxMoney": "0", "HBatChNo": "", "HRemark": ""
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+
+
+ }
+ table.render(option);
+ }
+ layer.closeAll(); //鍏抽棴鎵�鏈夐�氳繃layer
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { //褰撶偣鍑烩�滃彇娑堚�濇寜閽椂浼氳璋冪敤
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
+ }
+ });
+ });
}
//琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
index cac064d..7fc181a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
@@ -598,7 +598,6 @@
HQty: oldText //灏唄qty瀛楁鎭㈠鍒颁繚瀛樺崟鍏冩牸鐨勫��
});
table.render(option); //閲嶆柊娓叉煋琛ㄦ牸
-
layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!"); //鎻愮ず璇疯緭鍏ュぇ浜�0鏁板瓧
return;
}
@@ -628,7 +627,7 @@
obj.update({ //浣跨敤obj.update鏂规硶鏇存柊琛ㄦ牸涓煇涓�琛岀殑鏁版嵁
HPrice: oldText //灏咹Price瀛楁鎭㈠鍒颁繚瀛樺崟鍏冩牸鐨勫��
});
-
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!"); //鎻愮ず 鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!
return;
}
@@ -660,6 +659,7 @@
HTaxRate: oldText
});
layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸
return;
}
@@ -683,7 +683,6 @@
, HlineTotal: HlineTotal
});
break;
- table.render(option);
default:
}
});
@@ -1091,31 +1090,33 @@
// return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
//}
OptionData = checkStatus.data[0];
- var rowIndex = $(obj.tr).attr("data-index") * 1;
- for (var i = 0; i < checkStatus.data.length; i++) {
- if (rowIndex + i >= option.data.length) {
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
- };
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
+ };
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
- table.render(option);
+ table.render(option);
+ }
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+
}
-
- var HMaterID = checkStatus.data[i].HItemID;
- var resultData = getMaterialByMaterID(HMaterID);
- option.data[rowIndex + i].HMaterID = resultData.HMaterID;
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
- option.data[rowIndex + i].HUnitID = resultData.HUnitID;
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
-
+ table.render(option);
}
- table.render(option);
layer.closeAll();
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1124,14 +1125,50 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HMaterID": OptionData.HItemID
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
}
});
}
@@ -1210,6 +1247,110 @@
}
})
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ //if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ //}
+ OptionData = checkStatus.data[0];
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+
+ }
+ table.render(option);
+ }
+ layer.closeAll();
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+ }
+ });
+ });
}
//琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
index 0fba85e..f34d3e9 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
@@ -391,6 +391,108 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ switch (field) {
+ case "HQty": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = value * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ /* table.render(option);*/
+ break;
+ case "HPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = value * 1;
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ /* table.render(option);*/
+
+ layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1;
+ var HPrice = (HMoney / HQty).toFixed(2); //鍗曚环=閲戦/鏁伴噺
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ });
+ break;
+ table.render(option);
+ default:
+ }
+ });
+ //#endregion
//#region 閫�鍑�
form.on('submit(Exit)', function (data) {
@@ -727,35 +829,38 @@
// return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
//}
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ //閫変腑澶氳鏃�
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "鏁伴噺": "", "HRemark": ""
+ , "HPrice": "0", "HMoney": "0", "HDate": "", "HUseSub": ""
+ };
- var rowIndex = $(obj.tr).attr("data-index") * 1;
- for (var i = 0; i < checkStatus.data.length; i++) {
- if (rowIndex + i >= option.data.length) {
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "0", "HMoney": "0", "HDate": "","HUseSub":""
- };
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
+ table.render(option);
+ }
- table.render(option);
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+
+
}
-
-
-
- var HMaterID = checkStatus.data[i].HItemID;
- var resultData = getMaterialByMaterID(HMaterID);
- option.data[rowIndex + i].HMaterID = resultData.HMaterID;
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
- option.data[rowIndex + i].HUnitID = resultData.HUnitID;
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
-
-
+ table.render(option);
}
- table.render(option);
layer.closeAll();
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -815,6 +920,80 @@
return false;
}
})
+
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ //if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ //}
+
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ //閫変腑澶氳鏃�
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "鏁伴噺": "", "HRemark": ""
+ , "HPrice": "0", "HMoney": "0", "HDate": "", "HUseSub": ""
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+
+
+ }
+ table.render(option);
+ }
+ layer.closeAll();
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+ });
+ });
}
//琛屽唴鍒犻櫎
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_POOrderBillEdit.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_POOrderBillEdit.html"
index 7da3567..994989c 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_POOrderBillEdit.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_POOrderBillEdit.html"
@@ -783,6 +783,45 @@
});
break;
table.render(option); //娓叉煋琛ㄦ牸
+ case "HTaxPrice": //鍚◣鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HTaxPrice: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HTaxPrice = value * 1; //鍚◣鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HPrice = Number((HTaxPrice / (1 + HTaxRate)).toFixed(4)); //鍗曚环 = 鍚◣鍗曚环/(1+绋庣巼)
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ });
+ break;
default:
}
});
@@ -891,9 +930,9 @@
, { field: 'HWHName', title: '浠撳簱鍚嶇О', width: 100, edit: 'text', event: "HWHID" }//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text', totalRow: true}
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text'}
- , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100,style: 'background-color:#efefef4d;'}
+ , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text'}
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true , style: 'background-color:#efefef4d;'}
- , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100}
+ , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, style: 'background-color:#efefef4d;'}
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, style: 'background-color:#efefef4d;' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;'}
@@ -1167,35 +1206,37 @@
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ //閫変腑澶氳鏃�
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+ for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+ if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": 1, "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
+ }; // 鍒涘缓涓�涓柊鐨勫寘鍚暟缁� 鍏跺垵濮嬪�间负绌烘垨鑰�0 鎴栬�呮槸鏃堕棿鏍煎紡
- var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
- for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
- if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": 1, "HRemark": ""
- , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
- }; // 鍒涘缓涓�涓柊鐨勫寘鍚暟缁� 鍏跺垵濮嬪�间负绌烘垨鑰�0 鎴栬�呮槸鏃堕棿鏍煎紡
-
- table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
- option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+ table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
+ option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
- table.render(option);//娓叉煋鐣岄潰
+ table.render(option);//娓叉煋鐣岄潰
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID; //checkStatus.data鏁扮粍涓殑褰撳墠鍏冪礌锛堢储寮曚负i锛変腑鑾峰彇HItemID灞炴�х殑鍊� 骞惰祴鍊肩粰HMaterID
+ var resultData = getMaterialByMaterID(HMaterID); //浣跨敤HMaterID浣滀负鍙傛暟鏉ヨ皟鐢╣etMaterialByMaterID鍑芥暟鏉ヨ幏鍙栬鐗╂枡鐨勮缁嗕俊鎭�
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID; //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠ｇ爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡鍚嶇О 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel; //灏唎ption.data鏁扮粍涓搴旇鐨� 瑙勬牸鍨嬪彿 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁￠噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID 鏇存柊璁￠噺鍗曚綅灞炴��
+ option.data[rowIndex + i].HQty = 1; //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠ｈ〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
}
-
-
-
- var HMaterID = checkStatus.data[i].HItemID; //checkStatus.data鏁扮粍涓殑褰撳墠鍏冪礌锛堢储寮曚负i锛変腑鑾峰彇HItemID灞炴�х殑鍊� 骞惰祴鍊肩粰HMaterID
- var resultData = getMaterialByMaterID(HMaterID); //浣跨敤HMaterID浣滀负鍙傛暟鏉ヨ皟鐢╣etMaterialByMaterID鍑芥暟鏉ヨ幏鍙栬鐗╂枡鐨勮缁嗕俊鎭�
- option.data[rowIndex + i].HMaterID = resultData.HMaterID; //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠ｇ爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡鍚嶇О 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel; //灏唎ption.data鏁扮粍涓搴旇鐨� 瑙勬牸鍨嬪彿 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].HUnitID = resultData.HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁￠噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID 鏇存柊璁￠噺鍗曚綅灞炴��
- option.data[rowIndex + i].HQty = 1; //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠ｈ〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
}
- table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
- table.reload(option)
+
layer.closeAll(); //鍏抽棴鎵�鏈夐�氳繃layer
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1204,14 +1245,58 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
- "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�)*0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate*100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
}
});
}
@@ -1292,7 +1377,120 @@
return false;
}
- })
+ })
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val(); //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
+ layer.open({ //鎵撳紑灞�
+ type: 2 // //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'] //椤甸潰鍔犺浇
+ , btn: ["纭畾", "鍙栨秷"] //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
+ , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ //閫変腑澶氳鏃�
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+ for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+ if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": 1, "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
+ }; // 鍒涘缓涓�涓柊鐨勫寘鍚暟缁� 鍏跺垵濮嬪�间负绌烘垨鑰�0 鎴栬�呮槸鏃堕棿鏍煎紡
+
+ table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
+ option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+ table.render(option);//娓叉煋鐣岄潰
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID; //checkStatus.data鏁扮粍涓殑褰撳墠鍏冪礌锛堢储寮曚负i锛変腑鑾峰彇HItemID灞炴�х殑鍊� 骞惰祴鍊肩粰HMaterID
+ var resultData = getMaterialByMaterID(HMaterID); //浣跨敤HMaterID浣滀负鍙傛暟鏉ヨ皟鐢╣etMaterialByMaterID鍑芥暟鏉ヨ幏鍙栬鐗╂枡鐨勮缁嗕俊鎭�
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID; //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠ｇ爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡鍚嶇О 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel; //灏唎ption.data鏁扮粍涓搴旇鐨� 瑙勬牸鍨嬪彿 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁￠噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID 鏇存柊璁￠噺鍗曚綅灞炴��
+ option.data[rowIndex + i].HQty = 1; //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠ｈ〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
+ }
+ }
+ layer.closeAll(); //鍏抽棴鎵�鏈夐�氳繃layer
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { //褰撶偣鍑烩�滃彇娑堚�濇寜閽椂浼氳璋冪敤
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�)*0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate*100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
+ }
+ });
+ });
+
}
//琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 4021e56..5bbfa47 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -1249,6 +1249,69 @@
return false;
}
})
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁");
+ } else if (checkStatus.data.length == 1) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ , "HQty": 1
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ } else {
+ table.cache["mainTable"].splice(0, 1);
+ for (var rowData of checkStatus.data) {
+ var NewRow = {
+ "HMaterID": rowData.HItemID, "鐗╂枡浠ｇ爜": rowData.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": rowData.鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": rowData.瑙勬牸鍨嬪彿, "HUnitID": rowData.HUnitID, "璁￠噺鍗曚綅": rowData.璁￠噺鍗曚綅鍚嶇О, "HWHID": "0", "鍙戣揣浠撳簱": "",
+ "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ };
+ table.cache["mainTable"].push(NewRow);
+ }
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+
+ }
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
+ })
+ });
}
//#region 搴撳瓨鏌ヨ
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 0711ad8..3b70f05 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -678,189 +678,188 @@
, field = obj.field; //寰楀埌瀛楁
//layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
- //switch (field) {
- // case "HQty": //鏁伴噺
- // //鏁版嵁鏍煎紡鏍￠獙
- // temp = value + "";
- // if (!ref.test(temp) || temp == 0) {
- // //鎭㈠鏁版嵁鍒扮紪杈戝墠
- // obj.update({
- // HQty: oldText
- // });
- // table.render(option);
+ switch (field) {
+ case "HQty": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HQty: oldText
+ });
+ table.render(option);
- // layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
- // return;
- // }
+ layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
- // //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- // var HQty = value * 1; //鏁伴噺
- // var HPrice = obj.data.HPrice * 1; //鍗曚环
- // var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
- // /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- // var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- // /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- // //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- // var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- // var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = value * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+ //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
- // //璁剧疆鏁版嵁灏忔暟浣嶆暟
- // HQty = dealDoubleToFixed(HQty, 1);
- // HPrice = dealDoubleToFixed(HPrice, 3);
- // HTaxRate = HTaxRate;
- // HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- // HMoney = dealDoubleToFixed(HMoney, 2);
- // HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty = dealDoubleToFixed(HQty, 1);
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ HTaxRate = HTaxRate;
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ HMoney = dealDoubleToFixed(HMoney, 2);
+ HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
- // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- // obj.update({
- // HQty: HQty
- // , HPrice: HPrice
- // , HTaxRate: HTaxRate * 100
- // , HTaxPrice: HTaxPrice
- // , HMoney: HMoney
- // , HTaxMoney: HTaxMoney
- // });
- // table.render(option);
- // break;
- // case "HPrice": //鍗曚环
- // //鏁版嵁鏍煎紡鏍￠獙
- // temp = value + "";
- // if (!ref.test(temp) || temp == 0) {
- // //鎭㈠鏁版嵁鍒扮紪杈戝墠
- // obj.update({
- // HPrice: oldText
- // });
- // table.render(option);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HTaxRate: HTaxRate * 100
+ , HTaxPrice: HTaxPrice
+ , HMoney: HMoney
+ , HTaxMoney: HTaxMoney
+ });
+ table.render(option);
+ break;
+ case "HPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ table.render(option);
- // layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
- // return;
- // }
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
- // //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- // var HQty = obj.data.HQty * 1; //鏁伴噺
- // var HPrice = value * 1; //鍗曚环
- // var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
- // /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- // var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- // /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- // //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- // var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- // var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = value * 1; //鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+ //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
- // //璁剧疆鏁版嵁灏忔暟浣嶆暟
- // HQty = dealDoubleToFixed(HQty, 1);
- // HPrice = dealDoubleToFixed(HPrice, 3);
- // HTaxRate = HTaxRate;
- // HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- // HMoney = dealDoubleToFixed(HMoney, 2);
- // HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty = dealDoubleToFixed(HQty, 1);
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ HTaxRate = HTaxRate;
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ HMoney = dealDoubleToFixed(HMoney, 2);
+ HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
- // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- // obj.update({
- // HQty: HQty
- // , HPrice: HPrice
- // , HTaxRate: HTaxRate * 100
- // , HTaxPrice: HTaxPrice
- // , HMoney: HMoney
- // , HTaxMoney: HTaxMoney
- // });
- // table.render(option);
- // break;
- // case "HTaxRate": //鏁伴噺
- // //鏁版嵁鏍煎紡鏍￠獙
- // temp = value + "";
- // if (!ref.test(temp)) {
- // //鎭㈠鏁版嵁鍒扮紪杈戝墠
- // obj.update({
- // HTaxRate: oldText
- // });
- // table.render(option);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HTaxRate: HTaxRate * 100
+ , HTaxPrice: HTaxPrice
+ , HMoney: HMoney
+ , HTaxMoney: HTaxMoney
+ });
+ table.render(option);
+ break;
+ case "HTaxRate": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxRate: oldText
+ });
+ table.render(option);
- // layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
- // return;
- // }
+ layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
- // //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- // var HQty = obj.data.HQty * 1; //鏁伴噺
- // var HPrice = obj.data.HPrice * 1; //鍗曚环
- // var HTaxRate = value * 0.01; //绋庣巼
- // /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- // var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- // /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- // //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- // var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- // var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HTaxRate = value * 0.01; //绋庣巼
+ /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+ //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
- // //璁剧疆鏁版嵁灏忔暟浣嶆暟
- // HQty = dealDoubleToFixed(HQty, 1);
- // HPrice = dealDoubleToFixed(HPrice, 3);
- // HTaxRate = HTaxRate;
- // HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- // HMoney = dealDoubleToFixed(HMoney, 2);
- // HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty = dealDoubleToFixed(HQty, 1);
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ HTaxRate = HTaxRate;
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ HMoney = dealDoubleToFixed(HMoney, 2);
+ HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
- // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- // obj.update({
- // HQty: HQty
- // , HPrice: HPrice
- // , HTaxRate: HTaxRate * 100
- // , HTaxPrice: HTaxPrice
- // , HMoney: HMoney
- // , HTaxMoney: HTaxMoney
- // });
- // table.render(option);
- // break;
- // case "HTaxPrice": //鏁伴噺
- // //鏁版嵁鏍煎紡鏍￠獙
- // temp = value + "";
- // if (!ref.test(temp)) {
- // //鎭㈠鏁版嵁鍒扮紪杈戝墠
- // obj.update({
- // HTaxPrice: oldText
- // });
- // table.render(option);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HTaxRate: HTaxRate * 100
+ , HTaxPrice: HTaxPrice
+ , HMoney: HMoney
+ , HTaxMoney: HTaxMoney
+ });
+ table.render(option);
+ break;
+ case "HTaxPrice": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxPrice: oldText
+ });
+ table.render(option);
- // layer.msg("鍚◣鍗曟嵁璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
- // return;
- // }
- // //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
- // var HQty = obj.data.HQty * 1; //鏁伴噺
- // var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
- // var HTaxPrice = value * 1; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
- // var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
+ layer.msg("鍚◣鍗曟嵁璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxPrice = value * 1; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
- // /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
+ /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
- // /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- // //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
- // var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
- // var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
+ /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+ //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
- // //璁剧疆鏁版嵁灏忔暟浣嶆暟
- // HQty = dealDoubleToFixed(HQty, 1);
- // HPrice = dealDoubleToFixed(HPrice, 3);
- // HTaxRate = HTaxRate;
- // HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
- // HMoney = dealDoubleToFixed(HMoney, 2);
- // HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HQty = dealDoubleToFixed(HQty, 1);
+ HPrice = dealDoubleToFixed(HPrice, 3);
+ HTaxRate = HTaxRate;
+ HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
+ HMoney = dealDoubleToFixed(HMoney, 2);
+ HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
- // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- // obj.update({
- // HQty: HQty
- // , HPrice: HPrice
- // , HTaxRate: HTaxRate * 100
- // , HTaxPrice: HTaxPrice
- // , HMoney: HMoney
- // , HTaxMoney: HTaxMoney
- // });
- // table.render(option);
- // break;
- // default:
- //}
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HTaxRate: HTaxRate * 100
+ , HTaxPrice: HTaxPrice
+ , HMoney: HMoney
+ , HTaxMoney: HTaxMoney
+ });
+ break;
+ default:
+ }
});
//#endregion
//#endregion
@@ -1922,30 +1921,62 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
-
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
- , "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
- })
+ OptionData = checkStatus.data[0];
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
if (typeof (OptionData.HItemID) != "undefined") {
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": OptionData.HItemID
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
- OptionData = [];
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HCusID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ })
+ OptionData = [];
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
}
}
})
@@ -1993,6 +2024,87 @@
return false;
}
})
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.HItemID) != "undefined") {
+
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HCusID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ })
+ OptionData = [];
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
+ }
+ })
+ });
}
//#endregion
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBill.html"
index 7e995aa..7e6285a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBill.html"
@@ -978,6 +978,41 @@
return false;
}
})
+
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ });
}
//#region 搴撳瓨鏌ヨ
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\345\220\210\345\220\214/Add_Edit_Xs_ContractBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\345\220\210\345\220\214/Add_Edit_Xs_ContractBillList.html"
index bb104c3..ed2b147 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\345\220\210\345\220\214/Add_Edit_Xs_ContractBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\345\220\210\345\220\214/Add_Edit_Xs_ContractBillList.html"
@@ -624,7 +624,7 @@
obj.update({
HPrice: oldText
});
-
+ table.render(option);
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
}
@@ -1009,31 +1009,33 @@
// return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
//}
OptionData = checkStatus.data[0];
- var rowIndex = $(obj.tr).attr("data-index") * 1;
- for (var i = 0; i < checkStatus.data.length; i++) {
- if (rowIndex + i >= option.data.length) {
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
- };
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
+ };
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
- table.render(option);
+ table.render(option);
+ }
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+
}
-
- var HMaterID = checkStatus.data[i].HItemID;
- var resultData = getMaterialByMaterID(HMaterID);
- option.data[rowIndex + i].HMaterID = resultData.HMaterID;
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
- option.data[rowIndex + i].HUnitID = resultData.HUnitID;
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
-
+ table.render(option);
}
- table.render(option);
layer.closeAll();
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1042,14 +1044,52 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HMaterID": OptionData.HItemID
- , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
- , "HUnitID": OptionData.HUnitID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HCusID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
}
});
}
@@ -1128,6 +1168,115 @@
}
})
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ //鐗╂枡
+ if (obj.event == "HMaterID") {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ //if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ //}
+ OptionData = checkStatus.data[0];
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+
+ }
+ table.render(option);
+ }
+ layer.closeAll();
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HCusID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
+ }
+ });
+ }
+ });
}
//#region 搴撳瓨鏌ヨ
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 0812ae9..e8c1929 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"
@@ -1448,7 +1448,7 @@
"浠撳簱": result.data[i]["瀛愪粨搴�"],
"HQty": dealDoubleToFixed(result.data[i]["鏁伴噺"], 1),
"HPrice": dealDoubleToFixed(result.data[i]["鍗曚环"], 3),
- "HTaxPrice": dealDoubleToFixed(result.data[i]["鍚◣鍗曚环"], 3),
+ "HTaxPrice": dealDoubleToFixed(result.data[i]["HTaxPrice"], 3),
"HMoney": dealDoubleToFixed(result.data[i]["閲戦"],2),
"HDiscountRate": result.data[i]["鎶樻墸鐜�"],
"HRelTaxPrice": result.data[i]["瀹為檯鍚◣鍗曚环"],
@@ -3145,6 +3145,110 @@
//#endregion
})
+
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val();
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": "0", "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": "0", "璁￠噺鍗曚綅": "", "HQty": "0", "HPrice": "0", "HTaxPrice": "0"
+ , "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
+ , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": "", "HCusMaterNumber": "",
+ "HCusModel": "", "HCusMaterName": ""
+ }
+ btnAddLine(NewRow);
+ }
+
+ //鑾峰彇閫変腑鐨勭墿鏂欎俊鎭�
+ var resultData = checkStatus.data[i];
+
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+ //鑾峰彇閫夋嫨鐗╂枡鍓嶅悗鐨勭◣鐜�
+ var value = subHTaxRate; //閫夋嫨鐗╂枡鍚庢牴鎹鎴峰緱鍒扮殑绋庣巼
+ var oldText = option.data[rowIndex + i].HTaxRate; //璇ヨ褰曚腑鍘熸湁鐨勭◣鐜�
+
+ //绋庣巼鏁版嵁鏍煎紡鏍￠獙锛岃嫢鏍规嵁瀹㈡埛鑾峰彇鐨勭◣鐜囦笉鍚堟硶锛屽垯浣跨敤璁板綍涓師鏈夌殑绋庣巼锛屽苟鎻愮ず
+ temp = value + "";
+ if (!ref.test(temp)) {
+ value = oldText;
+ layer.msg("鑾峰彇鍒扮殑绋庣巼涓嶅悎娉曪紝宸茶嚜鍔ㄥ彉鏇翠负鍘熸湁绋庣巼!");
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = option.data[rowIndex + i].HQty; //鏁伴噺
+ var HPrice = option.data[rowIndex + i].HPrice; //鍗曚环
+ var HTaxRate = value * 0.01; //绋庣巼
+ /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
+ var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
+ //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+
+
+ option.data[rowIndex + i].HMaterID = resultData.HItemID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.鐗╂枡浠ｇ爜;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.鐗╂枡鍚嶇О;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.瑙勬牸鍨嬪彿;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.璁￠噺鍗曚綅鍚嶇О;
+
+ option.data[rowIndex + i].HQty = HQty;
+ option.data[rowIndex + i].HPrice = HPrice;
+ option.data[rowIndex + i].HTaxRate = HTaxRate * 100;
+ option.data[rowIndex + i].HTaxPrice = HTaxPrice;
+ option.data[rowIndex + i].HMoney = HMoney;
+ option.data[rowIndex + i].HlineTotal = HlineTotal;
+
+
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": HDataEmp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataEmp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataEmp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataEmp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataEmp.HUnitID
+ , "璁￠噺鍗曚綅": HDataEmp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataEmp = {};
+ }
+ }
+ })
+ });
}
//#endregion
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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
index fb4e059..9bc0cab 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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
@@ -917,8 +917,8 @@
"HQty_New": dealDoubleToFixed(result.data[i]["鏁伴噺"], 1),
"HTaxRate_Old": result.data[i]["绋庣巼"],
"HTaxRate_New": result.data[i]["绋庣巼"],
- "HTaxPrice_Old": dealDoubleToFixed(result.data[i]["鍚◣鍗曚环"], 3),
- "HTaxPrice_New": dealDoubleToFixed(result.data[i]["鍚◣鍗曚环"] ,3),
+ "HTaxPrice_Old": dealDoubleToFixed(result.data[i]["HTaxPrice"], 3),
+ "HTaxPrice_New": dealDoubleToFixed(result.data[i]["HTaxPrice"] ,3),
"HDate_Old": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HDate_New": new Date(result.data[i]["浜よ揣鏃ユ湡"]).getTime() < new Date().getTime() ? Format(new Date(),"yyyy-MM-dd"):formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HRemark": "",
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 065d691..6ae6c1b 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -1090,13 +1090,10 @@
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
- var HTaxRate = (obj.data.HTaxRate !== undefined ? value * 0.01 : 0 ) * 0.01; //绋庣巼
+ var HTaxRate = (obj.data.HTaxRate != undefined ? obj.data.HTaxRate * 0.01 : 0 ) ; //绋庣巼
var HTaxPrice = value * 1; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
- /*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
-
- /*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
//鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
var HTaxMoney = HMoney * (1 + HTaxRate); //浠风◣鍚堣=閲戦 * (1 + 绋庣巼)
@@ -1104,7 +1101,6 @@
//璁剧疆鏁版嵁灏忔暟浣嶆暟
HQty = dealDoubleToFixed(HQty, 1);
HPrice = dealDoubleToFixed(HPrice, 3);
- HTaxRate = HTaxRate;
HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
HMoney = dealDoubleToFixed(HMoney, 2);
HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);
@@ -1118,7 +1114,6 @@
, HMoney: HMoney
, HTaxMoney: HTaxMoney
});
- table.render(option);
break;
default:
}
@@ -2290,28 +2285,100 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID,
- "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜,
- "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О,
- "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
- , "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
- })
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
if (typeof (HDataTemp.HItemID) != "undefined") {
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": HDataTemp.HItemID
- , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
- , "HUnitID": HDataTemp.HUnitID
- , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
HDataTemp = {};
}
}
@@ -2429,6 +2496,129 @@
return false;
}
})
+
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val();
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataTemp.HItemID) != "undefined") {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+ HDataTemp = {};
+ }
+ }
+ })
+ });
}
//#endregion
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 49b5ea9..a78ebaa 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -818,6 +818,37 @@
});
//table.render(option);
break;
+ case "HTaxPrice": //鍗曚环
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HTaxPrice: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HTaxPrice = value * 1; //鍚◣鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HPrice = Number((HTaxPrice / (1 + HTaxRate)).toFixed(4)); //鍗曚环 = 鍚◣鍗曚环/(1+绋庣巼)
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ });
+ break;
default:
}
});
@@ -1658,46 +1689,49 @@
//}
OptionData = checkStatus.data[0];
- var rowIndex = $(obj.tr).attr("data-index") * 1;
- for (var i = 0; i < checkStatus.data.length; i++) {
- if (rowIndex + i >= option.data.length) {
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "","HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
- "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
- "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
- "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
- "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
- "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
- };
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
+ "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
+ };
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
- table.render(option);
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ //})
+ //layer.close(index);//鍏抽棴寮圭獥
}
-
-
-
- var HMaterID = checkStatus.data[i].HItemID;
- var resultData = getMaterialByMaterID(HMaterID);
- option.data[rowIndex + i].HMaterID = resultData.HMaterID;
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
- option.data[rowIndex + i].HUnitID = resultData.HUnitID;
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
- ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- //obj.update({
- // "HMaterID": checkStatus.data[0].HItemID
- // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
- // , "HUnitID": checkStatus.data[0].HUnitID
- // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
- //})
- //layer.close(index);//鍏抽棴寮圭獥
+ table.render(option);
}
- table.render(option);
+
layer.closeAll();
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1706,14 +1740,51 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HMaterID": OptionData.HItemID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
}
});
}
@@ -1827,6 +1898,127 @@
return false;
}
})
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ //if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ //}
+
+ OptionData = checkStatus.data[0];
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
+ "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ "HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ //})
+ //layer.close(index);//鍏抽棴寮圭獥
+ }
+ table.render(option);
+ }
+
+ layer.closeAll();
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+ var HSupID = $("#HSupID").val();
+ if (HSupID != 0) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ //url: "http://localhost:12761/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": HSupID
+ },
+ success: function (d) {
+ var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HPrice = obj.data.HPrice * 1; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "HTaxRate": HTaxRate * 100
+ , HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ })
+ }
+ });
+ } else {
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+ "HMaterID": OptionData.HItemID //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+ }
+ });
+ });
}
//琛屽唴浜嬩欢
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
index 4a3f4e1..d6ab8ee 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
@@ -1365,47 +1365,48 @@
//if (checkStatus.data.length != 1) {
// return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
//}
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQty": "", "HRemark": "",
+ "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
- var rowIndex = $(obj.tr).attr("data-index") * 1;
- for (var i = 0; i < checkStatus.data.length; i++) {
- if (rowIndex + i >= option.data.length) {
- var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQty": "", "HRemark": "",
- "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
- "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
- "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
- "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
- };
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
-
- table.render(option);
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ //})
+ //layer.close(index);//鍏抽棴寮圭獥
}
-
-
-
- var HMaterID = checkStatus.data[i].HItemID;
- var resultData = getMaterialByMaterID(HMaterID);
- option.data[rowIndex + i].HMaterID = resultData.HMaterID;
- option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
- option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
- option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
- option.data[rowIndex + i].HUnitID = resultData.HUnitID;
- option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
- ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- //obj.update({
- // "HMaterID": checkStatus.data[0].HItemID
- // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
- // , "HUnitID": checkStatus.data[0].HUnitID
- // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
- //})
- //layer.close(index);//鍏抽棴寮圭獥
+ table.render(option);
}
- table.render(option);
layer.closeAll();
//layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1534,6 +1535,89 @@
return false;
}
})
+
+ //鍙屽嚮
+ $('.layui-table-box tbody td[data-field="鐗╂枡浠ｇ爜"]').off('dblclick').on('dblclick', function () {
+ var HOrgID = $("#HOrgID").val();
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ //if (checkStatus.data.length != 1) {
+ // return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ //}
+ OptionData = checkStatus.data[0]; //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQty": "", "HRemark": "",
+ "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+ "HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ };
+
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+
+ table.render(option);
+ }
+
+
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].鐗╂枡浠ｇ爜 = resultData.HMaterNumber;
+ option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+ option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ //obj.update({
+ // "HMaterID": checkStatus.data[0].HItemID
+ // , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
+ // , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+ // , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ // , "HUnitID": checkStatus.data[0].HUnitID
+ // , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ //})
+ //layer.close(index);//鍏抽棴寮圭獥
+ }
+ table.render(option);
+ }
+ layer.closeAll();
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ obj.update({
+ "HMaterID": OptionData.HMaterID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
+ });
+ });
}
//琛屽唴浜嬩欢
--
Gitblit v1.9.1