parent: 7ac9b3da | 补丁 | 提交 | ignore whitespace
zzr99
2021-10-03 aaa58509a1db06b4e63f2a6f4643ac37494f3d02 
nothing
5个文件已修改
80 ■■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/layuiadmin/Scripts/webConfig.js


@@ -2,7 +2,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://localhost:8080/API/";   //颜晓军本地配置


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


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




 WebTM/views/index.html


@@ -451,9 +451,9 @@


                                </dd>


                            </dl>


                        </li>


                        <!-- æ¨¡æ²»å…·ç®¡ç† -->


                        <!-- å™¨å…·ç®¡ç† -->


                        <li data-name="set" class="layui-nav-item">


                            <a><i class="layui-icon layui-icon-set"></i><cite>模治具管理</cite></a>


                            <a><i class="layui-icon layui-icon-set"></i><cite>器具管理</cite></a>


                            <dl class="layui-nav-child">


                                <dd>


                                    <a>基础建模</a>


@@ -519,8 +519,8 @@


                                    <dl class="layui-nav-child">


                                        <dd><a lay-href="模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html">故障登记</a></dd>


                                        <dd><a lay-href="模治具管理/模治具管理/Sc_MouldConkBookBillList.html">故障登记单维护</a></dd>


                                        <dd><a lay-href="">模治具维修派工单n</a></dd>


                                        <dd><a lay-href="">模治具维修派工单维护n</a></dd>


                                        <dd><a lay-href="">器具维修派工单n</a></dd>


                                        <dd><a lay-href="">器具维修派工单维护n</a></dd>


                                        <dd><a lay-href="模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html">维修记录单</a></dd>


                                        <dd><a lay-href="模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html">维修记录单维护</a></dd>


                                        <dd><a lay-href="模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html">维修验收单</a></dd>


@@ -528,10 +528,10 @@


                                    </dl>


                                </dd>


                                <dd>


                                    <a>模治具报表</a>


                                    <a>器具报表</a>


                                    <dl class="layui-nav-child">


                                        <dd><a lay-href="">模治具库存查询n</a></dd>


                                        <dd><a lay-href="">模治具履历表n</a></dd>


                                        <dd><a lay-href="">器具库存查询n</a></dd>


                                        <dd><a lay-href="">器具履历表n</a></dd>


                                    </dl>


                                </dd>


                            </dl>


@@ -706,7 +706,7 @@


                                </dd>


                                <dd>


                                    <a href="" target="_blank">


                                        <i class="layui-icon layui-icon-layer"></i>模治具状态看板


                                        <i class="layui-icon layui-icon-layer"></i>器具状态看板


                                    </a>


                                </dd>


                            </dl>




 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_MouldType.html


