From 8d1b5f35430d62f60d11f7d46955a5dacef4546b Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 26 三月 2021 16:38:48 +0800
Subject: [PATCH] 新增不良品列表
---
WebTM/views/车间管理/不良品评审单/Cj_NoPassProcList.html | 197 +++++++++++++++++++++++++++++++++++++++++++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 14 ++-
WebTM/views/index.html | 10 ++
WebTM/Properties/PublishProfiles/JFTM.pubxml | 2
WebTM/WebTM.csproj | 1
5 files changed, 217 insertions(+), 7 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml b/WebTM/Properties/PublishProfiles/JFTM.pubxml
index a47e212..70a8712 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>F:\缃戠珯鍙戝竷\姹熶赴\JFTM</PublishUrl>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 0a2be27..1f93ee5 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4,17 +4,17 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_PublishTargetUrl>F:\缃戠珯鍙戝竷\姹熶赴\JFTM</_PublishTargetUrl>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/layui/layui.js">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>03/24/2021 16:35:44</publishTime>
+ <publishTime>03/26/2021 15:38:29</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>03/24/2021 16:35:44</publishTime>
+ <publishTime>03/26/2021 15:38:29</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -932,7 +932,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>03/24/2021 16:33:50</publishTime>
+ <publishTime>03/26/2021 15:37:43</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>03/23/2021 14:14:38</publishTime>
@@ -1126,6 +1126,12 @@
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
+ <File Include="views/杞﹂棿绠＄悊/涓嶈壇鍝佽瘎瀹″崟/Cj_NoPassProc.html">
+ <publishTime>03/26/2021 09:58:10</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/涓嶈壇鍝佽瘎瀹″崟/Cj_NoPassProcList.html">
+ <publishTime>03/26/2021 15:41:47</publishTime>
+ </File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a574249..b202e96 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -441,6 +441,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillList.html" />
<Content Include="views\缁勮鍗昞Sc_AssemblyBill_Fast.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\涓嶈壇鍝佽瘎瀹″崟\Cj_NoPassProcList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBill_PDA.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 0746e60..cd3386f 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -194,6 +194,12 @@
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</a></dd>
</dl>
</dd>
+ <dd class="layui-nav-itemed">
+ <a>涓嶈壇鍝佽瘎瀹″崟</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/涓嶈壇鍝佽瘎瀹″崟/Cj_NoPassProcList.html">涓嶈壇鍝佸垪琛�</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<li data-name="set" class="layui-nav-item">
@@ -422,10 +428,10 @@
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
var judgeMorPCflag = judgeMorPC();
if (!judgeMorPCflag) {//绉诲姩绔�
- var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
+ var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
$("#append").prepend(dd);
} else {//PC绔�
- var dd = '<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationInBill_PDA.html" target="main_self_frame">宸ュ簭杩涚珯鎺ユ敹鍗�</a ></dd > <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭姹囨姤/MES_StationOutBill_PDA.html" target="main_self_frame">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>';
+ var dd = '<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">宸ュ簭杩涚珯鎺ユ敹鍗�</a ></dd > <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>';
$("#append").prepend(dd);
}
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\270\215\350\211\257\345\223\201\350\257\204\345\256\241\345\215\225/Cj_NoPassProcList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\270\215\350\211\257\345\223\201\350\257\204\345\256\241\345\215\225/Cj_NoPassProcList.html"
new file mode 100644
index 0000000..b1eeaca
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\270\215\350\211\257\345\223\201\350\257\204\345\256\241\345\215\225/Cj_NoPassProcList.html"
@@ -0,0 +1,197 @@
+锘�<!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>
+
+</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" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓嶈壇鍘熷洜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" 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>
+
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ ,cellMinWidth: 90
+ , cols: [[
+ { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О' }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐗╂枡鍐呯爜', title: '鐗╂枡鍐呯爜' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '妫�楠屽憳浠ｇ爜', title: '妫�楠屽憳浠ｇ爜' }
+ , { field: '妫�楠屽憳鍚嶇О', title: '妫�楠屽憳鍚嶇О' }
+ , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
+ , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' }
+ , { field: '涓嶈壇鍘熷洜浠ｇ爜', title: '涓嶈壇鍘熷洜浠ｇ爜' }
+ , { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , { field: 'hsubid', title: 'hsubid', hide: true }
+ ]]
+ };
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Cj_NoPassProc/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and 涓嶈壇鍘熷洜浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 涓嶈壇鍘熷洜 like '%" + HName + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/Cj_NoPassProc/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
--
Gitblit v1.9.1