From 6c15622369ffff568463a55f37d7df4106da963c Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期一, 26 八月 2024 15:18:51 +0800
Subject: [PATCH] 物料列表项目字段
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 28 ++++-
WebTM/WebTM.csproj.user | 4
WebTM/views/home/console.html | 7 +
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 1
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 12 +-
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 4
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 70 +++++++++++--
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 37 ++++---
WebTM/WebTM.csproj | 1
WebTM/views/Baseset/基础资料/Gy_HProjectGroup.html | 105 +++++++++++++++++++++
11 files changed, 227 insertions(+), 44 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1e407b9..d330cbf 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -173,6 +173,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechnologyParameterList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechParameterUnitList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceListNew.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_HProjectGroup.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_UnitGroup.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseListNew.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 147597a..6cd52dd 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index adc8270..cc10225 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; */ //鏉滆春鏈湴閰嶇疆
- /*var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃� */
+ WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html"
new file mode 100644
index 0000000..d557238
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html"
@@ -0,0 +1,105 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>椤圭洰鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <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>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
+ RoadQuery($('#Value').val());
+ });
+
+ form.on('submit(FH)', function () {//閫夋嫨鍗曚綅
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHProjectGroupNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+
+ RoadQuery($('#Value').val());
+
+ table.render({
+ elem: '#mainTable'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HInterID', width: 150, title: '鍗曚綅缁処D', hide: true }
+ , { field: '椤圭洰浠ｇ爜', width: 150, title: '椤圭洰浠ｇ爜' }
+ , { field: '椤圭洰缁�', width: 150, title: '椤圭洰缁�', sort: true }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
+ });
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Gy_Material/GetProjectGroupList_Json",
+ async: true,
+ data: { "Unit": Value },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index d30526a..21861e1 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -411,6 +411,13 @@
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 });
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: 70``
+ });
+ break;
+ }
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 90 });
}
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 142b3ce..64f6691 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"
@@ -332,8 +332,8 @@
<div class="layui-input-inline">
<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>-->
<!--<input id="HDormID" name="HDormID" type="hidden" />-->
</div>
</div>
@@ -432,9 +432,9 @@
</div>
<div class="layui-inline">
<!--<label class="layui-form-label"> 璁￠噺鍗曚綅缁勶細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
<div class="layui-input-inline">
@@ -493,13 +493,24 @@
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 100px;">
+ <input type="hidden" name="HProjectBillMainID" id="HProjectBillMainID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HProjectGroupList" id="HProjectGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+
<div class="layui-row">
<div class="layui-inline">
<!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -958,7 +969,6 @@
//鏈湴瀛樺偍
localStorage.setItem("Add_Edit_Gy_Material", JSON.stringify(data));
}
-
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
function RoadBillMain(hID)//鍔犺浇琛ㄥご
@@ -1425,9 +1435,7 @@
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
-
}
-
form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
@@ -1568,7 +1576,6 @@
})
});
-
//閫夋嫨杈呭姪璁￠噺鍗曚綅
form.on('submit(HSecUnitList)', function () {//閫夋嫨瀹胯垗
$("#UnitType").val(2);
@@ -1599,7 +1606,6 @@
})
});
-
//閫夋嫨璁￠噺鍗曚綅缁�
form.on('submit(HUnitGroupList)', function () {//閫夋嫨璁￠噺鍗曚綅缁�
layer.open({
@@ -1623,6 +1629,37 @@
}
$("#HUnitGroupName").val(checkStatus.data[0].璁￠噺鍗曚綅缁�);
$("#HUnitGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+ //閫夋嫨椤圭洰
+ form.on('submit(HProjectGroupList)', function () {
+ layer.open({
+ type: 2
+ , area: ['60%', '90%']//澶у皬
+ , title: '璁￠噺鍗曚綅缁勫垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_HProjectGroup.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ console.log(checkStatus.data[0].椤圭洰缁�);
+ console.log(checkStatus.data[0].HInterID);
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰缁�);
+ $("#HProjectBillMainID ").val(checkStatus.data[0].HInterID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1942,6 +1979,13 @@
$("#HUnitGroupName").val(obj[0].璁￠噺鍗曚綅缁�);
$("#HUnitGroupID").val(obj[0].HItemID);
}
+
+ //杩斿洖椤圭洰缁�
+ function GetHProjectGroupNameValue(obj) {
+ $("#HProjectName").val(obj[0].椤圭洰缁�);
+ $("#HProjectBillMainID").val(obj[0].HInterID);
+ }
+
//杩斿洖璁￠噺鍗曚綅
function GetHUnitNameValue(obj) {
if ($("#UnitType").val() == 1) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 2e3bb01..0a2ac95 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -5,6 +5,7 @@
<title>渚涘簲鍟嗚缃�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -171,6 +172,7 @@
var params = getUrlVars();
var Type = params[params[0]];
var HSupTypeID = 0;
+ var HSupClsName = '';
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -240,22 +242,22 @@
break;
};
});
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
+
//#region 閲嶆柊鍚屾鎸夐挳
form.on('submit(btnResCnz)', function (data) {
set_ResCnz();
});
//#endregion
- //#endregion
-
-
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
@@ -300,6 +302,7 @@
//鏍戠姸鍥剧敓鎴�
get_Display_Tree();
}
+
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
option = {
@@ -323,6 +326,7 @@
//]]
};
}
+
//鏌ヨ
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
@@ -397,7 +401,6 @@
layer.close(index);
}
-
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -457,6 +460,7 @@
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+
// 閲嶇疆鎸夐挳
function set_ClearQuery() {
$("#HNumber").val("");
@@ -469,6 +473,7 @@
sWhere = "";
}
+
//閲嶆柊鍚屾鎸夐挳
function set_ResCnz() {
var HNumber2 = $('#HNumber2').val();
@@ -496,6 +501,7 @@
}
});
}
+
// 鍒犻櫎鎸夐挳
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -531,6 +537,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+
// 淇敼鎸夐挳
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -542,10 +549,11 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID + '&HSouceBillType=']
+ , content: ['../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID]
, resize: false
})
}
+
//鏂板鎸夐挳
function set_AddNew() {
layer.open({
@@ -581,7 +589,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=2&HSupTypeID=' + HSupTypeID,
+ content: '../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=2&linterid=0&HSupTypeID=' + HSupTypeID + '&HSupClsName=' + encodeURIComponent(HSupClsName),
end: function () {
//鍒锋柊椤甸潰,
get_FastQuery(table, option);
@@ -594,7 +602,6 @@
}
//#endregion
-
//#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(num) {
@@ -668,7 +675,6 @@
}
//#endregion
-
// 鏍戠姸鍥炬煡璇�
function get_Display_Tree() {
var ajaxLoad = layer.load();
@@ -698,7 +704,7 @@
for (var i = 0; i < data.length; i++) {
// 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
if (data[i].children != null && data[i].children.length > 0) {
- liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
// 閬嶅巻鑾峰彇瀛愯彍鍗�
for (var k = 0; k < data[i].children.length; k++) {
liStr += getChildMenu(data[i].children[k], 0);
@@ -706,7 +712,7 @@
liStr = liStr.substring(0, liStr.length - 1);
liStr += ']},';
} else {
- liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '"},';
}
};
liStr = liStr.substring(0, liStr.length - 1);
@@ -726,9 +732,10 @@
HSupTypeID = 0;
} else if (data.id == "0") {
sql = "";
- HMaterTypeID = 0;
+ HSupTypeID = 0;
} else {
sql = " and HSupTypeID = '" + data.id + "' ";
+ HSupClsName = data.title;
HSupTypeID = data.id;
}
get_Display(sql);
@@ -741,7 +748,7 @@
num++;
var subStr = '';
if (subMenu.children != null && subMenu.children.length > 0) {
- subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ subStr += '{"title": "' + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
for (var j = 0; j < subMenu.children.length; j++) {
subStr += getChildMenu(subMenu.children[j], num);
if (j + 1 == subMenu.children.length) {
@@ -750,11 +757,10 @@
}
subStr += ']},';
} else {
- subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
}
return subStr;
}
-
//#endregion
//#region 闅愯棌鍒楄缃�
@@ -791,6 +797,7 @@
}
})
}
+
//#endregion
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
@@ -900,7 +907,6 @@
$("#ColName").append(Organization);
form.render('select');
}
-
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -1111,6 +1117,7 @@
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index e5cbee1..b6301c8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -5,6 +5,7 @@
<title>渚涘簲鍟嗗熀纭�璧勬枡</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
@@ -20,6 +21,7 @@
.layui-form-item .layui-inline {
margin-right: 0px;
}
+
.layui-input, .layui-textarea {
width: 124%;
}
@@ -377,7 +379,6 @@
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
- var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
layui.config({
@@ -412,10 +413,13 @@
else if (OperationType == 2) {//鏂板娴佹按鍙�
setInitHCurName()
- var HSupTypeID = params[params[1]];//绫诲瀷id
+ var HSupTypeID = params[params[2]];//绫诲瀷id
+ var HSupClsName = params[params[3]];//绫诲瀷鍚嶇О
+ console.log(HSupClsName)
setHNumber(HSupTypeID);
- $("#HNumber").attr("readonly", true);
-
+ $("#HNumber").attr("readonly", false);
+ $("#HSupTypeID").val(HSupTypeID);
+ $("#HSupClsName").val(decodeURIComponent(HSupClsName));
//鍒濆鍖栬〃
get_InitGrid();
}
@@ -522,6 +526,7 @@
}
});
});
+
//閫夋嫨閲囪喘鏂瑰紡鎸夐挳
form.on('submit(btnSearchPss)', function () {
layer.open({
@@ -545,6 +550,7 @@
, btn2: function (index, layero) { }
})
});
+
//榛樿璐у竵寮圭獥
form.on('submit(btnCurrency)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -649,6 +655,7 @@
}
});
});
+
//淇濆瓨
form.on('submit(Saver)', function (data) {//鎻愪氦
var ModRightNameAdd = 'Gy_Supplier_Edit';
@@ -724,6 +731,7 @@
}
}
});
+
//閫�鍑�
form.on('submit(Exit)', function () {
if (linterid == undefined) {
@@ -735,10 +743,12 @@
Pub_Close(1);
}
});
+
//瀹℃牳
form.on('submit(Check)', function () {
});
+
//鎵撳嵃Printing
form.on("submit(print)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
@@ -746,21 +756,23 @@
window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
});
+
//鏂板
form.on('submit(Add)', function () {
window.location.reload();
$("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
});
+
//鍒涘缓缁勭粐
form.on('submit(HCreateOrgID_BT)', function () {
HCreateOrgID_BT();
});
+
//浣跨敤缁勭粐
form.on('submit(HUseOrgID_BT)', function () {
HUseOrgID_BT();
});
//#endregion
-
//#region 姝ら〉闈㈡墍鏈夋柟娉�
//鍒濆鍖栭〉闈�
@@ -796,6 +808,7 @@
}
});
}
+
//鏂板璁剧疆榛樿绋庣巼鍜岃揣甯�
function setInitHCurName() {
var ajaxLoad = layer.load();
@@ -863,7 +876,7 @@
var rowdata = [
{
- "HPayType": ""
+ "HPayType": ""
, "HPayRate": "0"
, "HPayTime": "0"
, "HPayRemark": ""
@@ -873,7 +886,6 @@
table.render(option);
}
//#endregion
-
//缂栬緫椤甸潰鍔犺浇
function set_EditFromGrid() {
@@ -934,11 +946,13 @@
}
});
}
+
//杩斿洖楠屾敹
function GetHSecManagerValue(obj) {
$("#HSecManager").val(obj[0].HName);
$("#HSecManagerID").val(obj[0].HItemID);
}
+
//鏁版嵁楠岃瘉
function AllowLoadData() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 57483a9..4930702 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -202,6 +202,7 @@
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝叧鑱旂敤鎴凤級
var titleData1 = ["HCusID"];
var HCusTypeID = 0;
+ var HCusClsName = '';
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -775,7 +776,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html?OperationType=2&HCusTypeID=' + HCusTypeID,
+ content: '../閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html?OperationType=2&HCusTypeID=' + HCusTypeID + '&HCusClsName=' + encodeURIComponent(HCusClsName),
end: function () {
//鍒锋柊椤甸潰,
get_FastQuery(table, option);
@@ -1121,7 +1122,7 @@
for (var i = 0; i < data.length; i++) {
// 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
if (data[i].children != null && data[i].children.length > 0) {
- liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
// 閬嶅巻鑾峰彇瀛愯彍鍗�
for (var k = 0; k < data[i].children.length; k++) {
liStr += getChildMenu(data[i].children[k], 0);
@@ -1129,7 +1130,7 @@
liStr = liStr.substring(0, liStr.length - 1);
liStr += ']},';
} else {
- liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ liStr += '{"title": "'+ data[i].title + '", "id": "' + data[i].id + '"},';
}
};
liStr = liStr.substring(0, liStr.length - 1);
@@ -1153,6 +1154,7 @@
} else {
sql = " and HCusTypeID='" + data.id + "' ";
HCusTypeID = data.id;
+ HCusClsName = data.title;
}
get_Display(sql);
}
@@ -1164,7 +1166,7 @@
num++;
var subStr = '';
if (subMenu.children != null && subMenu.children.length > 0) {
- subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
for (var j = 0; j < subMenu.children.length; j++) {
subStr += getChildMenu(subMenu.children[j], num);
if (j + 1 == subMenu.children.length) {
@@ -1173,7 +1175,7 @@
}
subStr += ']},';
} else {
- subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ subStr += '{"title": "'+ subMenu.title + '", "id": "' + subMenu.id + '"},';
}
return subStr;
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 2c0e9fe..3bb1fb8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -406,8 +406,10 @@
else if (OperationType == 2) {//娴佹按鍙锋柊澧�
var HCusTypeID = params[params[1]];//绫诲瀷id
+ var HCusClsName = params[params[2]]//绫诲瀷鍚嶇О
setHNumber(HCusTypeID);
- $("#HNumber").attr("readonly", true);
+ $("#HNumber").attr("readonly", false);
+ $("#HCusTypeName").val(decodeURIComponent(HCusClsName));
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
$("#HCreateOrgID").attr("disabled", true);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 4fbc899..6e7c4c8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -281,6 +281,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Notice" id="Notice"><i class="layui-icon layui-icon-export"></i>閫氱煡</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp" id="fp"><i class="layui-icon layui-icon-tips"></i>鍒嗛厤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb" id="fb"><i class="layui-icon layui-icon-tips"></i>鍙戝竷</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="back"><i class="layui-icon layui-icon-close-fill"></i>鎾ら攢</button>
--
Gitblit v1.9.1