From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
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/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.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/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
index 7b5b38b..ae37770 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/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.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/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>瀹屽伐鍗�</title>
+ <title>鍋滃伐鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -238,19 +238,46 @@
</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">
- <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HStopType" id="HStopType" lay-verify="HStopType">
+ <option value="">璇烽�夋嫨鍋滃伐鍘熷洜</option>
+ <option value="妯″叿淇濆吇">妯″叿淇濆吇</option>
+ <option value="鏂枡">鏂枡</option>
+ <option value="浜哄憳涓嶈冻">浜哄憳涓嶈冻</option>
+ <option value="鍋滄皵">鍋滄皵</option>
+ <option value="鍋滄按">鍋滄按</option>
+ <option value="鍋滅數">鍋滅數</option>
+ <option value="妯″叿鏁呴殰">妯″叿鏁呴殰</option>
+ <option value="鐩戞帶鎶ヨ">鐩戞帶鎶ヨ</option>
+ <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>
+ </div>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍋滃伐鍘熷洜</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
</div>
</div>
</div>
- </div>
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
@@ -577,8 +604,9 @@
, "HDeptName": data.閮ㄩ棬鍚嶇О //閮ㄩ棬鍚嶇О
, "HICMOInterID": data.HICMOInterID //鐢熶骇璁㈠崟涓籌D
, "HICMOEntryID": data.HICMOEntryID //鐢熶骇璁㈠崟瀛怚D
- , "HICMOBillNo": data.HICMOBillNo //鐢熶骇璁㈠崟
- , "HStopReason": data.鍋滃伐鍘熷洜 //鍋滃伐鍘熷洜
+ , "HICMOBillNo": data.HICMOBillNo
+ , "HStopType": data.鍋滃伐绫诲瀷 //鐢熶骇璁㈠崟
+ , "HStopReason": data.鍋滃伐鍘熷洜鎻忚堪 //鍋滃伐鍘熷洜
, "HRemark": data.澶囨敞 //澶囨敞
, "HMaker": data.鍒跺崟浜� //鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 //鍒跺崟鏃ユ湡
@@ -960,6 +988,10 @@
layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HStopType").val() == '' || $("#HStopType").val() == null) {
+ layer.msg("鍋滃伐绫诲瀷涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
layer.msg("鍋滃伐鍘熷洜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
--
Gitblit v1.9.1