From 8e9cd08b9b022ef1adba208aedcd9ed6e1aff005 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 24 七月 2024 17:54:28 +0800
Subject: [PATCH] 不良评审申请单,对不良数量增加保存前验证,异常反馈单,生产质量汇报单,设备故障登记单 增加字段
---
WebTM/WebTM.csproj.user | 2
WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdRequestBillMain.html | 4
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList_New.html | 4
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 47 ++++++
WebTM/views/质量管理/检验取样还样单/QC_Add_TakeSampleCheckBill.html | 43 +++++
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html | 24 +++
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 265 ++++++++++++++++++++++++++++++++++---
7 files changed, 354 insertions(+), 35 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 005e8c8..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdRequestBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdRequestBillMain.html"
index d4042f2..624a8ba 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdRequestBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdRequestBillMain.html"
@@ -1117,6 +1117,10 @@
layer.msg("鎺ユ敹浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HUnRightQty").val() == '' || $("#HUnRightQty").val() == null) {
+ layer.msg("涓嶈壇鏁伴噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
return Result;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 893ec51..96361e9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -101,7 +101,7 @@
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
</ul>
- <div class="layui-tab-content" style="height: 700px;">
+ <div class="layui-tab-content" style="height: 900px;">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
@@ -121,7 +121,7 @@
<div class="layui-inline">
<label class="layui-form-label">涓婚:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" readonly>
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" >
</div>
</div>
<div class="layui-inline">
@@ -184,31 +184,72 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">杞彂鑷�:</label>
+ <label class="layui-form-label">杞彂鑷�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璐ｄ换浜�:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
+ <input type="text" name="HBadProcManName" id="HBadProcManName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HBadProcMan" id="HBadProcMan" class="layui-input" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadProcManList" id="HBadProcManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>-->
- </div>
- <!--<div class="layui-form-item">
+ </div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戦�佺被鍨�:</label>
+ <label class="layui-form-label">QE璐ｄ换浜� :<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <select name="HSendType" lay-filter="HSendType" id="HSendType">
- <option value="0" selected="selected">鍏叡</option>
- <option value="1">涓汉</option>
- </select>
+ <input type="text" name="HQEManName" id="HQEManName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HQEMan" id="HQEMan" class="layui-input" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQEManList" id="HQEManList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
- </div>-->
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">闂鏉ユ簮:</label>
+ <div class="layui-input-inline">
+ <select name="HForm" lay-filter="HForm" id="HForm">
+ <option value="浜�" selected="selected">浜�</option>
+ <option value="鏈�">鏈�</option>
+ <option value="鏂�">鏂�</option>
+ <option value="娉�">娉�</option>
+ <option value="鐜�">鐜�</option>
+ <option value="娴�">娴�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍙樺寲鐐�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HChangeNote" id="HChangeNote" class="layui-input" value="" autocomplete="off">
+ </div>
+ </div>
+ </div>
+
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璇︾粏绫诲:<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璇︾粏鍐呭:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HDescription" id="HDescription" style="width:1080px;"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">棰勯槻绾犳鎺柦 :</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ラ闃茬籂姝ｆ帾鏂� " class="layui-textarea" name="HNote" id="HNote" style="width:1080px;"></textarea>
</div>
</div>
</div>
@@ -248,17 +289,23 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟鍗曞彿:</label>
+ <label class="layui-form-label">鐢熶骇璧勬簮</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
- <input id="HMainSourceInterID" name="HMainSourceInterID" value="0" type="hidden" />
- <input id="HMainSourceEntryID" name="HMainSourceEntryID" value="0" type="hidden" />
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px;" readonly>
+ <input type="hidden" value="0" name="HSourceID" id="HSourceID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷:</label>
+ <label class="layui-form-label">鐢熶骇鐝</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
+ <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px;" readonly>
+ <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -294,6 +341,20 @@
<div class="layui-input-inline">
<input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;" disabled>
<input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
+ <input id="HMainSourceInterID" name="HMainSourceInterID" value="0" type="hidden" />
+ <input id="HMainSourceEntryID" name="HMainSourceEntryID" value="0" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
</div>
</div>
</div>
@@ -535,7 +596,7 @@
});
}
- //#region 鎶ュ伐鍙版寫鎴� 鑷姩甯﹀嚭鏁版嵁
+ //#region 鎶ュ伐鍙版寫鎴� 鑷姩甯﹀嚭鏁版嵁
//鑾峰彇鎶ュ伐鍙拌烦杞俊鎭� 鐗╂枡 鏁伴噺
function set_Sc_ICMOBillStatus() {
@@ -618,7 +679,7 @@
$("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
$("#HReceiveMan ").val(LoadData[0].鐢ㄦ埛鍚嶇О); //鎺ユ敹浜�
}
-
+
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -639,13 +700,13 @@
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/set_EquipFile", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: false,
data: {
- "HSourceName": HSourceName
+ "HSourceName": HSourceName
},
success: function (data) {
if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
var LoadData = data.data;
- EquipNumber=LoadData[0].璁惧缂栫爜; //浜у搧鍚嶇О
+ EquipNumber = LoadData[0].璁惧缂栫爜; //浜у搧鍚嶇О
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -667,7 +728,7 @@
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
}
@@ -756,6 +817,17 @@
, "HHandleEmpName": data.HHandleEmpName
, "HMaterModel": data.HMaterModel
, "HQty": data.HQty
+ , "HForm": data.HForm
+ , "HChangeNote": data.HChangeNote
+ , "HNote": data.HNote
+ , "HBadProcMan": data.HBadProcMan
+ , "HBadProcManName": data.HBadProcManName
+ , "HQEMan": data.HQEMan
+ , "HQEManName": data.HQEManName
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.HSourceName
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.HShiftsName
, "HDescription": data.HDescription
, "HRemark": data.HRemark
, "HMaker": data.HMaker //鍒跺崟浜�
@@ -779,7 +851,7 @@
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
- }
+ }
//鑾峰彇涓嬫媺閫変腑鍊�
form.on('select(SourceType)', function (data) {
@@ -1107,6 +1179,82 @@
});
});
+ //璐ｄ换浜哄脊绐�
+ form.on('submit(HBadProcManList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍙戦�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HBadProcManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HBadProcMan").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //QE璐ｄ换浜哄脊绐�
+ form.on('submit(HQEManList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍙戦�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQEManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HQEMan").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//杞彂鑷�
form.on('submit(HReTransmitManList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -1154,6 +1302,59 @@
}
});
+ });
+
+ //鐢熶骇鐝
+ form.on('submit(BtnHShiftsName)', function (data) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇鐝鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , resize: false
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , cancel: function (index, layero) {
+ }
+ })
});
@@ -1231,6 +1432,16 @@
$("#HSendMan").val(obj[0].鑱屽憳鍚嶇О);
}
+ function GetHManagerValue(obj) { //QE璐ｄ换浜�
+ $("#HQEManName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HQEMan").val(obj[0].HItemID);
+ }
+
+ function GetHSecManagerValue(obj) { //璐ｄ换浜�
+ $("#HBadProcManName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HBadProcMan").val(obj[0].HItemID);
+ }
+
function GetHDeptNameValue(obj) { //閮ㄩ棬
if (HDeptType == 1) {
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList_New.html"
index 21fb434..3f682a3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList_New.html"
@@ -15,6 +15,7 @@
<script src="../../../../layuiadmin/PubCustom.js"></script>
<script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../../layuiadmin/PageTitle.js"></script>
+ <!--<script src="../../../../layuiadmin/modules/soulTable.js"></script>-->
</head>
<body>
<div class="layui-fluid">
@@ -172,13 +173,14 @@
base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , soulTable = layui.soulTable
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index deed7b0..717695f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -252,8 +252,13 @@
<!--琛屼笅鎷夐�夋嫨(鍒ゅ畾缁撴灉)-->
<script type="text/html" id="HResult">
<select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
- <!--<option value="涓嶈壇">涓嶈壇</option>-->
<option value="鎶ュ簾">鎶ュ簾</option>
+ <option value="杩斿伐">杩斿伐</option>
+ <option value="鐗归噰">鐗归噰</option>
+ <option value="鏀捐">鏀捐</option>
+ <option value="宸ュ簾">宸ュ簾</option>
+ <option value="鏂欏簾">鏂欏簾</option>
+ <option value="鏍蜂欢淇濈暀">鏍蜂欢淇濈暀</option>
</select>
</script>
<script>
@@ -419,6 +424,8 @@
"瑙勬牸鍨嬪彿": "",
"HPRocID": "0",
"宸ュ簭": "",
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
"HQty": "0",
@@ -635,6 +642,8 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: "background-color:#efefef4d;" }
, { field: 'HProcID', title: 'HProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
, { field: '宸ュ簭', title: '宸ュ簭', width: 150 }
+ , { field: 'HBadProcID', title: 'HBadProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
+ , { field: '璐ｄ换宸ュ簭', title: '璐ｄ换宸ュ簭', width: 150, event: "HBadProcID", edit: 'text' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, style: "background-color:#efefef4d;", hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: "background-color:#efefef4d;" }//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text' }
@@ -692,6 +701,8 @@
"瑙勬牸鍨嬪彿": "",
"HPRocID": "0",
"宸ュ簭": "",
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
"HQty": "0",
@@ -803,6 +814,8 @@
"HUnitID": data.HUnitID,
"璁￠噺鍗曚綅": data.璁￠噺鍗曚綅,
"HQty": data.鏁伴噺,
+ "HBadProcID": data.HBadProcID,
+ "璐ｄ换宸ュ簭": data.璐ｄ换宸ュ簭,
"HResult": data.鍒ゅ畾缁撴灉,
"HEmpID": data.HEmpID,
"妫�楠屽憳": data.妫�楠屽憳,
@@ -985,6 +998,8 @@
"HQty": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
"HSourceID": "0",
"鐢熶骇璧勬簮": "",
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
"HRemark": "",
"HProcExchInterID": "0",
@@ -1584,7 +1599,37 @@
}
})
}
+ //鐗╂枡
+ if (obj.event == "HBadProcID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璐ｄ换宸ュ簭鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HBadProcID": checkStatus.data[0].HItemID
+ , "璐ｄ换宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ }
+ })
+ }
obj.event = "";
return false;
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index a3748fe..d6672cf 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -123,14 +123,32 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绱ф�ョ▼搴�</label>
+ <div class="layui-input-block" style="margin-left: 120px;width:180px">
+ <select name="HLev" id="HLev" lay-filter="HLev">
+ <option value="鏅��" selected="">鏅��</option>
+ <option value="閲嶈" >閲嶈</option>
+ <option value="绱ф��">绱ф��</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏁呴殰鍘熷洜鍒嗘瀽鍙婇闃叉帾鏂�</label>
+ <div class="layui-input-inline" style="width:300px;">
+ <textarea placeholder="璇疯緭鍏ユ晠闅滃師鍥犲垎鏋愬強棰勯槻鎺柦" class="layui-textarea" name="HReason" id="HReason"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
+ <div class="layui-input-inline" style="width:300px;">
<textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
+ <div class="layui-input-inline" style="width:300px;">
<textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
</div>
@@ -480,6 +498,8 @@
, "HConkTypeName": data.鏁呴殰绫诲埆 //鏁呴殰绫诲埆
, "HConkBeginDate": formatDate(data.鍙戠敓鏃ユ湡) //鏁呴殰鍙戠敓鏃ユ湡
, "HExplanation": data.鏁呴殰鎻忚堪 //鎽樿
+ , "HLev": data.绱ф�ョ▼搴� //澶囨敞
+ , "HReason": data.鏁呴殰鍘熷洜鍒嗘瀽鍙婇闃叉帾鏂� //澶囨敞
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
});
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
index 069def4..3839f0b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
@@ -254,7 +254,39 @@
<div class="layui-inline">
<label class="layui-form-label">鍙栨牱鏁伴噺:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
+ <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐮村潖鎬у疄楠屾暟閲�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSampleDamageQty" lay-verify="HSampleDamageQty" id="HSampleDamageQty" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶ュ簾鍐呭</label>
+ <div class="layui-input-inline" style="width:300px;height:15px">
+ <textarea placeholder="璇疯緭鍏ユ姤搴熷唴瀹�" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍗曢噸1:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProdWeight1" lay-verify="HProdWeight1" id="HProdWeight1" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍗曢噸2:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProdWeight2" lay-verify="HProdWeight2" id="HProdWeight2" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍗曢噸3:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
</div>
</div>
</div>
@@ -589,6 +621,11 @@
, "HCheckEmp": data[0]["HCheckEmp"] //鍙栨牱鍛業D
, "HCheckEmpName": data[0]["鍙栨牱鍛�"] //鍙栨牱鍛�
, "HQty": data[0]["鍙栨牱鏁伴噺"] //鍙栨牱鏁伴噺
+ , "HSampleDamageQty": data[0]["鐮村潖鎬у疄楠屾暟閲�"] //鐮村潖鎬у疄楠屾暟閲�
+ , "HBadNote": data[0]["鎶ュ簾鍐呭"] //鎶ュ簾鍐呭
+ , "HProdWeight1": data[0]["浜у搧鍗曢噸1"] //浜у搧鍗曢噸1
+ , "HProdWeight2": data[0]["浜у搧鍗曢噸2"] //浜у搧鍗曢噸2
+ , "HProdWeight3": data[0]["浜у搧鍗曢噸3"] //浜у搧鍗曢噸3
, "HGroupID": data[0]["HGroupID"] //鐝粍ID
, "HGroupName": data[0]["鐢熶骇鐝粍"] //鐝粍鍚嶇О
, "HShiftsID": data[0]["HShiftsID"] //鐝ID
@@ -712,7 +749,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -752,7 +789,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
--
Gitblit v1.9.1