完善了客户新增修改，供应商新增修改以及两页面的禁用标志

zzr99

2021-08-30 5bdd7f25074c1140cede90f809c75961b76176e0

完善了客户新增修改，供应商新增修改以及两页面的禁用标志

 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>D:\Git仓库\MESWMS\LAYUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,10 +5,11 @@
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //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://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器
    var WEBURL = "http://localhost/API/";
    return WEBURL
}


 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html

@@ -55,6 +55,7 @@
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            <button type="button" id="set_SaveBarCode" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBarCode" style="display:none;">扫码保存</button>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="">
@@ -101,6 +102,7 @@
                                            <label class="layui-form-label">当前工序</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProcNo" id="HProcNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -115,7 +117,7 @@
                                            <label class="layui-form-label">产品名称</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -157,8 +159,8 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">检验员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
                                                <input type="text" class="layui-input" name="HCheckManName" id="HCheckManName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HCheckManID" id="HCheckManID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkEmp" id="get_checkEmp" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -167,6 +169,8 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">不良条码</label>
                                            <div class="layui-input-inline">
                                                <input type="hidden" name="HBadReasonNumber" id="HBadReasonNumber" value="0">
                                                <input type="hidden" name="HBadReasonID" id="HBadReasonID" value="0">
                                                <input type="text" class="layui-input" name="HBarCode" id="HBarCode" placeholder="请扫描或输入不良条码" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
