From 3f4362c22608464d251936b9bc4feabe3286aa5e Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期三, 31 七月 2024 15:07:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/view/b1-report-preparation.vue | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue index ab65de2..9ad9eb6 100644 --- a/src/components/view/b1-report-preparation.vue +++ b/src/components/view/b1-report-preparation.vue @@ -84,7 +84,9 @@ </div> <!-- <input id="input" type="file" accept=".doc,.docx"></input> --> <div class="table"> - <ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport" :componentData="componentData" + <ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport" + :isColumnWidth="true" + :componentData="componentData" :key="upIndex" /> </div> </div> @@ -153,12 +155,10 @@ <script> import ValueTable from '../tool/value-table.vue' - import Word from '../tool/word.vue' import onlyoffice from '../tool/onlyoffice.vue' export default { components: { ValueTable, - Word, onlyoffice }, data() { @@ -279,6 +279,7 @@ }, selectField: {}, requiredAdd: [], + needSort: ['createTime', 'state', 'writeTime', 'isExamine', 'examineTime', 'ratifyTime'], requiredUp: [] }, entityCopy: {}, @@ -332,8 +333,8 @@ // } }, methods: { - refreshTable() { - this.$refs['ValueTable'].selectList() + refreshTable(e) { + this.$refs['ValueTable'].selectList(e) }, refresh() { this.componentData.entity = this.HaveJson(this.entityCopy) @@ -438,13 +439,14 @@ document.body.appendChild(link); link.click(); }, + // 杩樺師鎿嶄綔 handleRestore(row) { this.$axios.post(this.$api.insReport.upReportUrl, { id: row.id }).then(res => { if (res.code === 200) { this.$message.success('鎿嶄綔鎴愬姛') - this.refreshTable() + this.refreshTable('page') } }) }, @@ -466,6 +468,7 @@ } this.issuedVisible = true; }, + // 瀹℃牳閫氳繃 subIssued() { this.loadingIssued = true; this.$axios.post(this.$api.insReport.examineReport, { @@ -477,7 +480,7 @@ return } this.$message.success('鎻愪氦鎴愬姛') - this.refreshTable() + this.refreshTable('page') this.currentInfo = null; this.issuedVisible = false; }).catch(e => { @@ -503,6 +506,7 @@ } this.approveVisible = true; }, + // 鎵瑰噯閫氳繃 subApprove() { this.loadingApprove = true; this.$axios.post(this.$api.insReport.ratifyReport, { @@ -515,11 +519,12 @@ return } this.$message.success('宸叉壒鍑�') - this.refreshTable() + this.refreshTable('page') this.currentInfo = null; this.approveVisible = false; }) }, + // 鎻愪氦鎿嶄綔 handleSubmit(row) { this.$confirm('鏄惁鎻愪氦褰撳墠鎶ュ憡?', "鎻愪氦", { confirmButtonText: "鎻愪氦", @@ -533,12 +538,13 @@ return } this.$message.success('鎻愪氦鎴愬姛') - this.refreshTable() + this.refreshTable('page') }).catch(e => { this.$message.error('鎻愪氦澶辫触') }) }).catch(() => {}) }, + // 瀹℃牳涓嶉�氳繃鍘熷洜鎻愪氦 handleIssuedReason() { if (!this.reason) { return this.$message.error('璇疯緭鍏ュ師鍥�') @@ -554,7 +560,7 @@ return } this.$message.success('鎿嶄綔鎴愬姛') - this.refreshTable() + this.refreshTable('page') this.currentInfo = null; this.reason = ''; this.issuedVisible = false; @@ -564,6 +570,7 @@ this.loadingIssuedReason = false; }) }, + // 涓嶆壒鍑嗗師鍥犳彁浜� handleApproveReason() { if (!this.reason) { return this.$message.error('璇疯緭鍏ュ師鍥�') @@ -579,7 +586,7 @@ return } this.$message.success('鎿嶄綔鎴愬姛') - this.refreshTable() + this.refreshTable('page') this.currentInfo = null; this.reason = ''; this.issuedVisible = false; -- Gitblit v1.9.3