From 10857dead6731bebcbf72b687d256834d2beb7ca Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 06 十一月 2024 15:01:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 2
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 103 ++++++++------
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 2
WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html | 4
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 4
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 4
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesSumQueryBillList.html | 26 +++
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 4
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 80 +++++++++-
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 4
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 6
WebTM/views/工资管理/工资结算单(个人)/Pay_BatchCheck.html | 162 +++++++++++++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/WebTM.csproj | 1
14 files changed, 330 insertions(+), 74 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 77a55ac..1764717 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -421,6 +421,7 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentMonthSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentTimeSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentPieceSumReport.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_BatchCheck.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 680af9f..f4da593 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,7 +10,7 @@
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */ //浣欐�濇澃鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_BatchCheck.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_BatchCheck.html"
new file mode 100644
index 0000000..d38c644
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_BatchCheck.html"
@@ -0,0 +1,162 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <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/PubCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</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">
+ <div class="layui-colla-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇鐝粍</label>
+ <div class="layui-input-block">
+ <select name="HGroupID" id="HGroupID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">骞�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HYear" id="HYear" lay-verify="HYear">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
+ <select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ //#endregion
+
+ set_ClearBill();
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Year();
+ Month();
+ get_Group();
+ }
+
+ function get_Group() {
+ //鑾峰彇杞﹂棿鍒�
+ var HGroupID = '<option value="0" style="color:red;" selected>鍏ㄩ儴鐝粍</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Group/list",
+ async: false,
+ data: { "sWhere": "", "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HGroupID += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].鐝粍鍚嶇О + '</option>';
+ }
+ $("#HGroupID").append(HGroupID);
+
+ if (sessionStorage["HGroupID"] != "0") {
+ $("#HGroupID").val(sessionStorage["HGroupID"]);
+ //鐢ㄦ埛缁戝畾鐨勮溅闂翠笉瀛樺湪锛屽垯榛樿鏄剧ず鍏ㄩ儴杞﹂棿
+ if ($("#HGroupID").val() == null || $("#HGroupID").val() == undefined) {
+ $("#HGroupID").val(0);
+ }
+ }
+
+ //$("#HDeptName").val("0");
+
+ form.render('select');
+
+ }
+ else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //骞�
+ function Year() {
+ var yyyy = new Date().getFullYear();
+ var YearOption = "";
+ for (var i = 0; i <= 10; i++) {
+ YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
+ }
+ $("#HYear").append(YearOption);
+ $("#HYear").val(yyyy)
+ form.render('select');
+ }
+
+ //鏈�
+ function Month() {
+ var MM = new Date().getMonth() + 1;
+ var MonthOption = "";
+ for (var i = 1; i <= 12; i++) {
+ MonthOption += '<option style="color:blue;" value="' + i + '">' + i + '</option>';
+ }
+ $("#HPeriod").append(MonthOption);
+ $("#HPeriod").val(MM)
+ form.render('select');
+ }
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index f2488ff..cbc3aad 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -591,18 +591,6 @@
//#region 瀵煎嚭Execel
function btn_Export() {
- var data = option.data
- data.forEach((item) => {
- for (let itemobj in item) {
- if (item[itemobj] == null) {
- item[itemobj] = "";
- }
- if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
- item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
- }
- }
- });
-
table.exportFile(ins.config.id, option.data, "xls");
}
//#endregion
@@ -764,40 +752,67 @@
}
//#endregion
+ ////#region 鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+ //function set_CheckBillAll(num) {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length != 0) {
+ // var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+ // var queryString = uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
+ // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ // data: { "ids": queryString, "Type": num, "HMaker": HMaker },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // // 寰楀埌frame绱㈠紩
+ // var index = layer.getFrameIndex(window.name);
+ // //鍏抽棴褰撳墠frame
+ // layer.close(index);
+ // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // $("#btnSearch").trigger('click');
+ // });
+ // } else {
+ // layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // }, error: function () {
+ // layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // });
+ // }
+ // else {
+ // layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
+
+ // }
+ //}
+ ////#endregion
+
//#region 鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
function set_CheckBillAll(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length != 0) {
- var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
- var queryString = uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "ids": queryString, "Type": num, "HMaker": HMaker },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- });
- } else {
- layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- }, error: function () {
- layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
-
- }
+ //$.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
+ // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ // data: { "ids": queryString, "Type": num, "HMaker": HMaker },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // // 寰楀埌frame绱㈠紩
+ // var index = layer.getFrameIndex(window.name);
+ // //鍏抽棴褰撳墠frame
+ // layer.close(index);
+ // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // $("#btnSearch").trigger('click');
+ // });
+ // } else {
+ // layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // }, error: function () {
+ // layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // });
}
//#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesSumQueryBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesSumQueryBillList.html"
index 29f3260..f2aa510 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesSumQueryBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesSumQueryBillList.html"
@@ -65,6 +65,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -91,7 +92,7 @@
var option = [];
var sWhere = "";
var HModName = "Pay_WorkTimesReportBill";
-
+ var ins;
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["hmainid", "HDeptID", "HGroupID","HMangerID","HLeaveID","hsubid","HMaterID","HProcID","hEmpid"];
//#endregion
@@ -115,6 +116,9 @@
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
break;
};
});
@@ -304,6 +308,24 @@
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
@@ -419,8 +441,10 @@
}
}
table.render(option);
+ ins = table.render(option);
} else {
table.render(option);
+ ins = table.render(option);
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
index 10d9e07..e20365e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
@@ -282,10 +282,10 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, cellMinWidth: 90
, totalRow: true
- , limit: 50
+ , limit: 20000
, limits: [50, 500, 5000, 20000]
, loading: false
, cols: [columns]
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index 9a5e3c3..6f6febd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -263,10 +263,10 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, cellMinWidth: 90
, totalRow: true
- , limit: 50
+ , limit: 20000
, limits: [50, 500, 5000, 20000]
, loading: false
, done: function (res, curr, count) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 71b8c56..e5da520 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -336,10 +336,10 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, cellMinWidth: 90
, totalRow: true
- , limit: 50
+ , limit: 20000
, limits: [50, 500, 5000, 20000]
, loading: false
, cols: [columns]
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
index da290c1..abadad5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
@@ -314,9 +314,9 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, cellMinWidth: 90
- , limit: 50
+ , limit: 20000
, limits: [50, 500, 5000, 20000]
, totalRow: true
, loading: false
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
index 8814bdb..b14df31 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
@@ -296,9 +296,9 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, cellMinWidth: 90
- , limit: 50
+ , limit: 20000
, totalRow: true
, limits: [50, 500, 5000, 20000]
, loading: false
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index d09066d..d1f0a73 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -1070,7 +1070,7 @@
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3) //
, "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
- , "HInvoiceBillNo_Sub": dataArray[i].鍙戠エ缂栧彿
+ , "HInvoiceBillNo_Sub": dataArray[i].鍙戠エ缂栧彿 ? "" : dataArray[i].鍙戠エ缂栧彿
, "HReceiveBillInterID": dataArray[i].hmainid
, "HReceiveBillEntryID": dataArray[i].hsubid
, "HReceiveBillNo": dataArray[i].鍗曟嵁鍙�
@@ -1355,7 +1355,7 @@
, "HRelSumMoney": data.鎶樻墸鍚庨噾棰�
, "HAccDate": formatDate(data.璐㈠姟鏃ユ湡)
, "HCreditRating_Now": data.HCreditRating_Now
- , "HInvoiceBillNo": data.鍙戠エ缂栧彿
+ , "HInvoiceBillNo": data.鍙戠エ缂栧彿 ? "" : data.鍙戠エ缂栧彿
, "HBigMoney": data.澶у啓閲戦
, "HReason": data.浠樻浜嬬敱
, "HMaker": data.鍒跺崟浜�
@@ -1387,7 +1387,7 @@
, "HQty": dealDoubleToFixed(result.data[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(result.data[i].鍗曚环, 3) //
, "HMoney": dealDoubleToFixed(result.data[i].缁撶畻閲戦, 2)
- , "HInvoiceBillNo_Sub": result.data[i].鍙戠エ鍙风爜
+ , "HInvoiceBillNo_Sub": result.data[i].鍙戠エ鍙风爜 ? "" : result.data[i].鍙戠エ鍙风爜
, "HReceiveBillInterID": result.data[i].婧愬崟涓诲唴鐮�
, "HReceiveBillEntryID": result.data[i].婧愬崟瀛愬唴鐮�
, "HReceiveBillNo": result.data[i].婧愬崟鍗曞彿
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 c9e5421..e3be052 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"
@@ -136,8 +136,9 @@
<label class="layui-form-label">鍗曚环绫诲瀷</label>
<div class="layui-input-inline">
<select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
- <option value="鎴愭湰浠�" selected="selected">鎴愭湰浠�</option>
+ <option value="鍘荤◣浠�" selected="selected">鍘荤◣浠�</option>
<option value="缁撶畻浠�">缁撶畻浠�</option>
+ <option value="鍚◣浠�">鍚◣浠�</option>
</select>
</div>
</div>
@@ -1286,6 +1287,69 @@
}
});
//#endregion
+
+ //#region 涓嬫媺妗嗕簨浠�
+ // 鐩戝惉涓嬫媺妗嗛�夋嫨
+ form.on('select(HPriceType)', function (data) {
+ console.log(data.value); // 寰楀埌琚�変腑鐨勫��
+ // 鎵ц鐩稿叧鎿嶄綔
+ //#region 瀛愯〃 鏁版嵁妫�楠�
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HMaterID"] == "0") {
+ layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
+ return false;
+ } else {
+ var HPrice = option.data[i]["HPrice"];
+ var HMaterID = option.data[i]["HMaterID"];
+ var HType = data.value.toString();
+ //鑾峰彇鐗╂枡瀵瑰簲鍗曚环绫诲瀷鐨勫崟浠�
+ $.ajax({
+ url: GetWEBURL() + "/Xs_ReceivableBill/getPriceByType",
+ type: "GET",
+ async: false,
+ data: { "HMaterID": HMaterID, HType: HType },
+ success: function (d) {
+ HPrice = Number(d.data);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!" + d.Message, { icon: 5 });
+ }
+ });
+ var Dec = getDecByMaterID(option.data[i]["HMaterID"]) //鑾峰彇绮惧害
+ var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
+ var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
+ var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HTaxRate = option.data[i]["HTaxRate"] * 0.01;
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HQty = option.data[i]["HQty"] * 1; //鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HDiscountRate = option.data[i]["HDiscountRate"] * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ ///鏁板瓧绮惧害
+ option.data[i]["HQty"] = Number(HQty.toFixed(HQtyDec));
+ option.data[i]["HPrice"] = Number(HPrice.toFixed(HPriceDec));
+ option.data[i]["HMoney"] = Number(HMoney.toFixed(HMoneyDec));
+ option.data[i]["HTaxMoney"] = Number(HTaxMoney.toFixed(HMoneyDec));
+ option.data[i]["HMoneyBB"] = Number(HMoneyBB.toFixed(HMoneyDec));
+ option.data[i]["HlineTotal"] = Number(HlineTotal.toFixed(HMoneyDec));
+ option.data[i]["HTaxPrice"] = Number(HTaxPrice.toFixed(HPriceDec));
+ option.data[i]["HRelTaxPrice"] = Number(HRelTaxPrice.toFixed(HPriceDec));
+ option.data[i]["HlineTotalBB"] = Number(HlineTotalBB.toFixed(HMoneyDec));
+ }
+
+ }
+ table.render(option);
+ //#endregion
+ });
+
+ //#endregion
+
//#endregion
//#endregion
@@ -2372,12 +2436,7 @@
var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
- var HPrice = 0;
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
- HPrice = OptionData.鍚◣鎴愭湰浠� * 1;//鍗曚环
- } else {
- HPrice = OptionData.缁撶畻浠� * 1;//鍗曚环
- }
+ var HPrice = obj.data.HPrice * 1;
var HTaxRate = obj.data.HTaxRate*0.01;
if (HSupID != 0) {
$.ajax({
@@ -2511,12 +2570,7 @@
var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //鏁伴噺绮惧害
var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //鍗曚环绮惧害
var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //閲戦绮惧害
- var HPrice = 0;
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
- HPrice = OptionData.鍚◣鎴愭湰浠� * 1;//鍗曚环
- } else {
- HPrice = OptionData.缁撶畻浠� * 1;//鍗曚环
- }
+ var HPrice = obj.data.HPrice * 1;
var HTaxRate = obj.data.HTaxRate*0.01;
if (HSupID != 0) {
$.ajax({
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 daf6b1e..dea00d6 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"
@@ -1555,7 +1555,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]["瀹為檯鍚◣鍗曚环"],
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 91cfe59..2e6ae0f 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"
@@ -66,7 +66,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁缂栧彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
</div>
</div>
--
Gitblit v1.9.1