From 5d232f3b7fea78c77ee63fd7b2c0a733cd8987c0 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期日, 29 九月 2024 18:27:45 +0800
Subject: [PATCH] 1
---
WebTM/App_Data/MssqlReportData.cs | 1
WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html | 6
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 8
WebTM/views/基础资料/公用基础资料/excel/Gy_Customer_Excel.html | 253 +++++
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 30
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html | 211 +++
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBinding.html | 36
WebTM/views/grf/流转卡JSON.grf | 662 +++++++++++++
WebTM/views/系统管理/模块管理/Xt_XtgnbList.html | 4
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 12
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 12
WebTM/views/质量管理/质量报表/QC_SkillExamMonthSumReport.html | 19
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 16
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 4
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 12
WebTM/views/车间管理/防错验证/Gy_MaterPreventErrMouldBillList.html | 2
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 25
WebTM/views/质量管理/检验取样还样单/QC_Add_TakeSampleCheckBill.html | 20
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 14
WebTM/views/系统管理/单据类型/Xt_BillTypeList.html | 4
WebTM/views/index.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 40
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 21
WebTM/WebTM.csproj.user | 2
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 15
WebTM/views/indexMenu.html | 20
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html | 4
WebTM/views/模治具管理/器具报表/Sc_MoldMainoverdueWarnReport.html | 295 ++++++
WebTM/views/系统管理/用户管理/Xt_UserSuplies.html | 10
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeUseBillList.html | 4
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 8
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_StockPlaceList.aspx | 17
WebTM/layuiadmin/PageTitle.js | 2
WebTM/views/系统管理/系统参数管理/Xt_SystemParameterList.html | 4
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 34
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 108 ++
WebTM/views/基础资料/公用基础资料/excel/Gy_Warehouse_Excel.html | 230 ++++
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html | 146 ++
WebTM/views/基础资料/公用基础资料/excel/Gy_Department_excel.html | 230 ++++
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html | 4
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 21
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 285 ++---
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 8
44 files changed, 2,473 insertions(+), 389 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index f7325a6..1900127 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -31,6 +31,7 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
//public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
//public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔濊彵鐢垫満
+ //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//娣诲悍绉戞妧
//public string sServer;
//public string sDataBase;
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 50873e6..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/PageTitle.js b/WebTM/layuiadmin/PageTitle.js
index fec07c5..1f54492 100644
--- a/WebTM/layuiadmin/PageTitle.js
+++ b/WebTM/layuiadmin/PageTitle.js
@@ -5,7 +5,7 @@
$.ajax({
type: "GET",
async: false,
- url: GetWEBURL() + "Web/GetModuleName", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Web/GetModuleName", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HModuleType": HModuleType },
success: function (result) {
if (result.count == 1) {
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 94e7b45..f5895a2 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/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:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf" "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf"
new file mode 100644
index 0000000..6139831
--- /dev/null
+++ "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf"
@@ -0,0 +1,662 @@
+锘縶
+ "Version":"6.8.2.5",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":11,
+ "Width":14.8,
+ "Height":21,
+ "Oriention":"Landscape",
+ "LeftMargin":1.5,
+ "TopMargin":1.5,
+ "RightMargin":1.5,
+ "BottomMargin":1.5
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鍗曟嵁鍙�"
+ },
+ {
+ "Name":"鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy/MM/dd"
+ },
+ {
+ "Name":"鐢熶骇璁㈠崟鍙�"
+ },
+ {
+ "Name":"娲惧伐鍗曞彿"
+ },
+ {
+ "Name":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Name":"浜у搧浠ｇ爜"
+ },
+ {
+ "Name":"浜у搧鍚嶇О"
+ },
+ {
+ "Name":"瑙勬牸鍨嬪彿"
+ },
+ {
+ "Name":"娴佽浆鍗℃暟閲�"
+ },
+ {
+ "Name":"鍗℃暟閲�"
+ },
+ {
+ "Name":"鎵瑰彿"
+ },
+ {
+ "Name":"娴佹按鍙�"
+ },
+ {
+ "Name":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "Name":"宸ュ簭鍚嶇О"
+ },
+ {
+ "Name":"鐝粍"
+ },
+ {
+ "Name":"鏈哄彴"
+ },
+ {
+ "Name":"瀹炰綔鏁伴噺"
+ },
+ {
+ "Name":"宸ュ簭璇存槑"
+ },
+ {
+ "Name":"鐝彿"
+ },
+ {
+ "Name":"宸ユ鍚嶇О"
+ },
+ {
+ "Name":"宸ヨ壓宸ヤ綔涓績"
+ },
+ {
+ "Name":"宸ヨ壓宸ヨ壓鍙傛暟"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column14",
+ "Width":1.16417
+ },
+ {
+ "Name":"Column1",
+ "Width":2.01083
+ },
+ {
+ "Name":"Column2",
+ "Width":2.40771
+ },
+ {
+ "Name":"Column16",
+ "Width":2.19604
+ },
+ {
+ "Name":"Column3",
+ "Width":1.19063
+ },
+ {
+ "Name":"Column8",
+ "Width":2.59292
+ },
+ {
+ "Name":"Column9",
+ "Width":1.19063
+ },
+ {
+ "Name":"Column12",
+ "Width":3.22792
+ },
+ {
+ "Name":"Column15",
+ "Width":1.98438
+ }
+ ],
+ "ColumnContent":{
+ "Height":1.19063,
+ "AdjustRowHeight":false,
+ "RowsPerPage":6,
+ "ColumnContentCell":[
+ {
+ "Column":"Column14",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox3",
+ "Left":0.5,
+ "Top":-0.8,
+ "Width":1.5875,
+ "Height":0.608542,
+ "SystemVar":"RowNo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox14",
+ "Dock":"Fill",
+ "DataField":"娴佹按鍙�"
+ }
+ ]
+ },
+ {
+ "Column":"Column1",
+ "DataField":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "Column":"Column2",
+ "CanGrow":true,
+ "CanShrink":true,
+ "ShrinkFontToFit":true,
+ "DataField":"宸ュ簭鍚嶇О"
+ },
+ {
+ "Column":"Column16",
+ "DataField":"宸ユ鍚嶇О"
+ },
+ {
+ "Column":"Column3",
+ "DataField":"鐝粍"
+ },
+ {
+ "Column":"Column8",
+ "WordWrap":true,
+ "DataField":"宸ヨ壓宸ヤ綔涓績"
+ },
+ {
+ "Column":"Column9",
+ "WordWrap":true,
+ "ShrinkFontToFit":true,
+ "DataField":"瀹炰綔鏁伴噺"
+ },
+ {
+ "Column":"Column12",
+ "DataField":"宸ヨ壓宸ヨ壓鍙傛暟"
+ },
+ {
+ "Column":"Column15",
+ "DataField":"鐝彿"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":1.19063,
+ "RepeatStyle":"OnPage",
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column14",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭鍙�"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column16",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ユ鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鐝粍"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column8",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鏈哄彴"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column9",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"瀹炰綔鏁伴噺"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column12",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭璇存槑"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column15",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鐝彿"
+ }
+ ]
+ }
+ },
+ "Parameter":[
+ {
+ "Name":"椤电爜"
+ }
+ ],
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "CanGrow":true,
+ "CanShrink":true,
+ "Height":4.60375,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Control":[
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Center":"Horizontal",
+ "Left":7.96396,
+ "Width":2.06375,
+ "Height":0.687917,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":180000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"娴佽浆鍗�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":10.6098,
+ "Top":2.19604,
+ "Width":2.61938,
+ "Height":0.608542,
+ "Text":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox4",
+ "Left":4.39208,
+ "Top":1.00542,
+ "Width":2.98979,
+ "Height":0.608542,
+ "TextAlign":"MiddleCenter",
+ "Text":"QC妫�鏌ユ柟寮忥細"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox8",
+ "Left":5.3975,
+ "Top":2.19604,
+ "Width":1.40229,
+ "Height":0.608542,
+ "Text":"鏃ユ湡锛�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":12.1973,
+ "Top":2.19604,
+ "Width":3.99521,
+ "Height":0.608542,
+ "DataField":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Left":6.40292,
+ "Top":2.19604,
+ "Width":3.78354,
+ "Height":0.608542,
+ "DataField":"鏃ユ湡"
+ },
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox1",
+ "Left":15.6104,
+ "Top":1.40229,
+ "Width":1.79917,
+ "Height":0.423333,
+ "Format":"鍏�0椤�",
+ "SystemVar":"PageCount"
+ },
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox2",
+ "Left":14.3933,
+ "Top":1.40229,
+ "Width":1.21708,
+ "Height":0.423333,
+ "Format":"绗�0椤�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox18",
+ "Left":0.211667,
+ "Top":2.98979,
+ "Width":2.61938,
+ "Height":0.608542,
+ "Text":"浜у搧浠ｇ爜锛�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox19",
+ "Left":0.211667,
+ "Top":2.19604,
+ "Width":2.80458,
+ "Height":0.582083,
+ "Text":"娲惧伐鍗�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox9",
+ "Left":1.5875,
+ "Top":2.19604,
+ "Width":3.20146,
+ "Height":0.582083,
+ "DataField":"娲惧伐鍗曞彿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox10",
+ "Left":1.79917,
+ "Top":2.98979,
+ "Width":2.80458,
+ "Height":0.608542,
+ "DataField":"浜у搧浠ｇ爜"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox21",
+ "Left":10.6098,
+ "Top":3.81,
+ "Width":2.80458,
+ "Height":0.582083,
+ "Text":"鎵规锛�"
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Left":12.2502,
+ "Top":0.899583,
+ "Width":1.98438,
+ "Height":1.21708,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "CaptionAlignment":"Far",
+ "CheckSum":true,
+ "Text":"[#鍗曟嵁鍙�#]"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox11",
+ "Left":11.8004,
+ "Top":3.81,
+ "Width":4.60375,
+ "Height":0.582083,
+ "DataField":"鎵瑰彿"
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode2",
+ "Left":0.211667,
+ "Top":0.608542,
+ "Width":2.59292,
+ "Height":1.40229,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "Text":"[#鐢熶骇璁㈠崟鍙�#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":12.0121,
+ "Top":0.211667,
+ "Width":1.79917,
+ "Height":0.582083,
+ "Text":"娴佽浆鍗″彿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox13",
+ "Left":13.8113,
+ "Top":0.211667,
+ "Width":4.20688,
+ "Height":0.582083,
+ "DataField":"鍗曟嵁鍙�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox24",
+ "Left":0.211667,
+ "Width":5.79438,
+ "Height":0.582083,
+ "Text":"浠诲姟鍗曞彿锛歔#鐢熶骇璁㈠崟鍙�#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox25",
+ "Left":7.19667,
+ "Top":1.00542,
+ "Width":1.19063,
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Text":"鎶芥"
+ },
+ {
+ "Type":"ShapeBox",
+ "Name":"ShapeBox1",
+ "Left":8.38729,
+ "Top":1.00542,
+ "Width":0.608542,
+ "Height":0.582083
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox26",
+ "Left":9.2075,
+ "Top":1.00542,
+ "Width":1.40229,
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Text":"鎶芥"
+ },
+ {
+ "Type":"ShapeBox",
+ "Name":"ShapeBox2",
+ "Left":10.2129,
+ "Top":1.00542,
+ "Width":0.79375,
+ "Height":0.582083
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox27",
+ "Left":5.3975,
+ "Top":2.98979,
+ "Width":4.60375,
+ "Height":0.608542,
+ "Text":"浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox28",
+ "Left":10.6098,
+ "Top":2.98979,
+ "Width":6.21771,
+ "Height":0.608542,
+ "Text":"瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox29",
+ "Left":0.211667,
+ "Top":3.81,
+ "Width":5.18583,
+ "Height":0.608542,
+ "Text":"鐢熶骇鏁伴噺锛歔#娴佽浆鍗℃暟閲�#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox30",
+ "Left":5.3975,
+ "Top":3.81,
+ "Width":3.99521,
+ "Height":0.608542,
+ "Text":"鍗℃暟閲忥細[#娴佽浆鍗℃暟閲�#]"
+ }
+ ],
+ "RepeatOnPage":true
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":2.01083,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid1",
+ "Dock":"Left",
+ "Border":{
+ "Styles":"[DrawLeft|DrawRight|DrawBottom]"
+ },
+ "ColumnCount":7,
+ "RowCount":2,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":3.175
+ },
+ {
+ "index":2,
+ "Width":2.38125
+ },
+ {
+ "index":3,
+ "Width":2.2225
+ },
+ {
+ "index":4,
+ "Width":1.16417
+ },
+ {
+ "index":5,
+ "Width":2.61938
+ },
+ {
+ "index":6,
+ "Width":1.19063
+ },
+ {
+ "index":7,
+ "Width":5.2123
+ }
+ ],
+ "FreeGridRow":[
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "Text":"鍏ュ簱璁板綍"
+ },
+ {
+ "row":2,
+ "col":1,
+ "Text":"棰嗙敤璁板綍"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 1cddf4a..06edaa3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -824,6 +824,7 @@
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_StockCheckItemList.html">鐩樼偣鏂规鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MouldStockBillMain_Temp.html">鐩樼偣璁板綍琛�</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">鐩樼偣鍒嗘瀽鍒楄〃</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MoldMainoverdueWarnReport.html">妯″叿淇濆吇閫炬湡棰勮鎶ヨ〃</a></dd>
</dl>
</dd>
</dl>
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index 4fa5b0e..81b80c7 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -156,7 +156,7 @@
<!-- 涓讳綋鍐呭 -->
<div class="layui-body" id="LAY_app_body">
<div class="layadmin-tabsbody-item layui-show">
- <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
+ <iframe src="home/console.html" frameborder="0" class="layadmin-iframe" name="mainIFrame"></iframe>
</div>
</div>
@@ -232,7 +232,6 @@
}
//閬嶅巻鐢熸垚涓昏彍鍗�
function MenuMain(data) {
-
var liStr = '';
//閬嶅巻鐢熸垚涓昏彍鍗�
for (var i = 0; i < data.length; i++) {
@@ -253,7 +252,7 @@
}
liStr += '</dl></li>';
} else {
- liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
+ liStr += '<li class="layui-nav-item"><a class="" id = "' + data[i].Hurl + '" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>';
}
};
$(".layui-nav-tree").html(liStr);
@@ -274,12 +273,10 @@
subStr += '</dl>';
subStr += '</dd>';
} else {
- subStr += '<dd><a lay-href="' + subMenu.Hurl + '">'+ subMenu.HName + '</a></dd>';
+ subStr += '<dd><a lay-href="' + subMenu.Hurl + '" id = "' + subMenu.Hurl + '">'+ subMenu.HName + '</a></dd>';
}
return subStr;
}
-
-
//鑿滃崟鑷畾涔夛細寮瑰嚭鑿滃崟鑷畾涔夊瓙椤甸潰
Ul = document.getElementById("MenuDefineID");
@@ -313,6 +310,17 @@
document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
+
+ function openChildPage(id) {
+ //鑾峰彇椤甸潰
+ var num = document.getElementById(id);
+ num.href = id;
+ num.target = "mainIFrame";
+ num.click();
+
+ console.log(num);
+
+ }
</script>
<!--<script>
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/Gy_DepartmentList.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/Gy_DepartmentList.html"
index 0e498d7..8125adc 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/Gy_DepartmentList.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/Gy_DepartmentList.html"
@@ -93,6 +93,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -173,6 +174,9 @@
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//娴忚
case 'get_PrintReport': get_PrintReport();
@@ -297,6 +301,17 @@
}
//#endregion
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Department_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
option = {
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/Gy_Warehouse.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/Gy_Warehouse.html"
index 90e2830..4543708 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/Gy_Warehouse.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/Gy_Warehouse.html"
@@ -140,15 +140,11 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <!--<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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><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="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -224,9 +220,11 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
-
//缂栬緫
case 'set_ShowBill': set_ShowBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
@@ -408,7 +406,16 @@
}
//#endregion
-
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Warehouse_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
//#region 鏌ヨ
function get_Display(sWhere) {
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/excel/Gy_Customer_Excel.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/excel/Gy_Customer_Excel.html"
new file mode 100644
index 0000000..d6569f5
--- /dev/null
+++ "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/excel/Gy_Customer_Excel.html"
@@ -0,0 +1,253 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>瀹㈡埛瀵煎叆</title>
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.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/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], 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
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_Customer/Gy_Process_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜' }
+ , { field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О' }
+ , { field: '鍦板尯浠ｇ爜', title: '鍦板尯浠ｇ爜' }
+ , { field: '鍦板尯鍚嶇О', title: '鍦板尯鍚嶇О' }
+ , { field: '榛樿璐у竵浠ｇ爜', title: '榛樿璐у竵浠ｇ爜' }
+ , { field: '榛樿璐у竵鍚嶇О', title: '榛樿璐у竵鍚嶇О' }
+ , { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜' }
+ , { field: '缁撶畻鏂瑰紡鍚嶇О', title: '缁撶畻鏂瑰紡鍚嶇О' }
+ , { field: '瀹㈡埛鍒嗙被浠ｇ爜', title: '瀹㈡埛鍒嗙被浠ｇ爜' }
+ , { field: '瀹㈡埛鍒嗙被鍚嶇О', title: '瀹㈡埛鍒嗙被鍚嶇О' }
+ , { field: '绠�绉�', title: '绠�绉�' }
+ , { field: '棰嗙敤浜�', title: '棰嗙敤浜�' }
+ , { field: '鑱旂郴浜�', title: '鑱旂郴浜�' }
+ , { field: '鑱旂郴鐢佃瘽', title: '鑱旂郴鐢佃瘽' }
+ , { field: '鎵嬫満', title: '鎵嬫満' }
+ , { field: '浼犵湡', title: '浼犵湡' }
+ , { field: '鍦板潃', title: '鍦板潃' }
+ , { field: '閭紪', title: '閭紪' }
+ , { field: '閭', title: '閭' }
+ , { field: '娉曚汉浠ｈ〃', title: '娉曚汉浠ｈ〃' }
+ , { field: '閾惰璐﹀彿', title: '閾惰璐﹀彿' }
+ , { field: '绋庡姟鐧昏鍙�', title: '绋庡姟鐧昏鍙�' }
+ , { field: '绋庣巼', title: '绋庣巼' }
+ , { field: '鑻辨枃鍚嶇О', title: '鑻辨枃鍚嶇О' }
+ , { field: '鑻辨枃鍦板潃', title: '鑻辨枃鍦板潃' }
+ , { field: '鍥藉', title: '鍥藉' }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�' }
+ , { field: '瀹㈡埛鐘舵��', title: '瀹㈡埛鐘舵��' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_Customer/Gy_Process_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
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/excel/Gy_Department_excel.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/excel/Gy_Department_excel.html"
new file mode 100644
index 0000000..f0b83f8
--- /dev/null
+++ "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/excel/Gy_Department_excel.html"
@@ -0,0 +1,230 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>閮ㄩ棬瀵煎叆</title>
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.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/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], 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
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_Department/Gy_Process_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
+ , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О' }
+ , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�' }
+ , { field: '璐熻矗浜哄悕绉�', title: '璐熻矗浜哄悕绉�' }
+ , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_Department/Gy_Process_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
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/excel/Gy_Warehouse_Excel.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/excel/Gy_Warehouse_Excel.html"
new file mode 100644
index 0000000..a542319
--- /dev/null
+++ "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/excel/Gy_Warehouse_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>浠撳簱瀵煎叆</title>
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.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/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], 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
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + 'Gy_Warehouse/Gy_Process_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜' }
+ , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+ , { field: '鑱旂郴鐢佃瘽', title: '鑱旂郴鐢佃瘽' }
+ , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜' }
+ , { field: '鑱屽憳鍚嶇О', title: '鑱屽憳鍚嶇О' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_Warehouse/Gy_Process_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
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/xmlLBM_Gy_StockPlaceList.aspx" "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/xmlLBM_Gy_StockPlaceList.aspx"
index d12ecb6..3d2b490 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/xmlLBM_Gy_StockPlaceList.aspx"
+++ "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/xmlLBM_Gy_StockPlaceList.aspx"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_StockPlaceList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_StockPlaceList" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_StockPlaceList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_StockPlaceList4" %>
<!DOCTYPE html>
@@ -7,14 +7,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<script runat="server">
- protected void Page_Load(object sender, EventArgs e)
- {
- //鈽呯壒鍒彁绀衡槄锛�
- //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
- //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_StockPlaceList where HItemID in(" + Request.Params["linterid"] + ")");
- }
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_Gy_StockPlaceList where HItemID in(" + Request.Params["linterid"] + ")","select 1");
+ }
</script>
</head>
<body>
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 1885000..98ec95d 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"
@@ -130,6 +130,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layu i-iconlayuiiconfileb"></i>娴佹按鍙锋柊澧�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -238,6 +239,9 @@
break;
//缂栬緫
case 'btnModify': set_ShowBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//鍒犻櫎
case 'btndelete': set_DeleteBill();
@@ -472,6 +476,17 @@
}
//#endregion
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '瀹㈡埛瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Customer_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
//#region 鏌ヨ (鍏宠仈鐢ㄦ埛)
function get_Display1(HCusID) {
var ajaxLoad = layer.load();
@@ -547,6 +562,7 @@
get_Display1(HCusID); //甯﹀嚭瀛愯〃[鍏宠仈鐢ㄦ埛]鏁版嵁
});
//#endregion
+
//#region 閫変腑琛屾敼鍙橀鑹�
function check_row(obj) {
var flag = !obj.tr.find(':checkbox:first').prop('checked');
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_SingleBalBillEdit.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_SingleBalBillEdit.html"
index b20275b..b8ceaba 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\344\270\252\344\272\272\051/Pay_SingleBalBillEdit.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_SingleBalBillEdit.html"
@@ -112,7 +112,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPayTypeName" id="HPayTypeName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
@@ -121,17 +121,18 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" style="width: 180px; ">
- <option value="1202">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="3791">宸ュ簭鍑虹珯姹囨姤鍗�</option>
+ <!--<option value="1202">鐢熶骇鍏ュ簱鍗�</option>
<option value="1245">鐢熶骇閫�搴撳崟</option>
<option value="1207">鐩存帴璋冩嫧璁㈠崟</option>
- <option value="3714">宸ュ簭姹囨姤鍗�</option>
+ <option value="3714">宸ュ簭姹囨姤鍗�</option>-->
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -755,6 +756,10 @@
url = "../../浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html?OperationType=2&ViewName=h_v_Pay_ProductInBillList_Source";
HSourceTitle = "鐢熶骇鍏ュ簱鍗�";
}
+ else if ($("#HSourceBillType").val() == "3791") {
+ url = "../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html?sProcExchBillNo=undefined&OperationType=2&ViewName=h_v_Pay_StationOutBillList_Source";
+ HSourceTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
+ }
else if ($("#HSourceBillType").val() == "1245") {
url = "../../鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html";
HSourceTitle = "鐢熶骇閫�搴撳崟";
@@ -805,22 +810,18 @@
, "HGroupID": result.data[0].HGroupID == null ? 0 : result.data[0].HGroupID
, "HGroupName": result.data[0].鐝粍
});
- $("#HMainSourceInterID").val(result.data[0].hmainid);
- $("#HMainSourceEntryID").val(result.data[0].hsubid);
- $("#HMainSourceBillType").val(result.data[0].HBillType);
- $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < result.data.length; i++) {
rowdata.push(
{
"HMaterID": result.data[i].HMaterID == null ? 0 : result.data[i].HMaterID
- , "HMaterNumber": result.data[i].鐗╂枡浠ｇ爜
- , "HMaterName": result.data[i].鐗╂枡鍚嶇О
+ , "HMaterNumber": result.data[i].HMaterNumber
+ , "HMaterName": result.data[i].HMaterName
, "HMaterModel": result.data[i].瑙勬牸鍨嬪彿
, "HProcID": result.data[i].HProcID == null ? 0 : result.data[i].HProcID
- , "HProcNumber": result.data[i].宸ュ簭浠ｇ爜
- , "HProcName": result.data[i].宸ュ簭鍚嶇О
+ , "HProcNumber": result.data[i].HProcNumber
+ , "HProcName": result.data[i].HProcName
, "HSourceID": result.data[i].HSourceID == null ? 0 : result.data[i].HSourceID
, "HSourceNumber": result.data[i].鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": result.data[i].鐢熶骇璧勬簮鍚嶇О
@@ -845,7 +846,7 @@
, "HSubsidyMoney": result.data[i].HSubsidyMoney == null ? 0 : result.data[i].HSubsidyMoney
, "HMoney": result.data[i].HMoney == null ? 0 : result.data[i].HMoney
, "HSourceBillType": result.data[i].HBillType == null ? "" : result.data[i].HBillType
- , "HSourceInterID": result.data[i].HMainID == null ? 0 : result.data[i].HMainID
+ , "HSourceInterID": result.data[i].hmainid == null ? 0 : result.data[i].hmainid
, "HSourceEntryID": result.data[i].hsubid == null ? 0 : result.data[i].hsubid
, "HSourceBillNo": result.data[i].鍗曟嵁鍙� == null ? "" : result.data[i].鍗曟嵁鍙�
, "HICMOInterID": result.data[i].HICMOInterID == null ? 0 : result.data[i].HICMOInterID
@@ -1247,14 +1248,39 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = OptionData.HItemID;
+ var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
+ var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": OptionData.HItemID
, "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
, "HMaterName": OptionData.鐗╂枡鍚嶇О
, "HMaterModel": OptionData.瑙勬牸鍨嬪彿
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1282,13 +1308,38 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
+ var HProcID = OptionData.HItemID;
+ var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HProcID": OptionData.HItemID
, "HProcNumber": OptionData.宸ュ簭浠ｇ爜
, "HProcName": OptionData.宸ュ簭鍚嶇О
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1316,13 +1367,38 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
+ var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
+ var HSourceID = OptionData.HItemID;
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSourceID": OptionData.HItemID
, "HSourceNumber": OptionData.鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": OptionData.鐢熶骇璧勬簮鍚嶇О
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1774,6 +1850,33 @@
}
//#endregion
+ //#region 鏍规嵁鐗╂枡銆佸伐搴忋�佺敓浜ц祫婧愬姞杞藉伐浠�
+ function subTable_GetHPrice2(HMaterID, HProcID, HSourceID) {
+ var HPrice = 0;
+ if (HMaterID != "0" && HProcID != "0") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_SingleBalBill/get_HPrice_BaseMaterHProcHSource",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID },
+ success: function (data) {
+ if (data.count == 1) {
+ HPrice = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ return HPrice;
+ }
+ //#endregion
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
@@ -1934,11 +2037,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HEmpID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (sSubStr[i].HPrice == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -1947,7 +2050,6 @@
return Result;
}
return Result;
-
}
</script>
</body>
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_GroupBalBillEdit.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_GroupBalBillEdit.html"
index 4975aca..93946c6 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_GroupBalBillEdit.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_GroupBalBillEdit.html"
@@ -102,7 +102,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPayTypeName" id="HPayTypeName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
@@ -111,23 +111,24 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">璁′欢宸ヨ祫<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁′欢宸ヨ祫</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>
+ <!--<input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>-->
+ <input type="number" name="HSumMoney" id="HSumMoney" lay-verify="HSumMoney" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();"readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍏朵粬琛ヨ创<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍏朵粬琛ヨ创</label>
<div class="layui-input-inline">
<input type="number" name="HOtherSubsidy" id="HOtherSubsidy" lay-verify="HOtherSubsidy" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍏朵粬鎵ｆ<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍏朵粬鎵ｆ</label>
<div class="layui-input-inline">
<input type="number" name="HOtherDeduct" id="HOtherDeduct" lay-verify="HOtherDeduct" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
@@ -144,10 +145,11 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" style="width: 180px; ">
- <option value="1202">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="3791">宸ュ簭鍑虹珯姹囨姤鍗�</option>
+ <!--<option value="1202">鐢熶骇鍏ュ簱鍗�</option>
<option value="1245">鐢熶骇閫�搴撳崟</option>
<option value="1207">鐩存帴璋冩嫧璁㈠崟</option>
- <option value="3714">宸ュ簭姹囨姤鍗�</option>
+ <option value="3714">宸ュ簭姹囨姤鍗�</option>-->
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -681,7 +683,7 @@
, { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', width: 100, edit: 'text', totalRow: true, hide: true }
, { field: 'HLeaveDays', title: '璇峰亣澶╂暟', width: 100, edit: 'text', totalRow: true, hide: true }
, { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', width: 100, edit: 'text', totalRow: true, hide: true }
- , { field: 'HMoney', title: '璁′欢宸ヨ祫', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HMoney', title: '璁′欢宸ヨ祫', width: 100, style: 'background-color:#efefef4d;', totalRow: true }
, { field: 'HOtherSubsidy', title: '鍏朵粬琛ヨ创', width: 100, edit: 'text', totalRow: true }
, { field: 'HOtherDeduct', title: '鍏朵粬鎵ｆ', width: 100, edit: 'text', totalRow: true }
, { field: 'HYF', title: '搴斾粯宸ヨ祫', width: 100, style: 'background-color:#efefef4d;', totalRow: true }
@@ -866,6 +868,8 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
element.tabChange('tab-GroupBalBill', '2');
}
else {
@@ -914,6 +918,10 @@
if ($("#HSourceBillType").val() == "1202") {
url = "../../浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html?OperationType=2&ViewName=h_v_Pay_ProductInBillList_Source";
HSourceTitle = "鐢熶骇鍏ュ簱鍗�";
+ }
+ else if ($("#HSourceBillType").val() == "3791") {
+ url = "../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html?sProcExchBillNo=undefined&OperationType=2&ViewName=h_v_Pay_StationOutBillList_Source";
+ HSourceTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
}
else if ($("#HSourceBillType").val() == "1245") {
url = "../../鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html";
@@ -969,25 +977,21 @@
set_InitGrid2(); //鍒濆鍖栧瓙琛�
GetEmployee(); //鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
}
- $("#HMainSourceInterID").val(result.data[0].HMainID);
- $("#HMainSourceEntryID").val(result.data[0].hsubid);
- $("#HMainSourceBillType").val(result.data[0].HBillType);
- $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < result.data.length; i++) {
rowdata.push(
{
"HMaterID": result.data[i].HMaterID == null ? 0 : result.data[i].HMaterID
- , "HMaterNumber": result.data[i].鐗╂枡浠ｇ爜
- , "HMaterName": result.data[i].鐗╂枡鍚嶇О
+ , "HMaterNumber": result.data[i].HMaterNumber
+ , "HMaterName": result.data[i].HMaterName
, "HMaterModel": result.data[i].瑙勬牸鍨嬪彿
, "HUnitID": result.data[i].HUnitID == null ? 0 : result.data[i].HUnitID
, "HUnitNumber": result.data[i].璁￠噺鍗曚綅浠ｇ爜
, "HUnitName": result.data[i].璁￠噺鍗曚綅鍚嶇О
, "HProcID": result.data[i].HProcID == null ? 0 : result.data[i].HProcID
- , "HProcNumber": result.data[i].宸ュ簭浠ｇ爜
- , "HProcName": result.data[i].宸ュ簭鍚嶇О
+ , "HProcNumber": result.data[i].HProcNumber
+ , "HProcName": result.data[i].HProcName
, "HSourceID": result.data[i].HSourceID == null ? 0 : result.data[i].HSourceID
, "HSourceNumber": result.data[i].鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": result.data[i].鐢熶骇璧勬簮鍚嶇О
@@ -997,7 +1001,7 @@
, "HPrice": result.data[i].HPrice == null ? 0 : result.data[i].HPrice
, "HMoney": result.data[i].HMoney == null ? 0 : result.data[i].HMoney
, "HSourceBillType": result.data[i].HBillType == null ? "" : result.data[i].HBillType
- , "HSourceInterID": result.data[i].HMainID == null ? 0 : result.data[i].HMainID
+ , "HSourceInterID": result.data[i].hmainid == null ? 0 : result.data[i].hmainid
, "HSourceEntryID": result.data[i].hsubid == null ? 0 : result.data[i].hsubid
, "HSourceBillNo": result.data[i].鍗曟嵁鍙� == null ? "" : result.data[i].鍗曟嵁鍙�
, "HICMOInterID": result.data[i].HICMOInterID == null ? 0 : result.data[i].HICMOInterID
@@ -1017,6 +1021,9 @@
table.render(option);
//鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
subTable_GetHPrice();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
element.tabChange('tab-GroupBalBill', '1');
}
@@ -1408,9 +1415,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1453,9 +1460,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1498,9 +1505,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1582,9 +1589,9 @@
, HMoney: HMoney
});
table.render(option);
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
break;
case "HPrice": //宸ヤ环
//鏁版嵁鏍煎紡鏍￠獙
@@ -1610,9 +1617,9 @@
, HMoney: HMoney
});
table.render(option);
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
break;
default:
}
@@ -1938,6 +1945,8 @@
value.HAvgFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
});
//#endregion
@@ -2022,9 +2031,6 @@
, "HCTPrjNumber": OptionData.HCTPrjNumber
, "HCTPrjName": OptionData.HCTPrjName
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
}
})
}
@@ -2082,6 +2088,34 @@
//layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
switch (field) {
+ case "HBaseTimes": //鍩烘湰宸ユ椂
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HBaseTimes: oldText
+ });
+ table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ layer.msg("鍩烘湰宸ユ椂锛氭暟鎹敊璇紝鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HBaseTimes = isNaN(value) ? 0 : value; //鍩烘湰宸ユ椂
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HBaseTimes: HBaseTimes
+ });
+ //table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ break;
case "HMoney": //璁′欢宸ヨ祫
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
@@ -2111,8 +2145,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
case "HOtherSubsidy": //鍏朵粬琛ヨ创
//鏁版嵁鏍煎紡鏍￠獙
@@ -2143,8 +2175,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
case "HOtherDeduct": //鍏朵粬鎵ｆ
//鏁版嵁鏍煎紡鏍￠獙
@@ -2175,8 +2205,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
default:
}
@@ -2213,7 +2241,10 @@
});
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = isNaN(rowList[i].HQty) ? 0 : rowList[i].HQty; //鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦
option.data[i]["HPrice"] = HPrice;
+ option.data[i]["HMoney"] = HMoney;
}
table.render(option);
}
@@ -2296,6 +2327,54 @@
}
//#endregion
+ //#region 瀛愯〃1鍙樻洿鏀瑰彉涓昏〃
+ function Sub1ChangeMain() {
+ var HSumMoney = 0;
+ //鎬婚噾棰�
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HMaterID"] != "0") {
+ HSumMoney += option.data[i]["HMoney"] * 1;
+ }
+ }
+
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney * 1 + HOtherSubsidy * 1 - HOtherDeduct * 1; //搴旀敮浠樺伐璧�
+ $("#HSumMoney").val(HSumMoney);
+ $("#HPayMoney").val(HPayMoney);
+ }
+ //#endregion
+
+ //#region 涓昏〃鍙樻洿鏀瑰彉瀛愯〃2
+ function MainChangeSub2() {
+ var HPayMoney = $("#HPayMoney").val(); //搴旀敮浠樺伐璧�
+ var HBaseTimes = 0;
+ //鍛樺伐鎬诲伐鏃�
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HEmpID"] != "0" && option2.data[i]["HAvgFlag"] == true) {
+ HBaseTimes += option2.data[i]["HBaseTimes"] * option2.data[i]["HEmpRate"] * 1;
+ }
+ }
+ if (HBaseTimes == 0) {
+ for (var i = 0; i < option2.data.length; i++) {
+ option2.data[i]["HMoney"] = (0).toFixed(4);
+ option2.data[i]["HYF"] = (option2.data[i]["HOtherSubsidy"] * 1 - option2.data[i]["HOtherDeduct"] * 1).toFixed(4);
+ }
+ }
+ else {
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HEmpID"] != "0" && HBaseTimes != 0) {
+ option2.data[i]["HMoney"] = (option2.data[i]["HBaseTimes"] * option2.data[i]["HEmpRate"] * (HPayMoney / HBaseTimes)).toFixed(4);
+ option2.data[i]["HYF"] = (option2.data[i]["HMoney"] * 1 + option2.data[i]["HOtherSubsidy"] * 1 - option2.data[i]["HOtherDeduct"] * 1).toFixed(4);
+ }
+ }
+ }
+ table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ }
+ //#endregion
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
@@ -2305,6 +2384,19 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+ //鏁板�煎瀷瀛楁锛岀晫闈负绌烘椂锛岃祴鍊间负0
+ if ($("#HSumMoney").val() == '') {
+ data.field.HSumMoney = 0
+ }
+ if ($("#HOtherSubsidy").val() == '') {
+ data.field.HOtherSubsidy = 0
+ }
+ if ($("#HOtherDeduct").val() == '') {
+ data.field.HOtherDeduct = 0
+ }
+ if ($("#HPayMoney").val() == '') {
+ data.field.HPayMoney = 0
+ }
//鑾峰彇鐢熶骇姹囨姤鍒楄〃瀛愯〃鏁版嵁
var tableSub1 = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -2329,7 +2421,7 @@
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ';' + OperationType + ";" + HMaker;
- if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ if (!AllowLoadData(sSubStr2))//鏁版嵁楠岃瘉
{
return false;
}
@@ -2395,6 +2487,32 @@
form.render('checkbox');
}
//#endregion
+
+ //#region 鐩戝惉鏂囨湰妗�
+
+ //鍏朵粬琛ヨ创
+ $("#HOtherSubsidy").on("input", function (e) {
+ var HSumMoney = $("#HSumMoney").val(); //璁′欢宸ヨ祫
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney*1 + HOtherSubsidy*1 - HOtherDeduct*1; //搴旀敮浠樺伐璧�
+ $("#HPayMoney").val(HPayMoney);
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ });
+
+ //鍏朵粬鎵ｆ
+ $("#HOtherDeduct").on("input", function (e) {
+ var HSumMoney = $("#HSumMoney").val(); //璁′欢宸ヨ祫
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney * 1 + HOtherSubsidy * 1 - HOtherDeduct * 1; //搴旀敮浠樺伐璧�
+ $("#HPayMoney").val(HPayMoney);
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ });
+ //#endregion
+
});
@@ -2490,11 +2608,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HEmpID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HPrice == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HYF == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,搴斾粯宸ヨ祫涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -2503,7 +2621,6 @@
return Result;
}
return Result;
-
}
</script>
</body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
index 3ea65fb..f6247bb 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
@@ -270,8 +270,8 @@
//鑾峰彇鍒跺崟浜� 鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index db4a0a3..7ec8faf 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -270,8 +270,8 @@
//鑾峰彇鍒跺崟浜� 鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
@@ -522,19 +522,41 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
+ var HBillType = "";
+ var barNo = "";
+ if (HBarCode.length < 22) {
+ barNo = HBarCode.substr(0, 4);
+ switch (barNo) {
+ case "GXLX":
+ HBillType = "3772";
+ break;
+ }
+ }
+
+ if (HBarCode.length > 22) {
+ barNo = HBarCode.substr(0, 22);
+ switch (barNo) {
+ case "https://qr61.cn/omM1Cj":
+ HBillType = "3899";
+ break;
+ case "https://qr61.cn/oAhaGh":
+ HBillType = "3308";
+ break;
+ }
+ }
var index = layer.load();
$.ajax({
url: GetWEBURL() + "/Sc_MouldUpperBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HSourceID": $("#HSourceID").val(), "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldUpperBill" },
+ data: { "HBarCode": HBarCode, "HSourceID": $("#HSourceID").val(), "UserID": sessionStorage["Czybm"], "HBillType": HBillType },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
layer.close(index);
$("#HBarCode").val("");
-
+
var num = data["Num"];
if ($("#HSourceID").val() == "0" && num != 1) {
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/Sc_MoldMainoverdueWarnReport.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/Sc_MoldMainoverdueWarnReport.html"
new file mode 100644
index 0000000..4fd6902
--- /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/Sc_MoldMainoverdueWarnReport.html"
@@ -0,0 +1,295 @@
+锘�<!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>
+ <script src="../../../layuiadmin/layui/layui1.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/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </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" style="width: 85px;">妯″叿鍒嗙被锛�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HMouldType" name="HMouldType" id="HMouldType" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <input type="hidden" name="HMouldTypeID" id="HMouldTypeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouldType" id="btnHMouldType" style="">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:40px;">
+ 鏌ヨ
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExit" id="btnExit" style="padding:0 5px">閫�鍑�</button>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], 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
+ , tree = layui.tree
+ var sWhere = "";
+ var option = [];
+ var HModName = "Sb_EquipMaintainWarningReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "Hprocid", "HUSEORGID","璁惧绫诲瀷"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //閫�鍑烘寜閽�
+ form.on('submit(btnExit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //妯″叿鍒嗙被
+ form.on('submit(btnHMouldType)', function (data) {//閫夋嫨璁惧鍒嗙被
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '璁惧鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMouldTypeID").val(checkStatus.data[0].HItemID);
+ $("#HMouldType").val(checkStatus.data[0].HName);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ var HMouldTypeID = $("#HMouldTypeID").val();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldRepairCheckTaskReport/Sc_MoldMainoverdueWarnReport',
+ type: "GET",
+ data: { "HMouldTypeID": HMouldTypeID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , totalRow: true
+ , done: function (res, curr, count) {
+ ////淇敼鍗曞厓鏍奸鑹�
+ ////宸茬偣妫� Y
+ ////鏈偣妫� E
+ ////棰勮 P
+ //var that = this.elem.next();
+ //res.data.forEach(function (item, index) {
+ // var tr = that.find("[data-index=" + index + "]").children();
+ // tr.each(function () {
+ // var tableText = $(this).text(); //鍗曞厓鏍间腑鐨勫唴瀹�
+ // if (tableText == "Y") {
+ // $(this).css("background-color", "#D6F7D1");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#ff241c");//鍗曞厓鏍煎瓧浣撻鑹�
+ // }
+ // else if (tableText == "E") {
+ // $(this).css("background-color", "#F5C6C6");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // } else if (tableText == "P") {
+ // $(this).css("background-color", "#F5F5C1");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // } else {
+ // //$(this).css("background-color", "#fffefd");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // }
+ // })
+ //})
+
+ soulTable.render(this);
+ }
+ }
+
+ ins = table.render(option);
+
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ } else {
+ option.data = data1.data
+ ins = table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(sql) {
+ var HMouldType = $("#HMouldType").val();
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HMouldType").val("");
+ $("#HMouldTypeID").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , cellMinWidth: 200
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+
+ //#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/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
index d85c89f..73d3eb7 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
@@ -269,8 +269,8 @@
, { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true, width: 165 }
, { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', sort: true, width: 165, totalRow: true }
, { field: '鍘熷墿浣欏鍛�', title: '鍘熷墿浣欏鍛�', sort: true, width: 165, totalRow: true }
- , { field: '鏈鑰楃敤', title: '涓婃鑰楃敤', sort: true, width: 165, totalRow: true }
- , { field: '鏈鍓╀綑瀵垮懡', title: '涓婃鍓╀綑瀵垮懡', sort: true, width: 165, totalRow: true }
+ , { field: '鏈鑰楃敤', title: '鏈鑰楃敤', sort: true, width: 165, totalRow: true }
+ , { field: '鏈鍓╀綑瀵垮懡', title: '鏈鍓╀綑瀵垮懡', sort: true, width: 165, totalRow: true }
, { field: '璋冩暣鍘熷洜', title: '璋冩暣鍘熷洜', sort: true, width: 165 }
, { field: '鎽樿', title: '鎽樿', sort: true, width: 165 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
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/Gy_BarCodeBillList.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/Gy_BarCodeBillList.html"
index f5507d6..7813033 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/Gy_BarCodeBillList.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/Gy_BarCodeBillList.html"
@@ -415,10 +415,10 @@
com = "like '%" + ColContent + "%'";
break;
case "8":
- com = "like '%" + ColContent + "'";
+ com = "like '" + ColContent + "%'";
break;
case "9":
- com = "like '" + ColContent + "%'";
+ com = "like '%" + ColContent + "'";
break;
case "10":
com = "not like '%" + ColContent + "%'";
@@ -437,10 +437,10 @@
com1 = "like '%" + ColContent1 + "%'";
break;
case "8":
- com1 = "like '%" + ColContent1 + "'";
+ com = "like '" + ColContent1 + "%'";
break;
case "9":
- com1 = "like '" + ColContent1 + "%'";
+ com = "like '%" + ColContent1 + "'";
break;
case "10":
com1 = "not like '%" + ColContent1 + "%'";
@@ -459,10 +459,10 @@
com2 = "like '%" + ColContent2 + "%'";
break;
case "8":
- com2 = "like '%" + ColContent2 + "'";
+ com = "like '" + ColContent2 + "%'";
break;
case "9":
- com2 = "like '" + ColContent2 + "%'";
+ com = "like '%" + ColContent2 + "'";
break;
case "10":
com2 = "not like '%" + ColContent2 + "%'";
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/Gy_MouldFile.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/Gy_MouldFile.html"
index b2ee8de..8eafd39 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/Gy_MouldFile.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/Gy_MouldFile.html"
@@ -410,6 +410,17 @@
</button>
</div>
</div>
+ <div class="layui-inline" style="margin-left:10px;">
+ <label class="layui-form-label">鍣ㄥ叿鍙敤鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus">
+ <option value="姝ｅ父" selected="selected">姝ｅ父</option>
+ <option value="寮傚父">寮傚父</option>
+ <option value="淇濆吇">淇濆吇</option>
+ <option value="缁翠慨">缁翠慨</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -1744,6 +1755,7 @@
$("#HNowSPID").val(d.data[0].褰撳墠浠撲綅ID);
$("#HNowSPName").val(d.data[0].褰撳墠浠撲綅);
$("#HMouldStatus").val(d.data[0].妯″叿鐘舵��);
+ $("#HMouldUseStatus").val(d.data[0].妯″叿鍙敤鐘舵��);
var HCycleUnit = d.data[0].鍛ㄦ湡鍗曚綅;
var HCheckCycle = d.data[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/Sc_Add_MouldMaintainPlanBillList.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/Sc_Add_MouldMaintainPlanBillList.html"
index ad76b61..4b0114d 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/Sc_Add_MouldMaintainPlanBillList.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/Sc_Add_MouldMaintainPlanBillList.html"
@@ -496,7 +496,28 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr;
+ var num = [];
+ if (OperationType==3) {
+ //鑾峰彇瀛愯〃鏁版嵁
+ for (var i = 0; i < table.cache["mainTable_plan"].length; i++) {
+ if (table.cache["mainTable_plan"][i] != "") {
+ table.cache["mainTable_plan"][i].LAY_TABLE_INDEX = i;
+ if (table.cache["mainTable_plan"][i].HRelationFlag == "鏈偣妫�") {
+ table.cache["mainTable_plan"][i].HRelationFlag = false
+ } else {
+ table.cache["mainTable_plan"][i].HRelationFlag = true
+ }
+ if (table.cache["mainTable_plan"][i].HSendFlag == "鏈彂閫�") {
+ table.cache["mainTable_plan"][i].HSendFlag = false
+ } else {
+ table.cache["mainTable_plan"][i].HSendFlag = true
+ }
+ num.push(table.cache["mainTable_plan"][i])
+ }
+ }
+ }
+ var sSubStr2 = JSON.stringify(num);
+ var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr + ";" +sSubStr2;
if (AllowLoadData(sSubStr1)) {
$.ajax(
{
@@ -515,13 +536,12 @@
}
else {
layer.alert(data.Message, { icon: 5 });
- //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
error: function (err) {
layer.alert("閿欒:" + err, { icon: 5 });
- //console.log("Reason" + sMainStr);
+
}
});
}
@@ -593,6 +613,7 @@
, page: false
, totalRow: true
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -623,6 +644,7 @@
, totalRow: true
, page: false
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -646,9 +668,9 @@
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
, { field: 'HSendFlag', title: '鍙戦�佹爣璁�' }
- , { field: 'HErrBeginQty', title: '棰勮寮�濮嬫鏁�' }
- , { field: 'HUseNowQty', title: '褰撳墠浣跨敤娆℃暟' }
- , { field: 'HUseEndQty', title: '缁撴潫浣跨敤娆℃暟' }
+ , { field: 'HErrBeginQty', edit: 'text', title: '棰勮寮�濮嬫鏁�' }
+ , { field: 'HUseNowQty', edit: 'text', title: '褰撳墠浣跨敤娆℃暟' }
+ , { field: 'HUseEndQty', edit: 'text', title: '缁撴潫浣跨敤娆℃暟' }
];
option_plan = {
id: 'mainTable_plan'
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/Sc_MouldMaintainRuleBillEdit.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/Sc_MouldMaintainRuleBillEdit.html"
index 0941ea2..f28cb72 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/Sc_MouldMaintainRuleBillEdit.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/Sc_MouldMaintainRuleBillEdit.html"
@@ -92,7 +92,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇鍐插埡鏁�</label>
+ <label class="layui-form-label">淇濆吇鍐插埡鏁�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HUseQtys" id="HUseQtys" class="layui-input" value="0">
</div>
@@ -100,19 +100,19 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟</label>
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+ <label class="layui-form-label">淇濆吇棰勮娆℃暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
</div>
@@ -452,6 +452,7 @@
, totalRow: true
, page: false
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -878,6 +879,22 @@
layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HUseQtys").val() == '' || $("#HUseQtys").val() == null) {
+ layer.msg("淇濆吇鍐插埡鏁颁笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSafeDays").val() == '' || $("#HSafeDays").val() == null) {
+ layer.msg("淇濆吇瀹夊叏澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarQtys").val() == '' || $("#HErrWarQtys").val() == null) {
+ layer.msg("淇濆吇棰勮娆℃暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarDays").val() == '' || $("#HErrWarDays").val() == null) {
+ layer.msg("淇濆吇棰勮澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
index eae9a1c..58a74a2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
@@ -393,8 +393,10 @@
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', sort: true }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', sort: true }
, { field: 'HEquipID', title: 'HEquipID', hide: true, sort: true }
- , { field: '鐢熶骇璁惧浠ｇ爜', title: '鐢熶骇璁惧浠ｇ爜', sort: true }
- , { field: '鐢熶骇璁惧', title: '鐢熶骇璁惧', sort: true }
+ , { field: '鐢熶骇涓昏澶囦唬鐮�', title: '鐢熶骇涓昏澶囦唬鐮�', sort: true }
+ , { field: '鐢熶骇涓昏澶�', title: '鐢熶骇涓昏澶�', sort: true }
+ , { field: '杈呭姪璁惧浠ｇ爜', title: '杈呭姪璁惧浠ｇ爜', sort: true }
+ , { field: '杈呭姪璁惧', title: '杈呭姪璁惧', sort: true }
, { field: 'HWorkerID', title: 'HWorkerID', hide: true, sort: true }
, { field: '鎿嶄綔宸ヤ唬鐮�', title: '鎿嶄綔宸ヤ唬鐮�', sort: true }
, { field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', sort: true }
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
index 73df689..069272f 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
@@ -353,7 +353,7 @@
, limits: [50, 500, 5000, 20000]
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -814,7 +814,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
- var ModRightNameCheck = "Xt_SystemLogListExcel";
+ var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
//閫昏緫瀹℃牳鏂规硶
$.ajax({
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
index b964f66..3bf0ede 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
@@ -579,7 +579,7 @@
, limits: [50, 500, 5000, 20000]
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -898,7 +898,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
- var ModRightNameCheck = "Xt_SystemLogListExcel";
+ var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
//閫昏緫瀹℃牳鏂规硶
$.ajax({
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
index defaab1..f25567e 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
@@ -395,7 +395,7 @@
, limits: [50, 500, 5000, 20000]
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -847,7 +847,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
- var ModRightNameCheck = "Xt_SystemLogListExcel";
+ var ModRightNameCheck = "Gy_Warehouse_ExportExcel";
//閫昏緫瀹℃牳鏂规硶
$.ajax({
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index 24cf9d0..941d38a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -43,7 +43,8 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" >閫�鍑�</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" onclick='window.frames["绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSupliesList.html"] '>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Excel">Excel瀵煎叆</button>
</div>
</div>
@@ -365,9 +366,12 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
if (params[1] != null) {
- Pub_Close(1);
- } else if (params[1] == null) {
Pub_Close(2);
+ } else if (params[1] == null) {
+ var parentWindow = window.parent;
+ Pub_Close(2);
+ parentWindow.openChildPage("绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSupliesList.html");
+
}
});
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
index 81fd545..721fe9a 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
@@ -402,7 +402,7 @@
, limits: [50, 500, 5000, 20000]
}
table.render(option);
-
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -876,7 +876,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
- var ModRightNameCheck = "Xt_SystemLogListExcel";
+ var ModRightNameCheck = "Gy_EmployeeList_ExportExcel";
//閫昏緫瀹℃牳鏂规硶
$.ajax({
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index c0ab9c1..c2ba757 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -856,10 +856,12 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- else {
- return true;
- }
+ if (sSubStr[i].HDotCheckResult != true) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁撴灉淇℃伅涓哄嬀閫�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
}
+ return true;
}
else {
return true;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index 7a7f77f..b9c55dc 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -634,15 +634,15 @@
, { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', width: 130, style: 'background-color:#efefef4d;' }
, { field: 'HSNO', title: '宸ヨ壓娆″簭', width: 110, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', width: 130, edit: 'text', event: "HTechParamIDStdName" }
- , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', width: 130, edit: 'text' }
+ , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', hide: true, width: 130, edit: 'text', event: "HTechParamIDStdName" }
+ , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', hide: true, width: 130, edit: 'text' }
, { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: false, event: "HVaule" }
, { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' }
, { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' }
, { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' }
, { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ // , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -1292,12 +1292,13 @@
return item;
});
- layui.table.reload('mainTable', {
- data: updatedData
- });
-
+ //layui.table.reload('mainTable', {
+ // data: updatedData
+ //});
// 鍙栨秷缂栬緫鐘舵��
cell.removeAttr('contenteditable');
+ //鍙栨秷鍐掓场
+ event.stopPropagation();
});
@@ -1773,7 +1774,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HTechParamID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟淇℃伅涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟浠ｇ爜/鍚嶇О涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HVaule == "" || sSubStr[i].HVaule == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟鍊间笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 332ac1c..1807470 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -1448,13 +1448,7 @@
success: function (data) {
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
- if (linterid == undefined) {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- location.reload();
- }
- else {
- location.reload();
- }
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
});
}
else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index 3ae6539..d89e0a8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -53,13 +53,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟</label>
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="1">
</div>
@@ -922,6 +922,14 @@
layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HSafeDays").val() == '' || $("#HSafeDays").val() == null) {
+ layer.msg("淇濆吇瀹夊叏澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarDays").val() == '' || $("#HErrWarDays").val() == null) {
+ layer.msg("淇濆吇棰勮澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
index 3839f0b..48bae72 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
@@ -264,13 +264,18 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎶ュ簾鍐呭</label>
- <div class="layui-input-inline" style="width:300px;height:15px">
- <textarea placeholder="璇疯緭鍏ユ姤搴熷唴瀹�" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
+ <label class="layui-form-label">閫佹祴绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <select name="TestType" lay-filter="TestType" id="TestType">
+ <option value="棣栨">棣栨</option>
+ <option value="宸℃">宸℃</option>
+ <option value="鏈">鏈</option>
+ <option value="瀹為獙">瀹為獙</option>
+ </select>
</div>
</div>
</div>
- <div class="layui-form-item">
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">浜у搧鍗曢噸1:</label>
<div class="layui-input-inline">
@@ -287,6 +292,12 @@
<label class="layui-form-label">浜у搧鍗曢噸3:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫佹祴鍐呭</label>
+ <div class="layui-input-inline" style="width:300px;height:15px">
+ <textarea placeholder="璇疯緭鍏ラ�佹祴鍐呭" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
</div>
</div>
</div>
@@ -626,6 +637,7 @@
, "HProdWeight1": data[0]["浜у搧鍗曢噸1"] //浜у搧鍗曢噸1
, "HProdWeight2": data[0]["浜у搧鍗曢噸2"] //浜у搧鍗曢噸2
, "HProdWeight3": data[0]["浜у搧鍗曢噸3"] //浜у搧鍗曢噸3
+ , "TestType": data[0]["閫佹祴绫诲瀷"] //閫佹祴绫诲瀷
, "HGroupID": data[0]["HGroupID"] //鐝粍ID
, "HGroupName": data[0]["鐢熶骇鐝粍"] //鐝粍鍚嶇О
, "HShiftsID": data[0]["HShiftsID"] //鐝ID
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
index 77749c2..8a23004 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
@@ -55,7 +55,15 @@
</button>
</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: 185px;">
+ <select name="HEquipType" id="HEquipType" class=" ForFilteringSchemes" lay-verify="HEquipType">
+ <option value="鎵嬪姩杈撳叆">鎵嬪姩杈撳叆</option>
+ <option value="璁惧閲囬泦">璁惧閲囬泦</option>
+ </select>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓鍙傛暟</label>
@@ -82,92 +90,6 @@
<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>
-
-
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -319,7 +241,7 @@
url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_EquipMentCollectionTechParamList',
type: "GET",
async:false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -388,98 +310,18 @@
var HProcName = $("#HProcName").val();
var HTechParamName = $("#HTechParamName").val();
var HDate = $("#HDate").val(); //寮�濮嬫棩鏈�
- var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HEquipType = $("#HEquipType").val();
+
+ if (HEquipNumber != "" || HTechParamName != "") {
+ sWhere = {
+ HEquipNumber: HEquipNumber
+ , HTechParamName: HTechParamName
+ , HDate: HDate
+ , HDate1: HDate1
+ , HEquipType: HEquipType
}
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
-
-
- if (HEquipNumber) {
- sWhere += " and 璁惧缂栫爜 = '" + HEquipNumber + "'";
- }
- if (HTechParamName) {
- sWhere += " and 宸ヨ壓浜ф暟 = '" + HTechParamName + "'";
- }
- if (HDate) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) <= '" + HDate1 + "'";
- }
- if (HEquipNumber != "" || HTechParamName!="") {
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -519,16 +361,25 @@
//鎶樼嚎鍥剧粦瀹氭暟鎹�
var H_X = [];//X杞存爣棰�
- var HVaule = [];//瀹為檯鍊�
+ var HVaule = [];//瀹為檯鍊�
+ var HStd = [];//鏍囧噯鍊�
+ var HMax = [];//涓婄嚎鍊�
+ var HMin = [];//涓嬮檺鍊�
var HTitle = "璁惧宸ヨ壓鍙傛暟瓒嬪娍鍒嗘瀽鍥�";//鍥惧舰鏍囬
if (option.data.length > 0) {
for (let i = 0; i < option.data.length ; i++) {
H_X.push(option.data[i].閲囬泦鏃ユ湡);
}
// 濉厖鏁版嵁
- for (let i = 0; i < option.data.length; i++) {
-
- HVaule.push(option.data[i].鏁伴噰鍊�);
+ for (let i = 0; i < option.data.length; i++) {
+ if ($("#HEquipType").val() == "鎵嬪姩杈撳叆") {
+ HMax.push(option.data[i].涓婇檺鍊�);
+ HMin.push(option.data[i].涓嬮檺鍊�);
+ HStd.push(option.data[i].鏍囧噯鍊�);
+ HVaule.push(option.data[i].瀹為檯鍊�);
+ } else {
+ HVaule.push(option.data[i].鏁伴噰鍊�);
+ }
}
}
@@ -545,7 +396,7 @@
trigger: 'axis'
},
legend: {
- data: ['鏁伴噰鍊�'],
+ data: ['鏁伴噰鍊�', '涓婇檺鍊�', '涓嬮檺鍊�', '鏍囧噯鍊�'],
top: 'bottom',
left: 'center'
},
@@ -591,6 +442,72 @@
}
},
data: HVaule
+ },
+ {
+ name: '涓婇檺鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMax
+ },
+ {
+ name: '涓嬮檺鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMin
+ },
+ {
+ name: '鏍囧噯鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'green' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HStd
}
]
};
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
index 344642a..2d998dd 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
@@ -657,9 +657,10 @@
series: [
{
name: '宸ユ枡鐜�',
- type: 'line',
+ type: 'line',
label: {
- show: true
+ show: true,
+ formatter: '{c}%'
},
itemStyle: {
normal: {
@@ -675,7 +676,8 @@
name: '鏂欏簾鐜�',
type: 'line',
label: {
- show: true
+ show: true,
+ formatter: '{c}%'
},
itemStyle: {
normal: {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
index ad3ba45..3df14e2 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
@@ -51,14 +51,7 @@
</button>
</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: 185px;">
- <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
- 鍔ㄦ�佹覆鏌撶粍缁�
- </select>
- </div>
- </div>-->
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -766,7 +759,10 @@
type: 'bar',
barWidth: 30,
barGap: 0,
- label: labelOption,
+ label: {
+ ...labelOption,
+ color: '#0066CC' // 璁剧疆鏍囩棰滆壊涓鸿摑鑹�
+ },
emphasis: {
focus: 'series'
},
@@ -785,7 +781,10 @@
type: 'line',
barWidth: 10,
barGap: 0,
- label: labelOption1,
+ label: {
+ ...labelOption,
+ color: '#FF0000' // 璁剧疆鏍囩棰滆壊涓鸿摑鑹�
+ },
emphasis: {
focus: 'series'
},
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
index dc35223..541bec2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
@@ -344,7 +344,12 @@
layer.alert("绗�<span style='color: red;'>" + (i + 1) + "</span>琛岋紝閰嶄欢 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> 鏈粦瀹氶綈鏁达紒")
return;
}
- }
+ }
+
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
//鍚敤杈撳叆妗�,鑳屾櫙鑹叉仮澶�
$("#HBarCode_P").removeAttr("disabled"); //浜у搧鐮佹枃鏈鍚敤
@@ -361,6 +366,20 @@
//娓呴櫎缁戝畾淇℃伅缃戞牸鎵爜璁板綍
option.data = [];
table.render(option);
+
+ //閲嶆柊鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
+ //閲嶆柊鍚敤淇濆瓨鎸夐挳
+ $("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ });
//鍘嗗彶缁戝畾璁板綍鏌ヨ
//get_Display();
@@ -493,13 +512,13 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
//鎶婃渶鍚庝竴涓骇鍝佺殑缁戝畾淇℃伅鍐欏叆鍒板巻鍙茶褰曟槑缁嗙綉鏍�
- for (var i = 0; i < option.data.length; i++) {
- option_detail.data.push(option.data[i])
- }
+ //for (var i = 0; i < option.data.length; i++) {
+ // option_detail.data.push(option.data[i])
+ //}
//搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(option_detail.data);
+ var sSubStr = JSON.stringify(option.data);
//鎷兼帴鍙傛暟
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
@@ -512,7 +531,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
+ layer.msg(data.Message, { icon: 1, time: 1000 });
$("#btnSave").addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
@@ -743,7 +762,7 @@
//鍒锋柊琛ㄦ牸鏁版嵁
option.data[rowIndex].HBarCode = "";
- option.data[rowIndex].HBindingQty = option.data[rowIndex].HBindingQty - 1;
+ option.data[rowIndex].HBindingQty = 0;
//option.data[rowIndex].HMaterID = 0;
option.data[rowIndex].HMaterNumber = "";
option.data[rowIndex].HMaterName = "";
@@ -930,6 +949,9 @@
return Result = false;
}
}
+ } else {
+ layer.msg("閰嶄欢缁戝畾淇℃伅涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
return true;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
index 029286f..bd9c223 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
@@ -333,7 +333,19 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+ if (data[i].name == "鐓х墖璺緞") {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150, templet: function (e) {
+ var html = "";
+ if (e.宸ュ簭鍚嶇О == "鎷嶇収" ) {
+ html = '<a style="color:#1E9FFF" href="" target="main_self_frame">' + e.鐓х墖璺緞+'</a>';
+ }
+ return html
+ }
+ });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+ }
}
}
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index babad37..3ca460f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -264,6 +264,10 @@
var HModName3 = "Sc_StationOutBillSub_SN";
var HModName4 = "Sc_StationOutBillSub_Emp";
var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var params = get_UrlVars();
+ var sProcExchBillNo = params[params[0]] == null ? "undefined" : params[params[0]]; //娴佽浆鍗″彿锛堝伐搴忔祦杞崱涓嬫煡鐢ㄥ埌锛�
+ var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
+ var ViewName = params[params[2]] == null ? "h_v_MES_StationOutBillList" : params[params[2]]; //鎵�璋冪敤鐨勮鍥�
//#region 銆愯繃婊ゆ柟妗堛��
@@ -287,7 +291,6 @@
//宸ュ簭娴佽浆鍗′笅鏌ユ爣璁�
var lookDownBar = 0; //(0:涓嬫煡鎿嶄綔锛�1锛氱洿鎺ユ煡鐪�)
- var params = get_UrlVars(); //鑾峰彇鍙傛暟
//鍒濆鍖栬〃鏍�
@@ -1578,8 +1581,8 @@
//蹇�熻繃婊�
function get_FastQuery() {
//鍒ゆ柇鏄惁涓轰笅鏌ユ搷浣滐紝鑻ユ槸鍒欏彉鏇存煡璇㈠崟鍙峰拰鏃堕棿杩囨护鏉′欢
- if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) {
- $("#HProcExchBillNo").val(params[params[0]]);
+ if (sProcExchBillNo != "undefined" && lookDownBar == 0) {
+ $("#HProcExchBillNo").val(sProcExchBillNo);
$("#HBeginDate").val("1990-01-01");
$("#HEndDate").val("2200-12-30");
lookDownBar = 1;
@@ -1684,26 +1687,14 @@
var ajaxLoad = layer.load();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
- //success: function (data1) {
- // if (data1.count == 0) {
- // option.data = [];
- // layer.alert(data1.Message, { icon: 5 });
- // } else {
- // option.data = data1.data;
- // }
- // table.render(option);
- // btnIs();
- // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- // ColFilter();
- // }
- // layer.close(wait);
- //}, error: function () {
- // layer.close(wait);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- //}
+ url: GetWEBURL() + '/Cj_StationOutBillController/GetSc_StationOutBillList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sWhere": sWhere, "HMaker": sessionStorage["HUserName"], "HBillSubType": "3791", "OperationType": OperationType, "ViewName": ViewName },
+
+ //url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
+ //type: "GET",
+ //data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -1711,6 +1702,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
index 76b7386..c09b00b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
@@ -16,6 +16,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
<style type="text/css">
.layui-form-item .layui-inline {
margin-right: 0;
@@ -51,7 +52,8 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_Print" disabled>鎵撳嵃</button>
+ <button type="button" id="batchPrint-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵归噺鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:50px !important;">閫�鍑�</button>
</div>
</div>
@@ -239,10 +241,15 @@
});
//鎵撳嵃
+ form.on('submit(get_Print)', function () {
+ get_Print();
+ })
+
+ //鎵归噺鎵撳嵃
form.on('submit(get_BatchPrint)', function () {
get_BatchPrint();
})
-
+
//閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
if (params[1] != null) {
@@ -267,7 +274,8 @@
, { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', width: 120 }//鐢熶骇璁㈠崟鍙�
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍐呯爜', width: 120 }//鐢熶骇璁㈠崟鍙�
+ , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -291,7 +299,7 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
+ "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HWorkShopID": 0, "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
, "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
, "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
, "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HBatchManager": "", "HGroupNumber": ""
@@ -332,7 +340,8 @@
rowdata.push(
{
"HICMOInterID": subdata[i].HICMOInterID, "HICMOEntryID": subdata[i].HICMOEntryID, "HICMOBillNo": subdata[i].HICMOBillNo
- , "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
+ , "HWorkShopID": subdata[i].HWorkShopID, "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
, "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
@@ -352,6 +361,7 @@
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', width: 120 }//鐢熶骇璁㈠崟鍙�
+ , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿鍐呯爜', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -439,6 +449,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#print-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵撳嵃鎸夐挳鍚敤
+ $('#batchPrint-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵归噺鎵撳嵃鎸夐挳鍚敤
layer.close(index);
}
else {
@@ -499,7 +510,7 @@
}
//鎵撳嵃
- function get_BatchPrint() {
+ function get_Print() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
@@ -525,6 +536,91 @@
}
}
+
+ //鎵归噺鎵撳嵃
+ var time;
+ var num = 0;
+ function get_BatchPrint() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length > 0) {
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
+ time = setInterval(function () {
+ dy_PL(data);
+ }, 1000);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ }
+
+ function dy_PL(rest) {
+ var HInterID = rest[num].HInterID.toString();
+ var sWhere = "select cast( b.娴佹按鍙� as float) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭浠ｇ爜,b.宸ュ簭鍚嶇О,a.鎵瑰彿,b.宸ヨ壓宸ヤ綔涓績,b.宸ヨ壓宸ヨ壓鍙傛暟,a.鐢熶骇杞﹂棿,b.宸ユ鍚嶇О from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") and b.宸ュ簭浠ｇ爜 != '9999' order by cast(b.娴佹按鍙� as int)"
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ for (var i = 0; i < data.data.length; i++) {
+ data.data[i]["娴佹按鍙�"] = data.data[i]["娴佹按鍙�"].toFixed(1);
+ dataPrint.push(data.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/娴佽浆鍗SON.grf"),
+ data: Customer
+ };
+
+ console.log(data.data[0].鍗曟嵁鍙�);
+ //var args = {
+ // report: urlAddRandomNo("../../grf/cs10.grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+
+ if (rest.length <= num + 1) {
+ num = 0;
+ clearInterval(time);
+ } else {
+ num++;
+ }
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ }
+
//琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
function set_GridDelete(obj) {
var data = obj.data;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
index 0eb26c6..dc73eca 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
@@ -430,7 +430,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_MaterPreventErrMouldBill/get锘縂y_MaterPreventErrMouldBillMainList',
+ url: GetWEBURL() + '/Gy_MaterPreventErrMouldBill/get锘縂y_MaterPreventErrMouldBillMainList_Main',
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
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/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/Xs_SeOutStockBillList.html"
index 74083ab..5afe216 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/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/Xs_SeOutStockBillList.html"
@@ -1314,7 +1314,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
--
Gitblit v1.9.1