From f4b072b0ec592f8423c12b4297854c426b49af6c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 03 十二月 2024 16:06:43 +0800
Subject: [PATCH] pda 进出站 增加附件上传功能,检验仪器 基础资料增加附件上传,首巡末编辑页面 检验仪器代码 增加链接跳转,修复 异常反馈分析报表 导出数据格式问题
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 32 +
WebTM/WebTM.csproj.user | 2
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 26 +
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 513 ++++++++++++++++++-----------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 11
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 19
WebTM/views/质量管理/质量报表/QC_ErrMsgBackBillList.html | 27 +
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 4
/dev/null | 0
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 14
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 16
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectInstruMent.html | 253 ++++++++++++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 35 +
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 28 +
WebTM/WebTM.csproj | 2
15 files changed, 741 insertions(+), 241 deletions(-)
diff --git "a/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf" "b/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf"
deleted file mode 100644
index 065d116..0000000
--- "a/WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01\347\203\230\346\226\231-A2_20240112_\350\202\226\346\260\264\346\270\205.pdf"
+++ /dev/null
Binary files differ
diff --git "a/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf" "b/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf"
deleted file mode 100644
index 5407b93..0000000
--- "a/WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02\346\263\250\345\241\221-A5_20240423_\345\221\250\350\212\263.pdf"
+++ /dev/null
Binary files differ
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index da0cbe9..e83b6cb 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -2093,6 +2093,8 @@
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkReportWeekBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBill.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 1daf955..8233a56 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
index c79b07e..e886c51 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
@@ -27,22 +27,27 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-
+
<h1 style="text-align:center;"><b>妫�楠屼华鍣�</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">闄勪欢淇℃伅</li>
+ </ul>
<div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input type="text" class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HName" id="HName" autocomplete="off">
+ <input type="text" class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -86,6 +91,31 @@
</div>
</div>
</div>
+
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+ <div class="layui-upload-list">
+ <table class="layui-table" lay-filter="fileTable">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>鍥剧墖</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList" class="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
</div>
</div>
@@ -115,13 +145,14 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'upload','element'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
+ , upload = layui.upload
, laydate = layui.laydate
, element = layui.element;
//#endregion
@@ -189,7 +220,7 @@
Pub_Close(1);
}
});
-
+
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -213,11 +244,40 @@
function set_AddFNew() {
$("#HItemID").val("0");
$("#HNumber").val("");
+
+ // 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
+ document.getElementById('testList').addEventListener('click', function () {
+ // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
+ document.getElementById('HNumber').click();
+ if ($("#HNumber").val() == "" || $("#HNumber").val() == null || $("#HNumber").val() == undefined) {
+ layer.msg('璇峰厛杈撳叆鐗╂枡浠ｇ爜绛変俊鎭悗鍦ㄤ笂浼犳枃浠讹紒', { time: 3 * 1000, icon: 3 });
+ }
+ });
+
+ // 鐩戝惉鏂囦欢杈撳叆妗嗙殑change浜嬩欢
+ document.getElementById('HNumber').addEventListener('change', function () {
+ var inputHNumber = document.getElementById('HNumber');
+ var hNumberValue = inputHNumber.value.trim(); // 鑾峰彇鏂囨湰妗嗙殑鐗╂枡浠ｇ爜鍊煎苟鍘婚櫎鍓嶅悗绌烘牸
+
+ if (hNumberValue == '') {
+ // 鐗╂枡浠ｇ爜涓虹┖锛岀粰鍑烘彁绀哄苟娓呴櫎宸查�夋嫨鐨勬枃浠�
+ layer.msg("鐗╂枡浠ｇ爜涓虹┖,鏃犳硶杩涜鏂囦欢涓婁紶");
+ this.value = '';
+ } else {
+ // 鐗╂枡浠ｇ爜涓嶄负绌猴紝璋冪敤鏂囦欢涓婁紶鏂规硶骞朵紶鍏ユ枃浠跺垪琛ㄥ拰鐗╂枡浠ｇ爜
+ PicUpload();
+ }
+ });
+
+
}
//缂栬緫
function set_EditFromGrid() {
$("#HItemID").val(linterid);
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
}
//缂栬緫鍔犺浇琛ㄥご
function set_EditForm(linterid) {
@@ -225,6 +285,7 @@
$.ajax({
url: GetWEBURL() + "GetGy_InspectInstruMentDetail",
type: "GET",
+ async: false,
data: {
"HID": linterid
},
@@ -249,13 +310,13 @@
}
});
}
-
- //
+
+ //寮规鎻愮ず淇℃伅
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
}
- //鑾峰彇鐧诲綍椤电粍缁囧垪
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
function Organ() {
var Organization = '';
$.ajax({
@@ -294,9 +355,185 @@
return true;
}
+ //#region 鏂囦欢涓婁紶
+ function PicUpload() {
+ //澶氬浘鐗囦笂浼�
+ //澶氭枃浠跺垪琛ㄧず渚�
+ var ProImgByList = $('#ProImgByList')
+ , uploadListIns = upload.render({
+ elem: '#testList'
+ , url: GetWEBURL() + "/Gy_InspectInstruMent_UploadFile"
+ , accept: 'file'
+ , multiple: true
+ , auto: false
+ //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+ , data: { "HBillNo": $("#HNumber").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+ , choose: function (obj) {
+ var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ //璇诲彇鏈湴鏂囦欢
+ obj.preview(function (index, file, result) {
+ var tr = $(['<tr id="upload-' + index + '">'
+ , '<td>' + file.name + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + result + '" alt="' + file.name + '">' + '</td>'
+ , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+ , '<td>绛夊緟涓婁紶</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+
+ //鍗曚釜閲嶄紶
+ tr.find('.demo-reload').on('click', function () {
+ obj.upload(index, file);
+ return false;
+ });
+
+ //鍒犻櫎
+ tr.find('.demo-delete').on('click', function () {
+ delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+ tr.remove();
+ uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+ });
+
+ ProImgByList.append(tr);
+
+ });
+ }
+ , done: function (res, index, upload) {
+ if (res.code == 1) { //涓婁紶鎴愬姛
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(3).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+ tds.eq(4).html(''); //娓呯┖鎿嶄綔
+
+ return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+ }
+ this.error(index, upload);
+ }
+ , error: function (index, upload) {
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+ tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+ }
+ });
+ }
+ //#endregion
+
+ //#region 缂栬緫鏃�,鑾峰彇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+ function getFile() {
+ var ProImgByList = $('#ProImgByList')
+ $.ajax({
+ url: GetWEBURL() + '/Gy_InspectInstruMent_Filelist',
+ type: "GET",
+ data: { "HBillNo": $("#HNumber").val() },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var index = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ var tr = $(['<tr id="upload-' + i + '">'
+ , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+ , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+ , '<td>' + data1.data[i].HFileName + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg' + i + '" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + data1.data[i].HFilePath + '" alt="' + data1.data[i].HFileName + '">' + '</td>'
+ , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+ , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+ , '<td style="display:none">' + data1.data[i].url + '</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+ $('#ProImgByList').append(tr);
+ }
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#endregion
});
+ function previewImg(obj) {
+ var img = new Image();
+ img.src = obj.src;
+ var height = img.height * 1.2; //鑾峰彇鍥剧墖楂樺害
+ var width = img.width * 1.2; //鑾峰彇鍥剧墖瀹藉害
+ var imgHtml = "<img src='" + obj.src + "' width='100%' height='100%'/>";
+ //寮瑰嚭灞�
+ layer.open({
+ type: 1,
+ shade: 0.8,
+ offset: 'auto',
+ area: ['80%', '80%'],
+ shadeClose: true,
+ scrollbar: false,
+ title: "鍥剧墖棰勮", //涓嶆樉绀烘爣棰�
+ content: imgHtml, //鎹曡幏鐨勫厓绱狅紝娉ㄦ剰锛氭渶濂借鎸囧畾鐨勫厓绱犺瀛樻斁鍦╞ody鏈�澶栧眰锛屽惁鍒欏彲鑳借鍏跺畠鐨勭浉瀵瑰厓绱犳墍褰卞搷
+ cancel: function () {
+ //layer.msg('鎹曡幏灏辨槸浠庨〉闈㈠凡缁忓瓨鍦ㄧ殑鍏冪礌涓婏紝鍖呰９layer鐨勭粨鏋�', { time: 5000, icon: 6 });
+ }
+ });
+ }
+
+ //#region 涓嬭浇宸蹭笂浼犵殑鏂囦欢
+ function dowload(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+ var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();
+
+ var a = document.createElement('a');
+ a.href = url;
+ a.download = url.split('/').pop(); // 鏇挎崲涓哄疄闄呮枃浠跺悕
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
+ }
+ //#endregion
+
+ //#region 鍒犻櫎宸蹭笂浼犵殑鏂囦欢
+ function toManager(r) {
+ //寰楀埌褰撳墠鎵�鍦ㄨ
+ var rows = r.parentNode.parentNode.rowIndex;
+ //寰楀埌鎵�鍦ㄨ鐨勭涓�鍒楃殑鍐呭:涓婚敭ID
+ var HItemID = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(0)").html();
+ //寰楀埌鎵�鍦ㄨ鐨勭浜屽垪鐨勫唴瀹�:鍗曟嵁鍙�
+ var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
+ //寰楀埌鎵�鍦ㄨ鐨勭涓夊垪鐨勫唴瀹�:鏂囦欢鍚嶇О
+ var HFileName = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(2)").html();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+
+ //鍒犻櫎宸蹭笂浼犳枃浠�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_InspectInstruMent_DeleteFilelist',
+ type: "GET",
+ data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.alert(data1.Message, { icon: 1 });
+ $("#ProImgByList tr").eq((rows - 1)).remove();
+ }
+ else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ //#endregion
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 46a0e40..764b124 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -1170,7 +1170,7 @@
// 灏嗘洿鏂板悗鐨勫�艰缃洖杈撳叆妗�
$("#HDescription").val(updatedValue);
} else if (OperationType == 4) {
- $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
+ $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
}
}
@@ -1587,6 +1587,8 @@
$("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
$("#HSourceID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ set_EquipFile($("#HSourceName").val());
+ $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
}
, cancel: function (index, layero) {
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index efca783..346d487 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -1013,7 +1013,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
@@ -1192,6 +1192,27 @@
});
}
+ var data = obj.data;
+ if (obj.event == '妫�楠屼华鍣ㄤ唬鐮�') {
+ var HNumber = data.妫�楠屼华鍣ㄤ唬鐮�;
+ var linterid = data.HInspectInstruMentID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妫�楠屼华鍣�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectInstruMent.html?OperationType=3&linterid=' + linterid + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
if (event.key == "F7") {
@@ -1259,6 +1280,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+ ,妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1578,7 +1600,7 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣ㄤ唬鐮�": data[i].妫�楠屼华鍣ㄤ唬鐮�, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].妫�楠屽崟浣�, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
@@ -1903,7 +1925,7 @@
//瀛愯〃 璧嬪��
rowdata.push(
{
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁� == null ? 0 : data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁� == null ? 0 : data[i].鎷掔粷鏁�,
@@ -2285,7 +2307,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣ㄤ唬鐮�": "", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
@@ -2305,6 +2327,8 @@
, { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�' }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , {field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true, templet: function (d) {
+ return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';}, style: 'cursor: pointer;'}
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index d8cd76e..3a885cc 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -986,7 +986,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣ㄤ唬鐮�": "","妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -1182,6 +1182,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
+ 妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�,
妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
@@ -1539,7 +1540,7 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣ㄤ唬鐮�": data[i].妫�楠屼华鍣ㄤ唬鐮�,"妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
@@ -1944,7 +1945,7 @@
//"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
//}
{
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
@@ -2239,7 +2240,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣ㄤ唬鐮�": "","妫�楠屼华鍣�": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -2259,6 +2260,11 @@
, { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�' }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , {
+ field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true, templet: function (d) {
+ return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';
+ }, style: 'cursor: pointer;'
+ }
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
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_ErrMsgBackBillList.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_ErrMsgBackBillList.html"
index c988659..ad20865 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_ErrMsgBackBillList.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_ErrMsgBackBillList.html"
@@ -522,14 +522,33 @@
function get_Export() {
var data = option.data
data.forEach((item) => {
- // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
- if (item.璇︾粏鍐呭.length > 0) { // 鍋囪瀛楁鍚嶄负field
- item.璇︾粏鍐呭 = item.璇︾粏鍐呭.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+
+ // 鏍煎紡鍖栨棩鏈熷瓧娈�
+ if (itemobj === '鍒跺崟鏃ユ湡' || itemobj === '鏃ユ湡' || itemobj === '绛惧埌鏃堕棿' || itemobj === '澶勭悊鏃堕棿' || itemobj === '楠屾敹鏃堕棿') { // 鏍规嵁浣犵殑瀛楁鍚嶆潵鍒ゆ柇
+ let date = new Date(item[itemobj]);
+ if (!isNaN(date.getTime())) { // 鍒ゆ柇鏄惁鏄湁鏁堢殑鏃ユ湡
+ item[itemobj] = date.toISOString().slice(0, 10) + ' ' + date.toTimeString().slice(0, 5); // 鏍煎紡鍖栦负 YYYY-MM-DD HH:mm
+ } else {
+ item[itemobj] = ""; // 濡傛灉涓嶆槸鏈夋晥鏃ユ湡锛屾竻绌鸿鍊�
+ }
+ }
+
+ // 澶勭悊鍏蜂綋瀛楁鐨勬浛鎹�
+ if (itemobj === '璇︾粏鍐呭' || itemobj === '鎶勯�佷汉' || itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
}
});
table.exportFile(ins.config.id, data, "xls");
}
- //#endregion
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
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_FiveMenOneRingList.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_FiveMenOneRingList.html"
index c436455..cccfcb2 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_FiveMenOneRingList.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_FiveMenOneRingList.html"
@@ -126,6 +126,7 @@
<li>娉�</li>
<li>鐜�</li>
<li>娴�</li>
+ <li>淇�</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -151,6 +152,10 @@
<div class="layui-tab-item">
<!--娴�-->
<table class="layui-hide" id="mainTable_Measure" lay-filter="mainTable_Measure"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--淇�-->
+ <table class="layui-hide" id="mainTable_Message" lay-filter="mainTable_Message"></table>
</div>
</div>
</div>
@@ -225,6 +230,7 @@
var option_Method = ""; //娉�
var option_Environments = ""; //鐜�
var option_Measure = ""; //娴�
+ var option_Message = ""; //淇�
var option_HB_SN = ""; //榛戠櫧鏍�
var ins;
//#endregion
@@ -334,6 +340,8 @@
set_InitGrid_Environments();
//鍒濆鍖栨祴鍒楄〃
set_InitGrid_Measure();
+ //鍒濆鍖栦俊鍒楄〃
+ set_InitGrid_Message();
//鍒濆鍖栭粦鐧芥爣鍒楄〃
set_InitGrid_HB_SN();
//鏌ヨ
@@ -500,6 +508,20 @@
};
}
+ //鍒濆鍖栦俊鍒楄〃
+ function set_InitGrid_Message() {
+ option_Man = {
+ elem: '#mainTable_Message'
+ , toolbar: '#toolbarDemo2'
+ , totalRow: true
+ , height: 600
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: []
+ , data: []
+ };
+ }
+
//鍒濆鍖栭粦鐧芥爣鍒楄〃
function set_InitGrid_HB_SN() {
option_HB_SN = {
@@ -548,6 +570,13 @@
}, style: 'cursor: pointer;'
});
}
+ else if (data[j].name == '宸ュ簭') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ュ簭', templet: function (d) {
+ return '<span style="color: blue;">' + d.宸ュ簭 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
else {
switch (data[j].Type) {
//int
@@ -572,7 +601,7 @@
, cellMinWidth: 90
}
table.render(option);
-
+ //浜�
option_Man = {
elem: '#mainTable_Man'
, toolbar: '#toolbarDemo2'
@@ -582,7 +611,7 @@
, cellMinWidth: 90
}
table.render(option_Man);
-
+ //鏈�
option_Machine = {
elem: '#mainTable_Machine'
, toolbar: '#toolbarDemo2'
@@ -592,7 +621,7 @@
, cellMinWidth: 90
}
table.render(option_Machine);
-
+ //鏂�
option_Material = {
elem: '#mainTable_Material'
, toolbar: '#toolbarDemo2'
@@ -602,7 +631,7 @@
, cellMinWidth: 90
}
table.render(option_Material);
-
+ //娉�
option_Method = {
elem: '#mainTable_Method'
, toolbar: '#toolbarDemo2'
@@ -612,7 +641,7 @@
, cellMinWidth: 90
}
table.render(option_Method);
-
+ //鐜�
option_Environments = {
elem: '#mainTable_Environments'
, toolbar: '#toolbarDemo2'
@@ -622,7 +651,7 @@
, cellMinWidth: 90
}
table.render(option_Environments);
-
+ //娴�
option_Measure = {
elem: '#mainTable_Measure'
, toolbar: '#toolbarDemo2'
@@ -632,6 +661,16 @@
, cellMinWidth: 90
}
table.render(option_Measure);
+ //淇�
+ option_Message = {
+ elem: '#mainTable_Message'
+ , toolbar: '#toolbarDemo2'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Message);
$("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐗╂枡鍚嶇О);
@@ -740,8 +779,8 @@
success: function (data1) {
if (data1.count == 1) {
var linterid = data1.data[0].hmainid;
- var SNs = "";
- getTable_Right(linterid, SNs);
+ var SNs = ""; var HProcID = "";
+ getTable_Right(linterid, HProcID, SNs);
layer.close(ajaxLoad);
} else {
@@ -815,12 +854,18 @@
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
var linterid;
+ var HProcID;
var SNs = $("#SN").val();
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '娴佽浆鍗�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
linterid = data.娴佽浆鍗d;
- getTable_Right(linterid, SNs);
- }
+ HProcID = data.宸ュ簭id;
+ getTable_Right(linterid, HProcID, SNs);
+ } else if (obj.event == '宸ュ簭') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ linterid = data.娴佽浆鍗d;
+ HProcID = data.宸ュ簭id;
+ getTable_Right(linterid, HProcID, SNs);
+ }
});
//#endregion
@@ -878,118 +923,7 @@
//浜�
table.on('tool(mainTable_Man)', function (obj) {
var data = obj.data;
- if (obj.event == '鍗曟嵁鍙�') {
- if (data.鍗曟嵁绫诲瀷=="姹囨姤鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍑虹珯鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "宸ュ簭杩涚珯鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅杩涚珯鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "鍙栨牱鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍙栨牱鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "寮�宸ュ崟") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅寮�宸ュ崟'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "鍋滃伐鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍙栨牱鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (data.鍗曟嵁绫诲瀷 == "瀹屽伐鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍙栨牱鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- }
-
- } else if (obj.event == '鑱屽憳') {
+ if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
var HProcID = data.宸ュ簭id;
layer.open({
@@ -1000,7 +934,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID +''
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
, resize: false,
end: function () {
}
@@ -1008,7 +942,6 @@
}
})
}
-
});
//鏈�
@@ -1198,22 +1131,24 @@
table.on('tool(mainTable_Material)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
- var linterid = data.鍗曟嵁涓籭d;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅涓婃枡闃查敊鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
+ if (data.鍗曟嵁绫诲瀷=="涓婃枡闃查敊") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅涓婃枡闃查敊鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
var HProcID = data.宸ュ簭id;
@@ -1240,23 +1175,24 @@
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
var linterid = data.鍗曟嵁涓籭d;
- if (data.鍗曟嵁绫诲瀷 == "宸ュ簭娴佽浆鍗�") {
+ if (data.鍗曟嵁绫诲瀷 == "浜у搧宸ヨ壓鍙傛暟") {
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟鐐规'
+ , title: '鏌ョ湅浜у搧宸ヨ壓鍙傛暟娓呭崟'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType=3772'
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_MaterialTechParamBillMain.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
, resize: false,
end: function () {
}
, cancel: function () {
}
})
- } else if (data.鍗曟嵁绫诲瀷 == "宸ヨ壓鍙傛暟鐐规鍗�") {
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "宸ヨ壓鍙傛暟鐐规鍗�") {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1272,7 +1208,26 @@
, cancel: function () {
}
})
- }
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "浣滀笟鎸囧涔�") {
+ var HProcID = data.宸ュ簭id;
+ var HMaterID = data.鐗╂枡id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅浣滀笟鎸囧涔�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
var HProcID = data.宸ュ簭id;
@@ -1285,25 +1240,6 @@
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- } else if (obj.event == '妯″叿鍚嶇О') {
- var linterid = data.妯″叿id;
- var HNumber = data.妯″叿缂栫爜;
- var HName = data.妯″叿鍚嶇О;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅妯″叿灞ュ巻'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
, resize: false,
end: function () {
}
@@ -1329,47 +1265,70 @@
, cancel: function () {
}
})
- } else if (obj.event == '宸ュ簭鍚嶇О') {
- if (data.鍗曟嵁绫诲瀷 == "宸ュ簭娴佽浆鍗�") {
- var linterid = data.鍗曟嵁涓籭d;
- var HProcID = data.宸ュ簭id;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅璁惧灞ュ巻'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + ''
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- }
- else {
+ } else if (obj.event == '宸ヨ壓鍙傛暟') {
+ if (data.鍗曟嵁绫诲瀷 == "浜у搧宸ヨ壓鍙傛暟") {
var linterid = data.娴佽浆鍗d;
var HProcID = data.宸ュ簭id;
+ var HTeachName = data.宸ヨ壓鍙傛暟;
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鏌ョ湅璁惧灞ュ巻'
+ , title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟瓒嬪娍鍥�'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + ''
+ , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + '&HTeachName=' + HTeachName + ''
, resize: false,
end: function () {
}
, cancel: function () {
}
})
- }
- }
+ }
+ }
+ });
+
+ //鐜�
+ table.on('tool(mainTable_Environments)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鐜妫�娴嬪崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
});
//娴�
@@ -1500,15 +1459,151 @@
}
});
+ //淇�
+ table.on('tool(mainTable_Message)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ if (data.鍗曟嵁绫诲瀷 == "姹囨姤鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅姹囨姤鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "宸ュ簭杩涚珯鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅杩涚珯鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "鍙栨牱鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "寮�宸ュ崟") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅寮�宸ュ崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "鍋滃伐鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "瀹屽伐鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ } else if (obj.event == '鑱屽憳') {
+ var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ });
+
//#endregion
//#region 娴佽浆鍗＄偣鍑绘煡璇� 浜烘満鏂欐硶鐜�
- function getTable_Right(linterid,SNs) {
+ function getTable_Right(linterid,HProcID,SNs) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right',
type: "GET",
- data: { "linterid": linterid, "SNs": SNs, "user": sessionStorage["HUserName"] },
+ data: { "linterid": linterid, "HProcID": HProcID, "SNs": SNs, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var Listcol = [];
@@ -1552,10 +1647,24 @@
}, style: 'cursor: pointer;'
});
}
- else if (data[j].name == '宸ュ簭鍚嶇О') {//娣诲姞瓒呴摼鎺�
+ else if (data[j].name == '宸ヨ壓鍙傛暟') {//娣诲姞瓒呴摼鎺�
col.push({
- field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ュ簭鍚嶇О', templet: function (d) {
- return '<span style="color: blue;">' + d.宸ュ簭鍚嶇О + '</span>'
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ヨ壓鍙傛暟', templet: function (d) {
+ return '<span style="color: blue;">' + d.宸ヨ壓鍙傛暟 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '娴佽浆鍗�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '娴佽浆鍗�', templet: function (d) {
+ return '<span style="color: blue;">' + d.娴佽浆鍗� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '宸ュ簭') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ュ簭', templet: function (d) {
+ return '<span style="color: blue;">' + d.宸ュ簭 + '</span>'
}, style: 'cursor: pointer;'
});
}
@@ -1644,13 +1753,25 @@
, page: false
}
table.render(option_Measure);
+ //淇�
+ option_Message = {
+ elem: '#mainTable_Message'
+ , toolbar: '#toolbarDemo2'
+ , cols: [Listcol[6]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query6
+ , height: 'full-80'
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , page: false
+ }
+ table.render(option_Message);
if (SNs =="") {
//宸︿晶琛ㄦ牸
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , cols: [Listcol[6]]
- , data: data1.data.h_p_QC_FiveMenOneRingList_Query6
+ , cols: [Listcol[7]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query7
, height: 'full-80'
, cellMinWidth: 90
}
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/SB_TechnologyParameterList.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/SB_TechnologyParameterList.html"
index 404b18b..d87122b 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/SB_TechnologyParameterList.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/SB_TechnologyParameterList.html"
@@ -157,17 +157,20 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var HMater; //鐗╂枡
+ var HProc; //宸ュ簭
+ var HEquId; //璁惧
+ var HTeachName; //宸ヨ壓鍙傛暟
var HModName = "SB_TechnologyParameterList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["骞�", "鏈�", "宸ュ簭"];
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var HProcID = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HProcID = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 宸ュ簭
+ HTeachName = decodeURI(params[params[3]]); //浠庡弬鏁颁腑鑾峰彇 宸ヨ壓鍙傛暟
var ins; //鐢ㄤ簬瀵煎嚭excel
- var HMater; //鐗╂枡
- var HProc; //宸ュ簭
- var HEquId; //璁惧
+
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -244,7 +247,10 @@
set_InitGrid1(); //鍒濆鍖栬〃鏍�
if (OperationType == 3) {
Get_SB_EquipICMOTechParamBill(linterid, HProcID);//鑾峰彇娴佽浆鍗�,宸ュ簭,璁惧,鐗╂枡,寮�濮嬬粨鏉熸椂闂�
- Get_TechParam();//鑾峰彇褰撳墠娴佽浆鍗�,鐗╂枡,宸ュ簭,璁惧 瀵瑰簲鐨勪骇鍝佸伐鑹哄弬鏁版竻鍗�
+ $("#HTechParamName").val(HTeachName);
+ $("#HEquipType").val("璁惧閲囬泦");
+ form.render('select');
+ Get_TechParam();//鑾峰彇褰撳墠娴佽浆鍗�,鐗╂枡,宸ュ簭,璁惧 瀵瑰簲鐨勪骇鍝佸伐鑹哄弬鏁版竻鍗�
get_FastQuery();
//鍔犺浇鎶樼嚎鍥�
set_Graphics();
@@ -793,11 +799,12 @@
HMater = $("#HMaterID").val();
HProc = $("#HProcID").val();
HEquId = $("#HEquipID").val();
+ HTeachName = $("#HTechParamName").val() == "" ? "":$("#HTechParamName").val();
$.ajax({
url: GetWEBURL() + "/QC_CustomerAppealReport/Get_TechParamList",
type: "GET",
async: false,
- data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId,"user": sessionStorage["HUserName"] },
+ data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId, "HTeachName": HTeachName,"user": sessionStorage["HUserName"] },
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/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 468502b..518b10c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1043,7 +1043,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0","妫�楠屼华鍣ㄤ唬鐮�":"", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -1222,6 +1222,27 @@
});
}
+ var data = obj.data;
+ if (obj.event == '妫�楠屼华鍣ㄤ唬鐮�') {
+ var HNumber = data.妫�楠屼华鍣ㄤ唬鐮�;
+ var linterid= data.HInspectInstruMentID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妫�楠屼华鍣�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectInstruMent.html?OperationType=3&linterid=' + linterid + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
if (event.key == "F7") {
@@ -1288,7 +1309,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- 妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+ 妫�楠屼华鍣ㄤ唬鐮�: checkStatus.data[0].妫�楠屼华鍣ㄤ唬鐮�
+ ,妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
, HInspectInstruMentID: checkStatus.data[0].HItemID
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1592,7 +1614,7 @@
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣ㄤ唬鐮�": data[i].妫�楠屼华鍣ㄤ唬鐮�,"妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
"HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
"HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
@@ -1954,7 +1976,7 @@
//瀛愯〃 璧嬪��
rowdata.push(
{
- "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊� , "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
@@ -2293,7 +2315,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0","妫�楠屼华鍣ㄤ唬鐮�":"", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -2313,6 +2335,8 @@
, { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�'}
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , { field: '妫�楠屼华鍣ㄤ唬鐮�', title: '妫�楠屼华鍣ㄤ唬鐮�', totalRow: true ,templet: function (d) {
+ return '<span style="color: blue;" lay-event="妫�楠屼华鍣ㄤ唬鐮�">' + d.妫�楠屼华鍣ㄤ唬鐮� + '</span>';}, style: 'cursor: pointer;'}
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
@@ -2414,6 +2438,7 @@
table.render(option_Value);
}
+
//琛岄�夋嫨澶勭悊锛堢粨璁猴級
form.on('select(HResult)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 83863b1..847c3a2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -2362,14 +2362,19 @@
})
}
- //涓嬭浇鏂囦欢
+ //涓嬭浇鏂囦欢
function dowload(r) {
//寰楀埌褰撳墠鎵�鍦ㄨ
var rows = r.parentNode.parentNode.rowIndex;
//寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
- /*window.location.href = url;*/
- window.open(url)
+
+ var a = document.createElement('a');
+ a.href = url;
+ a.download = url.split('/').pop(); // 鏇挎崲涓哄疄闄呮枃浠跺悕
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
}
//杩斿洖娴佹按鍙�
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_StationInBill_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_StationInBill_PDA.html"
index 4faeb20..f25d264 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_StationInBill_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_StationInBill_PDA.html"
@@ -359,11 +359,34 @@
</div>
</div>
</div>
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;min-height:calc(50vh);">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList"><i class="layui-icon">顧�</i>閫夋嫨鏂囦欢</button>
+ <div class="layui-upload-list">
+ <table class="layui-table">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
<li>涓婃枡闃查敊</li>
+ <li>闄勪欢淇℃伅</li>
</ul>
</div>
</div>
@@ -793,7 +816,6 @@
// $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
// $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
//}
- //PicUpload();
layer.close(index);
}
, error: function () {
@@ -916,7 +938,7 @@
, uploadListIns = upload.render({
elem: '#testList'
- , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+ , url: GetWEBURL() + "/Cj_StationInBill/UploadFile1"
, accept: 'file'
, multiple: true
, auto: false
@@ -976,7 +998,7 @@
if (HBillNo != null || HBillNo != undefined) {
var ProImgByList = $('#ProImgByList')
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+ url: GetWEBURL() + '/Cj_StationInBill/Filelist',
type: "GET",
data: { "HBillNo": HBillNo },
success: function (data1) {
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 252b3ee..a4bff63 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"
@@ -378,11 +378,34 @@
</tbody>
</table>
</div>
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;min-height:calc(50vh);">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList"><i class="layui-icon">顧�</i>閫夋嫨鏂囦欢</button>
+ <div class="layui-upload-list">
+ <table class="layui-table">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
+ <li>闄勪欢淇℃伅</li>
</ul>
</div>
</div>
@@ -542,6 +565,7 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ PicUpload();
}
});
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
@@ -619,7 +643,7 @@
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
}
- PicUpload();
+ //PicUpload();
layer.close(index);
} else {
layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index ff0ee97..3e1d7cc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -758,7 +758,7 @@
, uploadListIns = upload.render({
elem: '#testList'
- , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+ , url: GetWEBURL() + "/Cj_StationInBill/UploadFile1"
, accept: 'file'
, multiple: true
, auto: false
@@ -818,7 +818,7 @@
if (HBillNo != null || HBillNo != undefined) {
var ProImgByList = $('#ProImgByList')
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+ url: GetWEBURL() + '/Cj_StationInBill/Filelist',
type: "GET",
data: { "HBillNo": HBillNo },
success: function (data1) {
@@ -1496,7 +1496,7 @@
//鍒犻櫎宸蹭笂浼犳枃浠�
$.ajax({
- url: GetWEBURL() + '/Cj_StationOutBill/DeleteFilelist',
+ url: GetWEBURL() + '/Cj_StationInBill/DeleteFilelist',
type: "GET",
data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
success: function (data1) {
@@ -1520,10 +1520,16 @@
var rows = r.parentNode.parentNode.rowIndex;
//寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
- /*window.location.href = url;*/
- window.open(url)
+
+ var a = document.createElement('a');
+ a.href = url;
+ a.download = url.split('/').pop(); // 鏇挎崲涓哄疄闄呮枃浠跺悕
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
}
+
//杩斿洖鐢熶骇鐝粍
function GetProductionTeamValue(obj) {
$("#HGroupName").val(obj[0].鐝粍);
--
Gitblit v1.9.1