@@ -193,8 +193,10 @@


                option = {


                    elem: '#mainTable'


                    , toolbar: '#toolbarDemo'


                    , height: '500'


                    , height: 'full-50'


                    , page: true


                    , limits: [50, 200, 500, 1000, 5000, 10000]


                    , limit: 50 //每页默认显示的数量


                    , cellMinWidth: 90


                    , cols: [[


                        { type: 'checkbox', fixed: 'left' }




 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.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">


@@ -61,19 +61,19 @@


                                    </div>


                                    <div class="layui-row">


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">模具编号</label>


                                            <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="HMouldNo" id="HMouldNo" style="background-color:#efefef4d;">


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">模具名称</label>


                                            <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="HName" id="HName" style="background-color:#efefef4d;">


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">模具规格</label>


                                            <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="HModel" id="HModel" style="background-color:#efefef4d;">


                                            </div>


@@ -81,7 +81,7 @@


                                    </div>


                                    <div class="layui-row">


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">模具型号</label>


                                            <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="HModel2" id="HModel2" style="background-color:#efefef4d;">


                                            </div>


@@ -131,7 +131,7 @@


                                            </div>


                                        </div>-->


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">模具分类</label>


                                            <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="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;">


                                                <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">


@@ -187,7 +187,7 @@


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label" style="width: 85px;">模具状态</label>


                                            <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="HMouldStatus" id="HMouldStatus" style="background-color:#efefef4d;">


                                            </div>


@@ -437,7 +437,7 @@


                layer.open({


                    type: 2,


                    skin: 'layui-layer-rim', //加上边框


                    title: '模具分类列表',


                    title: '器具分类列表',


                    closeBtn: 1,


                    shift: 2,


                    area: ['80%', '80%'],


@@ -818,10 +818,10 @@


                        $("#HInterID").val(d.data[0].hmainid);


                        $("#HBillNo").val(d.data[0].单据号);


                        $("#HDate").val(formatDate(d.data[0].日期));


                        $("#HMouldNo").val(d.data[0].模具编号);


                        $("#HName").val(d.data[0].模具名称);


                        $("#HModel").val(d.data[0].当前模具规格);


                        $("#HModel2").val(d.data[0].模具型号);


                        $("#HMouldNo").val(d.data[0].器具编号);


                        $("#HName").val(d.data[0].器具名称);


                        $("#HModel").val(d.data[0].当前器具规格);


                        $("#HModel2").val(d.data[0].器具型号);


                        $("#HDiameter").val(d.data[0].直径);


                        $("#HSubjoin").val(d.data[0].辅助属性);


                        $("#HSubjoin2").val(d.data[0].辅助属性2);


@@ -830,7 +830,7 @@


                        //$("#HMaterID").val(d.data[0].HMaterID);


                        //$("#HMaterNumber").val(d.data[0].HMaterNumber);


                        $("#HMouleTypeID").val(d.data[0].HMouldTypeID);


                        $("#HMouleTypeName").val(d.data[0].模具品类);


                        $("#HMouleTypeName").val(d.data[0].器具品类);


                        $("#HUnitID").val(d.data[0].HUnitID);


                        $("#HUnitName").val(d.data[0].计量单位);


                        $("#HOutComDate").val(formatDate(d.data[0].出厂日期));


@@ -839,7 +839,7 @@


                        $("#HDeptName").val(d.data[0].使用部门);


                        $("#HSupID").val(d.data[0].HSupID);


                        $("#HSupName").val(d.data[0].供应商);


                        $("#HMouldStatus").val(d.data[0].模具状态);


                        $("#HMouldStatus").val(d.data[0].器具状态);


                        $("#HWHID").val(d.data[0].HWhID);


                        $("#HWHName").val(d.data[0].默认仓库);


                        //$("#HRoutingID").val(d.data[0].HRoutingID);




 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFileList.html


@@ -34,13 +34,13 @@


                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btn-DeAudit" style="padding:0 5px">反审核</button>


                                </div>


                                <div class="layui-inline">


                                    <label class="layui-form-label">模具编号</label>


                                    <label class="layui-form-label">器具编号</label>


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


                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">


                                    </div>


                                </div>


                                <div class="layui-inline">


                                    <label class="layui-form-label">模具名称</label>


                                    <label class="layui-form-label">器具名称</label>


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


                                        <input type="text" class="layui-input" name="HName" id="HName">


                                    </div>


@@ -156,21 +156,27 @@


                    //, toolbar: '#toolbarDemo'


                    , height: 'full-50'


                    , page: true


                    , limits: [50,200,500,1000,5000,10000]


                    , limit: 50 //每页默认显示的数量


                    , cellMinWidth: 200


                    , cols: [[


                        { type: 'checkbox', fixed: 'left' }


                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }


                        , { field: '日期', title: '日期', templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>"}


                        , { field: '条码编号', title: '条码编号' }


                        , { field: '模具品类', title: '模具品类' }


                        , { field: '模具状态', title: '模具状态' }


                        , { field: '模具编号', title: '模具编号' }


                        , { field: '模具名称', title: '模具名称' }


                        , { field: '模具型号', title: '模具型号' }


                        , { field: '当前模具规格', title: '当前模具规格' }


                        , { field: '初始模具规格', title: '初始模具规格' }


                        , { field: '模具品类', title: '器具品类' }


                        , { field: '模具状态', title: '器具状态' }


                        , { field: '当前仓库', title: '当前仓库' }


                        , { field: '当前仓位', title: '当前仓位' }


                        , { field: '虚拟仓类型', title: '虚拟仓类型' }


                        , { field: '虚拟仓', title: '虚拟仓' }


                        , { field: '模具编号', title: '器具编号' }


                        , { field: '模具名称', title: '器具名称' }


                        , { field: '模具型号', title: '器具型号' }


                        , { field: '当前模具规格', title: '当前器具规格' }


                        , { field: '初始模具规格', title: '初始器具规格' }


                        , { field: '当前设计寿命', title: '当前设计寿命' }


                        , { field: '模具ERP物料', title: '模具ERP物料' }


                        , { field: '模具ERP物料', title: '器具ERP物料' }


                        , { field: '直径', title: '直径' }


                        , { field: '辅助属性', title: '辅助属性' }


                        , { field: '辅助属性2', title: '辅助属性2' }


@@ -258,7 +264,7 @@


                layer.open({


                    type: 2,


                    skin: 'layui-layer-rim', //加上边框


                    title: '新增模具档案列表',


                    title: '新增器具档案列表',


                    closeBtn: false,


                    shift: 2,


                    area: ['100%', '100%'],


@@ -285,7 +291,7 @@


                    layer.open({


                        type: 2


                        , area: ['100%', '100%']


                        , title: '编辑模具档案列表'


                        , title: '编辑器具档案列表'


                        , shade: 0.6 //遮罩透明度


                        , maxmin: true //允许全屏最小化


                        , anim: 0 //0-6的动画形式，-1不开启