@@ -305,16 +309,16 @@
                elem: '#mainTable1'
                , toolbar: '#toolbarDemo1'
                , limit: 500 //每页默认显示的数量
                , height: 'full-50'
                , height: 'full-270'
                , cellMinWidth: 110
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号', totalRow: true }
                    , { field: 'HProcName', title: '不良原因代码' }
                    , { field: 'HWorkRemark', title: '不良原因' }
                    , { field: 'HCenterID', title: '检验员' }
                    , { field: '工作中心', title: '生产班组' }
                    , { field: '供应商', title: '生产资源' }
                    { type: 'checkbox' }
                    , { type: 'numbers', title: '序号' }
                    , { field: 'HBadReasonNumber', title: '不良原因代码' }
                    , { field: 'HBadReasonHName', title: '不良原因' }
                    , { field: 'HCheckMan', title: '检验员' }
                    , { field: 'HGroupName', title: '生产班组' }
                    , { field: 'HSourceName', title: '生产资源' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo1' }
                ]]
                , text: {
@@ -324,14 +328,17 @@
            var option2 = {
                elem: '#mainTable2'
                , limit: 500 //每页默认显示的数量
                , height: 'full-50'
                , height: 'full-300'
                , cellMinWidth: 110
                , totalRow: true
                , cols: [[ //表头
                    , { field: '不良原因代码', title: '不良原因代码' }
                    , { field: '不良原因', title: '不良原因' }
                    , { field: '检验员', title: '检验员' }
                    , { field: '生产班组', title: '生产班组' }
                    , { field: '生产资源', title: '生产资源' }
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { field: 'HQty', title: '数量', totalRow: true }
                    , { field: 'HBadReasonNumber', title: '不良原因代码' }
                    , { field: 'HBadReasonHName', title: '不良原因' }
                    , { field: 'HCheckMan', title: '检验员' }
                    , { field: 'HGroupName', title: '生产班组' }
                    , { field: 'HSourceName', title: '生产资源' }
                ]]
                , text: {
                    none: '无数据！'
@@ -421,8 +428,7 @@
            //#endregion


            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

            //#region é€‰æ‹©ç”Ÿäº§èµ„源按钮
            form.on('submit(get_checkSource)', function () {
@@ -445,39 +451,85 @@
            //#region æ‰«ä¸è‰¯æ¡ç 
            $('#HBarCode').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    var sMainStr = JSON.stringify(data.field);
                    var oMain = sMainStr + ';' + OperationType;
                    if ($("#HSourceID").val() == 0) {
                        layer.msg("请选择生产资源！", { icon: 7, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        $("#HBarCode").val("");
                        return;
                    }
                    if ($("#HGroupID").val() == 0) {
                        layer.msg("请选择班组！", { icon: 7, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        $("#HBarCode").val("");
                        return;
                    }
                    if ($("#HCheckManID").val() == 0) {
                        layer.msg("请选择检验员！", { icon: 7, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        $("#HBarCode").val("");
                        return;
                    }
                    //获取不良原因id
                    var ajaxLoad = layer.load();
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",
                        async: true,
                        data: { "oMain": oMain },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                        url: GetWEBURL() + "/Sc_QualityReportBill/get_HBadReasonID",
                        type: "GET",
                        data: { "HBadReasonNumber": $("#HBarCode").val() },
                        success: function (result) {
                            if (result.count == 1) {
                                $("#HBadReasonNumber").val($("#HBarCode").val());
                                $("#HBadReasonID").val(result.data[0].HItemID);
                                layer.close(ajaxLoad);
                                layer.msg("提交成功", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                get_BarCodeDetail();
                            }
                            else {
                                //扫码保存
                                $("#set_SaveBarCode").click();
                            } else {
                                layer.close(ajaxLoad);
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                layer.alert(result.Message, { icon: 5 });
                                $("#HBarCode").val("");
                            }
                        },
                        error: function (err) {
                        }, error: function () {
                            layer.close(ajaxLoad);
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            layer.alert("接口请求失败!", { icon: 5 });
                            $("#HBarCode").val("");
                        }
                    });
                }
            });
            //#endregion

            //#region æ‰«ç ä¿å­˜
            form.on('submit(set_SaveBarCode)', function (data) {
                var sMainStr = JSON.stringify(data.field);
                var oMain = sMainStr + ';' + OperationType;
                var ajaxLoad = layer.load();
                $("#HBarCode").val("");
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",
                    async: true,
                    data: { "oMain": oMain },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(ajaxLoad);
                            layer.msg("扫码成功");
                            get_BarCodeDetail();
                            get_BarCodeDetailSum();
                        }
                        else {
                            layer.close(ajaxLoad);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(ajaxLoad);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            });
            //#endregion

        //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

        //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

            //#region åˆ¤æ–­æ˜¯å¦ç™»å½• æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            function get_LoginIs() {
@@ -588,8 +640,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HEmpName").val(checkStatus.data[0].HName);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        $("#HCheckManName").val(checkStatus.data[0].HName);
                        $("#HCheckManID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -597,17 +649,17 @@
            }
            //#endregion

            //#region æ‰«ä¸è‰¯æ¡ç åŽè°ƒç”¨çš„显示表格方法
            //#region æ‰«ä¸è‰¯æ¡ç åŽè°ƒç”¨çš„显示扫描记录方法
            function get_BarCodeDetail() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/UserList',
                    url: GetWEBURL() + '/Sc_QualityReportBill/get_BarCodeDetail',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val() },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            option1.data = data1.data;
                            table.render(option1);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
@@ -621,8 +673,32 @@
            }
            //#endregion

            //#region æ‰«ä¸è‰¯æ¡ç åŽè°ƒç”¨çš„显示汇总记录方法
            function get_BarCodeDetailSum() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_QualityReportBill/get_BarCodeDetailSum',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val() },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option2.data = data1.data;
                            table.render(option2);
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

        //#endregion





 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillList.html

@@ -43,12 +43,6 @@
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
        <label class="layui-form-label" style="width: 85px;">物料名称</label>
        <div class="layui-input-block" style="margin-left: 120px;">
            <input type="text" class="layui-input" name="HMaterialName" id="HMaterialName">
        </div>
    </div>-->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -59,12 +53,6 @@
                        <table class="" 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-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_PrintReport"><i class="layui-icon layui-icon-print"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
@@ -73,7 +61,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>退出</button>

                            </div>
                        </script>
                    </form>