From 2bf4ff2ba42a6b68de0b298f9b701e6d6338dfdb Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 05 十一月 2025 16:54:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/销售管理/客户拜访记录单/Crm_ComplainVisitBillMainList.html | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\256\242\346\210\267\346\213\234\350\256\277\350\256\260\345\275\225\345\215\225/Crm_ComplainVisitBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\256\242\346\210\267\346\213\234\350\256\277\350\256\260\345\275\225\345\215\225/Crm_ComplainVisitBillMainList.html"
index a9b506d..c965e15 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\256\242\346\210\267\346\213\234\350\256\277\350\256\260\345\275\225\345\215\225/Crm_ComplainVisitBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\256\242\346\210\267\346\213\234\350\256\277\350\256\260\345\275\225\345\215\225/Crm_ComplainVisitBillMainList.html"
@@ -215,7 +215,7 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1410";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+ var HPageTitle = get_PageTitle(HModuleType) || document.title;
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -546,11 +546,11 @@
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
- layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -694,6 +694,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -978,7 +979,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(2);
+ //get_FastQuery(2);
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
@@ -991,8 +992,8 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
- //form.render("select");
+ // get_FastQuery()
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
--
Gitblit v1.9.1