parent: 49b541a9 | 补丁 | 提交 | ignore whitespace
jhz
2023-04-08 9f03d4f5160830f4d636c2aa940db264765756fd 
生产资源界面
5个文件已修改
3135 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2811 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html 313 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user


Diff too large




 WebTM/WebTM.csproj.user


@@ -1,7 +1,7 @@


<?xml version="1.0" encoding="utf-8"?>


<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


  <PropertyGroup>


    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>


    <NameOfLastUsedPublishProfile>E:\GIT仓库\ZYLMESTM\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>


    <ProjectView>ProjectFiles</ProjectView>


    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>


    <UseIISExpress>true</UseIISExpress>




 WebTM/layuiadmin/Scripts/webConfig.js


@@ -3,16 +3,13 @@


    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器


    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/


    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";


    //var WEBURL = "http://localhost:8085/API/";   //zgq本地


    var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置


    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置


    //var WEBURL = "http://localhost/WEBAPI/";   //颜家台式机本地配置


    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置


    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW


    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器


    var WEBURL = "http://47.96.97.237/API/";   //智云服务器


    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器外网


    //var WEBURL = "http://192.168.1.253:8080/API/";   //凯贝奈特客户服务器内网


    //var WEBURL = "http://220.189.218.154:8092/API/";   //丸井四维尔服务器




 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html


