From 32d659432b0e6627758faf39380fc569e56b9799 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期一, 11 八月 2025 16:26:48 +0800
Subject: [PATCH] 1
---
src/views/wel/shemi.vue | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index bef2816..91acb8c 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -67,7 +67,7 @@
<avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
<span v-else-if="tabsType == 'tab2'">鐗堟湰淇℃伅</span>
<template v-else-if="tabsType == 'tab3'">
- <div v-html="convertToHtml(fileContent)"></div>
+ <div v-html="convertToHtml(fileContent)" class="convertToHtml"></div>
</template>
<template v-else-if="tabsType == 'tab4'">
<avue-crud :addBtn="false" :option="tabsFormOption4" :data="tabsForm4" ref="crud4" @selection-change="selectionChange">
@@ -91,10 +91,10 @@
<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" />
+ <TodolistLeft :row="row" :replaceDataId="replaceDataId" :drawingNo="drawingNo" :processNo="processNo" :processEdition="processEdition" @selection-change="todoSelectionChange" />
</div>
<div class="right">
- <TodolistRightTop :row="row" />
+ <TodolistRightTop :row="row" :name="name" />
<avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
</div>
</div>
@@ -113,6 +113,9 @@
data() {
let rejectText = '椹冲洖';//+this.row.categoryName;
return {
+ drawingNo: '',
+ processNo: '',
+ processEdition: '',
replaceDataId: "",
formApprove: {
title: '',
@@ -161,7 +164,6 @@
rules: [
{
validator: (rule, value, callback) => {
- console.log('-------',this.formApprove)
if (value === '' && this.formApprove.approve !== 'Y') {
callback(new Error('璇疯緭鍏ュ娉�'));
} else {
@@ -628,6 +630,7 @@
title: this.formApprove.title,
nodeId: this.id,
tempInstanceId: this.replaceDataId,
+ comment: this.formApprove.comment,
assignee: this.formApprove.assignee
}
axios({
@@ -686,12 +689,16 @@
}).then(
resp => {
this.row = row;
- this.replaceDataId = resp.data.data;
+ this.replaceDataId = resp.data.data.processInstanceId;
+ this.processNo = resp.data.data.processNo;
+ this.processEdition = resp.data.data.processEdition;
+ this.drawingNo = resp.data.data.drawingNo;
+ this.formApprove.title = resp.data.data.name + "鏇挎崲";
this.todolistModel = true;
});
},
convertToHtml(text) {
- return text.replace(/\r\n/g, '<br>');
+ return text.replace(/\n/g, '<br>');
},
removeHasChildren(treeData) { //鏌ヨ鏃跺�欎娇鐢紝鍒犳帀hasChildren
return treeData.map(node => {
@@ -1153,6 +1160,10 @@
flex: 1;
}
}
+.convertToHtml {
+ background-color: #fffee1;
+ padding: 6px 12px;
+}
</style>
<style>
.highlight-row {
--
Gitblit v1.9.3