zgq
2021-03-26 8d1b5f35430d62f60d11f7d46955a5dacef4546b
新增不良品列表
4个文件已修改
1个文件已添加
224 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/不良品评审单/Cj_NoPassProcList.html 197 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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>
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" />
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">工序进站接收单PDA</a ></dd > <dd><a href="车间管理/工序汇报/MES_StationOutBill_PDA.html">工序出站汇报单PDA</a></dd>';
              var dd = '<dd><a href="车间管理/工序流转/MES_StationInBill_PDA.html">工序进站接收单PDA</a ></dd > <dd><a href="车间管理/工序流转/MES_StationOutBill_PDA.html">工序出站汇报单PDA</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);
          }
      });
WebTM/views/³µ¼ä¹ÜÀí/²»Á¼Æ·ÆÀÉóµ¥/Cj_NoPassProcList.html
New file
@@ -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 = "";//调用接口后清空sWhere缓存
            });
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //以上是layui模块
        });
    </script>
</body>
</html>