diff --git a/js/demandPlan/apply_plan_list.js b/js/demandPlan/apply_plan_list.js
index e2b25e3..ebcc6a3 100644
--- a/js/demandPlan/apply_plan_list.js
+++ b/js/demandPlan/apply_plan_list.js
@@ -16,6 +16,12 @@ layui.use(["form", "table", 'laydate'], function () {
// 查询/重置
function queryTable(type) {
if (type === 1) {
+ let keyWord = $('#keyWord').val();
+ let flag = checkValue(keyWord);
+ if (flag) {
+ $('#keyWord').val('');
+ return layer.msg('关键字查询包含特殊字符,请重新输入', { icon: 2 });
+ }
reloadTable(1);
} else if (type === 2) {
$('#keyWord').val('');
@@ -128,7 +134,7 @@ function initTable() {
title: "备注",
unresize: true,
align: "center",
-
+
},
{
field: "remark",
@@ -137,7 +143,7 @@ function initTable() {
unresize: true,
align: "center",
templet: function (d) {
- return getCheckStatus(d.statusType,d.status);
+ return getCheckStatus(d.statusType, d.status);
},
},
{
@@ -176,28 +182,28 @@ function exportExcel() {
//审核状态
function getCheckStatus(statusType, status) {
- var company = "";
- if (statusType === '1') {
- return "●审核通过";
- } else if (statusType === '2') {
- company = "分公司";
- } else if (statusType === '3') {
- company = "项目管理中心";
- } else if (statusType === '4') {
- company = "机具公司";
- }
- if (status === '1') {
- return "●待" + company + "审核";
- } else if (status === '2') {
- return "●审核通过";
- } else if (status === '3') {
- return "●"+company + "审核驳回";
- }
- return "●待审核";
+ var company = "";
+ if (statusType === '1') {
+ return "●审核通过";
+ } else if (statusType === '2') {
+ company = "分公司";
+ } else if (statusType === '3') {
+ company = "项目管理中心";
+ } else if (statusType === '4') {
+ company = "机具公司";
+ }
+ if (status === '1') {
+ return "●待" + company + "审核";
+ } else if (status === '2') {
+ return "●审核通过";
+ } else if (status === '3') {
+ return "●" + company + "审核驳回";
+ }
+ return "●待审核";
}
// 查询流程
-function showProcess(){
+function showProcess() {
openIframeByParamObj("show_process", "流程说明", "./child/show_process.html", "70%", "65%", null);
}
diff --git a/js/demandPlan/delivery_list.js b/js/demandPlan/delivery_list.js
index 5483fc7..cf32a07 100644
--- a/js/demandPlan/delivery_list.js
+++ b/js/demandPlan/delivery_list.js
@@ -70,6 +70,12 @@ function getStatistics() {
// 查询/重置
function queryTable(type) {
if (type === 1) {
+ let proName = $('#proName').val();
+ let flag = checkValue(proName);
+ if (flag) {
+ $('#proName').val('');
+ return layer.msg('工程名称查询包含特殊字符,请重新输入', { icon: 2 });
+ }
reloadTable(1);
} else if (type === 2) {
$('#proName').val('');
diff --git a/js/demandPlan/plan_check_list.js b/js/demandPlan/plan_check_list.js
index 67ea30a..a0f25e3 100644
--- a/js/demandPlan/plan_check_list.js
+++ b/js/demandPlan/plan_check_list.js
@@ -17,6 +17,12 @@ layui.use(["form", "table", 'element'], function () {
// 查询/重置
function queryTable(type) {
if (type === 1) {
+ let keyWord = $('#keyWord').val();
+ let flag = checkValue(keyWord);
+ if (flag) {
+ $('#keyWord').val('');
+ return layer.msg('关键字查询包含特殊字符,请重新输入', { icon: 2 });
+ }
reloadTable(1);
} else if (type === 2) {
$('#keyWord').val('');
diff --git a/js/public.js b/js/public.js
index 3a69f21..e4aac64 100644
--- a/js/public.js
+++ b/js/public.js
@@ -246,7 +246,7 @@ const useBase64 = {
/* 校验查询关键字是否包含特殊字符 */
function checkValue(value) {
if (value) {
- let pattern = new RegExp("[%<>]");
+ let pattern = new RegExp("[%_<>]");
if (pattern.test(value)) {
return true;
}