From 4d7afc0a8b0dbac43dc25ad02858aef668947929 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 26 一月 2022 00:12:00 +0800
Subject: [PATCH] 雅琪诺报工台产量汇报单传参修改
---
WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html | 82 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 12 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/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.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/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
index 240ebbd..849f6ca 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/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.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/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -132,6 +132,22 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭搴忓彿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcNo" id="HProcNo" lay-verify="number" autocomplete="off" class="layui-input" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩斿伐宸ュ簭</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <select name="HProcID" id="HProcID" lay-verify="required" lay-search="">
+ <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="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
@@ -140,17 +156,11 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
<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">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">杩斿伐鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
</div>
@@ -219,6 +229,12 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩斿伐鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
</div>
@@ -359,6 +375,9 @@
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
+ //鍒濆鍖栬繑宸ュ伐搴忓垪琛�(鎵�鏈夊伐搴�)
+ ReworkProcess();
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -412,8 +431,40 @@
}
+ //鍒濆鍖栬繑宸ュ伐搴忓垪琛�(鎵�鏈夊伐搴�)
+ function ReworkProcess()
+ {
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/GetMESReturnStepSelectBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var str = ''; //澹版槑瀛楃涓�
+ $("#HProcID option:gt(0)").remove();//閲嶆柊鍔犺浇鍓嶏紝绉婚櫎绗竴涓互澶栫殑option
+ $.each(data.data, function (i, obj) {
+ str += '<option value="' + obj.HItemID + '">' + obj.宸ュ簭鍚嶇О + '</option>';
+ });//閬嶅巻寰幆閬嶅巻
+ $(str).appendTo("#HProcID");//缁戝畾
+ form.render("select");//娉ㄦ剰锛氭渶鍚庡繀椤婚噸鏂版覆鏌撲笅鎷夋锛屽惁鍒欐病鏈変换浣曟晥鏋溿��
+ }
+ else
+ {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
//鏈夋簮鍗曟柊澧�
function set_AddNew() {
+
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
@@ -429,7 +480,7 @@
$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HMaterName').attr("disabled", true);
$('#HMaterSpec').attr("disabled", true);
- $('#HProcID').attr("disabled", true);
+ //$('#HProcID').attr("disabled", true);
$('#HProcName').attr("disabled", true);
$('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HPlanBeginDate').attr("disabled", true);
@@ -470,13 +521,11 @@
$("#HSourceBillNo").val(HSourceBillNo); //婧愬崟鍐呯爜
$("#HSourceInterID").val(HSourceInterID); //婧愬崟涓荤爜
$("#HSourceEntryID").val(HSourceEntryID); //婧愬崟瀛愮爜
-
- $("#HProcID").val(LoadData[0].HProcID); //杩斿伐宸ュ簭ID
- $("#HProcName").val(LoadData[0].HProcName); //杩斿伐宸ュ簭
+ //$("#HProcID").val(LoadData[0].HProcID); //杩斿伐宸ュ簭ID
+ //$("#HProcName").val(LoadData[0].HProcName); //杩斿伐宸ュ簭
$("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
$("#HDeptName").val(LoadData[0].HDeptName); //杞﹂棿
-
}
else {
@@ -603,6 +652,7 @@
{
return false;
}
+
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/SaveGetMESReturnStepWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -924,6 +974,14 @@
layer.msg("鍗曟嵁鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HProcNo").val() == '' || $("#HProcNo").val() == null) {
+ layer.msg("杩斿伐宸ュ簭鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HProcID").val() == '' || $("#HProcID").val() == null) {
+ layer.msg("杩斿伐宸ュ簭涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
--
Gitblit v1.9.1