From f31616796501e803798a08b0182103b8b7ddce6e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 09 八月 2025 20:18:21 +0800
Subject: [PATCH] 审批界面增加工序版次显示
---
src/views/wel/index.vue | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 34ae464..18963a0 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -69,7 +69,7 @@
<template v-else-if="tabsType == 'tab4'">
<avue-crud :addBtn="false" :option="tabsFormOption4" :data="tabsForm4" ref="crud4" @selection-change="selectionChange">
<template #menu-left>
- <el-button :size="size" type="primary" @click="comparison" :disabled="selectionList.length < 2">瀵规瘮</el-button>
+ <el-button :size="size" type="primary" @click="comparison" :disabled="selectionList.length != 2">瀵规瘮</el-button>
</template>
</avue-crud>
</template>
@@ -78,6 +78,12 @@
<avue-form :option="upgradeModalOption" v-model="upgradeModalForm" @submit="upgradeSubmit" @reset-change="upgradeCancel"></avue-form>
</el-dialog>
</basic-container>
+ <!-- 鏂囦欢瀵规瘮 -->
+ <el-drawer title="鏂囦欢瀵规瘮" append-to-body v-model="diffBox" size="100%" class="code-box">
+ <div>
+ <code-diff :old-string="this.content1" :new-string="this.content2" output-format="side-by-side" :hideStat="true" :filename="codeDiffFileName1" :newFilename="codeDiffFileName2"/>
+ </div>
+ </el-drawer>
</template>
<script>
@@ -85,6 +91,11 @@
export default {
data() {
return {
+ diffBox: false,
+ content1: "",
+ content2: "",
+ codeDiffFileName1: "",
+ codeDiffFileName2: "",
selectionList: [],
targetRow: {},
upgradeModal: false,
@@ -172,7 +183,7 @@
placeholder: " "
},
{
- label: '鏈�鍚庝慨鏀规椂闂�',
+ label: '淇敼鏃堕棿',
prop: 'updateTime',
disabled: true,
placeholder: " "
@@ -267,7 +278,7 @@
column: [
{label: '鐗堟湰鍙�',prop: 'versionNumber'},
{label: '鍒涘缓鏃堕棿',prop: 'createTime'},
- {label: '鍒涘缓浜�',prop: 'createUser'},
+ {label: '鍒涘缓浜�',prop: 'createUserName'},
]
},
tabsForm4: {},
@@ -296,11 +307,29 @@
},
{
label: '鐗堟湰',
- prop: 'abc'
+ prop: 'versionNumber',
+ formatter: (val, value, label) => {
+ if(val.nodeType == '60'){
+ if(value==-1){
+ return '';
+ }else{
+ return value;
+ }
+ }else{
+ return '';
+ }
+ }
},
{
label: '鐗堟',
- prop: 'abc'
+ prop: 'processEdition',
+ formatter: (val, value, label) => {
+ if(val.nodeType == '60'){
+ return value;
+ }else{
+ return '';
+ }
+ }
},
{
label: '鎻忚堪',
@@ -314,12 +343,7 @@
label: '璁惧',
prop: 'machineCode'
},
- /*
- {
- label: '鍥哄寲鐘舵��',
- prop: 'abc'
- },
- */
+
{
label: '閿佸畾鐘舵��',
prop: 'isLocked',
@@ -694,6 +718,9 @@
this.getFile(row.id);
//鑾峰彇鍘嗗彶璁板綍
this.getHistory(row.id);
+ //娓呯┖瀵规瘮璁板綍
+ this.content1 = "";
+ this.content2 = "";
}
this.$nextTick(()=> {
this.tabsType = 'tab1';
@@ -746,7 +773,21 @@
);
},
comparison() { //瀵规瘮
-
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/program/node/compare-content',
+ method: 'get',
+ params: {id1:this.selectionList[0].id,id2:this.selectionList[1].id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.content1 = res.data.data.content1;
+ this.content2 = res.data.data.content2;
+ this.codeDiffFileName1 = this.selectionList[0].versionNumber;
+ this.codeDiffFileName2 = this.selectionList[1].versionNumber;
+ this.diffBox = true;
+ }
+ );
},
selectionChange(list) {
this.selectionList = list;
@@ -950,4 +991,7 @@
background-color: #f0f7ff;
font-weight: bold;
}
+ .code-box .el-drawer__header {
+ margin-bottom: 0;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3