From 4ea4e7d7631d0ebe35adaa4a9cb36b0149962b71 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 23 十月 2024 09:10:40 +0800
Subject: [PATCH] 增加不良采集,生产质量汇报单在选择不良原因时,根据当前工序带出对应不良原因,增加字段HNowProcID int //当前工序,优化启动点检编辑时赋值为空,不良品台账增加过滤条件
---
WebTM/views/home/console.html | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index d30526a..fd33618 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -246,13 +246,13 @@
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/PubCustom.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -266,6 +266,8 @@
, table = layui.table
, form = layui.form
, element = layui.element
+ , tr = layui.tr
+ , td = layui.td
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
@@ -273,7 +275,7 @@
var $ = layui.jquery;
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�"];
+ var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�", "鎺ユ敹浜�"];
//鐧诲綍骞冲彴(PC绔�佹墜鏈虹)
var HType = "PC";
@@ -409,8 +411,15 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 75 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'MM-dd')}}</div>", width: 100 });
break;
+ case 'String':
+ if (data[i].id == '鐘跺喌') {
+ col.push({
+ field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? '绱ф��': '鏅��'}}</div>", width: 80
+ });
+ break;
+ }
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 90 });
}
--
Gitblit v1.9.1