From 0452488afd589359af79ec86a0ad96d5e9195cf7 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 29 十一月 2021 18:04:26 +0800
Subject: [PATCH] 丸井 器具收发料报表及汇总
---
WebTM/WebTM.csproj.user | 2
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 20 +
WebTM/views/模治具管理/器具报表/ReportInventoryAccount.html | 11
WebTM/views/index.html | 1
WebTM/views/模治具管理/器具报表/ReportMaterialReceipt.html | 520 ++++++++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/模治具管理/器具报表/ReportMouldStock.html | 16 +
WebTM/WebTM.csproj | 1
7 files changed, 559 insertions(+), 12 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index c9d06d4..08aec16 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -651,6 +651,7 @@
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportInventoryAccount.html" />
+ <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMaterialReceipt.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMouldStock.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 06468a2..c147982 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 7c82147..31efd80 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -540,6 +540,7 @@
<a>鍣ㄥ叿鎶ヨ〃</a>
<dl class="layui-nav-child">
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">鍣ㄥ叿搴撳瓨鏌ヨ</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMaterialReceipt.html">鐗╂枡鏀跺彂鏄庣粏鍙婃眹鎬�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">搴撳瓨鍙拌处</a></dd>
<dd><a lay-href="">鍣ㄥ叿灞ュ巻琛╪</a></dd>
</dl>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
index 8a66bb0..c44fdc4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
@@ -171,14 +171,14 @@
laydate.render({
elem: '#HEndDate'
});
+ $("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
}
//#endregion
// #region 鍒濆鍖栫晫闈�
function set_ClearBill(HStartDate, HEndDate, HSupName) {
resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
- $("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鏌ヨ
get_Display(HStartDate, HEndDate, HSupName);
@@ -251,6 +251,13 @@
limits: [50, 100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
method: 'get', //鎻愪氦鏂瑰紡
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ parseData: function (res) { //res 涓鸿繑鍥炵殑鏁版嵁
+ if (res.code == "0") {
+ return {
+ "msg": res.Message
+ }
+ }
+ },
response: {
statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
},
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html"
new file mode 100644
index 0000000..ac2a094
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html"
@@ -0,0 +1,520 @@
+锘�<!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">
+ <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>
+ <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-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ <li>姹囨�讳俊鎭�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HStartDate" id="HStartDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:190px;">
+ </div>
+ </div>
+
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉″舰鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="layTable" lay-filter="layTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HStartDate1" id="HStartDate1" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HEndDate1" id="HEndDate1" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber1" id="HNumber1" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName1" id="HSupName1" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="layTable1" lay-filter="layTable1"></table>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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/zgqCustom/zgqCustom.js"></script>
+ <script>
+ var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+ var cols_arr1 = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+ var table = null;
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var HStartDate = "";
+ var HEndDate = "";
+ var HNumber = "";
+ var HBarCode = "";
+ var HSupName = "";
+ var HDate1 = "";
+ var HStartDate1 = "";
+ var HEndDate1 = "";
+ var HNumber1 = "";
+ var HSupName1 = "";
+
+ var resultTableHead = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+ var resultTableHead1 = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill(HStartDate, HEndDate, HNumber, HBarCode, HSupName);
+ //set_ClearBill1(HDate1, HNumber1, HSupName1);
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+
+ };
+ });
+ $('.layui-tab-title').on('click', function (title) {
+ if (title.toElement.textContent == "鏄庣粏淇℃伅") {
+ get_FastQuery();
+ } else if (title.toElement.textContent == "姹囨�讳俊鎭�") {
+ get_FastQuery1();
+ }
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ form.on('submit(btnSearch1)', function (data) {
+ get_FastQuery1();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ form.on('submit(btnReSearch1)', function (data) {
+ set_ClearQuery1();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栬〃鍗�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HStartDate'
+ });
+ laydate.render({
+ elem: '#HEndDate'
+ });
+ laydate.render({
+ elem: '#HStartDate1'
+ });
+ laydate.render({
+ elem: '#HEndDate1'
+ });
+ $("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HStartDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ //#endregion
+
+ // #region 鍒濆鍖栫晫闈�
+ function set_ClearBill(HStartDate, HEndDate, HNumber, HBarCode, HSupName) {
+ resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+ //鍒濆鏌ヨ
+ get_Display(HStartDate, HEndDate, HNumber, HBarCode, HSupName);
+
+ }
+
+ function set_ClearBill1(HStartDate1, HEndDate1, HNumber1, HSupName1) {
+ resultTableHead1 = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+ //鍒濆鏌ヨ
+ get_Display1(HStartDate1, HEndDate1, HNumber1, HSupName1);
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(HStartDate, HEndDate, HNumber, HBarCode, HSupName) {
+ var ajaxLoad = layer.load();
+ var HStartDate = $("#HStartDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillList',
+ type: "GET",
+ data: { "page": 1, "limit": 500, "HStartDate": HStartDate, "HEndDate": HEndDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
+ async: false,
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data1) {
+ for (var key in data1.list) {
+ resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ set_InitGrid(HStartDate, HEndDate, HNumber, HBarCode, HSupName);
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ function get_Display1(HStartDate1, HEndDate1, HNumber1, HSupName1) {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillSumList',
+ type: "GET",
+ data: { "page": 1, "limit": 500, "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
+ async: false,
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data1) {
+ for (var key in data1.list) {
+ resultTableHead1.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ set_InitGrid1(HStartDate1, HEndDate1, HNumber1, HSupName1);
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid(HStartDate, HEndDate, HNumber, HBarCode, HSupName) {
+ //濉厖琛ㄦ牸澶存暟缁�
+ var data = resultTableHead;
+ cols_arr[0] = [];
+ cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == 'HItemID') {
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'Int32':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ //Decimal
+ case 'Decimal':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ default:
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ }
+ }
+ }
+ //濉厖琛ㄦ牸鏁版嵁
+ table.render({
+ elem: '#layTable',
+ url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillList',
+ toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ title: '鍣ㄥ叿鍗虫椂搴撳瓨鏄庣粏琛�',
+ cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
+ id: 'layTable', //琛ㄦ牸id
+ where: { "HStartDate": HStartDate, "HEndDate": HEndDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ page: true, //寮�鍚垎椤�
+ totalRow: true, //寮�鍚悎璁�
+ limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ limits: [50, 100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+ method: 'get', //鎻愪氦鏂瑰紡
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ parseData: function (res) { //res 涓鸿繑鍥炵殑鏁版嵁
+ if (res.code == "0") {
+ return {
+ "msg": res.Message
+ }
+ }
+ },
+ response: {
+ statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+
+ },
+ done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
+ }
+ });
+ }
+
+ function set_InitGrid1(HStartDate1, HEndDate1, HNumber1, HSupName1) {
+ //濉厖琛ㄦ牸澶存暟缁�
+ var data = resultTableHead1;
+ cols_arr1[0] = [];
+ cols_arr1[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == 'HItemID') {
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'Int32':
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ //Decimal
+ case 'Decimal':
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ default:
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ }
+ }
+ }
+ //濉厖琛ㄦ牸鏁版嵁
+ table.render({
+ elem: '#layTable1',
+ url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillSumList',
+ toolbar: '#toolbarDemo1', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ title: '鍣ㄥ叿鍗虫椂搴撳瓨姹囨�昏〃',
+ cols: cols_arr1, //濉厖琛ㄦ牸澶存暟鎹�,
+ id: 'layTable1', //琛ㄦ牸id
+ where: { "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ page: true, //寮�鍚垎椤�
+ totalRow: true, //寮�鍚悎璁�
+ limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ limits: [50,100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+ method: 'get', //鎻愪氦鏂瑰紡
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ response: {
+ statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+ },
+ done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
+ }
+ });
+ }
+ //endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HStartDate = $("#HStartDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HNumber = $("#HNumber").val();//鐗╂枡
+ var HBarCode = $("#HBarCode").val();//鏉″舰鐮�
+ var HSupName = $("#HSupName").val();//寰�鏉ュ崟浣�
+ set_ClearBill(HStartDate, HEndDate, HNumber, HBarCode, HSupName);
+
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery1() {
+ var HStartDate1 = $("#HStartDate1").val();//寮�濮嬫棩鏈�
+ var HEndDate1 = $("#HEndDate1").val();//缁撴潫鏃ユ湡
+ var HNumber1 = $("#HNumber1").val();//鐗╂枡
+ var HSupName1 = $("#HSupName1").val();//寰�鏉ュ崟浣�
+ set_ClearBill1(HStartDate1, HEndDate1, HNumber1,HSupName1);
+
+ }
+
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HNumber").val("");//鐗╂枡
+ $("#HBarCode").val("");//鏉″舰鐮�
+ $("#HSupName").val("");//寰�鏉ュ崟浣�
+ get_FastQuery();
+
+ }
+ function set_ClearQuery1() {
+ $("#HStartDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HNumber1").val("");//鐗╂枡
+ $("#HSupName1").val("");//寰�鏉ュ崟浣�
+ get_FastQuery();
+
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 閲嶆柊鍔犺浇琛ㄦ牸(澶囩敤鏂规硶)
+ function reloadByKeyword() {
+ table.reload('layTable', {
+ page: {
+ curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+ },
+ request: {
+ pageName: 'page', //椤电爜鐨勫弬鏁板悕绉帮紝榛樿:page
+ limitName: 'limit'//姣忛〉鏁版嵁閲忕殑鍙傛暟鍚嶏紝榛樿:limit
+ },
+ where: {
+ keyword: $('#demoInput').val() //鍙紶鍙傛煡璇㈢殑鍙傛暟
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇琛ㄦ牸涓殑鍊�(澶囩敤鏂规硶)
+ function batchDel() {
+ var data = table.checkStatus('layTable').data;
+ var ids = "";
+ for (var i = 0; i < data.length; i++) {
+ ids += data[i].id + ",";
+ }
+ alert(ids);
+ }
+ //#endregion
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
index d606c7f..03b912b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
@@ -238,8 +238,6 @@
laydate.render({
elem: '#HDate'
});
- }
- function set_InitFrom() {
laydate.render({
elem: '#HDate1'
});
@@ -345,6 +343,13 @@
limits: [50, 100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
method: 'get', //鎻愪氦鏂瑰紡
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ parseData: function (res) { //res 涓鸿繑鍥炵殑鏁版嵁
+ if (res.code == "0") {
+ return {
+ "msg": res.Message
+ }
+ }
+ },
response: {
statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
},
@@ -393,6 +398,13 @@
limits: [50,100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
method: 'get', //鎻愪氦鏂瑰紡
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ parseData: function (res) { //res 涓鸿繑鍥炵殑鏁版嵁
+ if (res.code == "0") {
+ return {
+ "msg": res.Message
+ }
+ }
+ },
response: {
statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
},
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index cf19a76..742e92d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -644,12 +644,17 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '閲囪喘璁㈠崟鍒楄〃',
+ title: '鍣ㄥ叿鏁呴殰鐧昏鍗曞垪琛�',
shift: 2,
area: ['90%', '90%'],
content: ['../../PublicPage/PurchOrder.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
+ var checkStatus = "";
+ $.ajax({
+ success:
+ checkStatus = data;
+ })
//option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];
//table.render(option);
var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
@@ -681,12 +686,12 @@
var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷 };
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
table.reload("mainTable", {
data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
})
}
- if (rowdate.length > 0 && rowdate.length <=checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+ if (rowdate.length > 0 && rowdate.length <= checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
{
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < rowdate.length; i++) {
@@ -699,13 +704,14 @@
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
table.reload("mainTable", {
data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
})
}
if (rowdate.length > 0 && rowdate.length > checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
{
+ console.log(checkStatus.data.length);
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < rowdate.length; i++) {
var checkrow = {
@@ -717,12 +723,12 @@
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
table.reload("mainTable", {
data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
})
}
-
+
//console.log(rowdate.length);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1304,7 +1310,7 @@
return true;
}
}
- //#endregion
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1