From 772f5bd3cba63a4cb007e12ccb3975834a795fd6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 01 七月 2024 11:27:11 +0800
Subject: [PATCH] spc质量报表
---
WebTM/App_Data/MssqlReportData.cs | 3
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 364 +++++++++++++++++++++++----------------------------
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html | 2
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 2
WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_CF.html | 11 +
WebTM/WebTM.csproj | 9 +
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 14 +
8 files changed, 204 insertions(+), 203 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 7f9b0c5..3393272 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -21,6 +21,7 @@
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YSJ娴嬭瘯
//public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //鏂帿灏�
+ public const string SqlConnStr = "Data Source=30.10.7.6;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //鏂帿灏�
//public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//甯呭▉
//public const string SqlConnStr = "Data Source=192.168.1.250;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴
//public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴娴嬭瘯
@@ -29,7 +30,7 @@
//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
//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.2.10;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 b/WebTM/WebTM.csproj
index cb91fb4..279e1f6 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -954,6 +954,15 @@
<Content Include="views\grf\閿�鍞皟浠峰崟涓嶅惈绋�.grf" />
<Content Include="views\grf\閿�鍞皟浠峰崟鍚◣锛堜粎闄愬惈绋庢墦鍗帮級.grf" />
<Content Include="views\grf\閿�鍞��璐у崟娴嬭瘯1.grf" />
+ <Content Include="views\grf\aaa.grf" />
+ <Content Include="views\grf\鍖呰鍗曠墿鏂欐爣璇嗗崱%28缃戦〉鐗�%29.grf" />
+ <Content Include="views\grf\鍖呰鍗曠墿鏂欐爣璇嗗崱%28缃戦〉鐗�%291.grf" />
+ <Content Include="views\grf\鐗╂枡鏉＄爜%28涓冭绾稿ぇ%29_浜斾簯.grf" />
+ <Content Include="views\grf\鐧芥爣鎵撳嵃.grf" />
+ <Content Include="views\grf\缁勬墭鍗曠墿鏂欐爣璇嗗崱%28缃戦〉鐗�%29.grf" />
+ <Content Include="views\grf\閫佽揣鍗�%28A4绾�%29.grf" />
+ <Content Include="views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
+ <Content Include="views\grf\閫佽揣鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
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 bb508be..3ea65fb 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"
@@ -439,7 +439,7 @@
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
$.ajax({
type: "POST",
- url: GetWEBURL() + "Sc_MouldUpperBill/SaveAddSc_MouldLowerBill_PDA",
+ url: GetWEBURL() + "Sc_MouldUpperBill/AddSc_MouldLowerBill_PDA",
async: true,
data: { "oMain": oMain },
dataType: "json",
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 d018727..3d615c2 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"
@@ -441,7 +441,7 @@
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
$.ajax({
type: "POST",
- url: GetWEBURL() + "Sc_MouldUpperBill/SaveAddSc_MouldUpperBill_PDA",
+ url: GetWEBURL() + "Sc_MouldUpperBill/AddSc_MouldUpperBill_PDA",
async: true,
data: { "oMain": oMain },
dataType: "json",
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_InspectionFormReport.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_InspectionFormReport.html"
index abfd8e7..043c41e 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_InspectionFormReport.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_InspectionFormReport.html"
@@ -15,6 +15,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -55,9 +56,11 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcName" id="HProcName">
+ <label class="layui-form-label">鏍锋湰鏁�</label>
+ <div class="layui-input-block">
+ <select name="limit" id="limit" lay-verify="required" lay-search class="layui-input">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -69,21 +72,25 @@
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </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;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -95,9 +102,13 @@
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妫�楠岄」鐩�</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠岄」鐩�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HCheckItem" id="HCheckItem">
+ <input type="hidden" class="layui-input" lay-verify="HQCCheckItemID" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+ <input type="text" class="layui-input" name="HQCCheckItemNumber" id="HQCCheckItemNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHQCCheckItemID" id="btnHQCCheckItemID" style="padding: 0 10px;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -175,7 +186,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -187,6 +198,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , soulTable = layui.soulTable
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
@@ -215,6 +227,19 @@
break;
};
});
+
+ //#region 浜у搧缂栫爜
+ form.on('submit(btnHMaterID)', function (data) {
+ btnHMaterID();
+ });
+ //#endregion
+
+ //#region 妫�楠岄」鐩�
+ form.on('submit(btnHQCCheckItemID)', function (data) {
+ btnHQCCheckItemID();
+ });
+ //#endregion
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -269,101 +294,74 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
get_Dept();
+ get_Limit();
//鍒濆鍖栨椂闂�
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display();
//get_FastQuery();
DisPlay_HideColumn();
- set_Line();
+ //set_Line();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ var columns = [];
+
+ columns.push({ type: 'numbers', title: '搴忓彿' });
+
+ //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+ var time1 = Date.parse(new Date($("#HBeginDate").val()));//寮�濮嬫椂闂�
+ var time2 = Date.parse(new Date($("#HEndDate").val()));//缁撴潫鏃堕棿
+ var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
+ //鑾峰彇骞�
+ var yyyy = new Date($("#HBeginDate").val()).getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = new Date($("#HBeginDate").val()).getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = new Date(new Date($("#HBeginDate").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
+ }
+
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-430'
- //, page: true
+ , height: 'full-50'
+ , cellMinWidth: 90
+ , limit: 500
, totalRow: true
- , cellMinWidth: 70
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鈭慩' }
- ,{ field: 'xh', title: '搴忓彿' }
- , { field: '1', title: '1' , totalRow: true}
- , { field: '2', title: '2' , totalRow: true}
- , { field: '3', title: '3' , totalRow: true}
- , { field: '4', title: '4' , totalRow: true}
- , { field: '5', title: '5' , totalRow: true}
- , { field: '6', title: '6' , totalRow: true}
- , { field: '7', title: '7' , totalRow: true}
- , { field: '8', title: '8' , totalRow: true}
- , { field: '9', title: '9', totalRow: true}
- , { field: '10', title: '10' , totalRow: true}
- , { field: '11', title: '11' , totalRow: true}
- , { field: '12', title: '12' , totalRow: true}
- , { field: '13', title: '13' , totalRow: true}
- , { field: '14', title: '14' , totalRow: true}
- , { field: '15', title: '15' , totalRow: true}
- , { field: '16', title: '16' , totalRow: true}
- , { field: '17', title: '17' , totalRow: true}
- , { field: '18', title: '18' , totalRow: true}
- , { field: '19', title: '19' , totalRow: true}
- , { field: '20', title: '20' , totalRow: true}
- , { field: '21', title: '21' , totalRow: true}
- , { field: '22', title: '22' , totalRow: true}
- , { field: '23', title: '23' , totalRow: true}
- , { field: '24', title: '24' , totalRow: true}
- , { field: '25', title: '25', totalRow: true}
- ]]
- , data: []
- }
- var sj = [];
- for (let i = 0; i < 5; i++) {
- var obj = {
- xh : i+1,
- 1: (Math.random() * (15 - 13) ).toFixed(2),
- 2: (Math.random() * (15 - 13) ).toFixed(2),
- 3: (Math.random() * (15 - 13) ).toFixed(2),
- 4: (Math.random() * (15 - 13) ).toFixed(2),
- 5: (Math.random() * (15 - 13) ).toFixed(2),
- 6: (Math.random() * (15 - 13) ).toFixed(2),
- 7: (Math.random() * (15 - 13) ).toFixed(2),
- 8: (Math.random() * (15 - 13) ).toFixed(2),
- 9: (Math.random() * (15 - 13) ).toFixed(2),
- 10: (Math.random() * (15 - 13) ).toFixed(2),
- 11: (Math.random() * (15 - 13) ).toFixed(2),
- 12: (Math.random() * (15 - 13) ).toFixed(2),
- 13: (Math.random() * (15 - 13) ).toFixed(2),
- 14: (Math.random() * (15 - 13) ).toFixed(2),
- 15: (Math.random() * (15 - 13) ).toFixed(2),
- 16: (Math.random() * (15 - 13) ).toFixed(2),
- 17: (Math.random() * (15 - 13) ).toFixed(2),
- 18: (Math.random() * (15 - 13) ).toFixed(2),
- 19: (Math.random() * (15 - 13) ).toFixed(2),
- 20: (Math.random() * (15 - 13) ).toFixed(2),
- 21: (Math.random() * (15 - 13) ).toFixed(2),
- 22: (Math.random() * (15 - 13) ).toFixed(2),
- 23: (Math.random() * (15 - 13) ).toFixed(2),
- 24: (Math.random() * (15 - 13) ).toFixed(2),
- 25: (Math.random() * (15 - 13) ).toFixed(2)
- };
- sj.push(obj);
- }
- option.data = sj;
-
-
+ , loading: false
+ , cols: [columns]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
table.render(option);
}
//鍔犺浇缃戞牸
function get_Display(sWhere) {
- sWhere = $("#HYear").val();
var wait = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/QC_CustomerAppealReport/QC_InspectionFormReport',
@@ -371,34 +369,8 @@
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
- var col = [];
if (data1.count == 1) {
- var data = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
- //鍒ゆ柇鏄惁鏄函鑻辨枃
- var patrn = new RegExp("[\u4E00-\u9FA5]+");
- for (var i = 0; i < data.length; i++) {
- if (!patrn.test(data[i].name)) {
- col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
- }
- else {
- switch (data[i].Type) {
- case 'DateTime':
- col.push({ field: data[i].name, 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: 120 });
- break;
- default:
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
- }
- }
- }
-
- option.cols = [col];
option.data = data1.data;
-
table.render(option);
layer.close(wait);
} else {
@@ -563,18 +535,8 @@
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
- if (sessionStorage["OrganizationID"] == 100014) {
- HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
- HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
- HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
- HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
- HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
- HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
- HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
- } else {
- for (var i = 0; i < data.length; i++) {
- HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
- }
+ for (var i = 0; i < data.length; i++) {
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
}
$("#HDeptName").append(HDeptName);
@@ -585,70 +547,104 @@
})
}
+ //鏍锋湰鏁伴噺
+ function get_Limit() {
+ var limit = "";
+ for (var i = 1; i <= 50; i++) {
+ limit += '<option style="color:blue;" value="' + i + '" >' + i + '</option>';
+ }
+ $("#limit").append(limit);
+ form.render('select');
+ }
+
//蹇�熻繃婊�
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var HBillNo = $("#HBillNo").val();//娴佽浆鍗″彿
- var HICMOBillNo = $("#HICMOBillNo").val(); //鎵瑰彿
- var HWorkShopID = $("#HDeptName").val();//杞﹂棿
- var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
- var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HState = $("#HState").val();//鐘舵��
- var HSTATUS = $("#HSTATUS").val();//鐢熶骇璁㈠崟鐘舵��
- var HOrgID = sessionStorage["OrganizationID"];
- var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var sWhere1 = "";
- 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;
- }
- sWhere1 += " and " + ColName + " " + com;
+ var HDeptID = $("#HDeptName").val();//杞﹂棿
+ var limit = $("#limit").val();//鏍锋湰鏁�
+ var HMaterID = $("#HMaterID").val();//鐗╂枡
+ var HQCCheckItemID = $("#HQCCheckItemID").val();//妫�楠岄」鐩�
+
+ if (limit == 0) {
+ return layer.msg("鏍锋湰鏁伴噺涓嶈兘涓�0!");
}
- if (checkWRuku) {
- checkWRuku = 1;
- } else {
- checkWRuku = 0;
+ if (HMaterID == 0) {
+ return layer.msg("鐗╂枡涓嶈兘涓虹┖!");
+ }
+
+ if (HQCCheckItemID == 0) {
+ return layer.msg("妫�楠岄」鐩笉鑳戒负绌�!");
}
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
- , HICMOBillNo: HICMOBillNo
- , HWorkShopID: HWorkShopID
- , F_BSV_WYID: F_BSV_WYID
- , HMaterNumber: HMaterNumber
- , HOrgID: HOrgID
- , HBillNo: HBillNo
- , IsTrue: checkWRuku
- , HState: HState
- , HSTATUS: HSTATUS
- , sWhere1: sWhere1
+ , HDeptID: HDeptID
+ , limit: limit
+ , HMaterID: HMaterID
+ , HQCCheckItemID: HQCCheckItemID
}
- //get_Display(JSON.stringify(sWhere));
+ get_Display(JSON.stringify(sWhere));
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
}
+
+ //鐗╂枡鍒楄〃
+ function btnHMaterID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+ //妫�楠岄」鐩垪琛�
+ function btnHQCCheckItemID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '妫�楠岄」鐩垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HQCCheckItemID").val(checkStatus.data[0].HItemID);
+ $("#HQCCheckItemNumber").val(checkStatus.data[0].浠ｇ爜);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
@@ -666,32 +662,6 @@
$("input[name='checkWRuku']").prop("checked", false);
form.render()
sWhere = "";
- }
-
- //鐗╂枡
- function get_btnHMaterID() {
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐗╂枡'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
- }
- $("#HMaterID").val(checkStatus.data[0].HItemID);
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- })
}
//闅愯棌鍒楄缃�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 91123ac..3a3bd46 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -39,6 +39,7 @@
</div>
</div>
<button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">鎵撳嵃</button>
+ <button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden" ></button>
<div class="layui-inline" style="width: 200px;">
<div class="layui-input-block">
<select name="PrintName" lay-verify="required" id="PrintName">
@@ -1028,7 +1029,7 @@
});
//鎵撳嵃鎸夐挳
- form.on('submit(Print)', function (data) {//閫�鍑�
+ form.on('submit(Print2)', function (data) {//閫�鍑�
//鎵撳紑鎵撳嵃妯℃澘
var linterid = $("#HInterID").val();
//var linterid = "28973";
@@ -1089,6 +1090,17 @@
})
});
+ //鎵撳嵃鎸夐挳
+ form.on('submit(Print)', function (data) {//閫�鍑�
+ //鎵撳紑鎵撳嵃妯℃澘
+ var linterid = $("#HInterID").val();
+ var Type = "HBarCodePrint";
+ var OpenTmp = "鐧芥爣鎵撳嵃1";
+ //var ReportViewer = document.getElementById("ReportViewer");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+ $("#Print2").click();
+ });
+
//鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
table.on('tool(smjl-table)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index 9cff146..2959eb5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -445,7 +445,7 @@
////var linterid = $("#HInterID").val();
////var linterid = "28973";
var Type = "HBarCodePrint";
- var OpenTmp = "鐧芥爣鎵撳嵃";
+ var OpenTmp = "鐧芥爣鎵撳嵃1";
//var ReportViewer = document.getElementById("ReportViewer");
window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
});
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_CF.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_CF.html"
index 87b4d42..72eae9c 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_CF.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_CF.html"
@@ -158,6 +158,14 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProjectNum" id="HProjectNum" style="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
@@ -166,7 +174,7 @@
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="background-color:#efefef4d;" readonly></textarea>
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="background-color:#efefef4d;" readonly></textarea>
</div>
</div>
</div>
@@ -406,6 +414,7 @@
, "HWorkShopID": d.data[0].HWorkShopID
, "HExplanation": d.data[0].鎽樿
, "HRemark": d.data[0].琛ㄥご澶囨敞
+ , "HProjectNum": d.data[0].椤圭洰鍙�
});
layer.close(ajaxLoad);
--
Gitblit v1.9.1