From 260c6e54c4f100ca49376a6afd70f73843868171 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 28 八月 2024 08:49:35 +0800
Subject: [PATCH] 组托收货测试
---
HTML/views/QualityControl/QualityChangeLog.html | 573 ++++++++++++++++++++++++++-------------------------------
1 files changed, 261 insertions(+), 312 deletions(-)
diff --git a/HTML/views/QualityControl/QualityChangeLog.html b/HTML/views/QualityControl/QualityChangeLog.html
index 0a0e60c..a21afd4 100644
--- a/HTML/views/QualityControl/QualityChangeLog.html
+++ b/HTML/views/QualityControl/QualityChangeLog.html
@@ -1,342 +1,291 @@
<!DOCTYPE html>
<html>
- <head>
- <meta 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">
- <link rel="stylesheet" href="../../css/public.css" media="all">
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
- GetIsSetColW();
- });
- </script>
- </head>
- <body id="body">
- <div class="layui-fluid" style="padding-bottom: 0;">
- <div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
- <div class="layui-form-item">
- <!-- 鍗曟嵁
+<head>
+ <meta 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">
+ <link rel="stylesheet" href="../../css/public.css" media="all">
+
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ //鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
+ GetIsSetColW();
+ });
+ </script>
+</head>
+
+<body id="body">
+ <div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-card">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"
+ id="top">
+ <div class="layui-form-item">
+ <!-- 鍗曟嵁
<div class="layui-inline">
<label class="layui-form-label" style="width: 60px;">鍏ュ簱鍗曟嵁</label>
<div class="layui-input-inline">
<input type="text" id="ASNNo" name="ASNNo" placeholder="璇疯緭鍏ュ叆搴撳崟鎹�" autocomplete="off" class="layui-input">
</div>
</div> -->
- <!-- 鎵规 -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
- <div class="layui-input-inline">
- <input type="text" id="LotNo" name="LotNo" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off" class="layui-input">
- </div>
- </div>
- <!-- 鐗╂枡鍙� -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
- <div class="layui-input-inline">
- <input type="text" id="SkuNo" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" autocomplete="off" class="layui-input">
- </div>
- </div>
- <!-- 鐗╂枡鍚嶇О -->
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" id="SkuName" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
- </button>
+ <!-- 鎵规 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" id="LotNo" name="LotNo" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off"
+ class="layui-input">
</div>
</div>
+ <!-- 鐗╂枡鍙� -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="SkuNo" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <!-- 鐗╂枡鍚嶇О -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" id="SkuName" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ lay-filter="LAY-app-contlist-search">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ </button>
+ </div>
</div>
- <div id="center"></div>
- <div class="layui-card-body">
-
- <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
+ </div>
+ <div id="center"></div>
+ <div class="layui-card-body">
+
+ <!-- <div style="padding-bottom: 5px; display: flex; flex-direction: row-reverse;">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" style="margin-right: 10px;" data-type="add" id="approvalBtn">
<i class="layui-icon"></i>娣诲姞
</button>
</div> -->
- <div class="position-relative">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+ <div class="position-relative">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
- <!--#region 鑷畾涔夎〃澶� -->
- <div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
- <i class="layui-icon"></i>
- </button>
- </div>
- <!-- #endregion -->
- </div>
-
- <script type="text/html" id="CreateTimeButton">
+ <!--#region 鑷畾涔夎〃澶� -->
+ <div class="headerSetIcon">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
+ <i class="layui-icon"></i>
+ </button>
+ </div>
+ <!-- #endregion -->
+ </div>
+
+ <script type="text/html" id="CreateTimeButton">
{{# console.log(d.CreateTime);
return formatDate(d.CreateTime);
}}
</script>
-
- </div>
+
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/public.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script>
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- layer = layui.layer;
+ </div>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ layer = layui.layer;
- var h1 = GetTableHeight();
-
- var TotalColsArr =
- [[
- {
- field: '',title: '搴忓彿',type: 'numbers',fixed: 'left', "disabled": true
- },
- {
- field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center'
- },
- {
- field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'
- },
- {
- field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center'
- },
- {
- field: 'LotNo',title: '鎵规鍙�',align: 'center'
- },
- {
- field: 'FailQty',title: '鏁伴噺',align: 'center'
- },
- {
- field: 'Demo',title: '鍙樻洿淇℃伅',align: 'center',width: 360
- },
- // {
- // field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center'
- // },
- {
- field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center', templet: '#CreateTimeButton',
- },
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ var h1 = GetTableHeight();
- refreshTable("","","","","","");
- var tableIns;
- var colsJson;
- function refreshTable(LotNo,SkuNo,SkuName) {
-
- var param1={
- // Href:'QualityControl/QualityInformation'
- Href:'BllQuality/GetBllQualityList2'
- };
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- console.log(1)
- colsJson=TotalColsArr
- }else{
- console.log(2)
- colsJson= eval(res.data);
- }
- }else{
- colsJson=TotalColsArr
- }
-
- var param = {
- // ASNNo: ASNNo,
- LotNo: LotNo,
- SkuNo: SkuNo,
- SkuName: SkuName,
- Origin:'WMS'
- };
- // console.log(param)
- var url = "/BllQuality/GetBllQualityList";
- table.render({
- elem: '#LAY-app-content-list',
- url: IP + url,
- method: 'post',
- height: h1,
- id: 'LAY-app-content-list',
- where: param,
- contentType: 'application/json',
- // toolbar: '#toolbarDemo',
- defaultToolbar: [], //'filter','print', 'exports'
- headers: { ToKen: $.cookie('token') },
- page: true,
- even: true,
- limit: pageCnt,
- limits: pageLimits,
- cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function (res) {
- setRight();
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list','BllQuality/GetBllQualityList2',TotalColsSysArr);
- },
- cols: colsJson
- });
- });
-
-
-
- // var url = "/BllQuality/GetBllQualityList";
- // sendData(IP + url, param, 'post', function(res) {
- // if (res.code == 0) //鎴愬姛
- // {
- // var list = res.data;
- // $.extend(infoOptions, {
- // data: list
- // });
- // infoOptions.page = {
- // curr: 1
- // }
- // console.log(res)
- // tableIns = table.render(infoOptions);
- // }
- // else //涓嶆垚鍔�
- // {
- // layer.msg('鑾峰彇璐ㄦ鍒楄〃淇℃伅澶辫触锛�', {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function() {});
- // }
- // });
- }
-
- // function tableclass(LotNo,SkuNo,SkuName)
- // {
- // var param = {
- // // ASNNo: ASNNo,
- // LotNo: LotNo,
- // SkuNo: SkuNo,
- // SkuName: SkuName
- // };
- // // console.log(param)
- // var url = "/BllQuality/GetBllQualityList";
- // table.render({
- // elem: '#LAY-app-content-list',
- // url: IP + url,
- // method: 'post',
- // height: 'full-136',
- // id: 'LAY-app-content-list',
- // where: param,
- // // contentType: 'application/json',
- // // toolbar: '#toolbarDemo',
- // // defaultToolbar: [], //'filter','print', 'exports'
- // // headers: { ToKen: $.cookie('token') },
- // page: true,
- // even: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // done: function (res) {
- // setRight();
- // },
- // cols: colsJson
- // });
- // }
-
- // 鏉冮檺璁剧疆
- function setRight() {
- $(function() {
- $("#approvalBtn").hide();
- });
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 0) { //鎴愬姛
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
- {
- $(function() {
- $("#approvalBtn").show();
- });
- }
- }
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }
-
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- // var ASNNo = data.field.ASNNo;
- var LotNo = data.field.LotNo;
- var SkuNo = data.field.SkuNo;
- var SkuName = data.field.SkuName;
-
- refreshTable(LotNo,SkuNo,SkuName);
- });
- var doing = true;
- var $ = layui.$,
- active = {
- customCols: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList2&ColsSysArr='+TotalColsSysArr,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
- });
- },
- };
- $('.layui-btn').on('click', function() {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
- });
-
- var element = layui.element;
- var houseId = 0;
- var param = {
- Id: $.cookie('userId')
- }
- var xml = '';
- function getchiled(data, mainId) {
- if (data)
+ var TotalColsArr =
+ [[
{
- var list = data.filter(item => item.ParentId == mainId);
- if (list)
- {
- for (var i = 0; i < list.length; i++)
- {
- var id = list[i].Id;
- //鏌ヨ鏈夋棤瀛愯彍鍗�
- var count = data.filter(item => item.ParentId == id).length;
- if (count > 0)
- {
- xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
- getchiled(data, id);
- xml = xml + '</dl></dd>';
- }
- else
- {
- xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
- }
+ field: '', title: '搴忓彿', type: 'numbers', fixed: 'left', "disabled": true
+ },
+ {
+ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'
+ },
+ {
+ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'
+ },
+ {
+ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center'
+ },
+ {
+ field: 'LotNo', title: '鎵规鍙�', align: 'center'
+ },
+ {
+ field: 'PassQty', title: '鍚堟牸鏁伴噺', align: 'center'
+ },
+ {
+ field: 'FailQty', title: '涓嶅悎鏍兼暟閲�', align: 'center'
+ },
+ {
+ field: 'Demo', title: '鍙樻洿淇℃伅', align: 'center', width: 360
+ },
+ // {
+ // field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center'
+ // },
+ {
+ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', templet: '#CreateTimeButton',
+ },
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+
+ refreshTable("", "", "", "", "", "");
+ var tableIns;
+ var colsJson;
+ function refreshTable(LotNo, SkuNo, SkuName) {
+
+ var param1 = {
+ // Href:'QualityControl/QualityInformation'
+ Href: 'BllQuality/GetBllQualityList2'
+ };
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ console.log(1)
+ colsJson = TotalColsArr
+ } else {
+ console.log(2)
+ colsJson = eval(res.data);
+ }
+ } else {
+ colsJson = TotalColsArr
+ }
+
+ var param = {
+ // ASNNo: ASNNo,
+ LotNo: LotNo,
+ SkuNo: SkuNo,
+ SkuName: SkuName,
+ Origin: 'WMS'
+ };
+ // console.log(param)
+ var url = "/BllQuality/GetBllQualityList";
+ table.render({
+ elem: '#LAY-app-content-list',
+ url: IP + url,
+ method: 'post',
+ height: h1,
+ id: 'LAY-app-content-list',
+ where: param,
+ contentType: 'application/json',
+ // toolbar: '#toolbarDemo',
+ defaultToolbar: [], //'filter','print', 'exports'
+ headers: { ToKen: $.cookie('token') },
+ page: true,
+ even: true,
+ limit: pageCnt,
+ limits: pageLimits,
+ cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ done: function (res) {
+ setRight();
+ //鑷畾涔夊垪瀹�
+ SetTableColW('LAY-app-content-list', 'BllQuality/GetBllQualityList2', TotalColsSysArr);
+ },
+ cols: colsJson
+ });
+ });
+ }
+
+
+ // 鏉冮檺璁剧疆
+ function setRight() {
+ $(function () {
+ $("#approvalBtn").hide();
+ });
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉") {
+ $(function () {
+ $("#approvalBtn").show();
+ });
+ }
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ // var ASNNo = data.field.ASNNo;
+ var LotNo = data.field.LotNo;
+ var SkuNo = data.field.SkuNo;
+ var SkuName = data.field.SkuName;
+
+ refreshTable(LotNo, SkuNo, SkuName);
+ });
+ var doing = true;
+ var $ = layui.$,
+ active = {
+ customCols: function () {
+ layer.open({
+ type: 2,
+ title: '鑷畾涔夊垪',
+ content: '../SystemSettings/HeaderSetting.html?Href=BllQuality/GetBllQualityList2&ColsSysArr=' + TotalColsSysArr,
+ maxmin: false,
+ resize: false,
+ area: ['970px', '650px']
+ });
+ },
+ };
+ $('.layui-btn').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
+
+ var element = layui.element;
+ var houseId = 0;
+ var param = {
+ Id: $.cookie('userId')
+ }
+ var xml = '';
+ function getchiled(data, mainId) {
+ if (data) {
+ var list = data.filter(item => item.ParentId == mainId);
+ if (list) {
+ for (var i = 0; i < list.length; i++) {
+ var id = list[i].Id;
+ //鏌ヨ鏈夋棤瀛愯彍鍗�
+ var count = data.filter(item => item.ParentId == id).length;
+ if (count > 0) {
+ xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
+ getchiled(data, id);
+ xml = xml + '</dl></dd>';
+ }
+ else {
+ xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
}
}
}
}
- });
- </script>
- </body>
-</html>
+ }
+ });
+ </script>
+</body>
+
+</html>
\ No newline at end of file
--
Gitblit v1.8.0