MES-WEB-LayUI.git

parent: 1e17b6fb | 补丁 | 提交 | show whitespace

llj

2026-03-06 8f96697a7954d4c832ea1bddea4a297ad5ae689f

6个文件已修改

	WebTM/WebTM.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/成本基础资料/CB_Wip_excelImport.html	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillEdit.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -666,6 +666,8 @@
    <Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨å\CB_ItemMoneyBillList.html" />
    <Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨å\CB_ItemMoneyBillEdit.html" />
    <Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨æ¥è¡¨\CB_ActualItemMoneyCost.html" />
    <Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨è°æ´å\CB_ChangeMoneyBillEdit.html" />
    <Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨è°æ´å\CB_ChangeMoneyBillList.html" />
    <Content Include="views\ææ¬ç®¡ç\æåå¨äº§åè¡¨\Gy_WIPBal_Excel.html" />
    <Content Include="views\ææ¬ç®¡ç\æåå¨äº§åè¡¨\Kf_WIPBal.html" />
    <Content Include="views\ææ¬ç®¡ç\è´¹ç¨åå¼å¥\CB_CostProjectImport.html" />

 WebTM/WebTM.csproj.user

@@ -7,7 +7,7 @@
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\æºäºLMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
@@ -16,8 +16,6 @@
    <IISExpressWindowsAuthentication />
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -4,7 +4,7 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //é¢æåæ¬å°éç½®
    var WEBURL = "http://localhost:8082/API/";        //æè´ºæ¬å°éç½®
    //var WEBURL = "http://localhost:81/API/"           //ç¿æ¶æ¶æ¬å°éç½®
    var WEBURL = "http://localhost:81/API/"           //ç¿æ¶æ¶æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/API/";        //å¼ çå¹¿æ¬å°éç½®
    //var WEBURL = "http://localhost:81/API/";          //ééå²æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //ææä¿æ¬å°éç½®

 WebTM/views/»ù´¡×ÊÁÏ/³É±¾»ù´¡×ÊÁÏ/CB_Wip_excelImport.html

@@ -4,14 +4,17 @@
<head>
    <meta charset="utf-8" />
    <title>wipå¯¼å¥</title>
    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../../layuiadmin/PubCustom.js"></script>
    <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">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
@@ -93,7 +96,7 @@
<script>

    layui.config({
        base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
    }).extend({
        index: 'lib/index' //ä¸»å¥å£æ¨¡å
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {

 WebTM/views/¹¤×Ê¹ÜÀí/½×ÌÝ¹¤¼ÛÏµÊý/Gy_SteppedPriceCoefficientBillList.html

@@ -385,10 +385,10 @@
                    , page: true
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: 50
                    , limit: 200
                    , height: 'full-50'
                    , cols: []  // åå§ä¸ºç©ºï¼å¨æå è½½
                    , limits: [50, 500, 5000, 20000]
                    , limits: [200, 500, 5000, 50]
                    , done: function (res, curr, count) {
                        console.log("=== è¡¨æ ¼æ¸²æå®æåè° ===");
                        console.log("æ»æ¡æ°:", count);

 WebTM/views/³É±¾¹ÜÀí/³É±¾·ÑÓÃµ¥/CB_ItemMoneyBillEdit.html

@@ -827,7 +827,9 @@
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    , limit: 100
                    , limit: 10
                    , limits: [10, 100, 500, 1000]
                    , page: true
                    , cols: [[
                        { type: 'checkbox', totalRowText: 'åè®¡è¡' }
                        , { type: 'numbers', field: 'åºå·', title: 'åºå·', style: 'background-color: #f9f9f9;' }

			@@ -666,6 +666,8 @@
			<Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨å\CB_ItemMoneyBillList.html" />
			<Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨å\CB_ItemMoneyBillEdit.html" />
			<Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨æ¥è¡¨\CB_ActualItemMoneyCost.html" />
			<Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨è°æ´å\CB_ChangeMoneyBillEdit.html" />
			<Content Include="views\ææ¬ç®¡ç\ææ¬è´¹ç¨è°æ´å\CB_ChangeMoneyBillList.html" />
			<Content Include="views\ææ¬ç®¡ç\æåå¨äº§åè¡¨\Gy_WIPBal_Excel.html" />
			<Content Include="views\ææ¬ç®¡ç\æåå¨äº§åè¡¨\Kf_WIPBal.html" />
			<Content Include="views\ææ¬ç®¡ç\è´¹ç¨åå¼å¥\CB_CostProjectImport.html" />

			@@ -7,7 +7,7 @@
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<NameOfLastUsedPublishProfile>D:\æºäºLMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<ProjectView>ShowAllFiles</ProjectView>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>
			<Use64BitIISExpress />
			@@ -16,8 +16,6 @@
			<IISExpressWindowsAuthentication />
			<IISExpressUseClassicPipelineMode />
			<UseGlobalApplicationHostFile />
			<NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			</PropertyGroup>
			<ProjectExtensions>
			<VisualStudio>

			@@ -4,7 +4,7 @@
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			//var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			//var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®
			var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			//var WEBURL = "http://localhost:81/API/"; //ééå²æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ææä¿æ¬å°éç½®

			@@ -4,14 +4,17 @@
			<head>
			<meta charset="utf-8" />
			<title>wipå¯¼å¥</title>
			<link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../../layuiadmin/PubCustom.js"></script>
			<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">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			</head>
			<body>
			<div class="layui-fluid" style="padding: 0;">
			@@ -93,7 +96,7 @@
			<script>

			layui.config({
			base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {

			@@ -385,10 +385,10 @@
			, page: true
			, cellMinWidth: 120
			, totalRow: true
			, limit: 50
			, limit: 200
			, height: 'full-50'
			, cols: [] // åå§ä¸ºç©ºï¼å¨æå è½½
			, limits: [50, 500, 5000, 20000]
			, limits: [200, 500, 5000, 50]
			, done: function (res, curr, count) {
			console.log("=== è¡¨æ ¼æ¸²æå®æåè° ===");
			console.log("æ»æ¡æ°:", count);

			@@ -827,7 +827,9 @@
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, limit: 100
			, limit: 10
			, limits: [10, 100, 500, 1000]
			, page: true
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', field: 'åºå·', title: 'åºå·', style: 'background-color: #f9f9f9;' }