1
zgq
2021-07-20 cfc5e6fa347eadeddd94a2a2e0d8dafccb4e452b
1
1个文件已添加
7个文件已修改
442 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_QCCheckProjectListView.html 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console_Mobile.html 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html 242 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -15,10 +15,10 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>07/19/2021 20:55:58</publishTime>
      <publishTime>07/20/2021 21:30:33</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>07/19/2021 20:55:58</publishTime>
      <publishTime>07/20/2021 21:30:33</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -633,7 +633,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>07/20/2021 15:02:24</publishTime>
      <publishTime>07/20/2021 23:24:33</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -799,6 +799,9 @@
    </File>
    <File Include="views/Baseset/基础资料/Gy_QCCheckItemListView.html">
      <publishTime>07/19/2021 19:30:28</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_QCCheckProjectListView.html">
      <publishTime>07/20/2021 21:27:45</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_RepairList.html">
      <publishTime>06/30/2021 11:17:08</publishTime>
@@ -1059,7 +1062,7 @@
      <publishTime>07/06/2021 16:01:53</publishTime>
    </File>
    <File Include="views/home/console_Mobile.html">
      <publishTime>05/08/2021 13:44:31</publishTime>
      <publishTime>07/20/2021 23:24:03</publishTime>
    </File>
    <File Include="views/home/homepage1.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1077,13 +1080,13 @@
      <publishTime>07/12/2021 15:38:26</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>07/14/2021 20:10:46</publishTime>
      <publishTime>07/20/2021 19:42:04</publishTime>
    </File>
    <File Include="views/index_Mobile.html">
      <publishTime>07/16/2021 17:40:57</publishTime>
    </File>
    <File Include="views/IpadIndex.html">
      <publishTime>07/20/2021 14:58:15</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/PublicPage/CheckItemType.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
@@ -1860,10 +1863,10 @@
      <publishTime>06/24/2021 16:58:24</publishTime>
    </File>
    <File Include="views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html">
      <publishTime>07/19/2021 15:36:50</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/生产管理/产量汇报单/Sc_ProductReportBillList.html">
      <publishTime>07/20/2021 14:58:15</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/生产管理/报工平台功能页/LineBind.html">
      <publishTime>07/19/2021 15:36:50</publishTime>
@@ -1881,7 +1884,7 @@
      <publishTime>07/19/2021 15:36:50</publishTime>
    </File>
    <File Include="views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html">
      <publishTime>07/20/2021 14:58:15</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/生产管理/生产停工单/Sc_MESStopWorkBillList.html">
      <publishTime>06/28/2021 11:17:20</publishTime>
@@ -1899,7 +1902,7 @@
      <publishTime>07/19/2021 15:36:51</publishTime>
    </File>
    <File Include="views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html">
      <publishTime>07/20/2021 14:58:15</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html">
      <publishTime>06/18/2021 16:05:28</publishTime>
@@ -1914,7 +1917,7 @@
      <publishTime>06/28/2021 11:17:20</publishTime>
    </File>
    <File Include="views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html">
      <publishTime>07/20/2021 14:58:15</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html">
      <publishTime>06/18/2021 16:05:28</publishTime>
@@ -1923,10 +1926,10 @@
      <publishTime>03/29/2021 10:46:21</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html">
      <publishTime>07/13/2021 17:09:13</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html">
      <publishTime>07/13/2021 17:09:13</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_ICMOReportBillList.html">
      <publishTime>07/12/2021 15:38:26</publishTime>
@@ -2079,7 +2082,7 @@
      <publishTime>07/19/2021 08:17:34</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>07/20/2021 14:56:47</publishTime>
      <publishTime>07/20/2021 22:33:39</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
@@ -2163,7 +2166,7 @@
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>07/20/2021 14:56:47</publishTime>
      <publishTime>07/20/2021 22:33:39</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
@@ -2226,13 +2229,13 @@
      <publishTime>07/19/2021 16:04:47</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>07/20/2021 09:37:24</publishTime>
      <publishTime>07/20/2021 19:37:19</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBill.html">
      <publishTime>07/19/2021 16:04:47</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>07/20/2021 09:37:24</publishTime>
      <publishTime>07/20/2021 19:37:19</publishTime>
    </File>
    <File Include="views/车间管理/报表分析/Qk_OutProcessList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -2298,7 +2301,7 @@
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBill_Fast.html">
      <publishTime>03/29/2021 10:48:23</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBill_FastList.html">
      <publishTime>03/29/2021 10:48:23</publishTime>
