From 43e741c8377b555f4e5ed287bee724e71a11540f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 22 一月 2024 12:41:01 +0800
Subject: [PATCH] 期初余额报表：查询过滤报错“客户名称无效”问题解决
---
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 275 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 190 insertions(+), 85 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
index aa96d1d..0ec1229 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
@@ -38,83 +38,115 @@
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヤ綔涓績浠ｇ爜</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
- <input id="HItemID" name="HItemID" type="hidden" />
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヤ綔涓績鍚嶇О</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HName" lay-verify="HName" id="HName">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヤ綔鏃堕棿</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HWorkTimes" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍔╄鐮�</label>
- <div class="layui-input-inline" style="margin-bottom: -15px;">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode" value="0">
- </div>
- </div>
- <div class="layui-col-xs4 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="0">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏉″舰鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">琛屼笟鏍囧噯</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDayMoney" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
- </div>
- </div>
- <div class="layui-col-xs4 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;">
- <input type="hidden" name="HDeptID" id="HDeptID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
- <input type="hidden" value="false" name="HStopflag" id="HStopflag">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
- </div>
- </div>
- </div>
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綔涓績浠ｇ爜*</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綔涓績鍚嶇О*</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍔╄鐮�</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏉″舰鐮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style=" width: 375%;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID" >
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="layui-tab-item">
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWorkTimes" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
+ </div>
+ </div>
+ <div class="layui-row">
+
+ <div class="layui-col-xs4 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="0">
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">琛屼笟鏍囧噯</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDayMoney" lay-verify="HDayMoney" id="HDayMoney" value="0">
+ </div>
+ </div>
+ <div class="layui-col-xs4 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; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <input type="hidden" value="0" name="HParentID" id="HParentID">
+ </div>
</div>
- <input type="hidden" value="0" name="HParentID" id="HParentID">
</form>
</div>
</div>
@@ -148,7 +180,7 @@
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
-
+ Organ();
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -161,8 +193,12 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -263,6 +299,7 @@
, "HDeptID": data.HDeptID
, "HStopflag": data.HStopflag
, "HRemark": data.HRemark
+ , "HUSEORGID": data.HUSEORGID
});
layer.close(ajaxLoad);
} else {
@@ -279,25 +316,70 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- var sMainStr = JSON.stringify(data.field);
- if (!$("#HDeptName").val()) {
- layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HNumber").val() == "") {
+ layer.msg("璇疯緭鍏ュ伐浣滀腑蹇冧唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!$("#HWorkTimes").val()) {
- layer.msg("璇疯緭鍏ュ伐浣滄椂闂达紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HName").val() == "") {
+ layer.msg("璇疯緭鍏ュ伐浣滀腑蹇冨悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!$("#HQty").val()) {
- layer.msg("璇疯緭鍏ヨ澶囨暟閲忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //var sMainStr = JSON.stringify(data.field);
+ //if (!$("#HDeptName").val()) {
+ // layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if (!$("#HWorkTimes").val()) {
+ // layer.msg("璇疯緭鍏ュ伐浣滄椂闂达紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if (!$("#HQty").val()) {
+ // layer.msg("璇疯緭鍏ヨ澶囨暟閲忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+
+ var HWorkTimes = $('#HWorkTimes').val();
+ if (HWorkTimes.substring(HWorkTimes.length - 1, HWorkTimes.length) == ".") {
+ layer.msg("宸ヤ綔鏃堕棿鐨勭粨灏句笉鑳芥槸.锛�");
return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HWorkTimes)) {
+ layer.msg("宸ヤ綔鏃堕棿璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
}
- var sMainStr = JSON.stringify(data.field);
+
+ var HQty = $('#HQty').val();
+ if (HQty.substring(HQty.length - 1, HQty.length) == ".") {
+ layer.msg("璁惧鏁伴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HQty)) {
+ layer.msg("璁惧鏁伴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HDayMoney = $('#HDayMoney').val();
+ if (HDayMoney.substring(HDayMoney.length - 1, HDayMoney.length) == ".") {
+ layer.msg("琛屼笟鏍囧噯鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HDayMoney)) {
+ layer.msg("琛屼笟鏍囧噯璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_WorkCenter/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "oMain": sMainStr },
+ data: { "oMain": sMainStr + ";" + sessionStorage["HUserName"] },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -319,6 +401,29 @@
}
//#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 閫夋嫨宸ュ簭鏂规硶
function get_checkProc() {
layer.open({
--
Gitblit v1.9.1