From 1a23e4c22444224346cb4ac1adde4f5cf94bed3d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 26 九月 2023 09:11:31 +0800
Subject: [PATCH] 增加颜色色号
---
WebTM/App_Data/MssqlReportData.cs | 2 +-
WebTM/views/系统管理/用户管理/Xt_UserGroupListEdit.html | 2 +-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement.html | 4 ++--
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 27 ++++++++++++++++++++++++++-
WebTM/views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul_RYQ.html | 2 --
5 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 2970159..8ddccbe 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -20,7 +20,7 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
//public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//甯呭▉
- //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴
+ //public const string SqlConnStr = "Data Source=192.168.1.250;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴
//public const string SqlConnStr = "Data Source=192.168.16.53;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//榫欏北姹介厤
//public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
//public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//闆呯惇璇烘祴璇�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 7a37b9e..b2c137b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -214,6 +214,13 @@
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label"> 棰滆壊鑹插彿锛�</label>
+ <div class="layui-input-inline" style="width: 151px;">
+ <input type="text" value="" placeholder="璇烽�夋嫨棰滆壊" class="layui-input" id="HColorNo" name="HColorNo" style="width: 101px; float: left;background-color: #efefef4d;" readonly>
+ <div id="HColorNoName" name="HColorNoName" style="width: 50px; "></div>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label"> 鐧藉澂瑕佹眰锛�</label>
<div class="layui-input-inline ">
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
@@ -546,7 +553,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','colorpicker'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -555,6 +562,7 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , colorpicker = layui.colorpicker
//鍒濆鍖栫晫闈�
@@ -671,6 +679,16 @@
get_checkHQCSchemeID_Patrol();
});
+ //閫夋嫨棰滆壊
+ colorpicker.render({
+ elem: '#HColorNoName'
+ , color: '#1c97f5'
+ , done: function (color) {
+ console.log(color);
+ $('#HColorNo').val(color);
+ }
+ });
+
//璇诲彇閰嶇疆鏂囦欢
function get_ReadConfigFile() {
//鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
@@ -785,7 +803,14 @@
, "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
, "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
, "HMaterRuleType": data.鐗╂枡鍏紡
+ , "HColorNo": data.棰滆壊鑹插彿
});
+
+ colorpicker.render({
+ elem: '#HColorNoName'
+ , color: data.棰滆壊鑹插彿
+ });
+
console.log($('#HUnitGroupID').val());
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
index 3ed32f5..e93fad5 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserGroupListEdit.html"
@@ -202,7 +202,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_User/list',
type: "GET",
- data: { "sWhere": "" },
+ data: { "sWhere": "", user: sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_RYQ.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_RYQ.html"
index 68c9c3b..9b66237 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_RYQ.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_RYQ.html"
@@ -834,8 +834,6 @@
//var sSubStr = JSON.stringify(num);
- return false;
-
var HEmpName1 = $("#HEmpName1").val();
var HEmpName2 = $("#HEmpName2").val();
var HEmpName3 = $("#HEmpName3").val();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
index 4b50849..c7658ff 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement.html"
@@ -352,11 +352,11 @@
res.data.forEach(function (item, index) {
// console.log(item);
//杩欓噷鐨別ntity_status_id 涓鸿〃鏍兼暟鎹腑鐨勪竴鍒楁暟鎹紝鐢ㄤ簬鍒ゆ柇鐗瑰畾琛�
- if (item.浜у搧鍚嶇О != null) {
+ if (item.棰滆壊鑹插彿 != null && item.棰滆壊鑹插彿 != "") {
//绂佺敤澶嶉�夋锛岃缃笉鍙�変腑鏍囪瘑锛屽皢璇ヨ璁剧疆涓洪槾褰辫壊
var tr = $(".layui-table tr[data-index=" + index + "]");
var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td
- td.eq(3).css("background-color", "#cf" + (9 - parseInt(index / 2)) + "6" + (2 + parseInt(index / 2)) + "" + (9 - index));
+ td.eq(9).css("background-color", item.棰滆壊鑹插彿);
// tr.find("input[type='checkbox']").next().addClass('layui-btn-disabled');
}
})
--
Gitblit v1.9.1