From b99dcd21acd751df93d438e89f5d74219a4d728c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 25 二月 2026 09:59:09 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj.user | 5 +----
WebTM/views/成本管理/费用单引入/CB_CostAccounting.html | 10 +++++-----
WebTM/WebTM.csproj | 3 ---
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b006e73..cd93407 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -668,10 +668,7 @@
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostProjectImport.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostAccounting.html" />
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
-<<<<<<< HEAD
-=======
<Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBill_Excel.html" />
->>>>>>> 50ceb8be38852f1a32825a7d172bd9a4d4db241d
<Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
<Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 3e543f0..2c596da 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -5,13 +5,10 @@
<NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
-<<<<<<< HEAD
<NameOfLastUsedPublishProfile>D:\鏅轰簯LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
-=======
<NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
->>>>>>> 50ceb8be38852f1a32825a7d172bd9a4d4db241d
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_CostAccounting.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_CostAccounting.html"
index 2c58820..b27c59c 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_CostAccounting.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_CostAccounting.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
@@ -46,7 +46,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; width: 185px;">
<select name="HType" id="HType" lay-verify="HType">
@@ -108,7 +108,7 @@
</button>
</div>
</div>-->
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Import" id="btn_Import" style="padding:0 30px;margin-left:50px;">寮�濮嬪紩鍏�</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Import" id="btn_Import" style="padding:0 30px;margin-left:50px;">寮�濮嬫牳绠�</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel" style="padding:0 20px">閫�鍑�</button>
</div>
<div class="layui-colla-item" style="height:600px;margin-top:20px;">
@@ -221,7 +221,7 @@
//#region 寮�濮嬭垂鐢ㄥ紩鍏�
form.on('submit(btn_Import)', function (data) {
- if (set_ModCheck("CB_ItemMoneyBillImport") == true) {
+ if (set_ModCheck("CB_CostAccounting") == true) {
var index = layer.open({
type: 1, // page 灞傜被鍨�
area: ['20%', '20%'],
@@ -286,7 +286,7 @@
var executionTime = endTime - startTime; // 姣
var executionTimeInSeconds = (executionTime / 1000).toFixed(2); // 杞崲涓虹骞朵繚鐣欎袱浣嶅皬鏁�
if (data1.count == 1) {
- layer.msg("瀹屾垚璐圭敤寮曞叆");
+ layer.msg("瀹屾垚鎴愭湰鏍哥畻");
// 鍚屾牱浣跨敤setTimeout寤惰繜鏄剧ず鎵ц鏃堕棿锛堝湪閿欒澶勭悊涓篃璁＄畻鏃堕棿锛�
setTimeout(function () {
layer.msg("鎵ц鏃堕棿: " + executionTimeInSeconds + " 绉�");
--
Gitblit v1.9.1