From 5369fee6bde3aad82af136dfd46d4da343854094 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 03 七月 2024 10:36:32 +0800
Subject: [PATCH] 销售出库明细报表:特殊导出 增加 税率 后,业务员没有数据
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 378 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 251 insertions(+), 127 deletions(-)
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 24b4277..f19db1b 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"
@@ -105,7 +105,7 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�:</label>
+ <label class="layui-form-label">鍗曟嵁鍙�:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
@@ -113,21 +113,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鏃ユ湡:</label>
+ <label class="layui-form-label">鍗曟嵁鏃ユ湡:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" disabled autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓婚:</label>
+ <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">
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍙戦�佷汉:</label>
+ <label class="layui-form-label">鍙戦�佷汉:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSendMan" id="HSendMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSendManList" id="HSendManList" style="width:40px;">
@@ -136,11 +136,10 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戦�侀儴闂�:</label>
+ <label class="layui-form-label">鎺ユ敹浜�:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" style="width:40px;">
+ <input type="text" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -150,27 +149,28 @@
<label class="layui-form-label">绱ф�ョ▼搴�:</label>
<div class="layui-input-inline">
<select name="HLevel" lay-filter="HLevel" id="HLevel">
- <option value="0" selected="selected">鏅��</option>
- <option value="1">绱ф��</option>
+ <option value="鏅��" selected="selected">鏅��</option>
+ <option value="绱ф��">绱ф��</option>
</select>
</div>
</div>
</div>
- </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 type="text" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <select name="HSendType" lay-filter="HSendType" id="HSendType">
+ <option value="鍏叡" selected="selected">鍏叡</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">
- <input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <label class="layui-form-label">鎶勯��:<label style="color:red"> * </label></label>
+ <div>
+ <input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:1035px;" disabled>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HCopyManList" id="HCopyManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -185,57 +185,6 @@
</button>
</div>
</div>-->
- <div class="layui-inline">
- <label class="layui-form-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>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <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 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" type="hidden" />
- <input id="HMainSourceEntryID" name="HMainSourceEntryID" type="hidden" />
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍌績娆℃暟:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMaterModel" lay-verify="HMaterModel" id="HMaterModel" autocomplete="off" disabled>
- </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>
<!--<div class="layui-form-item">
<div class="layui-inline">
@@ -250,9 +199,9 @@
</div>-->
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-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:780px;"></textarea>
+ <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HDescription" id="HDescription" style="width:1080px;"></textarea>
</div>
</div>
</div>
@@ -260,7 +209,84 @@
<div class="layui-inline">
<label class="layui-form-label">澶囨敞:</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HRemark" id="HRemark" style="width:780px;"></textarea>
+ <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
+ </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 class="layui-input" name="HMaterNumber" lay-verify="HMaterNumber" value="" id="HMaterNumber">
+ </div>
+ </div>
+ <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="HMaterName" lay-verify="HMaterName" value="" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterModel" lay-verify="HMaterModel" value="" id="HMaterModel">
+ </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" value="" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <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 class="layui-inline">
+ <label class="layui-form-label">鍙戦�侀儴闂�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" 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 type="text" name="HRecDeptName" id="HRecDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HRecDeptID" id="HRecDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HRecDeptList" id="HRecDeptList" 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" style="display:none;">
+ <label class="layui-form-label">鍌績娆℃暟:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
+ </div>
+ </div>
+ </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="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>
@@ -347,6 +373,16 @@
</div>
<script>
//鑾峰彇鍙傛暟
+ var HICMOBillNo = ""; //宸ュ崟鍙�
+ var HSourceName = ""; //璁惧
+ var HType = ""; //寮傚父绫诲瀷
+
+
+ var edit = function (data) {
+ HICMOBillNo = data[0].HICMOBillNo;
+ HSourceName = data[0].HSourceName;
+ HType = data[0].HType;
+ }
var HBillType = ""; //鍗曟嵁绫诲瀷
var HMainSourceInterID = ""; //婧愬崟涓诲唴鐮�
var HMainSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
@@ -354,25 +390,17 @@
var HMainSourceBillType = ""; //婧愬崟绫诲瀷
var refSav = ""; //鎻愪氦绫诲瀷
var Qty = "";
- //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
- 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 HEntryID = params[params[2]];//婧愬崟瀛恑d
- var HSBillType = params[params[3]];//婧愬崟绫诲瀷
- }
+
+
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HMainSourceInterID = data[0].HSourceInterID;
- HMainSourceEntryID = data[0].HSourceEntryID;
- HMainSourceBillNo = data[0].HSourceBillNo;
- HMainSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HMainSourceInterID = data[0].HSourceInterID;
+ // HMainSourceEntryID = data[0].HSourceEntryID;
+ // HMainSourceBillNo = data[0].HSourceBillNo;
+ // HMainSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
@@ -380,7 +408,7 @@
}).extend({
index: 'lib/index' //涓诲叆鍙fā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -388,7 +416,24 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+
+ window.HDeptType = 0;
//#endregion
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+ 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 HEntryID = params[params[2]];//婧愬崟瀛恑d
+ var HSBillType = params[params[3]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
+ }
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -403,6 +448,12 @@
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
+ } else if (OperationType == 4) {
+ set_AddFNew();
+ var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
+ var Person = sessionStorage["HUserName"];
+ //鎶ュ伐鍙拌烦杞〉闈㈣嚜鍔ㄧ敓鎴愬唴瀹�
+ $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -446,8 +497,7 @@
}
//鏃犳簮鍗曟柊澧�
- function set_AddFNew()
- {
+ function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
@@ -507,8 +557,7 @@
}
//缂栬緫
- function set_EditFromGrid()
- {
+ function set_EditFromGrid() {
refSav = "Update";
form.render('select');
$.ajax({
@@ -537,9 +586,11 @@
, "HMainSourceEntryID": data.HSourceEntryID //婧愬崟瀛怚D
, "HMainSourceBillNo": data.HSourceBillNo //婧愬崟鍗曞彿
, "HMainSourceBillType": data.HSourceBillType //婧愬崟绫诲瀷
- , "HHasten": data.HHasten
- , "HMaterName": data.HMaterName
- , "HMaterModel": data.HMaterModel
+ , "HHasten": data.HHasten
+ , "HMaterName": data.HMaterName
+ , "HHandleEmpID": data.HHandleEmpID
+ , "HHandleEmpName": data.HHandleEmpName
+ , "HMaterModel": data.HMaterModel
, "HQty": data.HQty
, "HDescription": data.HDescription
, "HRemark": data.HRemark
@@ -578,7 +629,7 @@
data: { "HBillType": '4502' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(0);
+ $("#HInterID").val(d.data[0].HInterID);
}
});
}
@@ -586,7 +637,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
}
- //鑾峰彇涓嬫媺閫変腑鍊�
+ //鑾峰彇涓嬫媺閫変腑鍊�
form.on('select(SourceType)', function (data) {
Sctag = data.value;
form.render('select');
@@ -603,16 +654,12 @@
}
});
-
-
-
-
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
- if (!AllowLoadData())//鏁版嵁楠岃瘉
+ if (!AllowLoadData(OperationType))//鏁版嵁楠岃瘉
{
return false;
}
@@ -624,18 +671,18 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ //$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
layer.confirm(data.Message, {
btn: ['纭']
}, function (index) {
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
});
}
else {
@@ -654,8 +701,7 @@
});
//瀹℃牳鎻愪氦
- function SaveVerify()
- {
+ function SaveVerify() {
var InterID = $("#HInterID").val();
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
@@ -687,8 +733,14 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
- Pub_Close(1);
- window.parent.location.reload();
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
});
@@ -703,7 +755,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -713,7 +765,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSendMan").val(checkStatus.data[0].HName);
+ $("#HSendMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
}
, btn2: function (index, layero) {
@@ -731,16 +783,18 @@
//鍙戦�侀儴闂�
form.on('submit(HDeptList)', function () {
+ HDeptType = 1;
+
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '璧勬簮鍒楄〃',
+ title: '閮ㄩ棬鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/DeptInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -750,8 +804,49 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
+ //鎺ユ敹閮ㄩ棬
+ form.on('submit(HRecDeptList)', function () {
+ HDeptType = 2;
+
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HRecDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HRecDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
}
, btn2: function (index, layero) {
@@ -917,10 +1012,20 @@
});
});
+
+
+ //鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
+ function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
+ // 鎷兼帴瀛楃涓�
+ var result = Datetime + ', ' + Person + '鍦�' + HSourceName + '涓婄敓浜у伐鍗曚负' + HICMOBillNo + ', 鍙戠敓寮傚父绫诲瀷涓�:' + HType;
+ return result;
+ }
+
+
//浠ヤ笂涓簂ayui妯″潡
});
- function AllowLoadData() { //闈炵┖楠岃瘉
+ function AllowLoadData(OperationType) { //闈炵┖楠岃瘉
var Result = true;
if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -931,6 +1036,10 @@
return Result = false;
}
if ($("#HMaterName").val() == '' || $("#HMaterName").val() == null) {
+ layer.msg("浜у搧鍚嶇О涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HMaterNumber").val() == '' || $("#HMaterName").val() == null) {
layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
@@ -946,7 +1055,7 @@
layer.msg("鎺ユ敹浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
-
+
if (OperationType == "2") {
if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -971,6 +1080,21 @@
return [year, month, day].join('-');
}
+
+ function GetHEmpValue(obj) { //鍙戦�佷汉
+ $("#HSendMan").val(obj[0].鑱屽憳鍚嶇О);
+ }
+
+ function GetHDeptNameValue(obj) { //閮ㄩ棬
+ if (HDeptType == 1) {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ } else if (HDeptType == 2) {
+ $("#HRecDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HRecDeptID").val(obj[0].HItemID);
+ }
+ }
+
</script>
</body>
</html>
--
Gitblit v1.9.1