From ee4008219492fa267ee3f9f62d2344cd5eff21ae Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 18 十月 2024 13:18:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterList.html | 91 +++++++++
WebTM/views/质量管理/质量报表/QC_SkillExamMonthSumReport.html | 2
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 20 +-
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 9
WebTM/views/人事管理/人员履历/HR_PersonnelResumeList.html | 324 ++++++++++++++++++++++++++++++++
WebTM/views/质量管理/质量报表/QC_RegistrationForTestingReport.html | 98 ++++++++-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 2
WebTM/views/工资管理/技能考核/HR_EmployeeSkillExamBill.html | 41 +++
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 6
WebTM/WebTM.csproj | 1
10 files changed, 561 insertions(+), 33 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a404706..d6a932b 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -315,6 +315,7 @@
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_QiaoYi_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
+ <Content Include="views\浜轰簨绠＄悊\浜哄憳灞ュ巻\HR_PersonnelResumeList.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBill_PDA.html" />
<Content Include="views\浠撳瓨绠＄悊\涓夌偣鐓у悎鎵爜璁板綍鍗昞WMS_CusBarCodeCheckBillList.html" />
diff --git "a/WebTM/views/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeList.html" "b/WebTM/views/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeList.html"
new file mode 100644
index 0000000..0f39c7c
--- /dev/null
+++ "b/WebTM/views/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeList.html"
@@ -0,0 +1,324 @@
+锘�<!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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鑱屽憳浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鑱屽憳鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn-Close" id="btn-Close" style="padding:0 5px">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" >
+ <ul class="layui-tab-title">
+ <li class="layui-this">鑱屽憳淇℃伅</li>
+ <li>鎶�鑳界瓑绾�</li>
+ <li>鑰冩牳璁板綍</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--鑱屽憳淇℃伅-->
+ <table class="layui-hide" id="mainTable_people" lay-filter="mainTable_people"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鎶�鑳界瓑绾�-->
+ <table class="layui-hide" id="mainTable_skill" lay-filter="mainTable_skill"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鑰冩牳璁板綍-->
+ <table class="layui-hide" id="mainTable_examine" lay-filter="mainTable_examine"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var Number = "";
+ var Name = "";
+ var option_people = ""; //鑱屽憳淇℃伅
+ var option_examine = ""; //鑰冩牳璁板綍
+ var option_skill = ""; //鎶�鑳界瓑绾�
+ var ins;
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
+ Number = params[params[1]] == null ? "" : params[params[1]]; //浠ｇ爜
+ Name = params[params[2]] == null ? "" : params[params[2]]; //鍚嶇О
+ Number = decodeURI(Number);
+ Name = decodeURI(Name);
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "HR_PersonnelResumeList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
+ var titleData = [""];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ // 閫�鍑烘寜閽�
+ form.on('submit(btn-Close)', function (data) {
+ if (OperationType==2) {
+ Pub_Close(1);
+ } else{
+ Pub_Close(2);
+ }
+
+ });
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栬亴鍛樹俊鎭垪琛�
+ set_InitGrid_people();
+ //鍒濆鍖栨妧鑳界瓑绾�
+ set_InitGrid_skill();
+ //鍒濆鍖栬�冩牳璁板綍鍒楄〃
+ set_InitGrid_examine();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val() != "" ? "" : Number;
+ var HName = $("#HName").val() != "" ? "" : Name;
+ sWhere = {
+ HNumber: HNumber,
+ HName: HName
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鍒濆鍖栬亴鍛樹俊鎭垪琛�
+ function set_InitGrid_people() {
+ option_people = {
+ elem: '#mainTable_people'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 300
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ //table.render(option);
+ }
+
+ //鍒濆鍖栬�冩牳璁板綍鍒楄〃
+ function set_InitGrid_examine() {
+ option_examine = {
+ elem: '#mainTable_examine'
+ , page: false
+ , height: 500
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+ //鍒濆鍖栨鍦ㄧ户缁垪琛�
+ function set_InitGrid_skill() {
+ option_skill = {
+ elem: '#mainTable_skill'
+ , page: false
+ , height: 500
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ };
+ }
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/HR_PersonnelResumeController/GetHR_PersonnelResumeList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var Listcol = [];
+ for (var i = 0; i < data1.list.length; i++) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list[i].Columns) {
+ data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
+ }
+ var col = [];
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var j = 0; j < data.length; j++) {
+ if ($.inArray(data[j].name, titleData) > -1) {
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[j].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: data[j].name });
+ }
+ }
+ }
+ Listcol.push(col);
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_people = {
+ elem: '#mainTable_people'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[0]]
+ , data: data1.data.h_p_HR_PersonnelResumeReport
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_people);
+ ins = table.render(option_people);
+
+ option_examine = {
+ elem: '#mainTable_examine'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_HR_PersonnelResumeReport1
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_examine);
+
+ option_skill = {
+ elem: '#mainTable_skill'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[2]]
+ , data: data1.data.h_p_HR_PersonnelResumeReport2
+ , height: 'full-80'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_skill);
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
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_TechnologyParameterList.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_TechnologyParameterList.html"
index 072b63a..05170ed 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_TechnologyParameterList.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_TechnologyParameterList.html"
@@ -115,6 +115,8 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
+ var HProcName = "";
+ var HMaterName = "";
var Organization = sessionStorage["Organization"]
var HModName = "Gy_TechnologyParameterList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -122,6 +124,11 @@
var params = get_UrlVars();
var Type = params[params[0]] == null ? "HTechParam" : params[params[0]];
var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
+ var HEquipNumber = params[params[2]] == null ? "" : params[params[2]]; //璁惧
+ HProcName = params[params[3]] == null ? "" : params[params[3]]; //宸ュ簭
+ HMaterName = params[params[4]] == null ? "" : params[params[4]]; //鐗╂枡
+ HProcName = decodeURI(HProcName);
+ HMaterName = decodeURI(HMaterName);
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -142,7 +149,17 @@
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
+ if (OperationType == 2) {
+ sWhere = {
+ HEquipNumber: HEquipNumber,
+ HProcName: HProcName,
+ HMaterName: HMaterName
+ }
+ get_Display1(JSON.stringify(sWhere));
+ } else {
+ get_Display(sWhere);
+ }
+
//#endregion
@@ -391,6 +408,78 @@
layer.close(wait);
}
//#endregion
+
+ //#region 鍏朵粬椤甸潰鑷姩杩囨护宸ヨ壓鍙傛暟 鐗╂枡+宸ュ簭+璁惧
+ function get_Display1(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_TechnologyParameter/list1',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(wait);
+ }
+ //#endregion
+
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
index 03bb56c..c15ce2a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\212\200\350\203\275\350\200\203\346\240\270/HR_EmployeeSkillExamBill.html"
@@ -138,6 +138,14 @@
</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: 128px; width: 185px;">
+ <select name="HDivisionID" id="HDivisionID" lay-verify="HDivisionID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
@@ -291,6 +299,7 @@
var option = {};
//璁板綍缁勭粐鐨勫��
var HOrgIDBar = 0;
+ var HDivisionIDBar = 0;
//鑾峰彇鍙傛暟
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
@@ -335,7 +344,7 @@
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
-
+
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -354,7 +363,7 @@
//鍒濆鍖栫粍缁�
Organ();
-
+ GetGy_Division();//鑾峰彇浜嬩笟閮�
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -785,6 +794,33 @@
}
//#endregion
+ //#region 鑾峰彇浜嬩笟閮�
+ function GetGy_Division() {
+ //鑾峰彇浜嬩笟閮℉DivisionIDBar
+ var HDivisionList = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HDivisionList += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDivisionID").append(HDivisionList);
+ $("#HDivisionID").val(HDivisionIDBar);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
//鑾峰彇瀛愯〃鏁版嵁
@@ -895,6 +931,7 @@
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
HOrgIDBar = data[0]["HOrgID"];
+ HDivisionIDBar = data[0]["HDivisionID"];
//瀛愯〃 璧嬪��
var rowdata = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
index 8572513..50885e1 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
@@ -303,6 +303,7 @@
});
layer.close(index);
}
+
//蹇�熸煡璇�
function get_FastQuery() {
var HEquipNumber = $("#HEquipNumber").val();
@@ -326,6 +327,7 @@
}
}
+
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HEquipNumber").val("");
@@ -348,6 +350,7 @@
sWhere = "";
}
+
//鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
@@ -619,6 +622,7 @@
//宸ヨ壓鍙傛暟
form.on('submit(btnHTechParam)', function () {
+ var HEquipNumber = $("#HEquipNumber").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -628,7 +632,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index 006a217..27ad11f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -794,7 +794,7 @@
}
} else if (obj.event == '鑱屽憳') {
- var linterid = data.鑱屽憳id;
+ var HName = data.鑱屽憳;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -803,7 +803,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName+''
, resize: false,
end: function () {
}
@@ -977,7 +977,7 @@
}
})
} else if (obj.event == '鑱屽憳') {
- var linterid = data.鑱屽憳id;
+ var HName = data.鑱屽憳;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -986,7 +986,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
, resize: false,
end: function () {
}
@@ -1017,7 +1017,7 @@
}
})
} else if (obj.event == '鑱屽憳') {
- var linterid = data.鑱屽憳id;
+ var HName = data.鑱屽憳;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1026,7 +1026,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
, resize: false,
end: function () {
}
@@ -1057,7 +1057,7 @@
}
})
} else if (obj.event == '鑱屽憳') {
- var linterid = data.鑱屽憳id;
+ var HName = data.鑱屽憳;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1066,7 +1066,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
, resize: false,
end: function () {
}
@@ -1239,7 +1239,7 @@
})
}
} else if (obj.event == '鑱屽憳') {
- var linterid = data.鑱屽憳id;
+ var HName = data.鑱屽憳;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1248,7 +1248,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
, resize: false,
end: function () {
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_RegistrationForTestingReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_RegistrationForTestingReport.html"
index d17a999..318c4f1 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_RegistrationForTestingReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_RegistrationForTestingReport.html"
@@ -117,7 +117,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -216,20 +216,20 @@
var columns = [];
columns.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- columns.push({ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 180});
+ columns.push({ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 180 });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true, width: 180 });
columns.push({ field: '鐗╂枡', title: '鐗╂枡', sort: true, width: 110 });
columns.push({ field: '宸ュ簭', title: '宸ュ簭', sort: true, width: 110 });
columns.push({ field: '鎵规鍙�', title: '鎵规鍙�', sort: true, width: 110 });
- columns.push({ field: '(1)浜у搧鍗曢噸/g', title: '(1)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140});
- columns.push({ field: '(2)浜у搧鍗曢噸/g', title: '(2)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140});
- columns.push({ field: '(3)浜у搧鍗曢噸/g', title: '(3)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140});
- columns.push({ field: '閫佹祴鍐呭', title: '閫佹祴鍐呭', sort: true, width: 110});
- columns.push({ field: '閫佹祴鏁伴噺', title: '閫佹祴鏁伴噺', sort: true, totalRow: true, width: 110});
- columns.push({ field: '閫佹祴鏃堕棿', title: '閫佹祴鏃堕棿', sort: true, width: 180});
- columns.push({ field: '鍒ゅ畾缁撴灉', title: '鍒ゅ畾缁撴灉', sort: true, width: 110});
- columns.push({ field: '鍥炴敹鏁伴噺', title: '鍥炴敹鏁伴噺', sort: true, totalRow: true, width: 110});
- columns.push({ field: '鍥炴敹鏃堕棿', title: '鍥炴敹鏃堕棿', sort: true, width: 180});
+ columns.push({ field: '(1)浜у搧鍗曢噸/g', title: '(1)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140 });
+ columns.push({ field: '(2)浜у搧鍗曢噸/g', title: '(2)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140 });
+ columns.push({ field: '(3)浜у搧鍗曢噸/g', title: '(3)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140 });
+ columns.push({ field: '閫佹祴鍐呭', title: '閫佹祴鍐呭', sort: true, width: 110 });
+ columns.push({ field: '閫佹祴鏁伴噺', title: '閫佹祴鏁伴噺', sort: true, totalRow: true, width: 110 });
+ columns.push({ field: '閫佹祴鏃堕棿', title: '閫佹祴鏃堕棿', sort: true, width: 180 });
+ columns.push({ field: '鍒ゅ畾缁撴灉', title: '鍒ゅ畾缁撴灉', sort: true, width: 110 });
+ columns.push({ field: '鍥炴敹鏁伴噺', title: '鍥炴敹鏁伴噺', sort: true, totalRow: true, width: 110 });
+ columns.push({ field: '鍥炴敹鏃堕棿', title: '鍥炴敹鏃堕棿', sort: true, width: 180 });
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo1'
@@ -238,7 +238,7 @@
//, cellMinWidth: 'auto'
, totalRow: true
, limit: 500
- , data:[]
+ , data: []
, limits: [50, 500, 5000, 20000]
//, done: function (res, curr, count) {
// soulTable.render(this);
@@ -272,6 +272,13 @@
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[i].name == '妫�楠屽崟鍗曞彿') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '妫�楠屽崟鍗曞彿', templet: function (d) {
+ return '<span style="color: blue;">' + d.妫�楠屽崟鍗曞彿 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -311,7 +318,7 @@
option.data = data1.data
}
-
+
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -343,10 +350,10 @@
var HProject = $("#HProject").val();//椤圭洰鍙�
var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
-
+
sWhere = {
HBeginDate: HBeginDate
- ,HEndDate: HEndDate
+ , HEndDate: HEndDate
, HMaterID: HMaterID
, HBatchNo: HBatchNo
, HProject: HProject
@@ -422,6 +429,67 @@
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '妫�楠屽崟鍗曞彿') {
+ const HBillNo = data.妫�楠屽崟鍗曞彿.substring(0, 2);
+ var linterid = data.HInterID;
+ if (HBillNo == "SJ") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅棣栦欢妫�楠屽崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (HBillNo == "XJ") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅宸℃璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (HBillNo == "GX") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鏈妫�楠屽崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ }
+ });
+
+
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
index 406801b..156c1de 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
@@ -41,7 +41,7 @@
<input name="HDate" id="HDate" autocomplete="off" class="layui-input ForFilteringSchemes">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
index 496b09d..55fa17e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/SB_TechnologyParameterList.html"
@@ -74,6 +74,7 @@
<label class="layui-form-label" style="width: 85px;">璁惧</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
+ <input type="hidden" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
</div>
</div>
<div class="layui-inline">
@@ -602,6 +603,9 @@
//宸ヨ壓鍙傛暟
form.on('submit(btnHTechParam)', function () {
+ var HMaterName = $("#HMaterName").val();
+ var HProcName = $("#HProcName").val();
+ var HEquipNumber = $("#HEquipNumber").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -611,7 +615,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '&HProcName=' + HProcName + '&HMaterName=' + HMaterName + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -650,7 +654,7 @@
if (result.count == 1) {
var data = result.data;
$("#HEquipName").val(data[0]["HName"]);
-
+ $("#HEquipNumber").val(data[0]["HEquipFileNumber"]);
} else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -676,6 +680,7 @@
$("#HProcName").val(data[0]["宸ュ簭鍚嶇О"]);
$("#HMaterName").val(data[0]["鐗╂枡鍚嶇О"]);
$("#HEquipName").val(data[0]["璁惧鍚嶇О"]);
+ $("#HEquipName").val(data[0]["璁惧鍚嶇О"]);
} else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
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_ProcessExchangeBill.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_ProcessExchangeBill.html"
index 471dff8..4eda9c7 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_ProcessExchangeBill.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_ProcessExchangeBill.html"
@@ -2258,7 +2258,7 @@
"HQty": 0, "HSNCtrl": "false", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
- "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0,"HSourceID":0
}];
table.render(option);
}
--
Gitblit v1.9.1