wyb
2021-05-20 eecc5f0480f2657de8b4e91dfe87aa13744ea5a1
来料检验编辑、删除完成
4个文件已修改
273 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBill.html 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/来料检验单/QC_POStockInCheckBillList.html 166 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\LAYUI</_PublishTargetUrl>
    <History>True|2021-05-19T09:30:07.9866409Z;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
    <History>True|2021-05-20T07:55:05.5871601Z;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="bin/layuiadmin/layui/layui.js">
@@ -23,11 +23,11 @@
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>04/27/2021 20:31:08</publishTime>
      <publishTime>05/19/2021 17:30:06</publishTime>
      <publishTime>05/20/2021 14:30:05</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>04/27/2021 20:31:08</publishTime>
      <publishTime>05/19/2021 17:30:06</publishTime>
      <publishTime>05/20/2021 14:30:05</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>04/12/2021 11:31:26</publishTime>
@@ -2348,13 +2348,13 @@
      <publishTime>05/18/2021 10:00:56</publishTime>
    </File>
    <File Include="views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBill.html">
      <publishTime>05/19/2021 17:29:58</publishTime>
      <publishTime>05/20/2021 15:35:19</publishTime>
    </File>
    <File Include="views/质量管理/来料检验单/QC_POStockInCheckBillList.html">
      <publishTime>05/18/2021 10:00:56</publishTime>
      <publishTime>05/20/2021 15:54:28</publishTime>
    </File>
    <File Include="views/质量管理/检验方案单/QC_Add_CheckProject.html">
      <publishTime>05/19/2021 16:11:24</publishTime>
      <publishTime>05/20/2021 14:33:04</publishTime>
    </File>
    <File Include="views/质量管理/检验方案单/QC_CheckProjectList.html">
      <publishTime>05/19/2021 16:27:17</publishTime>
WebTM/views/ÖÊÁ¿¹ÜÀí/À´ÁϼìÑéµ¥/QC_Add_Edit_POStockInCheckBill.html
@@ -20,7 +20,7 @@
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            </div>
@@ -42,7 +42,7 @@
                                                    <label class="layui-form-label">单 æ® å·ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                        <input id="HInterID" name="HInterID" type="hidden" />
                                                        <input id="HInterID" name="HInterID" value="0" type="hidden" />
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
@@ -76,13 +76,13 @@
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label">入库数量:</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HInStockQty" id="HInStockQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input">
                                                        <input type="text" name="HInStockQty" id="HInStockQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label">合格数量:</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HRightQty" id="HRightQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input">
                                                        <input type="text" name="HRightQty" id="HRightQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify=""  autocomplete="off" class="layui-input">
                                                    </div>
                                                </div>
@@ -115,27 +115,27 @@
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> ä¸åˆæ ¼æ•°é‡ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HBadQty" id="HBadQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input">
                                                        <input type="text" name="HBadQty" id="HBadQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" autocomplete="off" class="layui-input">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> é’¢æç‚‰å·ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSteelStoveNo" lay-verify="" id="HSteelStoveNo" readonly="readonly" autocomplete="off">
                                                        <input class="layui-input" name="HSteelStoveNo" lay-verify="" id="HSteelStoveNo"  autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> å¤–观:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HAspect" lay-verify="" id="HAspect" readonly="readonly" autocomplete="off">
                                                        <input class="layui-input" name="HAspect" lay-verify="" id="HAspect"  autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> å°ºå¯¸ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSize" lay-verify="" id="HSize" readonly="readonly" autocomplete="off">
                                                        <input class="layui-input" name="HSize" lay-verify="" id="HSize"   autocomplete="off">
                                                    </div>
                                                </div>
@@ -149,14 +149,14 @@
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> é’¢åŽ‚æŠ¥å‘Šä¸Šä¼ ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSteelCompReport" lay-verify="" id="HSteelCompReport" readonly="readonly" autocomplete="off">
                                                        <input class="layui-input" name="HSteelCompReport" lay-verify="" id="HSteelCompReport"  autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
                                                    <label class="layui-form-label"> åˆ¤å®šç»“论:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HCheckerResult" lay-verify="" id="HCheckerResult" readonly="readonly" autocomplete="off">
                                                        <input class="layui-input" name="HCheckerResult" lay-verify="" id="HCheckerResult"   autocomplete="off">
                                                    </div>
                                                </div>
                                            </div>