@@ -2391,7 +2394,7 @@
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_Fast.html">
      <publishTime>07/16/2021 17:40:57</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_FastList.html">
      <publishTime>03/29/2021 10:48:24</publishTime>
@@ -2430,7 +2433,7 @@
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_Fast.html">
      <publishTime>07/20/2021 14:58:15</publishTime>
      <publishTime>07/20/2021 17:07:50</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_FastList.html">
      <publishTime>03/29/2021 10:48:24</publishTime>
WebTM/WebTM.csproj
@@ -83,6 +83,7 @@
    <Content Include="layuiadmin\myicon\车间管理.svg" />
    <Content Include="layuiadmin\treeTable.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\基础资料\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckItemListView.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,7 +1,7 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//王永波本地配置,请勿更改
     //var WEBURL = "http://101.37.171.70/API/";   //公司服务器
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
@@ -10,7 +10,7 @@
    //var WEBURL = "http://10.1.4.154/API/";   //江丰客户
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器
    var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器
    return WEBURL
}
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_QCCheckProjectListView.html
New file
@@ -0,0 +1,102 @@
<!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-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>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="ck-table"></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 () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                RoadQuery($('#Value').val());
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#ck-table'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                  , { field: 'HItemID', title: 'HItemID', hide: true }
                  , { field: '检验方案代码', title: '检验方案代码' }
                  , { field: '方案名称', title: '方案名称' }
              ]]
              , page: true
            });
            ///加载显示数据
            function RoadQuery(Where) {
                var index = layer.load();
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetGy_QCCheckProject",
                    async: true,
                    data: { "CheckProject": Value, "OrganizationID": sessionStorage["OrganizationID"] },
                    //data: { "Value": Value },
                    success: function (result) {
                        if (result.count == 1) {
                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                            table.reload('ck-table', {
                                data: ajaxReturnData
                                , height: 'full-10'
                                , loading: false
                                , done: function (index, res) {
                                }
                            });
                            layer.close(index);
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (result) {
                        layer.close(index);
                        console.log(result);
                        //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>
</body>
</html>
WebTM/views/home/console_Mobile.html
@@ -40,6 +40,48 @@
                                      <cite>委外工序发出单</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../验收入库/外购入库/Kf_POStockInBill_Fast.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-console"></i>
                                      <cite>外购入库</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../验收入库/委外入库/Kf_EntrustInBill_Fast.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-template-1"></i>
                                      <cite>委外入库</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../验收入库/产品入库/Kf_ProductInBill_Fast.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-template-1"></i>
                                      <cite>产品入库</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../领料发货/领料出库/Kf_MateOutBill_Fast.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-chart"></i>
                                      <cite>领料出库</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../领料发货/委外出库/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-chart"></i>
                                      <cite>委外出库</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../领料发货/销售出库/Kf_SellOutBill_Fast.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-chat"></i>
                                      <cite>销售出库</cite>
                                  </a>
                              </li>
                              <li class="layui-col-xs3">
                                  <a href="../仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html" target="main_self_frame">
                                      <i class="layui-icon layui-icon-find-fill"></i>
                                      <cite>调拨单</cite>
                                  </a>
                              </li>
                          </ul>
                      </div>
                  </div>
WebTM/views/index.html
@@ -397,16 +397,16 @@
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="基础资料/公用基础资料/Gy_QCCheckClass.html">检验项目分类列表</a></dd>
                                        <dd><a lay-href="基础资料/公用基础资料/Add_Edit_Gy_QCCheckClass.html">检验项目列表</a></dd>
                                        <dd><a href="质量管理/检验方案单/QC_Add_CheckProject.html" target="main_self_frame">检验方案</a></dd>
                                        <dd><a lay-href="质量管理/检验方案单/QC_Add_CheckProject.html">检验方案</a></dd>
                                        <dd><a lay-href="质量管理/检验方案单/QC_CheckProjectList.html">检验方案维护</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>过程检验</a>
                                    <dl class="layui-nav-child">
                                        <dd><a href="质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html" target="main_self_frame">首件检验单</a></dd>
                                        <dd><a lay-href="质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">首件检验单</a></dd>
                                        <dd><a lay-href="质量管理/首件检验单/QC_FirstPieceCheckBillList.html">首件检验单维护</a></dd>
                                        <dd><a href="质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html" target="main_self_frame">巡检记录单</a></dd>
                                        <dd><a lay-href="质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html">巡检记录单</a></dd>
                                        <dd><a lay-href="质量管理/巡检记录单/QC_PatrolProcCheckBillList.html">巡检记录单维护</a></dd>
                                        <dd><a lay-href="质量管理/工序检验单/QC_ProcessCheckBill.html">工序转移检验单</a></dd>
                                        <dd><a lay-href="质量管理/工序检验单/QC_ProcessCheckBillList.html">工序转移检验单维护</a></dd>
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html
@@ -42,18 +42,15 @@
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px;">
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">预览</span></i>
                        </button>
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">新增</span></i>
                        </button>
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">修改</span></i>
                        </button>
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">保存</span></i>
                        </button>
                        <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">预览</span></i>
        </button>-->
                        <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">修改</span></i>
        </button>-->
                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">新增</button>
                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -102,7 +99,7 @@
                                        <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="HICMOQty" id="HICMOQty">
                                                <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -125,7 +122,7 @@
                                        <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="HProcExchQty" id="HProcExchQty">
                                                <input type="text" class="layui-input" name="HProcExchQty" id="HProcExchQty" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -159,6 +156,18 @@
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验方案</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: left;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -263,6 +272,11 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                        </div>
                    </script>
                    <!--隐藏字段-->
                    <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType">
                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
                    <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
                </form>
            </div>
        </div>
@@ -272,12 +286,12 @@
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <!--行下拉选择-->
    <script type="text/html" id="inputSel">
        <select name="HCloseType" lay-filter="HCloseType">
    <!--行下拉选择(结论)-->
    <script type="text/html" id="HResult">
        <select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
            <option value="">请选择</option>
            <option value="true">是</option>
            <option value="false">否</option>
            <option value="合格">合格</option>
            <option value="不合格">不合格</option>
        </select>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
@@ -340,6 +354,7 @@
            if (OperationType == 1) {
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//有源单时保存按钮禁用
                //获取最大单据号
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -357,6 +372,11 @@
            else if (OperationType == 2) {
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//有源单时新增按钮禁用
                $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//有源单时生产资源按钮禁用
                $('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//有源单时任务单号按钮禁用
                $('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//有源单时产品内码按钮禁用
                $('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//有源单时流转卡号按钮禁用
                //获取最大单据号
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -400,6 +420,9 @@
                            $("#HSourceName").val(data.生产资源);
                            $("#HSourceID").val(data.HSourceID);
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMainSourceBillNo").val(data.单据号);
                            $("#HMainSourceBillType").val(data.HBillType);
                            $("#HMainSourceInterID").val(data.HInterID);
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
@@ -417,15 +440,17 @@
                //新增行表格数据
                var NewRow = {
                    "HQCCheckItemID": "", "检验项目": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HSourceInterID": "",
                    "HSourceEntryID": "", "HSourceBillNo": "", "HSourceBillType": "", "HRelationQty": "", "HRelationMoney": "",
                    "HCloseMan": "", "HEntryCloseDate": "", "HCloseType": ""
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
                        table.render(option);
                        for (var i = 1; i <= option.data.length; i++) {
                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
                        }
                        form.render('select');
                        break;
                    case 'btn-CopyLine':
                        var copydata = JSON.stringify(data);
@@ -441,11 +466,38 @@
                            table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.render(option);//将数据渲染到表格上
                            //layer.alert(copyrow);
                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
                            }
                            form.render('select');
                        }
                        break;
                }
            });
            //退出按钮
            form.on('submit(btn-Exit)', function (data) {
                get_Exit();
            });
            //新增按钮
            form.on('submit(btn-AddNew)', function (data) {
                window.location.reload();
            });
            //退出
            function get_Exit() {
                if (OperationType == 1) {
                    parent.layui.admin.events.closeThisTabs();
                } else if (OperationType == 2) {
                    var index = parent.layer.getFrameIndex(window.name);
                    parent.layer.close(index);
                } else if (OperationType == 3) {
                    var index = parent.layer.getFrameIndex(window.name);
                    parent.layer.close(index);
                }
            }
            //行内事件
            table.on('tool(mainTable)', function (obj) {
@@ -539,51 +591,26 @@
            //保存
            function set_SaveBill(data) {
                //if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
                //    layer.msg("任务单数量不能为空且不能小于等于0!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                //    layer.msg("流转卡数量不能为空且不能小于等于0!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if ($("#HFirstCheckEmp").val() == 0) {
                //    layer.msg("检验员未选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //var sSubTable = table.cache['mainTable'];
                //for (var i = 0; i < sSubTable.length; i++) {
                //    if (!sSubTable[i].HQCCheckItemID) {
                //        var indexRow = i + 1;
                //        layer.msg("第" + indexRow + "行,检验项目不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //        return;
                //    }
                //    if (!sSubTable[i].HSourceInterID) {
                //        var indexRow = i + 1;
                //        layer.msg("第" + indexRow + "行,源单主内码不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //        return;
                //    }
                //    if (!sSubTable[i].HSourceEntryID) {
                //        var indexRow = i + 1;
                //        layer.msg("第" + indexRow + "行,源单子内码不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //        return;
                //    }
                //    if (!sSubTable[i].HRelationQty) {
                //        var indexRow = i + 1;
                //        layer.msg("第" + indexRow + "行,关联数量不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //        return;
                //    }
                //    if (!sSubTable[i].HRelationMoney) {
                //        var indexRow = i + 1;
                //        layer.msg("第" + indexRow + "行,关联金额不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //        return;
                //    }
                //    if (!sSubTable[i].HEntryCloseDate) {
                //        var indexRow = i + 1;
                //        layer.msg("第" + indexRow + "行,关闭时间不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //        return;
                //    }
                //}
                if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
                    layer.msg("任务单数量不能为空且不能小于等于0!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
                    layer.msg("流转卡数量不能为空且不能小于等于0!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HFirstCheckEmp").val() == 0) {
                    layer.msg("检验员未选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var sSubTable = table.cache['mainTable'];
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].HQCCheckItemID) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行,检验项目不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                }
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType;
@@ -630,11 +657,60 @@
                        // console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                    }
                })
            }
            //表头信息检验方案弹窗
            form.on('submit(btnSearchCheckProject)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '检验方案列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/Baseset/基础资料/Gy_QCCheckProjectListView.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
                        $("#HQCCheckProjectName").val(checkStatus.data[0].方案名称);
                        get_CheckItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            function get_CheckItem() {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
                    data: { "CheckProjectID": $("#HQCCheckProjectID").val()},
                    success: function (result) {
                        option.data = result.data;
                        table.render(option);
                    }
                })
            }
            //表头信息工序流转卡弹窗
            form.on('submit(btnSearchProcExch)', function () {
@@ -837,13 +913,12 @@
            //初始化表格
            function set_InitGrid() {
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始表格数据
                rowdata = [{
                    "HQCCheckItemID": "", "检验项目": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HSourceInterID": "",
                    "HSourceEntryID": "", "HSourceBillNo": "", "HSourceBillType": "", "HRelationQty": "", "HRelationMoney": "",
                    "HCloseMan": "", "HEntryCloseDate": "", "HCloseType": ""
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": ""
                }];
                option = {
                    elem: '#mainTable'
@@ -858,23 +933,14 @@
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HResult', title: '结论', edit: 'text' }
                        , { field: 'HResult', title: '结论', templet: '#HResult' }
                        , { field: 'HMax', title: '最大值', edit: 'text' }
                        , { field: 'HMin', title: '最小值', edit: 'text' }
                        , { field: 'HAvg', title: '平均值', edit: 'text', totalRow: true }
                        , { field: 'HRemark', title: '备注', edit: 'text' }
                        , { field: 'HSourceInterID', title: '源单主内码', edit: 'text' }
                        , { field: 'HSourceEntryID', title: '源单子内码', edit: 'text' }
                        , { field: 'HSourceBillNo', title: '源单单号' }
                        , { field: 'HSourceBillType', title: '源单类型' }
                        , { field: 'HRelationQty', title: '关联数量', edit: 'text' }
                        , { field: 'HRelationMoney', title: '关联金额', edit: 'text' }
                        , { field: 'HCloseMan', title: '行关闭人' }
                        , { field: 'HEntryCloseDate', title: '关闭时间', edit: 'text' }
                        , { field: 'HCloseType', title: '手工关闭', templet: '#inputSel' }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                    ]]
                    ,done: function (res, curr, count) {
                    , done: function (res, curr, count) {
                        option.data = res.data;
                        //去掉下拉框失焦事件否则在下拉框里输入值
                        $('.layui-form-select').find('input').unbind("blur");
@@ -884,7 +950,7 @@
                            var dataIndex = $cr.attr("data-index");
                            $.each(option.data, function (index, value) {
                                if (value.LAY_TNDEX == dataIndex) {
                                    $cr.find('input').val(value.HCloseType);
                                    $cr.find('input').val(value.HResult);
                                }
                            });
                        });
@@ -898,14 +964,14 @@
                table.render(option);
            }
            form.on('select(HCloseType)', function (data) {
            //行选择处理(结论)
            form.on('select(HResult)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HCloseType = data.value;//把选中下拉框id值赋值给表格缓存
                        value.HResult = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });
            });
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html
@@ -345,7 +345,7 @@
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HInterID.toString();
                    var OperationType = 2;
                    layer.open({
                    var FirstPieceCheck = layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '首件检验单-编辑'