From 1dff07b7861b6fc2cca07a372b24bc422b6ae906 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 24 三月 2025 17:27:34 +0800
Subject: [PATCH] 设备启动点检单、防错验证检查单、首件单、巡检单、工序转移检验单、库存检验单、车间自检单、环境检测单、不良品评审处理单、异常反馈单、异常反馈接收单、异常反馈签到单、异常反馈处理单、异常反馈验收单、检验取样单、检验还样单 三个自定义过滤；日期间隔；审核，反审核，关闭，反关闭，列设置，按钮设置，保存方案，读取方案 ；单据列表和单据编辑时以前用了同一个视图，全部改为2个视图（List Edit）；基本信息页签 和 制单信息页签； 保存前控制，保存后控制； 审核前控制，反审核前控制， 审核后控制，反审核后控制，删除前控制，删除后控制； 关闭前控制，反关闭前控制；；关闭后控制，反关闭后控制； 选基础资料时，应该是已审核未禁用的资料（包括 单据型基础资料 ）；
---
WebTM/views/质量管理/基础建模/Gy_EnvironmentTestSchemeBillEdit.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillEdit.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillEdit.html"
index 8c9d4e8..cd80555 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillEdit.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\237\272\347\241\200\345\273\272\346\250\241/Gy_EnvironmentTestSchemeBillEdit.html"
@@ -88,7 +88,17 @@
<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
</div>
</div>
- </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;" readonly>
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" readonly>
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -199,8 +209,10 @@
, element = layui.element;
var HModName = "Gy_EnvironmentTestSchemeBillEdit";
var option = [];
+ //璁板綍缁勭粐鐨勫��
+ var HOrgIDBar = 0;
//鍒濆琛ㄦ牸鏁版嵁
- var rowdata = [{"HPrjNo": "", "HEnvironmentItemID": "", "HEnvironmentItemName": "", "HTargetVal": "", "HUpLimit": "", "HDownLimit": ""}];
+ var rowdata = [{"HPrjNo": "0", "HEnvironmentItemID": "", "HEnvironmentItemName": "", "HTargetVal": "", "HUpLimit": "", "HDownLimit": ""}];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -271,7 +283,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
- var NewRow = { "HPrjNo": "", "HEnvironmentItemID": "", "HEnvironmentItemName": "", "HTargetVal": "", "HUpLimit": "", "HDownLimit": "" };
+ var NewRow = { "HPrjNo": "0", "HEnvironmentItemID": "", "HEnvironmentItemName": "", "HTargetVal": "", "HUpLimit": "", "HDownLimit": "" };
switch (obj.event) {
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
@@ -325,6 +337,9 @@
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
function set_ClearBill() {
+ Organ();
+ //绂佺敤缁勭粐閫夐」
+ $("#HOrgID").attr("disabled", true);
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -448,6 +463,32 @@
});
}
+ //#region 鑾峰彇缁勭粐
+ 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>';
+ }
+ $("#HOrgID").append(Organization);
+ if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
+ HOrgIDBar = sessionStorage["OrganizationID"];
+ }
+ $("#HOrgID").val(HOrgIDBar);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
//鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -552,6 +593,8 @@
, "hcloseman": d.data[0].鍏抽棴浜�
, "hclosedate": d.data[0].鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍏抽棴鏃ユ湡), "yyyy-MM-dd")
});
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = d.data[0]["HOrgID"];
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < d.data.length; i++) {
@@ -593,7 +636,7 @@
}
}
- data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐
+ /*data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐*/
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
@@ -647,7 +690,7 @@
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
//妯″叿涓嶄负绌�
- if (option.data[i]["HPrjNo "] == "0") {
+ if (option.data[i]["HPrjNo "] == "") {
layer.msg("绗�" + (i + 1) + "琛�:娆″簭鍙蜂笉鑳戒负绌�!");
return false;
}
--
Gitblit v1.9.1