From 7d88000ed19beab7b7411d7b64fd5e7e9916da2d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 08 十月 2024 10:51:28 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj.user | 2
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 42 ++++++---------------
WebTM/views/公共页面/Kf_SourceBillEditDlg_PDA.html | 12 +++++
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 6 +-
4 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 67044c2..ee77abe 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
index d72f20d..1af7cc6 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
@@ -46,6 +46,14 @@
<input type="text" name="HMater" id="HMater" lay-verify="HMater" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏宠仈椤�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HCustom" id="HCustom" lay-verify="HCustom" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
<button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
<button type="button" lay-submit="" lay-filter="cmdOK" class="layui-btn" id="cmdOK">杩斿洖</button>
@@ -93,6 +101,7 @@
var HMaker = sessionStorage["HUserName"]
var HSourceBillNo = "";
var HMater = "";
+ var HCustom = "";
var listOption = [];
var columns = "";
var HModName = "Kf_SourceBillEditDlg_PDA";
@@ -186,6 +195,7 @@
form.on('submit(cmdQuery)', function () {
HSourceBillNo = $("#HSourceBillNo").val();
HMater = $("#HMater").val();
+ HCustom = $("#HCustom").val();
//鏄剧ず鐗╂枡鍒楄〃淇℃伅
DisBillEntryList();
});
@@ -223,7 +233,7 @@
type: "GET",
url: GetWEBURL() + '/WEBSController/GetSourceBillList_Json',
async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater },
+ data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater, "HCustom": HCustom },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
index 8a23004..d747960 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
@@ -448,7 +448,7 @@
type: 'line',
label: {
show: true,
- formatter: '{c}%'
+ formatter: '{c}'
},
tooltip: {
valueFormatter: function (value) {
@@ -470,7 +470,7 @@
type: 'line',
label: {
show: true,
- formatter: '{c}%'
+ formatter: '{c}'
},
tooltip: {
valueFormatter: function (value) {
@@ -492,7 +492,7 @@
type: 'line',
label: {
show: true,
- formatter: '{c}%'
+ formatter: '{c}'
},
tooltip: {
valueFormatter: function (value) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
index 9235ac1..0512c19 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
@@ -803,21 +803,12 @@
toolbar: '#toolbarDemo'
, where: { HProcExchHinteID: HProcExchHinteID }
, cols: [[
- { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
- , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ { field: '娴佹按鍙�', title: '娴佹按鍙�', hide: true }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 180 }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', width: 90 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', hide: true }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', hide: true }
]]
, height: 500
}
@@ -885,21 +876,12 @@
toolbar: '#toolbarDemo'
, where: { HProcExchHinteID: HProcExchHinteID }
, cols: [[
- { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
- , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ { field: '娴佹按鍙�', title: '娴佹按鍙�', hide: true }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 180 }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', width: 90 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', hide: true }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', hide: true }
]]
, height: 500
}
--
Gitblit v1.9.1