1

wtt

2025-12-26 a57b723ec2f056529650f06a9830e47bfecca3e5

1

 WebTM/WebTM.csproj.user

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
<<<<<<< HEAD
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
@@ -11,9 +10,7 @@
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
=======
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
>>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,20 +7,9 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /*  var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
<<<<<<< HEAD
    var WEBURL = "http://localhost:8080/API/";    //王仪本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置

    //var WEBURL = "http://localhost:8080/API/";    //王仪本地配置
// var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
=======
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
   /* var WEBURL = "http://localhost:8080/API/";    //王仪本地配置*/
  //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
>>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //余思杰本地配置
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/

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

@@ -426,40 +426,30 @@
                    case 'btn-print':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        var ModRightName = 'Gy_BarCodeBillList_Print';
                        $.ajax({
                            url: GetWEBURL() + 'Gy_BarCodeBillList/GetBarCodeBillPermission',
                            type: "GET",
                            async: false,
                            data: { "user": sessionStorage["HUserName"]},
                            success: function (res) {
                                if (res.data == 1) {
                                    if (checkStatus.data.length > 0) {
                                        var rows = '';
                                        for (var i = 0; i < data.length; i++) {
                                            rows += data[i].HItemID.toString() + ',';
                                        }
                                        rows = rows.substring(rows.length - 1, 0);
                                        layer.open({
                                            type: 2
                                            , area: ['40%', '80%']
                                            , title: '打印模版选择'
                                            , shade: 0.6 //遮罩透明度
                                            , maxmin: false //允许全屏最小化
                                            , anim: 0 //0-6的动画形式，-1不开启
                                            , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
                                            , resize: false
                                        })
                                    }
                                    else {
                                        layer.msg(get_MessageError('[0000-1-016]请选择数据打印！', sessionStorage["HTranSlate"]));
                                    }
                        
                            if (checkStatus.data.length > 0) {
                                var rows = '';
                                for (var i = 0; i < data.length; i++) {
                                    rows += data[i].HItemID.toString() + ',';
                                }
                                else {
                                    layer.alert(get_MessageError("无打印权限!", sessionStorage["HTranSlate"]), { icon: 5 });
                                }
                                rows = rows.substring(rows.length - 1, 0);
                                layer.open({
                                    type: 2
                                    , area: ['40%', '80%']
                                    , title: '打印模版选择'
                                    , shade: 0.6 //遮罩透明度
                                    , maxmin: false //允许全屏最小化
                                    , anim: 0 //0-6的动画形式，-1不开启
                                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
                                    , resize: false
                                })
                            }
                        });
                            else {
                                layer.msg(get_MessageError('[0000-1-016]请选择数据打印！', sessionStorage["HTranSlate"]));
                            }
                                
                            
                       
                        break;
                    case 'btn-print-zx':
                        PrintZX();