From 5abd278b2f0a896e97532a99cef735cee9593565 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 八月 2023 19:21:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/info.vue |   59 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 915759b..99d2c3c 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -8,9 +8,9 @@
                    @selection-change="selectionChange"
                    @current-change="currentChange"
                    @size-change="sizeChange"
-                   @refresh-change="refreshChange" @row-click="rowClick">
+                   @refresh-change="refreshChange" @row-click="rowClick" :cell-style="cellStyle">
           <template slot="menu" slot-scope="{row,index}">
-            <el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)">缂栬緫</el-button>
+            <el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)" :disabled="row.usedFlag === 'true' ? false :true">缂栬緫</el-button>
             <el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)">鍒犻櫎</el-button>
             <el-button v-if="row.usedflag=='false'" icon="el-icon-position" size="small" type="text"
                        @click="ENABLE(row,index)">鍚敤
@@ -111,16 +111,27 @@
         delBtn: false,
         columnBtn: false,
         column: [ {
+          label: '鏄惁鍚敤',
+          prop: 'usedFlag',
+          width: 150,
+          formatter: res => res.usedFlag === "true" ? "鍚敤" : "鍋滅敤"
+        },{
           label: '闆嗘垚绯荤粺',
           prop: 'sysBaseName',
           sortable: true,
           width: 150
         },{
+          label: '鍒嗙被閫夋嫨',
+          prop: 'classifyName',
+          align:'center',
+          // sortable: true,
+          width: 150
+        },{
           label: '缂栫爜绫诲瀷',
           prop: 'isGroupCodeFlag',
           sortable: true,
           width: 150,
-          formatter: d => d.isGroupCodeFlag ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
+          formatter: res => res.isGroupCodeFlag ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
         },{
           label: '鎺ュ彛绫诲瀷',
           prop:'dataFlowTypeText',
@@ -150,23 +161,6 @@
           hide:true,
           sortable: true,
           width: 150
-        }, {
-          label: '鎺ュ彛鍑芥暟',
-          prop: 'interfaceFunction',
-          sortable: true,
-          align:'center',
-          width: 150
-        }, {
-          label: '鍛藉悕绌洪棿',
-          prop: 'nameSpace',
-          sortable: true,
-          width: 150
-        },{
-          label: '鍒嗙被閫夋嫨',
-          prop: 'classifyName',
-          align:'center',
-          // sortable: true,
-          width: 150
         },{
           label: '鎺ュ彛鏂瑰紡',
           prop: 'interfaceType',
@@ -198,6 +192,12 @@
           prop: 'requestUrl',
           sortable: true,
           width: 150
+        },  {
+          label: '鎺ュ彛鍑芥暟',
+          prop: 'interfaceFunction',
+          sortable: true,
+          align:'center',
+          width: 150
         }, {
             label: '鍙傛暟鍚嶇О',
             prop: 'targName',
@@ -220,6 +220,11 @@
             return this.returnTypeList[d.returnType]
           }
         }, {
+          label: '鍛藉悕绌洪棿',
+          prop: 'nameSpace',
+          sortable: true,
+          width: 150
+        },{
           label: '绯荤粺鎻忚堪',
           prop: 'description',
           width: 150
@@ -247,6 +252,18 @@
     }
   },
   methods: {
+    //鍗曞厓鏍兼牱寮�
+    cellStyle(row,column,rowIndex,columnIndex){
+      if(row.columnIndex==2) {
+        if(row.row.usedFlag == 'false'){
+          return {
+            color: 'red',
+            fontWeight: 'bold',
+            fontSize: '20'
+          }
+        }
+      }
+    },
     searchReset() {
       this.query = {};
       this.onLoad(this.page);
@@ -301,6 +318,8 @@
       this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs || [];
       this.$refs.infoForm.formData = this.editAttribute;
       this.$refs.infoForm.showSubmitDialog = true;
+      console.log('row',row.dataFlowTypeText)
+      console.log('editAttribute',this.editAttribute.dataFlowTypeText)
     },
     deleteSave(row, index) {
       this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {

--
Gitblit v1.10.0