@@ -577,7 +577,7 @@


                //    layer.msg("请选择工段！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                //    return;


                //}


                if (!$("#HWorkCenterName").val() == "") {


                if ($("#HWorkCenterName").val() == "") {


                    layer.msg("请选择工作中心！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                    return;


                }




 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Source.html


@@ -37,163 +37,178 @@


                        </div>


                    </div>


                    <div class="layui-form-item" style="padding-top: 10px;">


                        <div class="layui-row">


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">生产资源代码</label>


                                <div class="layui-input-inline">


                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">


                                    <input id="HItemID" name="HItemID" type="hidden" />


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">生产资源名称</label>


                                <div class="layui-input-inline">


                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">助记码</label>


                                <div class="layui-input-inline">


                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">


                                </div>


                            </div>


                        </div>


                        <div class="layui-row">


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">单班工时</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HWorkTimes" id="HWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">类型</label>


                                <div class="layui-input-inline" style="margin-bottom: -15px;">


                                    <div class="layui-form">


                                        <div class="layui-form-item">


                                            <select name="HType" id="HType" lay-verify="HType">


                                                <option value="">请选择类型</option>


                                                <option value="生产线">生产线</option>


                                                <option value="人">人</option>


                                                <option value="设备">设备</option>


                                            </select>


                        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">


                            <ul class="layui-tab-title">


                                <li class="layui-this">基本信息</li>


                                <li>其他信息</li>


                            </ul>


                            <div class="layui-tab-content">


                                <div class="layui-tab-item layui-show">


                                    <div class="layui-col-xs4 layui-inline">


                                        <label class="layui-form-label">生产资源代码</label>


                                        <div class="layui-input-inline">


                                            <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">


                                            <input id="HItemID" name="HItemID" type="hidden" />


                                        </div>


                                    </div>


                                    <div class="layui-col-xs4 layui-inline">


                                        <label class="layui-form-label">生产资源名称</label>


                                        <div class="layui-input-inline">


                                            <input class="layui-input" name="HName" id="HName" autocomplete="off">


                                        </div>


                                    </div>


                                    <div class="layui-col-xs4 layui-inline">


                                        <label class="layui-form-label">工作中心</label>


                                        <div class="layui-input-inline">


                                            <input type="text" name="HCenter" id="HCenter" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>


                                            <input type="hidden" name="HCenterID" id="HCenterID" value="0">


                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkingProcedure-BT" style="width:40px;">


                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                            </button>


                                        </div>


                                    </div>


                                    <div class="layui-col-xs4 layui-inline">


                                        <label class="layui-form-label">助记码</label>


                                        <div class="layui-input-inline">


                                            <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">


                                        </div>


                                    </div>


                                    <div class="layui-col-xs4 layui-inline">


                                        <label class="layui-form-label">mac地址</label>


                                        <div class="layui-input-inline">


                                            <input class="layui-input" name="HMacAddr" id="HMacAddr" autocomplete="off">


                                        </div>


                                    </div>


                                    <div class="layui-col-xs4 layui-inline">


                                        <label class="layui-form-label">组织</label>


                                        <div class="layui-input-inline" style="margin-bottom: -15px;">


                                            <div class="layui-form">


                                                <div class="layui-form-item">


                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">


                                                        <!--动态渲染组织-->


                                                    </select>


                                                </div>


                                            </div>


                                        </div>


                                    </div>


                                    <div class="layui-row">


                                        <div class="layui-col-xs8 layui-inline">


                                            <label class="layui-form-label" style="width: 12.5%;">备注</label>


                                            <div class="layui-input-block">


                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">禁用标志</label>


                                            <div class="layui-input-inline">


                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">


                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">


                                            </div>


                                        </div>


                                    </div>


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">关联ID</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HRelationID" id="HRelationID" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                </div>


                            </div>


                        </div>


                        <div class="layui-row">


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">单班最大工时</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HMaxWorkTimes" id="HMaxWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">最小进阶</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HMinAdd" id="HMinAdd" lay-verify="" value="0" autocomplete="off" class="layui-input">


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">每日班次</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HClassCount" id="HClassCount" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                </div>


                            </div>


                        </div>


                        <div class="layui-row">


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">加班工时</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HOverTimes" id="HOverTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">部门</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>


                                    <input type="hidden" name="HDeptID" id="HDeptID" value="0">


                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">


                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                    </button>


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">工序</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>


                                    <input type="hidden" name="HProcID" id="HProcID" value="0">


                                    <input type="hidden" name="HProcNumber" id="HProcNumber" value="">


                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT" style="width:40px;">


                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                    </button>


                                </div>


                            </div>


                        </div>


                        <div class="layui-row">


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">工作中心</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HCenter" id="HCenter" class="layui-input" value=""  style="float:left;width:150px; background-color:#efefef4d;" readonly>


                                    <input type="hidden" name="HCenterID" id="HCenterID" value="0">


                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkingProcedure-BT" style="width:40px;">


                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                    </button>


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">默认生产班组</label>


                                <div class="layui-input-inline">


                                    <input type="text" name="HGroup" id="HGroup" class="layui-input" value=""  style="float:left;width:150px; background-color:#efefef4d;" readonly>


                                    <input type="hidden" name="HGroupID" id="HGroupID" value="0">


                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionTeam-BT" style="width:40px;">


                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                    </button>


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">组织</label>


                                <div class="layui-input-inline" style="margin-bottom: -15px;">


                                    <div class="layui-form">


                                        <div class="layui-form-item">


                                            <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">


                                                <!--动态渲染组织-->


                                            </select>


                                <div class="layui-tab-item">


                                    <div class="layui-row">


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">单班工时</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HWorkTimes" id="HWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">类型</label>


                                            <div class="layui-input-inline" style="margin-bottom: -15px;">


                                                <div class="layui-form">


                                                    <div class="layui-form-item">


                                                        <select name="HType" id="HType" lay-verify="HType">


                                                            <option value="">请选择类型</option>


                                                            <option value="生产线">生产线</option>


                                                            <option value="人">人</option>


                                                            <option value="设备">设备</option>


                                                        </select>


                                                    </div>


                                                </div>


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">关联ID</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HRelationID" id="HRelationID" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                            </div>


                                        </div>


                                    </div>


                                </div>


                            </div>


                        </div>


                        <div class="layui-row">


                            <div class="layui-col-xs4 layui-inline">


                                <label class="layui-form-label">禁用标志</label>


                                <div class="layui-input-inline">


                                    <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">


                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">


                                </div>


                            </div>


                            <div class="layui-col-xs4 layui-inline">


                            <label class="layui-form-label">mac地址</label>


                            <div class="layui-input-inline">


                            <input class="layui-input" name="HMacAddr" id="HMacAddr" autocomplete="off">


                            </div>


                            </div>


                        </div>


                            <div class="layui-row">


                                <div class="layui-col-xs8 layui-inline">


                                    <label class="layui-form-label" style="width: 12.5%;">备注</label>


                                    <div class="layui-input-block">


                                        <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">


                                    <div class="layui-row">


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">单班最大工时</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HMaxWorkTimes" id="HMaxWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">最小进阶</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HMinAdd" id="HMinAdd" lay-verify="" value="0" autocomplete="off" class="layui-input">


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">每日班次</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HClassCount" id="HClassCount" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                            </div>


                                        </div>


                                    </div>


                                    <div class="layui-row">


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">加班工时</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HOverTimes" id="HOverTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">部门</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>


                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">


                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">


                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                                </button>


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">工序</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>


                                                <input type="hidden" name="HProcID" id="HProcID" value="0">


                                                <input type="hidden" name="HProcNumber" id="HProcNumber" value="">


                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT" style="width:40px;">


                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                                </button>


                                            </div>


                                        </div>


                                    </div>


                                    <div class="layui-row">




                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">默认生产班组</label>


                                            <div class="layui-input-inline">


                                                <input type="text" name="HGroup" id="HGroup" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>


                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">


                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionTeam-BT" style="width:40px;">


                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                                </button>


                                            </div>


                                        </div>




                                    </div>


                                    <div class="layui-row">






                                    </div>


                                </div>




                            </div>


                        </div>


                            </div>


                    </div>


</form>


            </div>


        </div>