From 0cc5d0c1cfe9f1a1b87575fefbc0451b6192633a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 21:00:56 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/wel/index.vue | 92 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 6bbd200..34ae464 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -31,14 +31,14 @@
</el-col>
</el-row>
</template>
- <template #menu-left>
+ <!-- <template #menu-left>
<el-button :size="size" type="primary" @click="showAdd()">鏂板鏍硅妭鐐�</el-button>
- </template>
+ </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 icon="el-icon-delete" type="primary" @click="showDel(row)" placeholder="鍒犻櫎" title="鍒犻櫎"></el-button>
- <el-button :size="size" text v-if="row.nodeType < 60" icon="el-icon-document-add" type="primary" @click="showAdd(row)" placeholder="鏂板瀛愮骇" 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 == 70 && isSM" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩増" title="鍗囩増"></el-button>
@@ -66,6 +66,14 @@
<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>
@@ -77,6 +85,7 @@
export default {
data() {
return {
+ selectionList: [],
targetRow: {},
upgradeModal: false,
file: null,
@@ -122,6 +131,10 @@
icon: 'el-icon-warning',
label: '鏂囦欢鍐呭',
prop: 'tab3'
+ }, {
+ icon: 'el-icon-warning',
+ label: '鍘嗗彶璁板綍',
+ prop: 'tab4'
}]
},
tabsFormOption: {
@@ -183,7 +196,7 @@
menuPosition: "right",
column: [
{
- label: '鑺傜偣绫诲瀷',
+ label: '鑺傜偣绫诲瀷1',
prop: 'nodeType',
labelWidth: "120",
type: 'select',
@@ -242,6 +255,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: 'createUser'},
+ ]
+ },
+ tabsForm4: {},
option: {
highlightCurrentRow: true,
rowKey: "id",
@@ -285,19 +314,31 @@
label: '璁惧',
prop: 'machineCode'
},
+ /*
{
label: '鍥哄寲鐘舵��',
prop: 'abc'
},
+ */
{
label: '閿佸畾鐘舵��',
- prop: 'abc'
+ prop: 'isLocked',
+ formatter: (val, value, label) => {
+ if(val.nodeType == '60' || val.nodeType == '70'){
+ if(value==1){
+ return '宸查攣瀹�';
+ }else{
+ return '鏈攣瀹�';
+ }
+ }
+ }
+
},
{
label: '娴佺▼鐘舵��',
prop: 'flowStatus',
formatter: (val, value, label) => {
- if(val.nodeType != '70'){
+ if(val.nodeType != '60'){
//闈炵▼搴忚妭鐐�
return '';
}else{
@@ -645,12 +686,14 @@
this.tabsForm.nodeTypeName = item.dictValue;
}
})
- if(this.tabsForm.nodeType < 70) {
+ if(this.tabsForm.nodeType != 70) {
this.tabsOption = this.tabsOption1;
}else {
this.tabsOption = this.tabsOption2;
//鑾峰彇鏂囦欢list
this.getFile(row.id);
+ //鑾峰彇鍘嗗彶璁板綍
+ this.getHistory(row.id);
}
this.$nextTick(()=> {
this.tabsType = 'tab1';
@@ -660,7 +703,7 @@
tabsHandleChange(tabs) {
this.tabsType = tabs.prop;
},
- showUpload(row) {//鑾峰彇鏂囦欢鍐呭
+ showUpload(row) {//鑾峰彇闄勪欢鍐呭锛堟殏鏃舵病鐢級
this.fileList = [];
this.uploadmodalForm = row;
this.loading = true;
@@ -688,6 +731,25 @@
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() { //瀵规瘮
+
+ },
+ selectionChange(list) {
+ this.selectionList = list;
},
showEdit(row,done) {
this.modalTitle = "淇敼";
@@ -717,14 +779,20 @@
showAdd (row) { //鏂板瀛愯妭鐐�
if(!row) {
this.modalTitle = "鏂板鏍硅妭鐐�";
- this.modalForm.nodeType = "10";
+ this.modalForm.nodeType = this.nodeTypeList[0].dictKey;
this.modalForm.parentId = 0;
}else {
- if(row.nodeType == 60) {
+ if(row.nodeType == 60) { //绋嬪簭鍖�
return;
}
+ var defalutNodeType = ""; //涓嬩竴绾ц妭鐐圭被鍨�
+ for(var i=0;i<this.nodeTypeList.length;i++) {
+ if(row.nodeType == this.nodeTypeList[i].dictKey) {
+ defalutNodeType = this.nodeTypeList[i+1].dictKey;
+ }
+ }
this.modalTitle = "鏂板瀛愯妭鐐�";
- this.selectedColumn.nodeType = String(Number(row.nodeType) + 10);
+ this.selectedColumn.nodeType = defalutNodeType;
this.selectedColumn.parentId = row.id;
this.selectedColumn.name = "";
this.selectedColumn.id = "";
--
Gitblit v1.9.3