From 13568a80fde6d52db3ebe760b9e184e527400508 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 25 十一月 2022 21:23:26 +0800
Subject: [PATCH] 基础资料
---
WebTM/views/Baseset/基础资料/Gy_PostList.html | 2
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html | 6 ++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 2
WebTM/views/Baseset/基础资料/Gy_DormList.html | 2
WebTM/views/PublicPage/GroupInformation.html | 45 ----------------------
WebTM/views/基础资料/公用基础资料/Add_Edit_Xt_ORGANIZATIONSList.html | 9 ++--
WebTM/views/Baseset/基础资料/Gy_DutyList.html | 2
WebTM/views/Baseset/基础资料/Gy_WorkTypeList.html | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 2
WebTM/views/Baseset/基础资料/Gy_ClassTimePrjList.html | 2
13 files changed, 20 insertions(+), 60 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
index db444b1..5917fb2 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
@@ -22,7 +22,7 @@
<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
</div>
</div>
</form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DormList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DormList.html"
index f23bf95..abfe992 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DormList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DormList.html"
@@ -22,7 +22,7 @@
<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
</div>
</div>
</form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyList.html"
index 709aa3c..3a8e3f1 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyList.html"
@@ -22,7 +22,7 @@
<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
</div>
</div>
</form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index aeb9c10..79c155f 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -22,7 +22,7 @@
<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
</div>
</div>
</form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostList.html"
index 70ffafd..c63ca09 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostList.html"
@@ -22,7 +22,7 @@
<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
</div>
</div>
</form>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
index d1f35c6..03e5c65 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
@@ -22,7 +22,7 @@
<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
</div>
</div>
</form>
diff --git a/WebTM/views/PublicPage/GroupInformation.html b/WebTM/views/PublicPage/GroupInformation.html
index d712074..9451bad 100644
--- a/WebTM/views/PublicPage/GroupInformation.html
+++ b/WebTM/views/PublicPage/GroupInformation.html
@@ -89,51 +89,6 @@
, tree = layui.tree
var sWhere = "";
- //tree.render({
- // elem: '#treeDepartment',
- // data: getData(sWhere),
- // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- // id: 'demoId',
- // isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
- // showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
- // onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉
- // click: function (obj) {
- // //鐐瑰嚮楂樺厜
- // if (obj.data.id !== treeCkData.id) {
- // $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
- // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- // treeCkData = obj.data;
- // TagId = obj.data.id;
- // TagParentId = obj.data.ParentID;
- // }
- // else {
- // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- // treeCkData = { id: 0 };
- // TagId = "";
- // TagParentId = "";
- // }
-
-
- // $.ajax({
- // url: GetWEBURL() + '/Gy_MaintenanceMode/GroupCX',
- // type: "GET",
- // data: { "HInterID": obj.data.id },
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.close(index);
- // } else {
- // layer.close(index);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(index);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- // });
- // }
- //});
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
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_Department.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_Department.html"
index cee5cd5..3a70b1c 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_Department.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_Department.html"
@@ -332,7 +332,7 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '宸ュ簭鍒楄〃'//鏍囬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
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 b2bb764..1d91aec 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"
@@ -716,7 +716,7 @@
layer.open({
type: 2
, area: ['90%', '90%']//澶у皬
- , title: '宸ョ鍒楄〃'
+ , title: '璁￠噺鍗曚綅缁勫垪琛�'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
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_Unit.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_Unit.html"
index 353fd12..def8e7d 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_Unit.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_Unit.html"
@@ -68,7 +68,7 @@
<div class="layui-col-xs4">
<label class="layui-form-label"> 榛樿鍗曚綅:</label>
<div class="layui-input-inline">
- <input type="radio" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" value="true" title="">
+ <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" value="true" title="">
<input type="hidden" value="false" name="HStandard" id="HStandard">
</div>
</div>
@@ -160,11 +160,15 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Edit_Gy_UnitList[0];
console.log("杩斿洖鐨刣ata.HStopFlag" + JSON.stringify(data.绂佺敤鏍囪));
+ console.log("杩斿洖鐨刣ata.HStandard" + JSON.stringify(data.榛樿鏍囪));
var IsHStopflag = data.绂佺敤鏍囪;
//绂佺敤鏍囪
if (IsHStopflag == "true") {
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
+ if (data.榛樿鏍囪 == "true") {
+ $("input[name='checkboxHStandard'][value='" + data.榛樿鏍囪 + "']").attr("checked", true);
+ }
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HNumber": data.璁￠噺鍗曚綅浠ｇ爜
, "HItemID": data.HItemID
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_Warehouse.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_Warehouse.html"
index c54bf5f..f61b7c6 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_Warehouse.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_Warehouse.html"
@@ -342,7 +342,7 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '宸ュ簭鍒楄〃'//鏍囬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
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_Xt_ORGANIZATIONSList.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_Xt_ORGANIZATIONSList.html"
index a2f198c..3b4d183 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_Xt_ORGANIZATIONSList.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_Xt_ORGANIZATIONSList.html"
@@ -238,9 +238,10 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
- var IsHStopflag = data.绂佺敤鏍囪;
+ var IsHStopflag = data.绂佺敤鐘舵��;
//绂佺敤鏍囪
- if (IsHStopflag) {
+ if (IsHStopflag == "鏄�") {
+ IsHStopflag = true;
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -248,7 +249,7 @@
, "HItemID": data.HItemID
, "HName": data.缁勭粐鍚嶇О
//, "HMakeTime": data.鏃ユ湡
- , "HStopflag": data.绂佺敤鏍囪
+ , "HStopflag": data.绂佺敤鐘舵��
, "HRemark": data.澶囨敞
});
$("#HMakeTime").val(Format(data.鏃ユ湡, "yyyy-MM-dd"));
@@ -268,7 +269,7 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- if (data.field.HStopflag) {
+ if (data.field.HStopflag == true) {
data.field.HStopflag = 1
} else {
data.field.HStopflag = 0
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/Gy_Employee_Add_Edit_.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/Gy_Employee_Add_Edit_.html"
index fa440ef..0c073dd 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/Gy_Employee_Add_Edit_.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/Gy_Employee_Add_Edit_.html"
@@ -477,7 +477,7 @@
<input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
<input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
- <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;background-color:#CDCDCD">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
--
Gitblit v1.9.1