1.单据编辑模块(工序汇报单): 按钮。增加关闭功能,撤销关闭功能。
2.单据编辑模块(工序汇报单):增加审核、反审核按钮
2个文件已修改
138 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html 127 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -1188,7 +1188,7 @@
      <publishTime>04/08/2021 10:57:44</publishTime>
    </File>
    <File Include="views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html">
      <publishTime>04/20/2021 21:10:48</publishTime>
      <publishTime>04/20/2021 09:15:32</publishTime>
    </File>
    <File Include="views/生产工序管理/增加不良评审单/QC_NoPassProdCheckBill.html">
      <publishTime>04/13/2021 10:12:44</publishTime>
@@ -1203,16 +1203,13 @@
      <publishTime>03/29/2021 19:54:57</publishTime>
    </File>
    <File Include="views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html">
      <publishTime>04/21/2021 21:58:28</publishTime>
    </File>
    <File Include="views/生产工序管理/工序汇报单/Sc_Detail_ProcessReportList.html">
      <publishTime>04/21/2021 19:59:24</publishTime>
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/生产工序管理/工序汇报单/Sc_ProcessReport_PDA.html">
      <publishTime>04/09/2021 17:56:11</publishTime>
    </File>
    <File Include="views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html">
      <publishTime>04/21/2021 16:40:38</publishTime>
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>03/23/2021 16:57:43</publishTime>
@@ -1233,7 +1230,7 @@
      <publishTime>04/21/2021 18:59:55</publishTime>
    </File>
    <File Include="views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html">
      <publishTime>04/09/2021 21:12:33</publishTime>
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/生产工序管理/工序计划单/Sc_ProcessPlanList.html">
      <publishTime>04/09/2021 20:12:18</publishTime>
WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤Ðò»ã±¨µ¥/Sc_Add_ProcessReportList.html
@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
        <title>新增派工单</title>
    <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">
@@ -82,21 +82,117 @@
                                                  
                                                    </div>
                                                </div>
                                                <!--<div class="layui-col-xs1">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>-->
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label"> å†…部单据号:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
                                                        <input id="HSupID" name="HSupID" type="hidden" />
                                                    </div>
                                                </div>-->
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label"> äº§å“ä»£ç ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HMateriaNumber" lay-verify="HMateriaNumber" id="HMateriaNumber" readonly="readonly" autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> äº§å“ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HMateriaName" lay-verify="HMateriaName" id="HMateriaName" readonly="readonly"  autocomplete="off">
                                                              <button type="button" lay-submit="" class="layui-btn" lay-filter="HMateriaID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>
                                                    </div>
                                                </div>-->
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                  <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label"> å•位代码:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HDHNumber" lay-verify="HDHNumber" id="HDHNumber">
                                                    </div>
                                                </div>
                                                  <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> å•位:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HDHName" lay-verify="HDHName" id="HDHName">
                                                          <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitID-BT">
                                                           <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                              </button>
                                                    </div>
                                                </div>-->
                                                   <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> è§„格型号:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                          <div class="layui-form-item">
                                            <div class="layui-row">
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label">工序计划单号:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HStatus" id="HStatus"  autocomplete="off">
                                                    </div>
                                                </div>-->
                                                <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> è®¡åˆ’开工日期:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate"  autocomplete="off">
                                                    </div>
                                                </div>
                                                <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> è®¡åˆ’完工日期:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate"  autocomplete="off">
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                           <div class="layui-form-item">
                                            <div class="layui-row">
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label">工序:</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HStatus" id="HStatus"  autocomplete="off">
                                                    </div>
                                                </div>-->
                                                <div class="layui-col-xs3">
                                                    <label class="layui-form-label"> æ±‡æŠ¥æ•°é‡ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty"  autocomplete="off">
                                                        <!--<input id="HSupID" name="HSupID" type="hidden" />-->
                                                    </div>
                                                </div>
                                                <!--<div class="layui-col-xs3">
                                                    <label class="layui-form-label"> æ€»å·¥æ—¶ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
                                                    </div>
                                                </div>-->
                                            </div>
                                        </div>
@@ -306,16 +402,16 @@
            }
            table.render({
                elem: '#mainTable'
                //, url: GetWEBURL()+'GetNewPOInStockShowBillSub'
                , toolbar: '#toolbarDemo'
                //, where: { sMsg: linterid, sMsg2: lentryid, sMsg3: lSourceBillType }
                // , where: { sMsg: '28', sMsg2: '28,5;' }
                , limit: 1000
                , totalRow: true
                , cols: [[
                     { type: 'checkbox' }
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号' }
                     ,{ field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
                     ,{ field: '日期', title: '日期', sort: true, width: 120 }
                    , { field: '单据号', title: '单据号', sort: true, width: 170 }
                    , { field: '数量', title: '数量', width: 100, edit: 'text', event: "inputHPlanQty" }
                    , { field: '数量', title: '数量', width: 100, edit: 'text', event: "inputHPlanQty", totalRow: true }
                    , { field: 'HDeptID ', title: 'HDeptID', width: 105 }
                    , { field: '部门代码', title: '部门代码' }
                    , { field: '部门', title: '部门' }
@@ -327,21 +423,16 @@
                    , { field: '计量单位代码', title: '计量单位代码', width: 160 }
                    , { field: '计量单位', title: '计量单位', width: 160 }
                    , { field: 'HprocID ', title: 'HprocID', width: 215 }
                    ////, { field: 'hunitid', title: 'hunitid' }
                    , { field: '工序代码 ', title: '工序代码 ', width: 115 }
                    , { field: '工序', title: '工序' }
                    ////, { field: 'hempid', title: 'hempid' }
                    , { field: 'HGroupID    ', title: 'HGroupID', width: 100 }
                    , { field: '班组代码', title: '班组代码' }
                    , { field: '班组名称', title: '班组名称' }
                    , { field: 'HSourceID', title: 'HSourceID' }
                    , { field: '资源代码', title: '资源代码' }
                    ////, { field: 'HCenterID', title: 'HCenterID' }
                    , { field: '生产资源', title: '生产资源' }
                    , { field: 'HWorkerID ', title: 'HWorkerID' }
                    ////, { field: 'hbomid', title: 'hbomid' }
                    , { field: '职员代码', title: '职员代码' }
                    ////, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
                    , { field: '职员    ', title: '职员' }
                    , { field: 'hsubid', title: 'hsubid', hide: true }
                    , { field: '计划开工日期', title: '计划开工日期' }
@@ -352,7 +443,6 @@
                    , { field: '生产任务单号', title: '生产任务单号' }
                    , { field: 'HSeOrderInterID', title: 'HSeOrderInterID' }
                    , { field: '销售订单号', title: '销售订单号' }
                    ////, { field: 'hsubid', title: 'hsubid' }
                    , { field: '表头备注', title: '表头备注' }
                    , { field: '制单人', title: '制单人' }
                    , { field: '制单日期', title: '制单日期' }
@@ -372,12 +462,7 @@
                    , { field: 'HBillType', title: 'HBillType' }
                    , { field: 'HQtyDecimal', title: 'HQtyDecimal' }
                    , { field: 'HPriceDecimal', title: 'HPriceDecimal' }
                ]]
                // , data: [linterid]
                // , page: true
                , limit: 500 //每页默认显示的数量
                //, height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
@@ -433,7 +518,6 @@
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {
                                layer.closeAll("loading");
@@ -448,7 +532,6 @@
            };
            //保存
              form.on('submit(Saver)', function (data) {//保存
                  //debugger;
               
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);