From 3bd2c47598b8c6fca2c2fe5bebc280cb536dbae9 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 20 十一月 2024 08:46:10 +0800
Subject: [PATCH] 发货通知单 允许 输入 负数（即 非0的数字都允许保存）
---
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMainList.html | 192 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 181 insertions(+), 11 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
index f2194da..6f5f63f 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
@@ -19,6 +19,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
</head>
<body>
@@ -88,6 +89,113 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div> <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -134,6 +242,13 @@
var option = [];
var sWhere = "";
var HModName = "h_v_PM_WorkReportWeekBillMainList";
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "4757";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+ //#endregion
+
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HInterID", "HReportEmpID","HOrgID"];
@@ -273,7 +388,7 @@
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
@@ -359,6 +474,13 @@
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -379,6 +501,48 @@
break;
}
sWhere += " and " + ColName + " " + com;
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -404,7 +568,12 @@
$("#HBillStatus").val("");
$("#ColContent").val("");
$("#ColName").val("0");
- $("#Comparator").val("0");
+ $("#Comparator").val("0"); $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
sWhere = "";
@@ -417,7 +586,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '宸ヤ綔鍛ㄦ�荤粨鍒楄〃-鏂板'
+ , title: '鏂板' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkReportWeekBillMain.html?OperationType=1&linterid=0&HSouceBillType='
,btn: ['纭畾'],
@@ -440,7 +609,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '宸ヤ綔鍛ㄦ�荤粨鍒楄〃-缂栬緫'
+ , title: '缂栬緫' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkReportWeekBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
@@ -518,7 +687,7 @@
$.ajax({
url: GetWEBURL() + '/PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -548,7 +717,7 @@
$.ajax({
url: GetWEBURL() + '/PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain',
type: "GET",
- data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -747,22 +916,23 @@
})
}
//#endregion
-
- //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- var noneArray = ["HMonday", "HTuesday", "HWednesday", "HThursday", "HFriday", "HSaturday", "HSunday"]; //璁剧疆涓嶈繘琛岃繃婊ょ殑瀛楁
for (var i = 1; i < option.cols[0].length; i++) {
- if (option.cols[0][i].hide != true && $.inArray(option.cols[0][i].field, noneArray) == -1) {
+ if (option.cols[0][i].hide != true) {
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
-
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
--
Gitblit v1.9.1