@@ -267,7 +267,7 @@
            if (hID == null || hID == 0)
            {
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HQCCheckClassID": " ", "HQCCheckItemID": 0, "HQCRelValue": "  ", "HResult": "   ", "HQCStd": 0, "HProcCheckEmp": "  ", "HProcCheckTime": "  ", "HRemark": "  " }];
                option.data = [{ "HQCCheckClassID": 0, "HQCCheckItemID": 0, "HQCRelValue": "  ", "HResult": "   ", "HQCStd": 0, "HProcCheckEmp": 0, "HProcCheckTime": "  ", "HRemark": "  " }];
                table.render(option);
            }
            else
@@ -275,7 +275,7 @@
                $("#HInterID").val(hID);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + 'MES_QC_CheckProjectDetail_Json',
                    url: GetWEBURL() + 'MES_QC_POStockInCheckDetail_Json',
                    type: "GET",
                    data: { "sqlWhere": "and HInterID="+hID },
                    success: function (result) {
@@ -303,7 +303,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    ,data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HQCCheckClassID": " ", "HQCCheckItemID": 0, "HQCRelValue": "  ", "HResult": "   ", "HQCStd": 0, "HProcCheckEmp": "  ", "HProcCheckTime": "  ", "HRemark": "  " };
                var NewRow = { "HQCCheckClassID": 0, "HQCCheckItemID": 0, "HQCRelValue": "  ", "HResult": "   ", "HQCStd": 0, "HProcCheckEmp": "  ", "HProcCheckTime": "  ", "HRemark": "  " };
                switch (obj.event) {
                    case 'btn-AddLine':
                        //table.cache["mainTable"].push(AddRow[rows]);
@@ -2298,29 +2298,33 @@
                alert(hID);
                //查询检验方案单是否存在
                $.ajax({
                    url: GetWEBURL() + "GetQCCheckProjectDetail",
                    url: GetWEBURL() + "GetPOStockInCheckDetail",
                    type: "GET",
                    data: {
                        "HID": hID
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Gy_Edit_QCCheckProjectList[0];
                            var data = result.data.h_v_QC_Edit_POStockInCheckBillList[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": data.日期
                                , "HName": data.方案名称
                                , "HMater": data.物料名称
                                , "HMaterID": data.物料ID
                                , "HMaterNumber": data.物料代码
                                , "HProcName": data.工序名称
                                , "HProcID": data.工序ID
                                , "HMaterTypeID": data.物料大类ID
                                , "HDepName": data.部门名称
                                , "HDeptID": data.部门ID
                                , "HUName": data.单位名称
                                , "HUnitID": data.单位ID
                                , "HUnitNumber": data.单位代码
                                , "HSupID": data.HSupID
                                , "HSupName": data.供应商名称
                                , "HMater": data.产品名称
                                , "HMaterID": data.产品ID
                                , "HMaterNumber": data.产品内码
                                , "HInStockQty": data.入库数量
                                , "HRightQty": data.合格数量
                                , "HEmpName": data.检验员名称
                                , "HFirstCheckEmp": data.检验员
                                , "HCheckQty": data.抽检数量
                                , "HBadQty": data.不合格数量
                                , "HSteelStoveNo": data.钢材炉号
                                , "HAspect": data.外观
                                , "HSize": data.尺寸
                                , "HSteelCompReport": data.钢厂报告上传
                                , "HCheckerResult": data.判定结论
                                , "HRemark": data.表头备注
                            });
@@ -2343,21 +2347,24 @@
            //判断是否新增
            if (hID == null || hID == 0) {
                //获取最大单据号 new
                $("#HInterID").val("");
                $("#HInterID").val(0);
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3320' },
                    data: { "HBillType": '7503' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                    /* $("#HInterID").val(d.data[0].HInterID);*/
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HInterID").val(0);
                    }
                });
            }
            else {//如果修改则走下面 new
                $("#HInterID").val(hID);//修改时主表ID
                RoadBillMain(hID);
               /* RoadBillSub(linterid);*/
            }
@@ -2443,8 +2450,9 @@
            });
            form.on('submit(Exit)', function (data) {//
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
                //var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                //parent.layer.close(index); //再执行关闭
                parent.location.href = "../../../views/index.html"
            });
            //选择责任人
