From a1aa5a9a05c211e8d78780a318fac71c9d3313f9 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 10 八月 2025 12:03:19 +0800
Subject: [PATCH] 1
---
src/views/wel/index.vue | 301 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 284 insertions(+), 17 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 9b69456..a493d52 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -36,14 +36,17 @@
</template> -->
<template #name="{ row }">
<span>{{row.name}}</span>
- <el-button :size="size" text v-if="row.nodeType != 70" icon="el-icon-setting" type="primary" placeholder="淇敼" @click="showEdit(row)" title="淇敼"></el-button>
+ <!-- <el-button :size="size" text v-if="row.nodeType != 70" icon="el-icon-setting" type="primary" placeholder="淇敼" @click="showEdit(row)" title="淇敼"></el-button>
<el-button :size="size" text v-if="row.nodeType != 10" icon="el-icon-delete" type="primary" @click="showDel(row)" placeholder="鍒犻櫎" title="鍒犻櫎"></el-button>
<el-button :size="size" text v-if="row.nodeType != 60 && row.nodeType != 70" icon="el-icon-document-add" type="primary" @click="showAdd(row)" placeholder="鏂板瀛愮骇" title="鏂板瀛愮骇"></el-button>
- <el-button :size="size" text v-if="row.nodeType == 60 || row.nodeType == 50" icon="el-icon-upload" type="primary" @click="showUpload(row)" placeholder="鏂囦欢涓婁紶" title="鏂囦欢涓婁紶"></el-button>
+ <el-button :size="size" text v-if="row.nodeType == 60 || row.nodeType == 50" icon="el-icon-upload" type="primary" @click="showUpload(row)" placeholder="鏂囦欢涓婁紶" title="鏂囦欢涓婁紶"></el-button> -->
<!-- 娑夊瘑缃戞墠鏈� -->
- <el-button :size="size" text v-if="row.nodeType == 70 && isSM" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩増" title="鍗囩増"></el-button>
+ <!-- <el-button :size="size" text v-if="row.nodeType == 70 && isSM" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩増" title="鍗囩増"></el-button> -->
<!-- 宸ユ帶缃戞墠鏈� -->
- <el-button :size="size" text v-if="row.nodeType == 70 && !isSM" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="涓嬪彂" title="涓嬪彂"></el-button>
+ <!-- <el-button :size="size" text v-if="row.nodeType == 70 && !isSM" icon="el-icon-position" type="primary" @click="downsend(row)" placeholder="涓嬪彂" title="涓嬪彂"></el-button> -->
+ <!-- 鏇挎崲 -->
+ <el-button :size="size" text v-if="row.nodeType == 60 && isSM && row.parentIds.indexOf('0,1,')>-1" icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="鏇挎崲" title="鏇挎崲"></el-button>
+ <!-- <el-icon><Switch /></el-icon> -->
</template>
</avue-crud>
<!-- 鏂板鑺傜偣 -->
@@ -66,17 +69,120 @@
<template v-else-if="tabsType == 'tab3'">
<div v-html="convertToHtml(fileContent)"></div>
</template>
+ <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>
+ </template>
+ </avue-crud>
+ </template>
+
<el-dialog title="鍗囩増" append-to-body v-model="upgradeModal" width="500">
<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>
+ <!-- 鏇挎崲 -->
+ <el-drawer title="鏇挎崲" append-to-body v-model="todolistModel" size="100%" class="code-box">
+ <div class="approve-box">
+ <div class="left">
+ <TodolistLeft :row="row" @selection-change="todoSelectionChange" />
+ </div>
+ <div class="right">
+ <TodolistRightTop :row="row" />
+ <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
+ </div>
+ </div>
+ </el-drawer>
</template>
<script>
import { ElMessage } from 'element-plus';
+import TodolistLeft from './components/TodolistLeft.vue';
+import TodolistRightTop from './components/TodolistRightTop.vue';
export default {
+ components: {
+ TodolistLeft,
+ TodolistRightTop
+ },
data() {
+ let rejectText = '椹冲洖';//+this.row.categoryName;
return {
+ replaceDataId: "",
+ formApprove: {
+ title: '',
+ comment: '',
+ approve: '', // 榛樿鍚屾剰
+ assignee: ''
+ },
+ optionApprove: {
+ labelWidth: 100,
+ column: [
+ {
+ label: '娴佺▼鏍囬',
+ prop: 'title',
+ rules: [{ required: true, message: '璇疯緭鍏ユ祦绋嬫爣棰�', trigger: 'blur' }],
+ },
+ {
+ label: '鍙戦�佺粰',
+ prop: 'assignee',
+ type: 'select',
+ dicUrl: `/api/blade-mdm/flow/flow-user-list?deptId=0`,
+ dicFlag: true,
+ props: {
+ label: 'name',
+ value: 'id',
+ },
+ filterable: true,
+ span: 24,
+ disabled: false,
+ rules: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+ },
+ {
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
+ type: 'input',
+ span: 24,
+ // disabled: true,
+ display: false,// 闅愯棌鏄剧ず
+ // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
+ },
+ {
+ label: '澶囨敞',
+ span: 24,
+ prop: 'comment',
+ type: 'textarea',
+ // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ rules: [
+ {
+ validator: (rule, value, callback) => {
+ console.log('-------',this.formApprove)
+ if (value === '' && this.formApprove.approve !== 'Y') {
+ callback(new Error('璇疯緭鍏ュ娉�'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ]
+ },
+ ],
+ },
+ applist: [],
+ row: {},
+ todolistModel: false,
+ diffBox: false,
+ content1: "",
+ content2: "",
+ codeDiffFileName1: "",
+ codeDiffFileName2: "",
+ selectionList: [],
targetRow: {},
upgradeModal: false,
file: null,
@@ -122,6 +228,10 @@
icon: 'el-icon-warning',
label: '鏂囦欢鍐呭',
prop: 'tab3'
+ }, {
+ icon: 'el-icon-warning',
+ label: '鍘嗗彶璁板綍',
+ prop: 'tab4'
}]
},
tabsFormOption: {
@@ -159,7 +269,7 @@
placeholder: " "
},
{
- label: '鏈�鍚庝慨鏀规椂闂�',
+ label: '淇敼鏃堕棿',
prop: 'updateTime',
disabled: true,
placeholder: " "
@@ -242,6 +352,22 @@
current: 1,
total: 0,
},
+ tabsFormOption4: {
+ rowKey: "id",
+ selection: true,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ searchBtn: false,
+ emptyBtn: false,
+ menu: false,
+ column: [
+ {label: '鐗堟湰鍙�',prop: 'versionNumber'},
+ {label: '鍒涘缓鏃堕棿',prop: 'createTime'},
+ {label: '鍒涘缓浜�',prop: 'createUserName'},
+ ]
+ },
+ tabsForm4: {},
option: {
highlightCurrentRow: true,
rowKey: "id",
@@ -259,6 +385,12 @@
menu: false,
searchBtn: false,
emptyBtn: false,
+ refreshBtn: false,
+ columnBtn: false,
+ searchShowBtn: false,
+ refreshBtn: false,
+ copyBtn: false,
+ gridBtn: false,
column: [
{
label: '鐩綍',
@@ -267,11 +399,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: '鎻忚堪',
@@ -285,12 +435,7 @@
label: '璁惧',
prop: 'machineCode'
},
- /*
- {
- label: '鍥哄寲鐘舵��',
- prop: 'abc'
- },
- */
+
{
label: '閿佸畾鐘舵��',
prop: 'isLocked',
@@ -475,11 +620,77 @@
}
},
watch: {
- uploadmodalBox(old) {
- //this.onLoad();
- }
+
},
methods: {
+ handleSubmit(form, done) {
+ //鍙戣捣绋嬪簭鏇挎崲娴佺▼
+ var obj = {
+ title: this.formApprove.title,
+ nodeId: this.id,
+ tempInstanceId: this.replaceDataId,
+ assignee: this.formApprove.assignee
+ }
+ axios({
+ url: '/blade-mdm/flow/replace/start',
+ method: 'post',
+ data: obj
+ }).then(
+ resp => {
+ this.$message({
+ type: 'success',
+ message: '鎿嶄綔鎴愬姛!',
+ });
+ done();
+ this.todolistModel = false;
+ });
+ // if(this.row.taskDefinitionKey === 'programmingTask') {
+ // // if(this.applist.length !== 1) {
+ // // done();
+ // // return this.$message.success('璇烽�夋嫨1涓▼搴�');
+ // // }
+ // }
+ // approve({
+ // ...this.formApprove,
+ // taskId: this.row.taskId,
+ // processInstanceId: this.row.processInstanceId,
+ // // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
+ // }).then(res => {
+ // if(res.data.code !== 200) {
+ // this.$message.error(res.data.msg);
+ // done();
+ // return;
+ // }
+ // this.$message.success('瀹℃壒鎴愬姛');
+ // this.approveBox = false;
+ // this.onLoad(this.page, this.query);
+ // done();
+ // }).catch(err => {
+ // done();
+ // console.error(err);
+ // });
+ },
+ todoSelectionChange(applist) {
+ this.applist = applist;
+ },
+ replacement(row) { //鏇挎崲
+ this.id = row.id;
+ this.formApprove = {
+ comment: '',
+ approve: 'Y', // 榛樿鍚�
+ }
+ //鍑嗗绋嬪簭鏇挎崲娴佺▼
+ axios({
+ url: '/blade-mdm/flow/replace/prestart',
+ method: 'post',
+ params: {nodeId: row.id}
+ }).then(
+ resp => {
+ this.row = row;
+ this.replaceDataId = resp.data.data;
+ this.todolistModel = true;
+ });
+ },
convertToHtml(text) {
return text.replace(/\r\n/g, '<br>');
},
@@ -663,6 +874,11 @@
this.tabsOption = this.tabsOption2;
//鑾峰彇鏂囦欢list
this.getFile(row.id);
+ //鑾峰彇鍘嗗彶璁板綍
+ this.getHistory(row.id);
+ //娓呯┖瀵规瘮璁板綍
+ this.content1 = "";
+ this.content2 = "";
}
this.$nextTick(()=> {
this.tabsType = 'tab1';
@@ -672,7 +888,7 @@
tabsHandleChange(tabs) {
this.tabsType = tabs.prop;
},
- showUpload(row) {//鑾峰彇鏂囦欢鍐呭
+ showUpload(row) {//鑾峰彇闄勪欢鍐呭锛堟殏鏃舵病鐢級
this.fileList = [];
this.uploadmodalForm = row;
this.loading = true;
@@ -700,6 +916,39 @@
this.fileContent = res.data.data;
}
);
+ },
+ getHistory(id) { //鏌ョ湅鍘嗗彶璁板綍
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/program/node/history-by-nodeid',
+ method: 'get',
+ params: {id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.tabsForm4 = res.data.data;
+ }
+ );
+ },
+ 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;
},
showEdit(row,done) {
this.modalTitle = "淇敼";
@@ -894,10 +1143,28 @@
.highlight-row:hover {
background-color: #e6f0ff !important;
}
+.approve-box {
+ display: flex;
+
+ &>div {
+ border: 1px solid #ccc;
+ }
+
+ .left {
+ width: 400px;
+ }
+
+ .right {
+ flex: 1;
+ }
+}
</style>
<style>
.highlight-row {
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