From 145545d402d3c9e5bd10cd7c0ecd6bc3ff8ddb81 Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期五, 30 五月 2025 09:37:10 +0800 Subject: [PATCH] 1.表格样式确定 --- H5/Js/IPQC_SJ/Add.js | 147 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 142 insertions(+), 5 deletions(-) diff --git a/H5/Js/IPQC_SJ/Add.js b/H5/Js/IPQC_SJ/Add.js index 41c9e40..d33e4f4 100644 --- a/H5/Js/IPQC_SJ/Add.js +++ b/H5/Js/IPQC_SJ/Add.js @@ -2,6 +2,48 @@ el: '#app', data: function () { return { + tableTbData: [], // "鍒剁儹鎬ц兘"鐢熸垚鐨勮〃鏍兼暟鎹� + formTbData: { // 琛ㄥ崟鏁版嵁 + temperatureData: {} // 瀛樺偍鐨勫疄闄呮俯搴︺�佸疄闄呮祦閲忔暟鎹� + }, + headers: [], + showZr: false, + waterOptions: [ + { value: '100鈩�', text: '100鈩�' }, + { value: '99鈩�', text: '99鈩�' }, + { value: '90鈩�', text: '90鈩�' }, + { value: '85鈩�', text: '85鈩�' }, + { value: '80鈩�', text: '80鈩�' }, + { value: '75鈩�', text: '75鈩�' }, + { value: '65鈩�', text: '65鈩�' }, + { value: '60鈩�', text: '60鈩�' }, + { value: '55鈩�', text: '55鈩�' }, + { value: '45鈩�', text: '45鈩�' }, + { value: '42鈩�', text: '42鈩�' }, + { value: '甯告俯姘�', text: '甯告俯姘�' }, + { value: '鍐版按', text: '鍐版按' }, + { value: '70鈩�', text: '70鈩�' }, + { value: '50鈩�', text: '50鈩�' }, + { value: '寰喎', text: '寰喎' } + ],//姘存俯閫夐」 + flowOptions: [ + { value: '50ml', text: '50ml' }, + { value: '120ml', text: '120ml' }, + { value: '150ml', text: '150ml' }, + { value: '160ml', text: '160ml' }, + { value: '250ml', text: '250ml' }, + { value: '260ml', text: '260ml' }, + { value: '350ml', text: '350ml' }, + { value: '360ml', text: '360ml' }, + { value: '450ml', text: '450ml' }, + { value: '550ml', text: '550ml' }, + { value: '750ml', text: '750ml' }, + { value: '999ml', text: '999ml' }, + { value: '1min', text: '涓�鍒嗛挓娴侀噺' }, + { value: '3min', text: '涓夊垎閽熸祦閲�' } + ],//娴侀噺閫夐」 + selectedWater: [],// 宸查�夋按娓╁�� + selectedFlow: [], // 宸查�夋祦閲忓�� isLoading: false, userInfo: { "loginGuid": '', @@ -40,6 +82,8 @@ okValue: '',//OK-鏁伴噺 ngValue: '',//NG-鏁伴噺 showDialog: false,//涓嶈壇琛ㄨ堪杈撳叆妗� + showDialogRzxx: false,//璁よ瘉淇℃伅杈撳叆妗� + rzxxValue: '',//璁よ瘉淇℃伅杈撳叆鍊� //鍥剧墖涓婁紶妗� fileList: [ //{ @@ -83,6 +127,18 @@ .replace(/(\..*)\./g, '$1') // 2. 绂佹澶氫釜灏忔暟鐐� .replace(/^\./g, ''); }, + + + openZrPopup() { + this.showZr = true; + }, + closeZrPopup() { + this.showZr = false; + this.selectedWater = []; // 鍏抽棴鏃舵竻绌洪�夋嫨 + this.selectedFlow = []; // 鍏抽棴鏃舵竻绌洪�夋嫨 + }, + + //閽堝娌℃湁涓婁笅闄愬�肩殑鏁版嵁锛屽彧闇�閫夋嫨鍚堟牸鎴栦笉鍚堟牸.鎸夐挳瑙﹀彂 handleQualified(isQualified) { var input = ""; @@ -170,7 +226,7 @@ //妫�楠屾槑缁嗗埛鏂� refreshJYItem() { const that = this; - return that.AxiosHttp("post", 'LLJ/getJYItem', { + return that.AxiosHttp("post", 'Ipqc/getJYItem', { releaseNo: that.formData.releaseNo }, false).then(res1 => { const tableData = res1.data.tbBillList || []; @@ -197,7 +253,7 @@ if (data) { that.formData = data; that.remarks = that.formData.fnGDesc; - that.AxiosHttp("post", 'LLJ/getJYItem', { + that.AxiosHttp("post", 'Ipqc/getJYItem', { //id: that.formData.guid, releaseNo: that.formData.releaseNo }, false).then(function (res1) { @@ -231,7 +287,7 @@ submit() { var that = this; that.ttrre = true; - that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EditModelSubmit', { + that.AxiosHttp("post", 'FqcManager/EditModelSubmit', { guid: that.formData.guid }, true, 1).then(function (res1) { if (res1.rtnData.outSum == 1) { @@ -284,6 +340,10 @@ updateRemarks(guid) { this.showDialog= true }, + + updateRzxx() { + this.showDialogRzxx = true + }, deleteDetail13(guid12) { const that = this; var guid1 = that.formData.guid;//涓昏〃id @@ -316,6 +376,32 @@ }).catch(() => { // 鍙栨秷鍥炶皟 that.$toast('宸插彇娑堟搷浣�'); + that.isLoading = false; + }); + }, + rzxxConfirm() { + var that = this; + var guid1 = that.formData.guid;//涓昏〃id + var mxguid = that.tableData[that.tabActive].guid;//妫�楠岄」鐩殑guid + that.isLoading = true; + that.AxiosHttp("post", 'Ipqc/updateIpqcRzxx', { + gid: guid1, + pid: mxguid, + inRzxxValue: that.rzxxValue,//杈撳叆鐨勮璇佷俊鎭� + }, true, 0).then(function (res) { + var json = res; + if (json.status == 0) { + that.$notify({ type: 'success', message: '杈撳叆鎴愬姛' }); + that.refreshJYItem();//鍒锋柊妫�楠岄」鐩� + } + else { + that.$toast.fail(json.message); + } + //that.$notify({ type: 'success', message: json.message }); + that.isLoading = false; + }).catch(function (error) { + that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�"); + that.inRzxxValue = null; that.isLoading = false; }); }, @@ -431,17 +517,68 @@ }, true, 0).then(res1 => { if (res1.status === 0) { that.$notify({ type: 'success', message: '鍒犻櫎鎴愬姛' }); - that.init();//鍒锋柊妫�楠岄」鐩� + } else { that.$toast.fail(res1.rtnMsg); + } + that.init();//鍒锋柊妫�楠岄」鐩� }).catch(error => { that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�"); }); }).catch(() => { // 鍙栨秷鎿嶄綔 + that.init();//鍒锋柊妫�楠岄」鐩� }) }, + createTb() { + // 娓呯┖鏃ф暟鎹� + this.tableTbData = []; + this.formTbData.temperatureData = {}; + + // 鏍¢獙閫夋嫨 + if (this.selectedWater.length === 0 || this.selectedFlow.length === 0) { + this.$toast.fail('璇峰厛閫夋嫨姘存俯鍜屾祦閲�'); + return; + } + + // 鐢熸垚琛ㄥご + // 淇敼headers鐢熸垚閫昏緫 鈫� + const headers = [ + '璁惧畾娓╁害', + '瀹為檯娓╁害锛堚剝锛�', + ...this.selectedFlow.sort().map(f => `娴侀噺${f}`) + ]; + this.headers = headers; + console.log(this.headers); + // 鐢熸垚琛屾暟鎹� + this.tableTbData = this.selectedWater.sort((a,b) => a - b).map(water => { + const row = { + temperature: water === '甯告俯姘�' ? water : water, + values: Object.fromEntries([ + ['temp', ''], // 鍥哄畾娓╁害瀛楁 + ...this.selectedFlow.map(flow => [flow, '']) + ]) + }; + + // 鍒濆鍖栬〃鍗曟暟鎹粨鏋� + this.$set(this.formTbData.temperatureData, water, {}); + // 娣诲姞鍥哄畾瀛楁鈥濆疄闄呮俯搴︹�滃垵濮嬪寲 + this.$set(this.formTbData.temperatureData[water], 'temp', ''); + this.selectedFlow.forEach(flow => { + this.$set(this.formTbData.temperatureData[water], flow, ''); + }); + + return row; + }); + + // 鑷姩婊氬姩鍒拌〃鏍煎尯鍩� + setTimeout(() => { + const tableEl = document.getElementById('temperature-table'); + if (tableEl) tableEl.scrollIntoView({ behavior: 'smooth' }); + }, 100); + console.log(this.formTbData); + }, } -}) \ No newline at end of file +}) -- Gitblit v1.9.3