From a5025745eb67cc9ede05653cbf38a9675dfb649d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 28 六月 2024 18:11:03 +0800
Subject: [PATCH] 1
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 26
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 116 ++
WebTM/WebTM.csproj.user | 5
WebTM/views/Baseset/基础资料/Gy_ProcessList.html | 134 +++
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 11
WebTM/views/index_Mobile.html | 4
WebTM/views/WMS扫码模块/上料防错单/Sc_MaterToSourceBill_PDA.html | 199 +++++
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 101 ++
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 402 +++++++++++
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 24
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 500 ++++++++++++-
WebTM/WebTM.csproj | 1
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 92 ++
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 431 +++++++++++
15 files changed, 1,886 insertions(+), 166 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index afcd600..28d1967 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -151,6 +151,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GroupList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_Source.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ProcessList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_SupplierListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 005e8c8..879287d 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -16,9 +16,8 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>
- </StartPageUrl>
- <StartAction>CurrentPage</StartAction>
+ <StartPageUrl>views/user/login.html</StartPageUrl>
+ <StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index bc007d7..109cb39 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,11 +5,11 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcessList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcessList.html"
new file mode 100644
index 0000000..8ea14eb
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcessList.html"
@@ -0,0 +1,134 @@
+锘�<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var HStockOrgID = params[params[0]];
+
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ //蹇�熸煡璇�
+ form.on('submit(HQuery)', function () {
+ RoadQuery($('#Value').val());
+ });
+ //杩斿洖
+ form.on('submit(FH)', function () {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHProcValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: '宸ュ簭ID', hide: true }
+ , { field: 'HNumber', width: 150, title: '宸ュ簭浠ｇ爜' }
+ , { field: 'HName', width: 150, title: '宸ュ簭鍚嶇О', sort: true }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
+ });
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHProcValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/WEBSController/GetProcessList_Json",
+ async: true,
+ data: { "Process": Value, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
index d88e2d4..8f2152e 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
@@ -80,6 +80,37 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">娴佹按鍙�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HProcNo" id="HProcNo" lay-verify="HProcNo" 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 class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HProcNo-BT" class="layui-btn" id="HProcNo-BT" style="padding:0 10px">纭畾</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">宸ュ簭</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HProcName" id="HProcName" lay-verify="HProcName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HProcID-BT" class="layui-btn" id="HProcID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇璁惧</label>
</div>
<div class="layui-col-xs10">
@@ -438,6 +469,8 @@
$("#HMainSourceBillType").append(optionHtml);
layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HProcName").attr("disabled", "disabled");
+ $('#HProcID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
else {
$("#HMainSourceBillType").empty();
@@ -453,9 +486,14 @@
$("#HICMOInterID").val(d.data[0].HICMOInterID);
$("#HICMOEntryID").val(d.data[0].HICMOEntryID);
$("#HICMOBillNo").val(d.data[0].HICMOBillNo);
+ $("#HProcID").val(d.data[0].HProcID);
+ $("#HProcName").val(d.data[0].HProcName);
$("#HSourceBillNo").val(d.data[0].HMainSourceBillNo);
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HProcNo").val(d.data[0].HProcNo);
+ $("#HProcNo").attr("disabled", "disabled");
+ $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
else {
@@ -469,6 +507,76 @@
//#endregion
//#region 鍩虹璧勬枡閫夋嫨
+
+ //#region 宸ュ簭
+ //鎵弿宸ュ簭鏉＄爜
+ $('#HProcName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HProcName = $('#HProcName').val()
+ if (HProcName == '') {
+ playSound();
+ $("#HProcID").val("0");
+ $("#HProcName").val("");
+ layer.msg("宸ュ簭鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HProcName").select();
+ $("#HProcName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetProcess_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HProcName, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HProcID").val(result.data[0].HInterID);
+ $("#HProcName").val(result.data[0].HName);
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HProcID").val("0");
+ $("#HProcName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HProcName").select();
+ $("#HProcName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //宸ュ簭鎸夐挳
+ form.on('submit(HProcID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcessList.html?HStockOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
//#region 鐢熶骇璁惧
//鎵弿鐢熶骇璁惧鏉＄爜
@@ -704,6 +812,10 @@
$("#HGroupID").val("0");
data.field.HGroupID = $('#HGroupID').val()
}
+ if ($("#HProcName").val() == '') {
+ $("#HProcID").val("0");
+ data.field.HProcID = $('#HProcID').val()
+ }
var sMainStr = JSON.stringify(data.field);
var sSubStr = table.cache['wl-table'];
@@ -853,11 +965,21 @@
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$("#HMainSourceBillType").attr("disabled", "disabled");
form.render('select');
- element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
- $("#HBarCode").select();
- $("#HBarCode").focus();
- //鏄剧ず琛ㄤ綋鏄庣粏
- DisBillEntryList();
+ //婧愬崟锛氬伐搴忔祦杞崱
+ if (HSourceBillType == "3772") {
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+ $("#HProcNo").select();
+ $("#HProcNo").focus();
+ }
+ else {
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
+ $("#HProcNo").attr("disabled", "disabled");
+ $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
}
else {
playSound();
@@ -877,6 +999,66 @@
//#endregion
+ //#region 娴佹按鍙峰洖杞�
+
+ //娴佹按鍙峰洖杞�
+ $('#HProcNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByProcNo();
+ }
+ });
+
+ //娴佹按鍙锋寜閽�
+ form.on('submit(HProcNo-BT)', function (data) {
+ GetMeesageByProcNo();
+ });
+
+ //娴佹按鍙峰洖杞﹁繑鍥炰俊鎭�
+ function GetMeesageByProcNo(obj) {
+ var HProcExchBillNo = $("#HProcExchBillNo").val()
+ var HProcNo = $("#HProcNo").val()
+ if ($("#HProcNo").val() == '') {
+ HProcNo = 0
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_ProcNo_MaterToSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HProcExchBillNo": HProcExchBillNo, "HProcNo": HProcNo, "HMaker": HMaker },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ playSound_OK();
+ $("#HProcExchEntryID").val(result.data[0].HProcExchEntryID);
+ $("#HProcID").val(result.data[0].HProcID);
+ $("#HProcName").val(result.data[0].HProcName);
+ $("#HProcName").attr("disabled", "disabled");
+ $('#HProcID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HProcNo").attr("disabled", "disabled");
+ $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+ $("#HProcNo").select();
+ $("#HProcNo").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
//#region 鎵弿鐗╂枡鏉＄爜
@@ -1087,6 +1269,13 @@
//浠ヤ笂涓簂ayui妯″潡
//姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖宸ュ簭淇℃伅
+ function GetHProcValue(obj) {
+ if (obj.length > 0) {
+ $("#HProcName").val(obj[0].HName);
+ $("#HProcID").val(obj[0].HInterID);
+ }
+ }
//鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖鐢熶骇璁惧淇℃伅
function GetHEquipNameValue(obj) {
if (obj.length > 0) {
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 409dc40..32dccad 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -163,13 +163,13 @@
</a>
</dd>-->
<dd>
- <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_QiaoYi.html?type=jzd" target="main_self_frame" style="color: aqua;">
+ <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html?type=jzd" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭杩涚珯鎺ユ敹鍗�
</a>
</dd>
<dd>
- <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_QiaoYi.html?type=czd" target="main_self_frame" style="color: aqua;">
+ <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html?type=czd" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭鍑虹珯姹囨姤鍗�
</a>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 313b2d6..55bb2df 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -686,7 +686,6 @@
// data: ajaxReturnData
//});
}
-
});
}
//杩斿洖楠屾敹
@@ -706,17 +705,17 @@
layer.msg("璇疯緭鍏ヤ緵搴斿晢鍚嶇О", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- var HAddress = $("#HAddress").val();
- if (HAddress == null || HAddress == undefined || HAddress == "") {
- layer.msg("鍦板潃涓嶅緱涓虹┖锛�", { icon: 5 });
- return;
+ //var HAddress = $("#HAddress").val();
+ //if (HAddress == null || HAddress == undefined || HAddress == "") {
+ // layer.msg("鍦板潃涓嶅緱涓虹┖锛�", { icon: 5 });
+ // return;
- }
+ //}
- if ($("#HAreaName").val() == '') {
- layer.msg("娌℃湁閫夋嫨鍦板尯", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HAreaName").val() == '') {
+ // layer.msg("娌℃湁閫夋嫨鍦板尯", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
if ($("#HCurName").val() == '') {
layer.msg("娌℃湁閫夋嫨榛樿璐у竵", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -727,17 +726,18 @@
}
var reg = /^0\d{2,3}-?\d{7,8}$/;
- if (reg.test($("#HLinkPhone").val()) == false || $("#HLinkPhone").val() == '') {
+ if (reg.test($("#HLinkPhone").val()) == false && $("#HLinkPhone").val() != "") {
layer.msg("鑱旂郴鐢佃瘽鍙风爜鏈夎锛岃杈撳叆鍖哄彿+鍙风爜鏍煎紡鐨勭數璇濆彿鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
- if (reg1.test($("#HEmail").val()) == false || $("#HEmail").val() == '') {
+ if (reg1.test($("#HEmail").val()) == false && $("#HEmail").val() != "" ) {
layer.msg("璇峰～鍐欐纭牸寮忕殑閭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
var reg2 = /^[1][3,4,5,7,8][0-9]{9}$/;
- if (reg2.test($("#HMobilePhone").val()) == false || $("#HMobilePhone").val() == '') {
+ if (reg2.test($("#HMobilePhone").val()) == false && $("#HMobilePhone").val() != "")
+ {
layer.msg("璇峰～鍐欐纭牸寮忕殑鎵嬫満鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
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 d7eb263..d0744f6 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"
@@ -398,7 +398,7 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠浠撲綅</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HNowSPName" id="HNowSPName" style="width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HNowSPID" id="HNowSPID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <input type="hidden" class="layui-input" name="HNowSPID" id="HNowSPID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -483,6 +483,11 @@
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li style="padding:1px;" class="layui-this">瀛愬櫒鍏�</li>
+ <li style="padding:1px;">淇濆吇瑙勭▼</li>
+ <li style="padding:1px;">鐐规瑙勭▼</li>
+ </ul>
<div class="layui-tab-content">
<!--瀛愯〃-->
<div class="layui-tab-item layui-show">
@@ -491,6 +496,28 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </div>
+ <div class="layui-tab-item ">
+ <!--淇濆吇瑙勭▼璇︾粏-->
+ <table class="layui-hide" id="mainTableMaintainRule" lay-filter="mainTableMaintainRule"></table>
+ <script type="text/html" id="toolbarDemoMaintainRule">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
+ </div>
+ </script>
+ </div>
+ <div class="layui-tab-item">
+ <!--鐐规瑙勭▼鍒楄〃-->
+ <table class="layui-hide" id="mainTableDotCheckRule" lay-filter="mainTableDotCheckRule"></table>
+ <script type="text/html" id="toolbarDemoDotCheckRule">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
</div>
</script>
</div>
@@ -513,7 +540,20 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
-
+ <!--//瀛愯〃鍒犻櫎-->
+ <script type="text/html" id="barDemoMaintainRule">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script type="text/html" id="barDemoDotCheckRule">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--//澶嶉�夋-->
+ <script type="text/html" id="HStdFlag">
+ <input type="checkbox" name="checkbox" value="{{d.HStdFlag}}" lay-skin="primary" lay-filter="HStdFlag" {{ d.HStdFlag == true ? 'checked' : '' }}>
+ </script>
+ <script type="text/html" id="HStdFlag2">
+ <input type="checkbox" name="checkbox" value="{{d.HStdFlag}}" lay-skin="primary" lay-filter="HStdFlag2" {{ d.HStdFlag == true ? 'checked' : '' }}>
+ </script>
<script>
var Stverf = "";
//鑾峰彇椤甸潰璺宠浆鍙傛暟
@@ -542,6 +582,23 @@
;
var sBillType = "3899";
window.OptionData = [];
+ var tabIndex = 1;
+ var optionMaintainRule;//涓や釜瀛愯〃option鍜屽垵濮嬪垪鏁版嵁
+ var optionDotCheckRule;
+ var rowdataMaintainRule = [{
+ "HMaintainRuleID": 0, "淇濆吇瑙勭▼鍗曟嵁鍙�": "", "HStdFlag": false, "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+ }];
+ var rowdataDotCheckRule = [{
+ "HDotCheckRuleID": 0, "鐐规瑙勭▼鍗曟嵁鍙�": "", "HStdFlag": false, "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+ }];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -1294,7 +1351,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMouldFileID": "0", "HMouldFileName": "", "HUnionDate": Format(new Date, "yyyy- MM - dd"),"HRemark": "",
+ "HMouldFileID": "0", "HMouldFileName": "", "HUnionDate": Format(new Date, "yyyy- MM - dd"), "HRemark": "",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
};
switch (obj.event) {
@@ -1317,13 +1374,104 @@
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
}
break;
}
});
+ //淇濆吇瑙勭▼澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTableMaintainRule)', function (obj) {
+ var checkStatus = table.checkStatus('mainTableMaintainRule')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaintainRuleID": 0, "淇濆吇瑙勭▼鍗曟嵁鍙�": "", "HStdFlag": false, "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTableMaintainRule"].push(NewRow);
+ optionMaintainRule.data = table.cache["mainTableMaintainRule"];
+
+ table.render(optionMaintainRule);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTableMaintainRule"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ optionMaintainRule.data = table.cache["mainTableMaintainRule"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(optionMaintainRule);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+ //鍒楄缃�
+ //case 'set_hidecolumn':
+ // get_hidecolumn();
+ // break;
+ }
+ });
+ //鐐规瑙勭▼澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTableDotCheckRule)', function (obj) {
+ var checkStatus = table.checkStatus('mainTableDotCheckRule')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HDotCheckRuleID": 0, "鐐规瑙勭▼鍗曟嵁鍙�": "", "HStdFlag": false, "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTableDotCheckRule"].push(NewRow);
+ optionDotCheckRule.data = table.cache["mainTableDotCheckRule"];
+
+ table.render(optionDotCheckRule);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ break;
+ case 'btn-CopyLine':
+ var copyschemedata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copyschemedata2 = copyschemedata.substring(1, copyschemedata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyschemerow = copyschemedata2.substring(0, copyschemedata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTableDotCheckRule"].push(JSON.parse(copyschemerow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ optionDotCheckRule.data = table.cache["mainTableDotCheckRule"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(optionDotCheckRule);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ console.log(optionDotCheckRule.data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+ //鍒楄缃�
+ //case 'set_hidecolumn':
+ // get_hidecolumn();
+ // break;
+ }
+ });
//瀛愯〃锛氳鍐呬簨浠�
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
@@ -1343,6 +1491,44 @@
}
});
}
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTableMaintainRule)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ table.on('tool(mainTableDotCheckRule)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ //#region 瀹屾垚鏍囪
+ form.on('checkbox(HStdFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(optionMaintainRule.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStdFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ form.on('checkbox(HStdFlag2)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(optionDotCheckRule.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStdFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+ // 鐩戝惉Tab鍒囨崲锛屽垏鎹㈡椂瑙﹀彂
+ element.on('tab(table)', function (data) {
+ // 鑾峰彇琚垏鎹㈠埌鐨勯潰鏉跨殑绱㈠紩
+ var index = data.index;
+ // 鎵ц涓�浜涙搷浣滐紝渚嬪鏀瑰彉椤甸潰鍐呭
+ tabIndex = index + 1;
});
//#endregion
@@ -1397,6 +1583,56 @@
];
option.data = rowdata;
table.render(option);
+ optionMaintainRule = {
+ elem: '#mainTableMaintainRule'
+ , toolbar: '#toolbarDemoMaintainRule'
+ //, page: true
+ //, limit: 500
+ //, limits: [50, 500, 5000, 50000]
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMaintainRuleID', title: 'HMaintainRuleID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: '淇濆吇瑙勭▼鍗曟嵁鍙�', title: '淇濆吇瑙勭▼鍗曟嵁鍙�', edit: 'text', style: 'background-color: #f9f9f9;', event: "HMaintainRuleID" } //f7
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HStdFlag', title: '榛樿鏍囪', templet: "#HStdFlag" }//checkbox
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+ optionMaintainRule.data = rowdataMaintainRule;
+ table.render(optionMaintainRule);
+ optionDotCheckRule = {
+ elem: '#mainTableDotCheckRule'
+ , toolbar: '#toolbarDemoDotCheckRule'
+ //, page: true
+ //, limit: 500
+ //, limits: [50, 500, 5000, 50000]
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HDotCheckRuleID', title: 'HDotCheckRuleID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: '鐐规瑙勭▼鍗曟嵁鍙�', title: '鐐规瑙勭▼鍗曟嵁鍙�', edit: 'text', style: 'background-color: #f9f9f9;', event: "HDotCheckRuleID" } //f7
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HStdFlag', title: '榛樿鏍囪', templet: "#HStdFlag2" }//checkbox
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+ optionDotCheckRule.data = rowdataDotCheckRule;
+ table.render(optionDotCheckRule);
}
//#endregion
@@ -1527,6 +1763,55 @@
table.render(option);
}
});
+ $.ajax({
+ url: GetWEBURL() + "/Gy_MouldFileMain/Gy_MouldFileSubDetai",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (data) {
+ if (data.code == 1) {
+ var dataMaintainRule = data.data[0];
+ var dataDotCheckRule = data.data[1];
+ //瀛愯〃1璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataMaintainRule.length; i++) {
+ rowdata.push(
+ {
+ "HMaintainRuleID": dataMaintainRule[i].HMaintainRuleID, "淇濆吇瑙勭▼鍗曟嵁鍙�": dataMaintainRule[i].HBillNo, "HStdFlag": dataMaintainRule[i].HStdFlag, "HRemark": dataMaintainRule[i].HRemark
+ , "HSourceInterID": dataMaintainRule[i].HSourceInterID
+ , "HSourceEntryID": dataMaintainRule[i].HSourceEntryID
+ , "HSourceBillNo": dataMaintainRule[i].HSourceBillNo
+ , "HSourceBillType": dataMaintainRule[i].HSourceBillType
+ }
+ )
+ }
+ optionMaintainRule.data = rowdata;
+ table.render(optionMaintainRule);
+ //瀛愯〃2璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataDotCheckRule.length; i++) {
+ rowdata.push(
+ {
+ "HDotCheckRuleID": dataDotCheckRule[i].HDotCheckRuleID, "鐐规瑙勭▼鍗曟嵁鍙�": dataDotCheckRule[i].HBillNo, "HStdFlag": dataDotCheckRule[i].HStdFlag, "HRemark": dataDotCheckRule[i].HRemark
+ , "HSourceInterID": dataDotCheckRule[i].HSourceInterID
+ , "HSourceEntryID": dataDotCheckRule[i].HSourceEntryID
+ , "HSourceBillNo": dataDotCheckRule[i].HSourceBillNo
+ , "HSourceBillType": dataDotCheckRule[i].HSourceBillType
+ }
+ )
+ }
+ optionDotCheckRule.data = rowdata;
+ table.render(optionDotCheckRule);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
}
// 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
@@ -1557,7 +1842,24 @@
num.push(table.cache["mainTable"][i])
}
}
-
+ //淇濆吇瑙勬牸
+ var mainTableMaintainRulenum = [];
+ for (var i = 0; i < table.cache["mainTableMaintainRule"].length; i++) {
+ if (table.cache["mainTableMaintainRule"][i] != "") {
+ table.cache["mainTableMaintainRule"][i].LAY_TABLE_INDEX = i;
+ mainTableMaintainRulenum.push(table.cache["mainTableMaintainRule"][i])
+ }
+ }
+ mainTableMaintainRuleStr = JSON.stringify(mainTableMaintainRulenum);
+ //鐐规瑙勬牸
+ var mainTableDotCheckRulenum = [];
+ for (var i = 0; i < table.cache["mainTableDotCheckRule"].length; i++) {
+ if (table.cache["mainTableDotCheckRule"][i] != "") {
+ table.cache["mainTableDotCheckRule"][i].LAY_TABLE_INDEX = i;
+ mainTableDotCheckRulenum.push(table.cache["mainTableDotCheckRule"][i])
+ }
+ }
+ mainTableDotCheckRuleStr = JSON.stringify(mainTableDotCheckRulenum);
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
return false;
@@ -1567,7 +1869,7 @@
var sMainStr = JSON.stringify(data.field);
//瀛愯〃鏁版嵁搴忓垪鍖�
var sSubStr = JSON.stringify(num);
- var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user + ";" + sSubStr;
+ var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user + ";" + sSubStr + ";" + mainTableMaintainRuleStr + ";" + mainTableDotCheckRuleStr;
//鏂板
$.ajax({
type: "POST",
@@ -1604,7 +1906,7 @@
var sMainStr = JSON.stringify(data.field);
//瀛愯〃鏁版嵁搴忓垪鍖�
var sSubStr = JSON.stringify(num);
- var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user + ";" + sSubStr;
+ var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user + ";" + sSubStr + ";" + mainTableMaintainRuleStr + ";" + mainTableDotCheckRuleStr;
$.ajax({
type: "POST",
url: GetWEBURL() + "/Gy_Mould_Edit/AddBill1",
@@ -1691,6 +1993,83 @@
}
})
}
+ if (obj.event == "HMaintainRuleID") {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍣ㄥ叿淇濆吇瑙勭▼',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['Sc_MouldMaintainRuleBillList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaintainRuleID": OptionData.hmainid
+ , "淇濆吇瑙勭▼鍗曟嵁鍙�": OptionData.鍗曟嵁鍙�
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.hmainid) != "undefined") {
+ obj.update({
+ "HMaintainRuleID": OptionData.hmainid
+ , "淇濆吇瑙勭▼鍗曟嵁鍙�": OptionData.鍗曟嵁鍙�
+ })
+ OptionData = [];
+ }
+ }
+ })
+ }
+ if (obj.event == "HDotCheckRuleID") {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍣ㄥ叿鐐规瑙勭▼',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HDotCheckRuleID": OptionData.hmainid
+ , "鐐规瑙勭▼鍗曟嵁鍙�": OptionData.鍗曟嵁鍙�
+
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (OptionData.hmainid) != "undefined") {
+ obj.update({
+ "HMaintainRuleID": OptionData.hmainid
+ , "鐐规瑙勭▼鍗曟嵁鍙�": OptionData.鍗曟嵁鍙�
+ })
+ OptionData = [];
+ }
+ }
+ })
+ }
obj.event = "";
return false;
}
@@ -1715,6 +2094,11 @@
for (var i = 0; i < oldData.length; i++) {
$('#HCheckResult' + (i + 1)).find("option[value='" + oldData[i].HCheckResult + "']").attr("selected", true);
}
+ obj.del();
+ optionMaintainRule.data = table.cache["mainTableMaintainRule"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(optionMaintainRule);
+ optionDotCheckRule.data = table.cache["mainTableDotCheckRule"];
+ table.reload(optionDotCheckRule);
form.render('select');
layer.close(index);
}
@@ -1870,6 +2254,7 @@
function GetMouldMaintainRuleValue(obj) { //淇濆吇瑙勭▼
$("#HMouldMaintainRuleInterName").val(obj[0].鍗曟嵁鍙�);
$("#HMouldMaintainRuleInterID").val(obj[0].hmainid);
+ OptionData = obj[0];
}
function GetHAccSupNameValue(obj) { //杩斿洖鍒堕�犲巶鍟�
@@ -1880,6 +2265,9 @@
function GetMouldFileValue(obj) {
OptionData = obj[0];
}
+ function GetMouldDotCheckRuleValue(obj) {
+ OptionData = obj[0];
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 97bd18b..ad94ecd 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -145,6 +145,13 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈�缁堢粨璁�</label>
+ <div class="layui-input-inline">
+ <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -311,6 +318,35 @@
table.on('tool(mainTable1)', function (obj) {
set_GridDelete1(obj); //琛屽唴鍒犻櫎
set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+
+ //琛岄�夋嫨澶勭悊锛堢偣妫�缁撴灉锛�
+ form.on('select(HMaintainResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HMaintainResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+
+ console.log(table.cache['mainTable']);
+
+ var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+ for (let i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i].HMaintainResult == "X") {
+ HQty++;
+ }
+ }
+ if (HQty > 0) {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
});
//琛ㄥご淇℃伅璁惧寮圭獥
@@ -512,9 +548,11 @@
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option.data = buttonArr;
+ table.render(option);
+ //table.reload("mainTable", {
+ // data: option.data //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
}
@@ -531,9 +569,11 @@
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
- table.reload("mainTable1", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ option1.data = buttonArr;
+ table.render(option1);
+ //table.reload("mainTable1", {
+ // data: option1.data //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
}
} else {
@@ -890,6 +930,15 @@
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
});
+ if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -911,12 +960,19 @@
//console.log('gouba' + result);
if (result.count == 1) {
option.data = result.list[0];
+ for (let i = 0; i < option.data.length; i++) {
+ if (option.data[i].HMaintainResult == "鍚堟牸") {
+ option.data[i].HMaintainResult = "Y";
+ } else {
+ option.data[i].HMaintainResult = "X";
+ }
+ }
table.render(option);
option1.data = result.list[1];
table.render(option1);
- for (let j = 0; j < result.list.length; j++) {
- $("#HMaintainResult" + (j + 1)).val(result.list[j].淇濆吇缁撴灉 == "鍚堟牸" ? 'Y' : 'X')
+ for (let j = 0; j < result.list[0].length; j++) {
+ $("#HMaintainResult" + (j + 1)).val(result.list[0][j].HMaintainResult == "鍚堟牸" ? 'Y' : (result.list[0][j].HMaintainResult == 'Y' ? 'Y' : 'X'))
}
form.render('select');
} else {
@@ -942,15 +998,14 @@
}
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HMaintainResult' + i + '').find("option[value='" + option.data[i - 1].HMaintainResult + "']").attr("selected", true);
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ form.render('select');
}
//澧炲姞涓�琛�1
function btnAddLine1(NewRow) {
@@ -979,6 +1034,11 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HMaintainResult' + i + '').find("option[value='" + option.data[i - 1].HMaintainResult + "']").attr("selected", true);
+ }
+ form.render('select');
}
}
//澶嶅埗涓�琛�1
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 a5b6e8b..2809d20 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"
@@ -9,6 +9,11 @@
<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/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/PageTitle.js"></script>
<style type="text/css">
/*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
@@ -18,10 +23,9 @@
margin-right: 0px;
}
/*end*/
- .layui-form-label{
- width:95px;
+ .layui-form-label {
+ width: 95px;
}
-
</style>
</head>
<body>
@@ -380,12 +384,55 @@
</div>-->
</div>
</div>
+ <div class="layui-tab" lay-filter="table">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li style="padding:1px;" class="layui-this">淇濆吇瑙勭▼</li>
+ <li style="padding:1px;">鐐规瑙勭▼</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--淇濆吇瑙勭▼璇︾粏-->
+ <table class="layui-hide" id="mainTableMaintainRule" lay-filter="mainTableMaintainRule"></table>
+ <script type="text/html" id="toolbarDemoMaintainRule">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
+ </div>
+ </script>
+ </div>
+ <div class="layui-tab-item">
+ <!--鐐规瑙勭▼鍒楄〃-->
+ <table class="layui-hide" id="mainTableDotCheckRule" lay-filter="mainTableDotCheckRule"></table>
+ <script type="text/html" id="toolbarDemoDotCheckRule">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine2"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine2"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
</form>
</div>
</div>
</div>
</div>
-
+ <!--//瀛愯〃鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script type="text/html" id="barDemo2">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--//澶嶉�夋-->
+ <script type="text/html" id="HStdFlag">
+ <input type="checkbox" name="checkbox" value="{{d.HStdFlag}}" lay-skin="primary" lay-filter="HStdFlag" {{ d.HStdFlag == true ? 'checked' : '' }}>
+ </script>
+ <script type="text/html" id="HStdFlag2">
+ <input type="checkbox" name="checkbox" value="{{d.HStdFlag}}" lay-skin="primary" lay-filter="HStdFlag2" {{ d.HStdFlag == true ? 'checked' : '' }}>
+ </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>
@@ -422,6 +469,7 @@
;
var sBillType = "3308";
$("#HMakeSupID").val(0);
+ var tabIndex = 1;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -441,6 +489,157 @@
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
+ //#endregion
+
+ //#region 鍒濆鍖栧瓙琛�
+ var optionMaintainRule;
+ var optionDotCheckRule;
+ var rowdataMaintainRule = [{
+ "HMaintainRuleID": 0, "淇濆吇瑙勭▼鍗曟嵁鍙�": "", "HStdFlag": false, "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+ }];
+ var rowdataDotCheckRule = [{
+ "HDotCheckRuleID": 0, "鐐规瑙勭▼鍗曟嵁鍙�": "", "HStdFlag": false, "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+ }];
+ set_InitGrid();
+ //淇濆吇瑙勭▼澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTableMaintainRule)', function (obj) {
+ var checkStatus = table.checkStatus('mainTableMaintainRule')
+ , data = checkStatus.data;
+
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HMaintainRuleID": 0, "淇濆吇瑙勭▼鍗曟嵁鍙�": "", "HStdFlag": false, "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTableMaintainRule"].push(NewRow);
+ optionMaintainRule.data = table.cache["mainTableMaintainRule"];
+
+ table.render(optionMaintainRule);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTableMaintainRule"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ optionMaintainRule.data = table.cache["mainTableMaintainRule"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(optionMaintainRule);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+ //鍒楄缃�
+ //case 'set_hidecolumn':
+ // get_hidecolumn();
+ // break;
+ }
+ });
+ //鐐规瑙勭▼澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTableDotCheckRule)', function (obj) {
+ var checkStatus = table.checkStatus('mainTableDotCheckRule')
+ , data = checkStatus.data;
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow = {
+ "HDotCheckRuleID": 0, "鐐规瑙勭▼鍗曟嵁鍙�": "", "HStdFlag": false, "HRemark": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine2':
+ table.cache["mainTableDotCheckRule"].push(NewRow);
+ optionDotCheckRule.data = table.cache["mainTableDotCheckRule"];
+
+ table.render(optionDotCheckRule);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ break;
+ case 'btn-CopyLine2':
+ var copyschemedata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copyschemedata2 = copyschemedata.substring(1, copyschemedata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyschemerow = copyschemedata2.substring(0, copyschemedata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTableDotCheckRule"].push(JSON.parse(copyschemerow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ optionDotCheckRule.data = table.cache["mainTableDotCheckRule"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(optionDotCheckRule);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ console.log(optionDotCheckRule.data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ break;
+ //鍒楄缃�
+ //case 'set_hidecolumn':
+ // get_hidecolumn();
+ // break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTableMaintainRule)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ table.on('tool(mainTableDotCheckRule)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+
+ //#region 瀹屾垚鏍囪
+ form.on('checkbox(HStdFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(optionMaintainRule.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStdFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ form.on('checkbox(HStdFlag2)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(optionDotCheckRule.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HStdFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+ // 鐩戝惉Tab鍒囨崲锛屽垏鎹㈡椂瑙﹀彂
+ element.on('tab(table)', function (data) {
+ // 鑾峰彇琚垏鎹㈠埌鐨勯潰鏉跨殑绱㈠紩
+ var index = data.index;
+ // 鎵ц涓�浜涙搷浣滐紝渚嬪鏀瑰彉椤甸潰鍐呭
+ tabIndex = index + 1;
+ });
//#endregion
//#region 椤甸潰鎸夐挳瑙﹀彂浜嬩欢
@@ -566,8 +765,8 @@
}
});
});
-
-
+
+
//瀵瑰簲Erp鐗╂枡
form.on('submit(HMaterList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -903,8 +1102,59 @@
});
//#endregion
-
-
+ //瀛愯〃鍒濆鍖�
+ function set_InitGrid() {
+ optionMaintainRule = {
+ elem: '#mainTableMaintainRule'
+ , toolbar: '#toolbarDemoMaintainRule'
+ //, page: true
+ //, limit: 500
+ //, limits: [50, 500, 5000, 50000]
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HMaintainRuleID', title: 'HMaintainRuleID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: '淇濆吇瑙勭▼鍗曟嵁鍙�', title: '淇濆吇瑙勭▼鍗曟嵁鍙�', edit: 'text', style: 'background-color: #f9f9f9;', event: "HMaintainRuleID" } //f7
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HStdFlag', title: '榛樿鏍囪', templet: "#HStdFlag" }//checkbox
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+ optionMaintainRule.data = rowdataMaintainRule;
+ table.render(optionMaintainRule);
+ optionDotCheckRule = {
+ elem: '#mainTableDotCheckRule'
+ , toolbar: '#toolbarDemoDotCheckRule'
+ //, page: true
+ //, limit: 500
+ //, limits: [50, 500, 5000, 50000]
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HDotCheckRuleID', title: 'HDotCheckRuleID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: '鐐规瑙勭▼鍗曟嵁鍙�', title: '鐐规瑙勭▼鍗曟嵁鍙�', edit: 'text', style: 'background-color: #f9f9f9;', event: "HDotCheckRuleID" } //f7
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HStdFlag', title: '榛樿鏍囪', templet: "#HStdFlag2" }//checkbox
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+ optionDotCheckRule.data = rowdataDotCheckRule;
+ table.render(optionDotCheckRule);
+ }
//鍒濆鍖栬〃鍗曟彃浠�
function set_InitFrom() {
//甯歌鐢ㄦ硶
@@ -917,7 +1167,100 @@
$("#HEquipMaintainRuleInterID").val(0);
$("#HEquipDotCheckRuleInterID").val(0);
}
+ //琛屽唴蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == "HMaintainRuleID") {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧淇濆吇瑙勭▼',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaintainRuleID": OptionData.hmainid
+ , "淇濆吇瑙勭▼鍗曟嵁鍙�": OptionData.鍗曟嵁鍙�
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ }
+ })
+ }
+ if (obj.event == "HDotCheckRuleID") {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧鐐规瑙勭▼',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HDotCheckRuleID": OptionData.hmainid
+ , "鐐规瑙勭▼鍗曟嵁鍙�": OptionData.鍗曟嵁鍙�
+
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+
+ })
+ }
+
+ //琛屽唴鍒犻櫎
+ 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 {
+ obj.del();
+ optionMaintainRule.data = table.cache["mainTableMaintainRule"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(optionMaintainRule);
+ optionDotCheckRule.data = table.cache["mainTableDotCheckRule"];
+ table.reload(optionDotCheckRule);
+ layer.close(index);
+ }
+ });
+ }
+ }
//鏂板
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
@@ -933,7 +1276,7 @@
type: "GET",
data: { "HBillType": sBillType },
success: function (d) {
- $("#HInterID").val(0);
+ $("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HOutComDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -1001,6 +1344,55 @@
form.render("select");
}
});
+ $.ajax({
+ url: GetWEBURL() + "/Gy_EquipFileMain/Gy_EquipFileSubDetai",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (data) {
+ if (data.code == 1) {
+ var dataMaintainRule = data.data[0];
+ var dataDotCheckRule = data.data[1];
+ //瀛愯〃1璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataMaintainRule.length; i++) {
+ rowdata.push(
+ {
+ "HMaintainRuleID": dataMaintainRule[i].HMaintainRuleID, "淇濆吇瑙勭▼鍗曟嵁鍙�": dataMaintainRule[i].HBillNo, "HStdFlag": dataMaintainRule[i].HStdFlag, "HRemark": dataMaintainRule[i].HRemark
+ , "HSourceInterID": dataMaintainRule[i].HSourceInterID
+ , "HSourceEntryID": dataMaintainRule[i].HSourceEntryID
+ , "HSourceBillNo": dataMaintainRule[i].HSourceBillNo
+ , "HSourceBillType": dataMaintainRule[i].HSourceBillType
+ }
+ )
+ }
+ optionMaintainRule.data = rowdata;
+ table.render(optionMaintainRule);
+ //瀛愯〃2璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataDotCheckRule.length; i++) {
+ rowdata.push(
+ {
+ "HDotCheckRuleID": dataDotCheckRule[i].HDotCheckRuleID, "鐐规瑙勭▼鍗曟嵁鍙�": dataDotCheckRule[i].HBillNo, "HStdFlag": dataDotCheckRule[i].HStdFlag, "HRemark": dataDotCheckRule[i].HRemark
+ , "HSourceInterID": dataDotCheckRule[i].HSourceInterID
+ , "HSourceEntryID": dataDotCheckRule[i].HSourceEntryID
+ , "HSourceBillNo": dataDotCheckRule[i].HSourceBillNo
+ , "HSourceBillType": dataDotCheckRule[i].HSourceBillType
+ }
+ )
+ }
+ optionDotCheckRule.data = rowdata;
+ table.render(optionDotCheckRule);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
}
// 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
@@ -1022,7 +1414,22 @@
$("#HMaker").val(sessionStorage["HUserName"]);
var user = sessionStorage["HUserName"];
var ModRightNameAdd = 'Gy_MouldFile_Edit';
-
+ //淇濆吇瑙勬牸
+ var mainTableMaintainRuleStr = [];
+ for (var i = 0; i < table.cache["mainTableMaintainRule"].length; i++) {
+ if (table.cache["mainTableMaintainRule"][i] != "") {
+ table.cache["mainTableMaintainRule"][i].LAY_TABLE_INDEX = i;
+ mainTableMaintainRuleStr.push(table.cache["mainTableMaintainRule"][i])
+ }
+ }
+ //鐐规瑙勬牸
+ var mainTableDotCheckRuleStr = [];
+ for (var i = 0; i < table.cache["mainTableDotCheckRule"].length; i++) {
+ if (table.cache["mainTableDotCheckRule"][i] != "") {
+ table.cache["mainTableDotCheckRule"][i].LAY_TABLE_INDEX = i;
+ mainTableDotCheckRuleStr.push(table.cache["mainTableDotCheckRule"][i])
+ }
+ }
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
return false;
@@ -1030,7 +1437,7 @@
if (Stverf == "Add") {
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainStr = JSON.stringify(data.field);
- var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user;
+ var oMain = sMainStr + ";" + JSON.stringify(mainTableMaintainRuleStr) + ";" + JSON.stringify(mainTableDotCheckRuleStr)+";"+ user;
//鏂板
$.ajax({
type: "POST",
@@ -1063,7 +1470,7 @@
//淇敼
data.field.HUpDater = sessionStorage["HUserName"];//淇敼浜�
var sMainStr = JSON.stringify(data.field);
- var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user;
+ var oMain = sMainStr + ";" + JSON.stringify(mainTableMaintainRuleStr) + ";" + JSON.stringify(mainTableDotCheckRuleStr) + ";" + user;
$.ajax({
type: "POST",
url: GetWEBURL() + "/Gy_EquipFileMain/EditBill",
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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
index 4204dcc..5f68f5a 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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
@@ -113,11 +113,11 @@
<div style="background-color:#0085E8;">
<span style="color: white;" class="jzd"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</span>
</div>
- <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
- <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
- <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger" id="Cancel">閫�鍑�</button>
</div>
<div class="layui-form-item">
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -129,7 +129,7 @@
<th>鏉″舰鐮�</th>
<td class="bz_td">
<input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" id="QueDin" style="line-height: 30px;">纭畾</button>
</td>
</tr>
<tr>
@@ -173,7 +173,7 @@
<tr>
<th>鎺ユ敹浜�</th>
<td class="bz_td">
- <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" >
+ <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
</td>
<td class="bz_td">
<input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎺ユ敹浜�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
@@ -334,36 +334,60 @@
</tbody>
</table>
</div>
- <!--<div class="layui-tab-item">
- <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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <!--涓婃枡闃查敊-->
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>閰嶄欢鏉＄爜</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterBarCode" id="HMaterBarCode" lay-verify="HMaterBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="HMaterBarCode-BT" style="line-height: 30px;">纭畾</button>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius layui-btn-danger" id="cmdDelete">鍒犺</button>
</div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
- <script type="text/html" id="barDemo">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
- </script>
- </div>-->
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
- <!--<li>鏄庣粏淇℃伅</li>-->
+ <li>涓婃枡闃查敊</li>
</ul>
</div>
- </div>
+ </div>
<!--闅愯棌瀛楁-->
- <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID">
<input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
<input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ <input type="hidden" name="HMaterToSourceInterID" id="HMaterToSourceInterID" value="0"><!--涓婃枡闃查敊鍗旾D-->
+ <input type="hidden" name="HMaterToSourceBillNo" id="HMaterToSourceBillNo"><!--涓婃枡闃查敊鍗曞崟鎹彿-->
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
</form>
</div>
</div>
@@ -382,8 +406,10 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+ var HMaker = sessionStorage["HUserName"]
var params = get_UrlVars();
var option = [];
+ var listOption = [];
var titleData = [];
var upload = layui.upload;
//#region 鍒濆鍖栭〉闈�
@@ -417,6 +443,82 @@
//});
//#endregion
+ //#region 鎻愮ず闊�
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('TabTest', '1');
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+ var pFocus = $("#HBarCode");
+ pFocus.select();
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-60'
+ , cellMinWidth: 90
+ , limit: 50
+ };
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(wl-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //#endregion
+
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
@@ -447,6 +549,7 @@
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HBillNo = params[params[3]];//鍗曟嵁鍙�
var closeType = params[params[4]]; //鍏抽棴绫诲瀷
+ $("#HMaterToSourceInterID").val(params[params[5]]); //涓婃枡闃查敊鍗旾D
}
//鍒ゆ柇鏄惁鏂板
@@ -611,7 +714,7 @@
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
- location.replace('MES_StationInBill_PDA.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
+ location.replace('MES_StationInBill_PDA.html?OperationType=4&linterid=' + $("#HInterID").val() + '& HSouceBillType=& HBillNo=& closeType=2&HMaterToSourceInterID=' + $("#HMaterToSourceInterID").val());
}
//#endregion
@@ -625,33 +728,71 @@
data: { "HInterID": linterid },
success: function (result) {
var data = result.data[0];
- txtHBarCode_KeyDown(data.HBarCode);
- txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
- form.val("formData", { //HGroupName
+ form.val("formData", {
"HInterID": data.HInterID,
"HBillNo": data.HBillNo,
- "HBarCode": data.HBarCode,
+ "HDate": formatDate(data.HDate),
+ "HICMOBillNo": data.HICMOBillNo,
+ "HICMOInterID": data.HICMOInterID,
+ "HICMOEntryID": data.HICMOEntryID,
+ "HProcExchBillNo": data.HProcExchBillNo,
+ "HProcExchHinteID": data.HProcExchInterID,
"HProcNo": data.HProcNo,
"HQty": data.HQty,
- "HGroupID": data.HGroupID,
- "HGroupName": data.HGroupName,
"HSourceID": data.HSourceID,
"HSourceName": data.HSourceName,
+ "HCenterID": data.HCenterID,
+ "HCenterName": data.HCenterName,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.HGroupName,
"HEmpID": data.HEmpID,
+ "HEmpNumber": data.HEmpNumber,
"HEmpName": data.HEmpName,
- "HRemark": data.HRemark
+ "HProcID": data.HProcID,
+ "HProcName": data.HProcName,
+ "HMaterID": data.HMaterID,
+ "HMaterNumber": data.HMaterNumber,
+ "HMaterName": data.HMaterName,
+ "HMaterModel": data.HMaterModel,
+ "HPlanQty": data.HPlanQty,
+ "HICMOQty": data.HICMOQty,
+ "HOrderProcNO": data.HOrderProcNO,
+ "lngBillKey": data.HProcExchInterID,
+ "lngBillSubKey": data.HProcExchEntryID,
+ "HPRDOrgID": data.HPRDORGID,
+ "HPRDOrg": data.HPRDOrg,
+ "HRemark": data.HRemark,
+ "HMaker": data.HMaker,
+ "HChecker": data.HChecker,
+ "HCloseMan": data.HCloseMan,
+ "HUpDater": data.HUpDater,
+ "HDeleteMan": data.HDeleteMan,
+ "HMakeDate": data.HMakeDate == null ? "" : Pub_Format(data.HMakeDate, "yyyy-MM-dd hh:mm:ss"),
+ "HCheckDate": data.HCheckDate == null ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss"),
+ "HCloseDate": data.HCloseDate == null ? "" : Pub_Format(data.HCloseDate, "yyyy-MM-dd hh:mm:ss"),
+ "HUpDateDate": data.HUpDateDate == null ? "" : Pub_Format(data.HUpDateDate, "yyyy-MM-dd hh:mm:ss"),
+ "HDeleteDate": data.HDeleteDate == null ? "" : Pub_Format(data.HDeleteDate, "yyyy-MM-dd hh:mm:ss")
});
- if (data.鏄惁瀹℃牳 == "true") {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
- } else {
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
- }
- if (OperationType == 3) {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- }
+ $("#HBarCode").attr("readonly", "readonly");
+ $("#HBarCode").css("background-color", "#efefef4d");
+ $('#QueDin').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ $('#SerialNum-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+
+ //if (data.鏄惁瀹℃牳 == "true") {
+ // $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ // $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ //} else {
+ // $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ // $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ //}
+ //if (OperationType == 3) {
+ // $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ // $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ //}
//PicUpload();
layer.close(index);
}
@@ -1011,7 +1152,7 @@
case "GXLX":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HICMOInterID": data.hicmointerid,
- "lngICMOEntryID": data.HICMOEntryID,
+ "HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
"HMaterID": data.HMaterID,
"HMaterName": data.浜у搧,
@@ -1025,8 +1166,7 @@
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrg": data.缁勭粐,
- "HPRDOrgID": data.缁勭粐,
- "HQty": data.娴佽浆鍗℃暟閲�,
+ "HPRDOrgID": data.缁勭粐
});
if (data.鎺掑簭鍙� == "涔斾竴") {
@@ -1154,11 +1294,12 @@
});
function txtHProcNo_KeyDown(sBillNo, sProcNo) {
+ var sHBillNo = $('#HBillNo').val();
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ url: GetWEBURL() + "/Cj_StationInBill/HProcNo_KeyDown",
type: "GET",
- data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ data: { "HBillNo": sHBillNo, "HProcExchBillNo": sBillNo, "HProcNo": sProcNo, "HMaker": HMaker },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -1167,10 +1308,16 @@
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
"HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID
+ "HCenterID": data.HCenterID,
+ "HQty": data.HQty,
+ "HMaterToSourceInterID": data.HMaterToSourceInterID,
+ "HMaterToSourceBillNo": data.HMaterToSourceBillNo
});
$("#HProcNo").attr("readonly", "readonly");
$("#HProcNo").css("background-color", "#efefef4d");
+ $('#SerialNum-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
layer.close(index);
}
else {
@@ -1448,7 +1595,7 @@
}
, end: function () {
var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
+ var sBillNo = $('#HProcExchBillNo').val();
if (sProcNo != "") {
txtHProcNo_KeyDown(sBillNo, sProcNo);
}
@@ -1464,9 +1611,262 @@
form.on('submit(btnSearchSup)', function () {
layer.msg('绂佹閫夋嫨');
});
- //浠ヤ笂涓簂ayui妯″潡
+
+
+ //#region 鎵弿閰嶄欢鏉＄爜
+
+ //鎵弿閰嶄欢鏉＄爜
+ $('#HMaterBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus(); //鑾峰彇鍏夋爣
+ }
+ });
+
+ //鏉＄爜鎸夐挳
+ form.on('submit(HMaterBarCode-BT)', function (data) {
+ GetMeesageByBarCode();
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus(); //鑾峰彇鍏夋爣
+ });
+
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) {
+ var sOldBarCode = $('#HMaterBarCode').val()
+ var HDeleteFlag = sOldBarCode.substring(0, 1);
+ var sBarCode = sOldBarCode.slice(1);
+ var HMaterToSourceInterID = $('#HMaterToSourceInterID').val()
+ var HMaterToSourceBillNo = $('#HMaterToSourceBillNo').val()
+
+ if (HDeleteFlag == "*") {
+ if (sBarCode == "") {
+ playSound();
+ layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ return;
+ }
+ else {
+ $('#HMaterBarCode').val("");
+ }
+ layer.load(3)
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/set_DelStationInBillSub_BindBarCodeTemp_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HMaterToSourceInterID, "HBillType": '3786', "HBarCode": sBarCode },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ playSound_OK();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg('閿欒' + err, {
+ icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ else {
+ var sBarCode = $('#HMaterBarCode').val()
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ return;
+ }
+ if (sBarCode != "") {
+ $('#HMaterBarCode').val("");
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MaterToSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HMaterToSourceInterID, "HBillNo": HMaterToSourceBillNo, "HBillType": '3786', "HBarCode": sBarCode, "HMaker": HMaker },
+ success: function (result) {
+ if (result.count == 1) {
+ playSound_OK();
+ element.tabChange('TabTest', '3');
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ }
+
+ //#endregion
+
+ //#region 鏄剧ず涓婃枡闃查敊鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ var HMaterToSourceInterID = $('#HMaterToSourceInterID').val()
+ var HMaterToSourceBillNo = $('#HMaterToSourceBillNo').val()
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_MaterToSource_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HMaterToSourceInterID, "HBillNo": HMaterToSourceBillNo, "HBillType": '3786' },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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;
+ default:
+
+ if (data[i].name == '搴斿彂鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 90, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 200 });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏉＄爜鏁伴噺', title: '鏉＄爜鏁伴噺', width: 100 }
+ , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+ //#region 鍒犺
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ var HBarCode = data[0].鏉＄爜缂栧彿
+ var HMaterToSourceInterID = $('#HMaterToSourceInterID').val()
+
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelStationInBillSub_BindBarCodeTemp_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HMaterToSourceInterID, "HBillType": '3786', "HBarCode": HBarCode },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+
+ //#endregion
+
});
+ //浠ヤ笂涓簂ayui妯″潡
+
//杩斿洖鐢熶骇鐝粍
function GetProductionTeamValue(obj) {
$("#HGroupName").val(obj[0].鐝粍);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index 54e3912..2fd66bf 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -187,7 +187,7 @@
<div class="layui-inline">
<label class="layui-form-label">澶у啓閲戦</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBigMoney" id="HBigMoney" value="" autocomplete="off" >
+ <input class="layui-input" name="HBigMoney" id="HBigMoney" value="" autocomplete="off" style="background-color: #efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -439,6 +439,7 @@
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
$("#HRelSumMoney").val(HRelSumMoney);
+ getBigMoneyByRelSumMoney();
});
//#endregion
@@ -466,28 +467,44 @@
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
$("#HRelSumMoney").val(HRelSumMoney);
+ getBigMoneyByRelSumMoney();
});
//#endregion
});
-
- $(document).ready(function () {
- $("#HBigMoney").blur(function () {
- var num = $(this).val();
- var strOutput = "";
- var strUnit = '浠熶桨鎷句嚎浠熶桨鎷句竾浠熶桨鎷惧厓瑙掑垎';
- num += "00";
- var intPos = num.indexOf('.');
- if (intPos >= 0) {
- num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
- }
- strUnit = strUnit.substr(strUnit.length - num.length);
- for (var i = 0; i < num.length; i++) {
- strOutput += '闆跺９璐板弫鑲嗕紞闄嗘煉鎹岀帠'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
- }
- // 灏嗚浆鎹㈠悗鐨勫ぇ鍐欓噾棰濇浛鎹㈡枃鏈涓殑鍐呭
- $(this).val(strOutput.replace(/闆惰闆跺垎$/, '鏁�').replace(/闆禰浠熶桨鎷綸/g, '闆�').replace(/闆秢2,}/g, '闆�').replace(/闆�([浜縷涓嘳)/g, '$1').replace(/闆�+鍏�/, '鍏�').replace(/浜块浂{0,3}涓�/, '浜�').replace(/^鍏�/, "闆跺厓"));
- });
- });
+ function getBigMoneyByRelSumMoney() {
+ var num = $("#HRelSumMoney").val();
+ var strOutput = "";
+ var strUnit = '浠熶桨鎷句嚎浠熶桨鎷句竾浠熶桨鎷惧厓瑙掑垎';
+ num += "00";
+ var intPos = num.indexOf('.');
+ if (intPos >= 0) {
+ num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
+ }
+ strUnit = strUnit.substr(strUnit.length - num.length);
+ for (var i = 0; i < num.length; i++) {
+ strOutput += '闆跺９璐板弫鑲嗕紞闄嗘煉鎹岀帠'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
+ }
+ // 灏嗚浆鎹㈠悗鐨勫ぇ鍐欓噾棰濇浛鎹㈡枃鏈涓殑鍐呭
+ $("#HBigMoney").val(strOutput.replace(/闆惰闆跺垎$/, '鏁�').replace(/闆禰浠熶桨鎷綸/g, '闆�').replace(/闆秢2,}/g, '闆�').replace(/闆�([浜縷涓嘳)/g, '$1').replace(/闆�+鍏�/, '鍏�').replace(/浜块浂{0,3}涓�/, '浜�').replace(/^鍏�/, "闆跺厓"));
+ }
+ //$(document).ready(function () {
+ // $("#HBigMoney").blur(function () {
+ // var num = $("#HRelSumMoney").val();
+ // var strOutput = "";
+ // var strUnit = '浠熶桨鎷句嚎浠熶桨鎷句竾浠熶桨鎷惧厓瑙掑垎';
+ // num += "00";
+ // var intPos = num.indexOf('.');
+ // if (intPos >= 0) {
+ // num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
+ // }
+ // strUnit = strUnit.substr(strUnit.length - num.length);
+ // for (var i = 0; i < num.length; i++) {
+ // strOutput += '闆跺９璐板弫鑲嗕紞闄嗘煉鎹岀帠'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
+ // }
+ // // 灏嗚浆鎹㈠悗鐨勫ぇ鍐欓噾棰濇浛鎹㈡枃鏈涓殑鍐呭
+ // $(this).val(strOutput.replace(/闆惰闆跺垎$/, '鏁�').replace(/闆禰浠熶桨鎷綸/g, '闆�').replace(/闆秢2,}/g, '闆�').replace(/闆�([浜縷涓嘳)/g, '$1').replace(/闆�+鍏�/, '鍏�').replace(/浜块浂{0,3}涓�/, '浜�').replace(/^鍏�/, "闆跺厓"));
+ // });
+ //});
//#endregion
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
@@ -738,7 +755,49 @@
}
$("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
$("#HSupID").val(checkStatus.data[0].HItemID);
-
+ if ($("#HAccSupName").val() == '') {
+ $("#HAccSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HAccSupID").val(checkStatus.data[0].HItemID);
+ }
+ //鑾峰彇閾惰鐩稿叧鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": $("#HSupID").val()
+ },
+ success: function (d) {
+ $("#HBankName").val(d.data[0].寮�鎴烽摱琛�);
+ $("#HCurID").val(d.data[0].榛樿璐у竵ID);
+ $("#HCurName").val(d.data[0].榛樿璐у竵);
+ $("#HBankNo").val(d.data[0].閾惰璐﹀彿);
+ $("#HSSID").val(d.data[0].缁撶畻鏂瑰紡ID);
+ $("#HSSName").val(d.data[0].缁撶畻鏂瑰紡);
+ //鑾峰彇榛樿璐у竵姹囩巼
+ $.ajax({
+ url: GetWEBURL() + "GetGy_CurrencyDetail",
+ type: "GET",
+ data: {
+ "HID": $("#HCurID").val()
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Edit_Gy_CurrencyList[0];
+ $("#HExRate").val(data.姹囩巼);
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ //table.reload(layTableId, {
+ // data: ajaxReturnData
+ //});
+ },error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index f3cd326..09402f5 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -469,8 +469,8 @@
//#endregion
var rowdata = [{
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0,"HWHName":"", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": 1, "HRelTaxPrice": "", "HTaxRate": 1, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd"),
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": "", "HRemark": ""
+ , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": 1, "HRelTaxPrice": "", "HTaxRate": 0, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd"),
}];
// 鍒濆鍖栫晫
@@ -482,8 +482,8 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "1", "HRelTaxPrice": "", "HTaxRate":1, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd")
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": "", "HRemark": ""
+ , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "1", "HRelTaxPrice": "", "HTaxRate":0, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd")
};
switch (obj.event) {
case 'btn-AddLine':
@@ -530,7 +530,7 @@
form.on('submit(HEmpList)', function () {
get_checkEmp();
});
- //閫夋嫨瀹㈡埛鎸夐挳
+ //閫夋嫨渚涘簲鍟嗘寜閽�
form.on('submit(HSupList)', function () {
get_checkSup();
});
@@ -650,13 +650,13 @@
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp) || temp == 0) {
+ if (!ref.test(temp) ) {
//鎭㈠鏁版嵁鍒扮紪杈戝墠
obj.update({
HPrice: oldText
});
- layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ layer.msg("鍗曚环璇疯緭鍏ユ暟瀛�!");
return;
}
@@ -685,7 +685,7 @@
, HlineTotalBB: HlineTotalBB
});
break;
- case "HTaxRate": //鏁伴噺
+ case "HTaxRate": //绋庣巼
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
if (!ref.test(temp)) {
@@ -694,7 +694,7 @@
HTaxRate: oldText
});
- layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ layer.msg("绋庣巼璇疯緭鍏ユ暟瀛�!");
return;
}
@@ -1075,7 +1075,7 @@
for (var i = 0; i < checkStatus.data.length; i++) {
if (rowIndex + i >= option.data.length) {
var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": 1, "HRemark": ""
, "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
};
@@ -1095,6 +1095,7 @@
option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
option.data[rowIndex + i].HUnitID = resultData.HUnitID;
option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ option.data[rowIndex + i].HQty = 1;
}
table.render(option);
@@ -1112,7 +1113,8 @@
, "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ ,"HQty":1
})
}
});
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/Add_Edit_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/Add_Edit_Xs_SeOutStockBillList.html"
index 77102f9..3bb317f 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/Add_Edit_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/Add_Edit_Xs_SeOutStockBillList.html"
@@ -258,7 +258,17 @@
<div class="layui-input-inline">
<input class="layui-input" name="HProjectName" id="HProjectName" autocomplete="off" readonly>
</div>
-
+
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
</div>
</div>
</div>
@@ -510,6 +520,10 @@
//閫夋嫨浠撳簱鎸夐挳
form.on('submit(HWHList)', function () {
get_checkWH();
+ });
+ //閫夋嫨缁撶畻鎸夐挳
+ form.on('submit(HSSList)', function () {
+ get_checkSS();
});
//閫夋嫨甯佸埆鎸夐挳
form.on('submit(HCurList)', function () {
@@ -822,6 +836,8 @@
, "HDeptID": data.HDeptID
, "HCurID": data.HCurID
, "HCurName": data.甯佸埆
+ , "HSSID": data.HSSID
+ , "HSSName": data.缁撶畻鏂瑰紡
, "HExRate": data.姹囩巼
, "HManagerName": data.涓荤
, "HManagerID": data.HManagerID
@@ -1025,7 +1041,33 @@
});
}
}
+ //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋��
+ function getCustomerByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ $("#HCurID").val(data.HCurID);
+ $("#HCurName").val(data.HCurName);
+ $("#HExRate").val(data.HExRate);
+ $("#HSSID").val(data.HSSID);
+ $("#HSSName").val(data.HSSName);
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//琛屽唴蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -1047,20 +1089,35 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁");
+ }else if (checkStatus.data.length == 1) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ ,"HQty": 1
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ } else {
+ table.cache["mainTable"].splice(0, 1);
+ for (var rowData of checkStatus.data) {
+ var NewRow = {
+ "HMaterID": rowData.HItemID, "鐗╂枡浠ｇ爜": rowData.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": rowData.鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": rowData.瑙勬牸鍨嬪彿, "HUnitID": rowData.HUnitID, "璁￠噺鍗曚綅": rowData.璁￠噺鍗曚綅鍚嶇О, "HWHID": "0", "鍙戣揣浠撳簱": "",
+ "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ };
+ table.cache["mainTable"].push(NewRow);
+ }
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ layer.close(index);//鍏抽棴寮圭獥
}
-
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
- , "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
- })
- layer.close(index);//鍏抽棴寮圭獥
+
}
, end: function () {
if (typeof (OptionData.HItemID) != "undefined") {
@@ -1220,6 +1277,7 @@
}
$("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
$("#HCusID").val(checkStatus.data[0].HItemID);
+ getCustomerByCusID($("#HCusID").val());
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1325,7 +1383,29 @@
, btn2: function (index, layero) { }
})
}
-
+ //缁撶畻鏂瑰紡
+ function get_checkSS() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
+ $("#HSSID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
//椤圭洰浠ｇ爜
function get_checkSearchHProNumber() {
var HOrgID = sessionStorage["OrganizationID"];
@@ -1451,7 +1531,11 @@
}
layui.table.render(option);
}
-
+ function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
+ {
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
+ $("#HSSID").val(obj[0].HItemID);
+ }
//鍙屽嚮杩斿洖浠撳簱
function GetHWHSubValue(data) {
OptionData = data[0]
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 47b55df..667b2e2 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -988,14 +988,14 @@
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp) || temp == 0) {
+ if (!ref.test(temp) ) {
//鎭㈠鏁版嵁鍒扮紪杈戝墠
obj.update({
HPrice: oldText
});
table.render(option);
- layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟瀛�!");
return;
}
@@ -2202,11 +2202,8 @@
//鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HPrice"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟瀛楋紒");
return false;
}
--
Gitblit v1.9.1