From b2886a29fbc328bf51aa82bf2e5a19483ca11012 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 14 十一月 2023 09:22:34 +0800
Subject: [PATCH] 不良原因加 不良类型选项 不良类型编辑页面 不良类型列表 单品过站功能完善
---
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 103 ++++++++++
WebTM/views/基础资料/生产基础资料/Gy_BadType.html | 12
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadType.html | 310 ++++++++++++++++++++++++++++++++++
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html | 69 +++++++
WebTM/WebTM.csproj | 2
5 files changed, 480 insertions(+), 16 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2511d1f..afbc2a3 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -258,6 +258,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadType.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadType.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
index 4114ec1..90a812b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
@@ -85,6 +85,24 @@
</div>
</div>
<div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">涓嶈壇绫诲瀷锛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBadTypeName" id="HBadTypeName" lay-verify="HBadTypeName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadType-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
+ </button>
+ <input id="HBadTypeID" name="HBadTypeID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">涓嶈壇绫诲瀷浠ｇ爜锛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBadTypeNumber" id="HBadTypeNumber" lay-verify="HBadTypeNumber" readonly="readonly" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label"> 绂佺敤鏍囧織:</label>
<div class="layui-input-inline">
<!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
@@ -235,6 +253,44 @@
}
})
});
+
+ //閫夋嫨榛樿涓嶈壇绫诲瀷
+ form.on('submit(HBadType-BT)', function () {//閫夋嫨閮ㄩ棬
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '涓嶈壇绫诲瀷鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadType.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HBadTypeName").val(checkStatus.data[0].涓嶈壇绫诲瀷鍚嶇О);
+ $("#HBadTypeID").val(checkStatus.data[0].HItemID);
+ $("#HBadTypeNumber").val(checkStatus.data[0].涓嶈壇绫诲瀷浠ｇ爜);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
+
//閫夋嫨榛樿宸ュ簭
form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
layer.open({
@@ -322,6 +378,9 @@
$("#HProcName").val(data.宸ュ簭鍚嶇О);//榛樿宸ュ簭
$("#HProcID").val(data.宸ュ簭ID);//宸ュ簭ID
$("#HProcNumber").val(data.宸ュ簭浠ｇ爜);//宸ュ簭浠ｇ爜
+ $("#HBadTypeName").val(data.涓嶈壇绫诲瀷);//榛樿涓嶈壇绫诲瀷
+ $("#HBadTypeID").val(data.HBadTypeID);//涓嶈壇绫诲瀷ID
+ $("#HBadTypeNumber").val(data.涓嶈壇绫诲瀷浠ｇ爜);//涓嶈壇绫诲瀷浠ｇ爜
$("#HRemark").val(data.澶囨敞);//澶囨敞
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
@@ -344,13 +403,17 @@
layer.msg("璇烽�夋嫨榛樿閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HDepName").val() == '') {
+
+ if ($("#HProcName").val() == '') {
layer.msg("璇烽�夋嫨榛樿宸ュ簭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- else {
- return true;
+
+ if ($("#HBadTypeNumber").val() == '') {
+ layer.msg("璇烽�夋嫨榛樿涓嶈壇绫诲瀷", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
}
+ return true;
}
//
function f_alert(sMsg) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadType.html"
new file mode 100644
index 0000000..8f43c6d
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadType.html"
@@ -0,0 +1,310 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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 id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+ </div>
+
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <!--<ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>-->
+ <!--<li>鍏朵粬淇℃伅</li>-->
+ <!--</ul>-->
+ <h1 style="text-align:center;"><b>涓嶈壇绫诲瀷</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">浠ｇ爜锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" id="HName" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">榛樿鐝粍锛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" readonly="readonly" autocomplete="off" class="layui-input" style="float: left; width: 150px; background-color: #efefef4d;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
+ </button>
+ <input id="HGroupID" name="HGroupID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">榛樿鐝粍浠ｇ爜锛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupNumber" id="HGroupNumber" lay-verify="" readonly="readonly" style="background-color: #efefef4d;" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+ <div class="layui-input-inline">
+ <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-col-xs11">
+ <label class="layui-form-label"> 澶囨敞锛�</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ <input type="hidden" class="layui-input" name="HOrgID" id="HOrgID" autocomplete="off">
+ <input type="hidden" class="layui-input" name="HMakeEmp" id="HMakeEmp" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+ set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid();
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+
+ var isEndCheck = document.getElementById("HStopflag").checked;
+ isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ if (AllowLoadData()) {
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveGy_BadType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "msg": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ });
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {//
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+ //閫夋嫨榛樿鐝粍
+ form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐝粍鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ $("#HGroupNumber").val(checkStatus.data[0].鐝粍浠ｇ爜);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ })
+ });
+
+ ////绂佺敤鏍囧織
+ //form.on('checkbox(HStopflag)', function (data) {
+ // $("#HStopflag").val(data.elem.checked);
+ //});
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+ //#endregion
+
+
+ //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ $("#HItemID").val("0");
+ $("#HNumber").val("");
+ }
+ //缂栬緫
+ function set_EditFromGrid() {
+ $("#HItemID").val(linterid);
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ }
+ //缂栬緫鍔犺浇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "GetGy_BadTypeDetail",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_gy_BadTypeList[0];
+ $("#HNumber").val(data.涓嶈壇绫诲瀷浠ｇ爜);//浠ｇ爜
+ $("#HItemID").val(data.HItemID);//浠ｇ爜ID
+ $("#HName").val(data.涓嶈壇绫诲瀷鍚嶇О);//鍚嶇О
+ $("#HHelpCode").val(data.鍔╄浠ｇ爜);//鍔╄浠ｇ爜
+ $("#HGroupNumber").val(data.鐝粍浠ｇ爜);//榛樿閮ㄩ棬浠ｇ爜
+ $("#HGroupName").val(data.鐝粍鍚嶇О);//榛樿閮ㄩ棬
+ $("#HGroupID").val(data.HGroupID);//閮ㄩ棬id
+ $("#HRemark").val(data.澶囨敞);//澶囨敞
+ $("input[name='HStopflag']").attr("checked", (data.绂佺敤鏍囪==""?false:true));//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ if ($("#HHelpCode").val() == '') {
+ layer.msg("璇峰～鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HGroupNumber").val() == '') {
+ layer.msg("璇烽�夋嫨榛樿鐝粍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ return true;
+ }
+ //
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ //#endregion
+ });
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
index ef892be..a3e3bcd 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
@@ -79,10 +79,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></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>
@@ -114,7 +114,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var HModName = "Gy_BadReason";
+ var HModName = "Gy_BadType";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
//#endregion
@@ -339,7 +339,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=1&linterid=&HSouceBillType=',
+ content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadType.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -362,7 +362,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -387,7 +387,7 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "DeltetGy_BadReason", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "DeltetGy_BadType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index 86e4c5a..3ee937c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -354,7 +354,8 @@
//鏌ヨ涓嶈壇璁板綍
get_BadRecords(HBarCode);
//鏌ヨ鍚堟牸璁板綍
- get_HGRecords(HBarCode);
+ get_HGRecords();
+ //鏌ヨ鎬绘暟閲�
}
});
@@ -374,6 +375,16 @@
}
get_Accessory(HBarCode);
}
+ });
+
+ //涓嶈壇璁板綍琛屽唴浜嬩欢
+ table.on('tool(mainTable3)', function (obj) {
+ set_GridDelete1(obj); //琛屽唴鍒犻櫎
+ });
+
+ //鍚堟牸璁板綍琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete2(obj); //琛屽唴鍒犻櫎
});
//涓嶈壇姹囨姤
@@ -537,6 +548,8 @@
, { field: 'HBarCode', title: 'SN鐮�' }
, { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜' }
, { field: 'HBatchNo', title: '涓嶈壇绫诲瀷' }
+ , { field: 'HInterID', title: 'HInterID', hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', hide: true}
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo2' }
]]
}
@@ -557,8 +570,8 @@
, { field: '鏃ユ湡', title: '鏃ユ湡' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '浜у搧鏉＄爜', title: 'SN鐮�' }
- , { field: '閰嶄欢鏉＄爜', title: '閰嶄欢SN鐮�' }
- , { field: '浠诲姟鍗曞彿', title: '璁㈠崟鍙�' }
+ //, { field: '閰嶄欢鏉＄爜', title: '閰嶄欢SN鐮�' }
+ //, { field: '浠诲姟鍗曞彿', title: '璁㈠崟鍙�' }
, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
, { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
@@ -603,13 +616,16 @@
}
//鏌ヨ鍚堟牸璁板綍
- function get_HGRecords(HBarCode) {
+ function get_HGRecords() {
+ var HProcExchInterID = $("#HProcExchInterID").val();
+ var HProcExchEntryID = $("#HProcExchEntryID").val();
+ var sWhere = "and HProcExchInterID=" + HProcExchInterID + " and HProcExchEntryID=" + HProcExchEntryID;
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/HGRecordsList',
type: "GET",
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option3.data = data1.data;
@@ -663,6 +679,71 @@
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
+ }
+
+ //涓嶈壇璁板綍鍒犻櫎鏂规硶
+ function set_GridDelete1(obj) {
+ if (obj.event === 'del2') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ var HInterID = obj.data.HInterID;
+ var HEntryID = obj.data.HEntryID;
+ var HProcID = $("#HProcID").val();
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_SingleStation/DelBadRecords",
+ type: "GET",
+ async: false,
+ data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"], "HProcID": HProcID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg("鍒犻櫎鎴愬姛锛�");
+ layer.close(ajaxLoad);
+ //鏌ヨ涓嶈壇璁板綍
+ get_BadRecords($("#HBardCodeProcExchBillNo").val());
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ })
+ });
+ }
+ }
+
+ //鍚堟牸璁板綍鍒犻櫎鏂规硶
+ function set_GridDelete2(obj) {
+ if (obj.event === 'del3') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ var HInterID = obj.data.hmainid;
+ var HEntryID = obj.data.hsubid;
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_SingleStation/DelQualifiedRecords",
+ type: "GET",
+ async: false,
+ data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg("鍒犻櫎鎴愬姛锛�");
+ layer.close(ajaxLoad);
+ //鏌ヨ鍚堟牸璁板綍
+ get_HGRecords();
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ })
+ });
+ }
}
//娴佽浆鍗℃煡璇㈠叧閿欢娓呭崟
@@ -963,6 +1044,9 @@
, title: '宸ュ簭涓嶈壇姹囨姤'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../杞﹂棿绠＄悊/鍗曞搧杩囩珯/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val(), 'yes']
+ , end: function () {
+ get_BadRecords($("#HBardCodeProcExchBillNo").val());
+ }
})
}
else {
@@ -992,8 +1076,13 @@
layer.msg("鎻愪氦鎴愬姛");
//淇濆瓨鍒颁复鏃惰〃
get_AddBomTempList();
- get_BomList($("#HBardCodeProcExchBillNo").val());
- get_BadRecords($("#HBardCodeProcExchBillNo").val());
+ var HBardCodeProcExchBillNo = $("#HBardCodeProcExchBillNo").val();
+ get_BomList(HBardCodeProcExchBillNo);
+ get_BadRecords(HBardCodeProcExchBillNo);
+ //鏌ヨ鍚堟牸璁板綍
+ get_HGRecords();
+ //鏌ヨ涓嶈壇璁板綍
+ get_BadRecords(HBardCodeProcExchBillNo);
}
else {
layer.close(index);
--
Gitblit v1.9.1