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 |   74 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 2250621..34ae464 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -31,13 +31,13 @@
           </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 != 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>
         <!-- 娑夊瘑缃戞墠鏈� -->
@@ -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: {
@@ -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{
@@ -651,6 +692,8 @@
         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;
@@ -689,6 +732,25 @@
         }
       );
     },
+    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 = "淇敼";
       this.modalBox = true;

--
Gitblit v1.9.3