From 7d57d520febeded35e08f557732d656404dbde17 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 10 九月 2021 16:45:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html | 799 ++++++++++++++++++++------------------
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html | 114 ++--
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 86 +--
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html | 58 +-
WebTM/views/生产管理/生产上料单/Sc_MaterToSourceBillList.html | 28
WebTM/views/IpadIndex.html | 7
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 113 +++-
WebTM/layuiadmin/layui/css/ReportPlatform.css | 2
8 files changed, 640 insertions(+), 567 deletions(-)
diff --git a/WebTM/layuiadmin/layui/css/ReportPlatform.css b/WebTM/layuiadmin/layui/css/ReportPlatform.css
index a2d16e9..851b901 100644
--- a/WebTM/layuiadmin/layui/css/ReportPlatform.css
+++ b/WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -52,7 +52,7 @@
.cns {
border: 1px solid #5FB878;
- height: 140px;
+ height: 160px;
border-radius: 5px;
}
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 21547a0..662ca53 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -82,9 +82,9 @@
html1 += '<dd>';
html1 += '<h1 style="display:none;"><span>璧勬簮ID锛�</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
html1 += '<h1><span>璁惧缂栧彿锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
- html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
- html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
- html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
+ //html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
+ //html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
+ //html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
html1 += '<h1><span>璐熻矗浜猴細</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
html1 += '</dd>';
html1 += '</dl>';
@@ -175,6 +175,7 @@
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].HMaterName + '</span></h1>';
html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
+ html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty+'</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
index efcd069..f26ae2f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
@@ -383,7 +383,8 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -396,7 +397,7 @@
var option2;
//#endregion
-
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -418,302 +419,9 @@
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- //鍒濆鍖栨彃浠�
- function set_InitFrom() {
- //鏃ユ湡鏃堕棿閫夋嫨鍣�
- laydate.render({
- elem: '#HDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HMakeDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HUpDateDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HCheckDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HCloseDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HDeleteDate'
- , type: 'datetime'
- });
- }
+ //#endregion
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- Table1(); //淇濆吇椤瑰垪琛�
- Table2(); //閰嶄欢椤瑰垪琛�
-
- }
-
- //鍒濆鍖栭厤鏂欏垪琛�
- function Table1() {
- //琛ㄥご
- columns = [
- { type: 'checkbox', fixed: 'left' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HBarCode', title: '鎵弿鏉＄爜', edit: 'text', hide: true }
- , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', hide: true }
- , { field: 'HNumber', title: '鐗╂枡浠ｇ爜', edit: 'text' }
- , { field: 'HName', title: '鐗╂枡鍚嶇О', edit: 'text' }
- , { field: 'HModel', title: '瑙勬牸鍨嬪彿', edit: 'text' }
- , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
- , { field: 'HUnitName', title: '鍗曚綅', edit: 'text' }
- , { field: 'HMQty', title: '閰嶆枡鏁伴噺', edit: 'text' }
- , { field: 'HQty', title: '瀹為厤鏁伴噺', edit: 'text' }
- ];
- option = {
- id: 'mainTable'
- , elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , defaultToolbar: false //鏄惁鏄剧ず鍙充晶宸ュ叿鏍�
- , page: false
- , cellMinWidth: 120
- , height: 350
- , cols: [columns]
- , done: function (res, curr, count) {
-
- }
- };
- }
-
- //鍒濆鍖栭厤浠堕」鍒楄〃
- function Table2() {
- //琛ㄥご
- columns1 = [
- { type: 'checkbox', fixed: 'left' }
- , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HMouldID', title: '娌诲叿ID', edit: 'text', hide: true}
- , { field: 'HMouldNumber', title: '娌诲叿浠ｇ爜', edit: 'text' }
- , { field: 'HMouldName', title: '娌诲叿鍚嶇О', edit: 'text' }
- , { field: 'HMouldSpec', title: '瑙勬牸鍨嬪彿', edit: 'text' }
- ];
- option2 = {
- id: 'mainTable1'
- , elem: '#mainTable1'
- , toolbar: '#toolbarDemo1'
- , defaultToolbar: false //鏄惁鏄剧ず鍙充晶宸ュ叿鏍�
- , page: false
- , cellMinWidth: 120
- , height: 350
- , cols: [columns1]
- , done: function (res, curr, count) {
-
- }
- };
- }
-
- //鏃犳簮鍗曟柊澧�
- function set_AddFNew()
- {
- //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
-
- }
-
- //鏈夋簮鍗曟柊澧�
- function set_AddNew() {
- get_MAXNum();
- set_SourceAdd();
- option.data = [];
- option2.data = [];
- table.render(option);
- table.render(option2);
- }
-
- //缂栬緫
- function set_EditFromGrid()
- {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- refSav = "Update";
- $('#HMaterCode').attr("disabled", true);
- $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HMaterName').attr("disabled", true);
- $('#HMaterSpec').attr("disabled", true);
- $('#HBeginDate').attr("disabled", true);
- $('#HSourceName').attr("disabled", true);
- $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HMainSourceBillNo').attr("disabled", true);
- $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
-
-
- $('#SourceType').attr("disabled", true);
- form.render('select');
- $('#HICMOBillNo').attr("disabled", true);
-
- set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
- set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
-
- }
-
- //缂栬緫鑾峰彇琛ㄥご
- function set_EditForm(linterid) {
- //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
- $.ajax({
- url: GetWEBURL() + "Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
- type: "GET",
- data: {
- "HID": linterid
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_MouldMaintain[0];
- form.val("component-form-group", {
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HBeginDate": formatDate(data.淇濆吇寮�濮嬫棩鏈�)
- , "HEndDate": formatDate(data.淇濆吇缁撴潫鏃ユ湡)
- , "HExplanation": data.鎽樿
- , "HRemark": data.澶囨敞
- , "HPlanNo": data.淇濆吇璁″垝缂栧彿
- , "HPlanInterID": data.淇濆吇璁″垝鍐呯爜
- , "HMouldID": data.HMouldID
- , "HMouldName": data.浜у搧妯″叿
-
- });
-
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
-
- // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
- function formatDate(date) {
- var d = new Date(date),
- month = '' + (d.getMonth() + 1),
- day = '' + d.getDate(),
- year = d.getFullYear();
-
- if (month.length < 2) month = '0' + month;
- if (day.length < 2) day = '0' + day;
-
- return [year, month, day].join('-');
- }
-
- // 缂栬緫鑾峰彇琛ㄤ綋
- function set_EditGrid(linterid) {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
- $.ajax({
- url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
- type: "GET",
- data: { "HInterID": linterid },
- success: function (result) {
- if (result.count == 1) {
- option.data = result.list[0];
- table.render(option);
- option2.data = result.list[1];
- table.render(option2);
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //鏈夋簮鍗曟柊澧�
- function set_SourceAdd() {
- refSav = "Add";
- //鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鎶ュ伐鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
-
- //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
- $('#HICMOBillNo').attr("disabled", true);
- $('#HSourceBillNo').attr("disabled", true);
- $('#HProcExchBillNo').attr("disabled", true);
- $('#HProcName').attr("disabled", true);
- $('#HMaterCode').attr("disabled", true);
- $('#HMaterList').addClass("layui-btn-disabled").attr("disabled",true);
- $('#HMaterName').attr("disabled", true);
- $('#HMaterSpec').attr("disabled", true);
- $('#HPlanQty').attr("disabled", true);
- $('#HSourceName').attr("disabled", true);
- $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HWorkBeginDate').attr("disabled", true);
- $('#HWorkReportDate').attr("disabled", true);
-
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL() + "/Sc_MaterToSourceBill/GetMESMaterToSourceFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: {
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HBillType
- },
- dataType: "json",
- success: function (data) {
- if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
- {
- var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
- $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
- $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
- $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
- $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
- $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
- $("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
- $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
- $("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
- $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
- $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
- $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
- $("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
- $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
- $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
- $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
- $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
- $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟鍙�
- $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
- $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁㈠崟鏁伴噺
-
- }
- else {
- layer.alert(data.Message, { icon: 5 });
-
- }
- },
- error: function (err) {
- layer.alert(err, { icon: 5 });
- }
- });
- }
-
- //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
- function get_MAXNum() {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3786' },
- success: function (d) {
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(0);
- }
- });
- }
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//鏂板淇濆瓨
form.on('submit(Add)', function (data) {
@@ -732,7 +440,7 @@
form.on('submit(Saver)', function (data) {
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
@@ -749,17 +457,18 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.confirm(data.Message, {icon: 1,
+ layer.confirm(data.Message, {
+ icon: 1,
btn: ['纭']
}, function (index) {
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
});
}
else {
@@ -782,72 +491,6 @@
ReVerIfySaver();
});
- //瀹℃牳鎻愪氦
- function SaveVerify()
- {
- var InterID = $("#HInterID").val();
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
- {
- return false;
- }
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- //layer.close(layer.index);
- //window.parent.location.reload();
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 })
- }
- },
- error: function (err) {
- layer.alert(err, { icon: 5 })
- }
- })
- }
-
- //鍙嶅鏍告彁浜�
- function ReVerIfySaver() {
- var InterID = $("#HInterID").val();
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
- {
- return false;
- }
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- //layer.close(layer.index);
- //window.parent.location.reload();
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 })
- }
- },
- error: function (err) {
- layer.alert(err, { icon: 5 })
- }
- })
- }
-
-
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
@@ -868,7 +511,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_MaterToSourceBill/get_CheckTypeByBarCode_Json",
type: "GET",
- data: { "HBarCode": HBarCode, "HSourceID": "111", "HICMOInterID": "100030", "HICMOEntryID": "100050"},
+ data: { "HBarCode": HBarCode, "HSourceID": "111", "HICMOInterID": "100030", "HICMOEntryID": "100050" },
success: function (result) {
console.info(result);
if (result.count == 1) {
@@ -876,8 +519,7 @@
$("#HSourceID").val(result.data.Gy_Source[0].HItemID);
$("#HSourceName").val(result.data.Gy_Source[0].HName);
}
- if (result.Verify == '鐢ㄦ枡娓呭崟鐗╂枡鏉＄爜')
- {
+ if (result.Verify == '鐢ㄦ枡娓呭崟鐗╂枡鏉＄爜') {
//鍥炲啓鐢ㄦ枡娓呭崟鏁版嵁鍒楄〃
// 婧愭暟鎹�
tableBak = table.cache.mainTable;
@@ -889,8 +531,7 @@
option.data = table.cache["mainTable"];
table.render(option);
}
- else
- {
+ else {
// 鍘婚噸(涓嶈兘鏈夌浉鍚屾壂鐮佺墿鏂�)
for (var i = 0; i < tableBak.length; i++) {
console.log(tableBak[i].HMaterID, result.data[0].HMaterID);
@@ -1116,7 +757,7 @@
var AddRow = table.cache['mainTable'];
switch (obj.event) {
//鍒犻櫎涓�琛�
- case 'btn-DeleteLine': btnDeleteLine(checkStatus,data, obj);
+ case 'btn-DeleteLine': btnDeleteLine(checkStatus, data, obj);
break;
}
});
@@ -1133,6 +774,405 @@
break;
}
});
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //鍒濆鍖栨彃浠�
+ function set_InitFrom() {
+ //鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HMakeDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HUpDateDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCheckDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCloseDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDeleteDate'
+ , type: 'datetime'
+ });
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ Table1(); //淇濆吇椤瑰垪琛�
+ Table2(); //閰嶄欢椤瑰垪琛�
+
+ }
+
+ //鍒濆鍖栭厤鏂欏垪琛�
+ function Table1() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HBarCode', title: '鎵弿鏉＄爜', edit: 'text', hide: true }
+ , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', hide: true }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜', edit: 'text' }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О', edit: 'text' }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿', edit: 'text' }
+ , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
+ , { field: 'HUnitName', title: '鍗曚綅', edit: 'text' }
+ , { field: 'HMQty', title: '閰嶆枡鏁伴噺', edit: 'text' }
+ , { field: 'HQty', title: '瀹為厤鏁伴噺', edit: 'text' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: false //鏄惁鏄剧ず鍙充晶宸ュ叿鏍�
+ , page: false
+ , cellMinWidth: 120
+ , height: 350
+ , cols: [columns]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
+ //鍒濆鍖栭厤浠堕」鍒楄〃
+ function Table2() {
+ //琛ㄥご
+ columns1 = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HMouldID', title: '娌诲叿ID', edit: 'text', hide: true}
+ , { field: 'HMouldNumber', title: '娌诲叿浠ｇ爜', edit: 'text' }
+ , { field: 'HMouldName', title: '娌诲叿鍚嶇О', edit: 'text' }
+ , { field: 'HMouldSpec', title: '瑙勬牸鍨嬪彿', edit: 'text' }
+ ];
+ option2 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , toolbar: '#toolbarDemo1'
+ , defaultToolbar: false //鏄惁鏄剧ず鍙充晶宸ュ叿鏍�
+ , page: false
+ , cellMinWidth: 120
+ , height: 350
+ , cols: [columns1]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew()
+ {
+ //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+ refSav = "Add";
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#form0")[0].reset();
+ layui.form.render();
+ get_MAXNum();
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鎶ュ伐鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+ }
+
+ //鏈夋簮鍗曟柊澧�
+ function set_AddNew() {
+ get_MAXNum();
+ set_SourceAdd();
+ option.data = [];
+ option2.data = [];
+ table.render(option);
+ table.render(option2);
+ }
+
+ //缂栬緫
+ function set_EditFromGrid()
+ {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ refSav = "Update";
+ $('#HMaterCode').attr("disabled", true);
+ $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMaterName').attr("disabled", true);
+ $('#HMaterSpec').attr("disabled", true);
+ $('#HBeginDate').attr("disabled", true);
+ $('#HSourceName').attr("disabled", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMainSourceBillNo').attr("disabled", true);
+ $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+
+
+ $('#SourceType').attr("disabled", true);
+ form.render('select');
+ $('#HICMOBillNo').attr("disabled", true);
+
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+
+ }
+
+ //缂栬緫鑾峰彇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Sc_MaterToSourceBill/Sc_MaterToSourceBillListCheckDetai",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_MaterToSourceBillMain[0];
+ form.val("component-form-group", {
+ "HInterID": data.hmainid
+ , "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HPlanQty":"0"
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HICMOInterID": data.HICMOInterID
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HProcExchBillNo": data.宸ュ簭娴佽浆鍗″彿
+ , "HProcExchQty": ""
+ , "HSourceInterID": data.HMainSourceInterID
+ , "HSourceEntryID": data.HMainSourceEntryID
+ , "HSourceBillNo": data.HMainSourceBillNo
+ , "HSourceBillType": data.HMainSourceBillType
+ , "HProcName":""
+ , "HProcID": "0"
+ , "HMaterCode": data.浜у搧浠ｇ爜
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.浜у搧鍚嶇О
+ , "HMaterSpec": data.瑙勬牸鍨嬪彿
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮
+ , "HGroupName": data.鐢熶骇鐝粍
+ , "HGroupID": data.HGroupID
+ , "HWorkerName": data.鎿嶄綔宸�
+ , "HWorkerID": data.HWorkerID
+ , "HMaker": data.鍒跺崟浜� //鍒跺崟浜�
+ , "HMakeDate": formatDate(data.鍒跺崟鏃ユ湡) //鍒跺崟鏃ユ湡
+ , "HUpDater": sessionStorage["HUserName"] //淇敼浜�
+ , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss") //淇敼鏃ユ湡
+ , "HChecker": data.瀹℃牳浜� //瀹℃牳浜�
+ , "HCheckDate": formatDate(data.瀹℃牳鏃ユ湡) //瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜� //鍏抽棴浜�
+ , "HCloseDate": formatDate(data.鍏抽棴鏃ユ湡) //鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜� //浣滃簾浜�
+ , "HDeleteDate": formatDate(data.浣滃簾鏃ユ湡) //浣滃簾鏃ユ湡
+
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+
+ // 缂栬緫鑾峰彇琛ㄤ綋
+ function set_EditGrid(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sc_MaterToSourceBill/Sc_MaterToSourceBillListProjectDetai',
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.list[0];
+ table.render(option);
+ option2.data = result.list[1];
+ table.render(option2);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鏈夋簮鍗曟柊澧�
+ function set_SourceAdd() {
+ refSav = "Add";
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鎶ュ伐鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+
+ //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+ $('#HICMOBillNo').attr("disabled", true);
+ $('#HSourceBillNo').attr("disabled", true);
+ $('#HProcExchBillNo').attr("disabled", true);
+ $('#HProcName').attr("disabled", true);
+ $('#HMaterCode').attr("disabled", true);
+ $('#HMaterList').addClass("layui-btn-disabled").attr("disabled",true);
+ $('#HMaterName').attr("disabled", true);
+ $('#HMaterSpec').attr("disabled", true);
+ $('#HPlanQty').attr("disabled", true);
+ $('#HSourceName').attr("disabled", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HWorkBeginDate').attr("disabled", true);
+ $('#HWorkReportDate').attr("disabled", true);
+
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/GetMESMaterToSourceFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: {
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
+ "HSourceBillType": HBillType
+ },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
+ $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
+ $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
+ $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
+ $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
+ $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
+ $("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
+ $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
+ $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+ $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+ $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
+ $("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
+ $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+ $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
+ $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
+ $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
+ $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟鍙�
+ $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
+ $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁㈠崟鏁伴噺
+
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
+ function get_MAXNum() {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3786' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(0);
+ }
+ });
+ }
+
+ //瀹℃牳鎻愪氦
+ function SaveVerify()
+ {
+ var InterID = $("#HInterID").val();
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
+ if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
+ //鍙嶅鏍告彁浜�
+ function ReVerIfySaver() {
+ var InterID = $("#HInterID").val();
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
+ if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
//鍒犻櫎琛�
function btnDeleteLine(checkStatus,data) {
@@ -1182,6 +1222,7 @@
});
}
+ //#endregion
//浠ヤ笂涓簂ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\270\212\346\226\231\345\215\225/Sc_MaterToSourceBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\270\212\346\226\231\345\215\225/Sc_MaterToSourceBillList.html"
index 2e1c027..cb215d1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\270\212\346\226\231\345\215\225/Sc_MaterToSourceBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\270\212\346\226\231\345\215\225/Sc_MaterToSourceBillList.html"
@@ -152,7 +152,7 @@
case 'btn-Audit': set_CheckBill();
break;
//鍙嶅鏍告寜閽�
- case 'btn-DeAudit': set_DeCheckBill();
+ case 'btn-DeAudit': set_AbandonCheck();
break;
//閫�鍑�
case 'get_Exit': Pub_Close(2);
@@ -199,12 +199,14 @@
, page: true
, cellMinWidth: 120
, cols: [[
- { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
- , { field: 'HBillType', title: 'HBillType', hide: true }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+ , { field: 'HBillType', title: 'HBillType', hide: true }
+ , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', hide: true }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
, { field: 'HSourceID', title: 'HSourceID', hide: true }
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
@@ -221,19 +223,9 @@
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: 'hsubid', title: 'hsubid', hide: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HUnitID', title: 'HUnitID', hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
- , { field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅鍚嶇О' }
- , { field: '鏁伴噺', title: '鏁伴噺' }
- , { field: '浠堕噺', title: '浠堕噺' }
- , { field: '鎵弿鏃堕棿', title: '鎵弿鏃堕棿', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
- , { field: '绠卞彿鏉＄爜', title: '绠卞彿鏉＄爜' }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
@@ -407,7 +399,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -442,7 +434,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index ba09076..4fb7b44 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -70,7 +70,7 @@
<label class="layui-form-label">璁惧</label>
<div class="layui-input-inline">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
<button type="button" lay-submit="" class="layui-btn" lay-filter="ProductModulList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -166,7 +166,7 @@
var option=[];
var sBillType = "3903";
- var TabRow = { /*"HDotCheckID": 0, "HDotCheckCode": "",*/"HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+ var TabRow = { "HDotCheckItemID": 0, "HDotCheckCode": "","HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
//#endregion
@@ -312,8 +312,8 @@
columns = [
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- //, { field: 'HDotCheckID', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', hide: true }
- //, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode" }
+ , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode" }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
@@ -383,42 +383,42 @@
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- //if (obj.event === 'HDotCheckCode') //鐐规椤圭洰浠ｇ爜
- //{
- // //椤甸潰灞�-鑷畾涔�
- // layer.open({
- // type: 2,
- // skin: 'layui-layer-rim', //鍔犱笂杈规
- // title: '鐗╂枡鍒楄〃',
- // closeBtn: 1,
- // shift: 2,
- // area: ['90%', '90%'],
- // maxmin: true,
- // content: ['../PublicPage/CheckItemInformation.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('璇烽�夋嫨鏁版嵁');
- // }
- // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- // obj.update({
- // HDotCheckID: checkStatus.data[0].HItemID,
- // HDotCheckCode: checkStatus.data[0].HNumber,
- // HDotCheckItem: checkStatus.data[0].HName
- // });
- // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- // }
- // , btn2: function (index, layero) {
- // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- // },
- // end: function () {
- // }
- // });
- //}
+ if (obj.event === 'HDotCheckCode') //鐐规椤圭洰浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../PublicPage/CheckItemInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemID: checkStatus.data[0].HItemID,
+ HDotCheckCode: checkStatus.data[0].HNumber,
+ HDotCheckItem: checkStatus.data[0].HName
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ }
+ });
+ }
if (obj.event === 'HManagerCode') //璐熻矗浜轰唬鐮�
{
//椤甸潰灞�-鑷畾涔�
@@ -575,11 +575,7 @@
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
- //if (sSubStr[i].HDotCheckCode == "") {
- // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return false;
- //}
- if (sSubStr[i].HDotCheckItem == "") {
+ if (sSubStr[i].HDotCheckCode == "" || sSubStr[i].HDotCheckItemID == "") {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index 6e67cdb..b58571e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>璁惧鐐规璁板綍鍗曞垪琛�</title>
+ <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">
@@ -37,7 +37,7 @@
<option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
</select>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -49,30 +49,29 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
</div>
- </div>-->
+ </div>
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
- <!--<div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
- </div>
- </div>
- </div>-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -331,35 +330,36 @@
}
//蹇�熻繃婊�
function get_FastQuery() {
- var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+ //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
if (HBillNo) {
- sWhere += " and HBillNo like '%" + HBillNo + "%'";
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HCreateBy) {
- sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
+ sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
}
if (BenginHCreateDate) {
- sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
}
if (EndHCreateDate) {
- sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#HBillType").val("");//鍗曟嵁绫诲瀷
+ //$("#HBillType").val("");//鍗曟嵁绫诲瀷
$("#HBillNo").val("");//鍗曟嵁鍙�
$("#HSourceBillNo").val("");//婧愬崟鍙�
$("#HCreateBy").val("");//鍒跺崟浜�
$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
sWhere = "";
+ $("#btnSearch").click();
}
//鍒锋柊
function get_Refresh() {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index f448fc9..376442a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -173,7 +173,7 @@
, element = layui.element;
var option;
var sBillType = "3904";
- var TabRow = { "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HRemark": "" };
+ var TabRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
@@ -319,10 +319,14 @@
columns = [
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode" }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
- , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
+ , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
+ , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode' }
+ , { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
];
@@ -359,9 +363,9 @@
var myDate = new Date();
var aa = myDate.toLocaleDateString()
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(aa);
- $("#HBeginDate").val(aa);
- $("#HEndDate").val(aa);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HInterID").val(0);
}
});
@@ -391,15 +395,14 @@
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HDeptID": data.HDeptID //楠屾敹閮ㄩ棬
- , "HEmpID": data.HEmpID //楠屾敹浜�
- , "HEmpID": data.HEmpID //璐熻矗浜�
- , "HEquipID": data.HEquipID //璁惧
- , "HCheckBeginDate": formatDate(data.鍙戠敓鏃ユ湡) //缁翠慨鏃ユ湡
- , "HCheckResult": data.楠屾敹缁撹 //楠屾敹缁撹
- , "HExplanation": data.鎽樿 //鎽樿
- , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
-
+ , "HEquipName": data.璁惧鍚嶇О
+ , "HEquipID": data.璁惧ID
+ , "HCycleUnit": data.鍛ㄦ湡鍗曚綅
+ , "HCheckCycle": data.鐐规鍛ㄦ湡
+ , "HBeginDate":data.寮�濮嬫棩鏈�
+ , "HEndDate": data.缁撴潫鏃ユ湡
+ , "HExplanation": data.鎽樿
+ ,"HRemark":data.琛ㄥご澶囨敞
});
} else {
@@ -410,18 +413,6 @@
}
});
}
- // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
- function formatDate(date) {
- var d = new Date(date),
- month = '' + (d.getMonth() + 1),
- day = '' + d.getDate(),
- year = d.getFullYear();
-
- if (month.length < 2) month = '0' + month;
- if (day.length < 2) day = '0' + day;
-
- return [year, month, day].join('-');
- }
// 缂栬緫鑾峰彇琛ㄤ綋
function set_EditGrid(linterid) {
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
@@ -429,7 +420,7 @@
$.ajax({
url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListProjectDetai',
type: "GET",
- data: { "sqlWhere": "and hmainid=" + hID },
+ data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
console.log(result);
//console.log('gouba' + result);
@@ -445,6 +436,18 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
}
//澧炲姞涓�琛�
function set_AddLine(NewRow) {
@@ -490,25 +493,24 @@
});
}
}
- //琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ // 琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event === 'HRepairCode') //缁翠慨浠ｇ爜
+ if (obj.event === 'HDotCheckCode') //鐐规椤圭洰浠ｇ爜
{
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '缁翠慨椤圭洰鍒楄〃',
+ title: '鐗╂枡鍒楄〃',
closeBtn: 1,
shift: 2,
- area: ['80%', '80%'],
+ area: ['90%', '90%'],
maxmin: true,
- content: ['../PublicPage/RepairItemInformation.html', 'yes'],
+ content: ['../PublicPage/CheckItemInformation.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
-
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
@@ -517,11 +519,10 @@
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HRepairID1: checkStatus.data[0].HItemID,
- HRepairCode: checkStatus.data[0].HNumber,
- HRepairName: checkStatus.data[0].HName,
+ HDotCheckItemID: checkStatus.data[0].HItemID,
+ HDotCheckCode: checkStatus.data[0].HNumber,
+ HDotCheckItem: checkStatus.data[0].HName
});
-
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -529,11 +530,45 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
}
});
}
-
+ if (obj.event === 'HManagerCode') //璐熻矗浜轰唬鐮�
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../PublicPage/UserInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HManagerID: checkStatus.data[0].HItemID,
+ HManagerCode: checkStatus.data[0].HNumber,
+ HManagerName: checkStatus.data[0].HName
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ }
+ });
+ }
obj.event = "";
return false;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index 863570f..8e3cad0 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -29,15 +29,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
- </div>
- </div>
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-input-block">
+ <select name="HBillType" id="HBillType">
+ <option value="">鎵�鏈�</option>
+ <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
+ <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -49,30 +49,24 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
</div>
- </div>-->
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
- <!--<div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
- </div>
- </div>
- </div>-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -213,14 +207,14 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
, { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200 }
, { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
- , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
- , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
+ , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
, { field: '鐐规鍛ㄦ湡', title: '鐐规鍛ㄦ湡', width: 200 }
, { field: '鎽樿', title: '鎽樿', width: 200 }
@@ -237,15 +231,15 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
@@ -257,20 +251,34 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HNumber").val("");
- $("#HName").val("");
+ //$("#HBillType").val("");//鍗曟嵁绫诲瀷
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HSourceBillNo").val("");//婧愬崟鍙�
+ $("#HCreateBy").val("");//鍒跺崟浜�
+ $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+ $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+ sWhere = "";
+ $("#btnSearch").click();
}
//蹇�熻繃婊�
- function get_FastQuery(table, option) {
- //var HNumber = $("#HNumber").val();
- //var HName = $("#HName").val();
- //if (HNumber) {
- // sWhere += " and 鑱屽憳浠ｇ爜 like '%" + HNumber + "%'";
- //}
- //if (HName) {
- // sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
- //}
- var index = layer.load(0);
+ function get_FastQuery() {
+ //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+ var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+ var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HCreateBy) {
+ sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
+ }
+ if (BenginHCreateDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+ }
+ if (EndHCreateDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -284,7 +292,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html',
+ content: '../璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -299,7 +307,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var hID = data[0].hmainid.toString();
+ var linterid = data[0].hmainid.toString();
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -308,7 +316,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html?hID=' + hID
+ , content: '../璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
--
Gitblit v1.9.1