@@ -2497,7 +2505,7 @@
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "SaveQCCheckProjectList", //方法所在页面和方法名
                        url: GetWEBURL() + "SaveQC_POStockInCheckList", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
@@ -2583,11 +2591,11 @@
        }
        function GetHKeeperValue(obj) {  //返回责任人
            EmpName = obj[0].HName;
           // $("#HEmpName").val(obj[0].HName);
            //$("#HItemID").val(obj[0].HItemID);
        }
        //function GetHKeeperValue(obj) {  //返回责任人
        //    EmpName = obj[0].HName;
        //   // $("#HEmpName").val(obj[0].HName);
        //    //$("#HItemID").val(obj[0].HItemID);
        //}
        //function GetHProcValue(obj) {  //返回申请工序
        //    SQProcName = obj[0].工序;
        //    ProcID = obj[0].HItemID;
WebTM/views/ÖÊÁ¿¹ÜÀí/À´ÁϼìÑéµ¥/QC_POStockInCheckBillList.html
@@ -64,6 +64,8 @@
                    <table class="layui-hide" 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-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>
                        </div>
                    </script>
                </div>
@@ -201,149 +203,66 @@
                        var data = checkStatus.data;
                        layer.alert(JSON.stringify(data));
                        break;
                        //case 'getCheckLength':
                        //    var data = checkStatus.data;
                        //    layer.msg('选中了:' + data.length + ' ä¸ª');
                        //    break;
                        //case 'isAll':
                        //    layer.msg(checkStatus.isAll ? '全选' : '未全选');
                        //    break;
                        //自定义头工具栏右侧图标 - æç¤º
                    case 'btn-reload':
                        _cur_page = $(".layui-laypage-em").next().html();
                        RoadHBillNo(sql);
                        break;
                    case 'btn-confirm':
                    case 'btn-Edit':
                        var checkStatus = table.checkStatus('mainTable')
                         , data = checkStatus.data;
                        _cur_page = $(".layui-laypage-em").next().html();
                        if (data[0]["状态"] == "未确认") {
                            layer.confirm('是否确认单据?', { icon: 3, title: '提示' }, function (index) {
                                $.ajax({
                                    type: "get",
                                    url: GetWEBURL()+"POOrderAccept",
                                    data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["单据号"].toString(), "HUser": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                            layer.msg(result.Message, { icon: 1 });
                                            RoadHBillNo(sql);
                                        }
                                        else {
                                            // $("#verifycode").click();
                                            layer.msg(result.Message, { icon: 5 });
                                        }
                                        layer.closeAll("loading");
                                    }
                                })
                                layer.close(index);
                            });
                        }
                        else {
                            layer.msg("必须是未确认单据才能进行确认操作!", { icon: 5 });
                        }
                        break;
                    case 'btn-back':
                        var checkStatus = table.checkStatus('mainTable')
                       , data = checkStatus.data;
                        _cur_page = $(".layui-laypage-em").next().html();
                        var HBackRemark;
                        if (data[0]["状态"] == "未确认") {
                            layer.prompt({
                                formType: 2,
                                //value: '',
                                title: '请输入驳回理由',
                                area: ['400px', '200px'] //自定义文本域宽高
                            }, function (value, index, elem) {
                                HBackRemark = value.toString();
                                $.ajax({
                                    type: "get",
                                    url: GetWEBURL()+"POOrderRefuse",
                                    data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["单据号"].toString(), "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
                                    success: function (result) {
                                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                            layer.msg("拒绝成功!", { icon: 1 });
                                            RoadHBillNo(sql);
                                        }
                                        else {
                                            // $("#verifycode").click();
                                            layer.msg(result.Message, { icon: 5 });
                                        }
                                        layer.closeAll("loading");
                                    }
                                })
                                //alert(value); //得到value
                                layer.close(index);
                            });
                        }
                        else {
                            layer.msg("必须是未确认单据才能进行驳回操作!", { icon: 5 });
                        }
                        break;
                    case 'btn-details':
                        var checkStatus = table.checkStatus('mainTable')
                       , data = checkStatus.data;
                        var linterid = data[0].hmainid.toString();
                        if (checkStatus.data.length === 1) {
                            var hID = data[0].hmainid.toString();
                        //if (AllowLoadData(sSubStr) != false) {//非空验证
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '采购订单'
                                , title: '编辑来料检验单'
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式,-1不开启
                            , content: '../../../src/views/SRM/SRM_POOrderBill.html?linterid=' + linterid
                                , content: '../来料检验单/QC_Add_Edit_POStockInCheckBill.html?hID=' + hID
                            , resize: false
                            , cancel: function () {
                                //$(".layui-btn").removeClass("layui-btn-disabled");
                            }
                        })
                        } else {
                            layer.msg('请选择一行数据编辑!');
                        }
                        break;
                    case 'btn-generate':
                    case 'btn-Delete':
                        var checkStatus = table.checkStatus('mainTable')
                        , data = checkStatus.data;
                        ajaxLabelData = data;
                        var rows = '';
                        var HEntry = '';
                        for (var i = 0; i < data.length; i++) {
                            if (data[i]["状态"] == "已确认") {
                                rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            //逻辑删除方法
                            $.ajax({
                                url: GetWEBURL() + 'DeltetQC_POStockInCheck',
                                type: "GET",
                                data: { "HInterID": InterID },
                                success: function (result) {
                                    console.log('gouba' + result);
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { icon: 1 }, function () {
                                            // å¾—到frame索引
                                            var index = layer.getFrameIndex(window.name);
                                            //关闭当前frame
                                            layer.close(index);
                                            //修改为功后刷新界面
                                            window.location.reload();
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                            }
                            else {
                                HEntry += (i + 1) + ',';
                            }
                        }
                        if (HEntry != '') {
                            HEntry = HEntry.substring(0, HEntry.length - 1);
                            layer.msg("第" + HEntry + "行未确认!", { icon: 5 });
                        }
                        else{
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '送货单'
                            , shade: 0.6 //遮罩透明度
                            , maxmin: false //允许全屏最小化
                            , anim: 0 //0-6的动画形式,-1不开启
                            , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102', 'yes']
                            , resize: false
                            //, cancel: function () {
                            //    $(".layui-btn").removeClass("layui-btn-disabled");
                            //}
                        })
                            layer.msg('请选择一行数据删除!');
                        }
                        break;
                    case 'btn-exit':
                        //var index = parent.layer.getFrameIndex(window.name);
                        //element.tabDelete('layadmin-layout-tabs', this);
                        parent.layui.admin.events.closeThisTabs();
                        //parent.layer.close(index);
                        break;
                };
            });
@@ -371,15 +290,12 @@
                            }
                        });
                        layer.close(index0);
                    } else {
                            layer.close(index0);
                            layer.alert(result.code + result.Message, { icon: 5 });
                    }
                    },
                    error: function (result) {
                        layer.close(index0);
                    layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_Add_CheckProject.html
@@ -20,7 +20,7 @@
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            </div>
@@ -42,7 +42,7 @@
                                                    <label class="layui-form-label">单 æ® å·ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                        <input id="HInterID" name="HInterID" type="hidden" />
                                                        <input id="HInterID" name="HInterID" value="0" type="hidden" />
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs2">
@@ -2310,7 +2310,7 @@
            //判断是否新增
            if (hID == null || hID == 0) {
                //获取最大单据号 new
                $("#HInterID").val("");
                $("#HInterID").val(0);
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -2318,14 +2318,17 @@
                    data: { "HBillType": '3320' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                    /* $("#HInterID").val(d.data[0].HInterID);*/
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HInterID").val(0);
                    }
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(hID);
                $("#HInterID").val(hID);//修改时主表ID
               /* RoadBillSub(linterid);*/
            }