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 | 148 ++++++++++++++++++++++++++++++------------------
1 files changed, 92 insertions(+), 56 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 3a82337..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,13 +113,13 @@
</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" style="width:485px">
</div>
@@ -127,7 +127,7 @@
</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,7 +136,7 @@
</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="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;">
@@ -168,8 +168,8 @@
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鎶勯��:</label>
- <div >
+ <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>
@@ -199,7 +199,7 @@
</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:1080px;"></textarea>
</div>
@@ -215,27 +215,27 @@
</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 class="layui-input" name="HMaterNumber" lay-verify="HMaterNumber" id="HMaterNumber">
+ <input class="layui-input" name="HMaterNumber" lay-verify="HMaterNumber" value="" id="HMaterNumber">
</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="HMaterName" lay-verify="HMaterName" id="HMaterName">
+ <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" id="HMaterModel">
+ <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" autocomplete="off">
+ <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="" autocomplete="off">
</div>
</div>
</div>
@@ -278,6 +278,15 @@
<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>
@@ -364,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 = ""; //婧愬崟瀛愬唴鐮�
@@ -371,21 +390,8 @@
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 HBillType = params[params[3]];
- var HSourceInterID = params[params[4]];
- var HSourceEntryID = params[params[5]];
- var HSourceBillNo = params[params[6]];
- var HSourceBillType = params[params[7]];
- }
+
+
//var edit = function (data) {
// HBillType = data[0].HBillType;
@@ -402,7 +408,7 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -413,6 +419,21 @@
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();
@@ -427,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 });
@@ -470,8 +497,7 @@
}
//鏃犳簮鍗曟柊澧�
- function set_AddFNew()
- {
+ function set_AddFNew() {
//鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
@@ -531,8 +557,7 @@
}
//缂栬緫
- function set_EditFromGrid()
- {
+ function set_EditFromGrid() {
refSav = "Update";
form.render('select');
$.ajax({
@@ -561,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
@@ -610,7 +637,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
}
- //鑾峰彇涓嬫媺閫変腑鍊�
+ //鑾峰彇涓嬫媺閫変腑鍊�
form.on('select(SourceType)', function (data) {
Sctag = data.value;
form.render('select');
@@ -627,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;
}
@@ -652,14 +675,14 @@
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 {
@@ -678,8 +701,7 @@
});
//瀹℃牳鎻愪氦
- function SaveVerify()
- {
+ function SaveVerify() {
var InterID = $("#HInterID").val();
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
@@ -799,7 +821,7 @@
});
});
-
+
//鎺ユ敹閮ㄩ棬
form.on('submit(HRecDeptList)', function () {
HDeptType = 2;
@@ -990,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: "娓╅Θ鎻愮ず" });
@@ -1004,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;
}
@@ -1019,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: "娓╅Θ鎻愮ず" });
--
Gitblit v1.9.1