From e37f04c97ef893edce5f3f748398424fa17ffc2a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 九月 2024 10:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/loge.vue |   55 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 0d49a57..73af2ff 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -27,12 +27,15 @@
           <small slot="more">...</small>
         </avue-text-ellipsis>
       </template>
+      <template slot="menu" slot-scope="scope">
+        <el-button type="text" icon="el-icon-view" size="mini" @click="rowView(scope.row)">鏌ョ湅</el-button>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-import {getLogoList} from "@/api/docking/loge";
+import {getLogoList,gridLogeDetail} from "@/api/docking/loge";
 import {validatenull} from "@/util/validate";
 import {mapGetters} from "vuex";
 
@@ -100,18 +103,19 @@
             value:7
           },
           {
-            label: '鏍囧噯鐢宠',
-            prop: 'applyCodeForBZ',
-            value:8          },
-          {
-            label: '閮ㄩ棬鐢宠',
-            prop: 'syncDataForOrg',
-            value:9
+            label:'鎺ュ彛鍙傛暟',
+            prop:'paramString',
+            value:11
           },
           {
-            label: '浜哄憳鐢宠',
-            prop: 'syncDataForPerson',
-            value:10
+            label:'杩斿洖鍙傛暟',
+            prop:'returnString',
+            value:12
+          },
+          {
+            label: '杩斿洖msg',
+            prop: 'msg',
+            value:13
           },
         ],
       },
@@ -126,16 +130,19 @@
       data:[],
       option: {
         height:'auto',
-        calcHeight: 0,
+        calcHeight: 20,
+        menuWidth:120,
         tip: false,
         searchShow: false,
         border: true,
         index: true,
+        indexFixed:false,
         selection: false,
         dialogClickModal: false,
-        menuFixed:false,
+        menuFixed:'right',
         dialogType: 'drawer',
-        viewBtn: true,
+        viewBtn: false,
+        stripe: true,
         addBtn:false,
         editBtn:false,
         delBtn:false,
@@ -213,6 +220,7 @@
             width: 150,
             type: "textarea",
             slot: true,
+            hide:true,
           },
           {
             label:'杩斿洖鍙傛暟',
@@ -222,10 +230,12 @@
             width: 150,
             type: "textarea",
             slot: true,
+            hide:true,
           },
           {
             label: '杩斿洖msg',
             prop: 'msg',
+            width: 150,
             overHidden: true
           },
           {
@@ -268,6 +278,16 @@
     }
   },
   methods: {
+    rowView(row){
+      this.loading = true;
+      gridLogeDetail({oid:row.oid}).then(res =>{
+        console.log(res)
+        if(res.data.data){
+          this.loading = false
+          this.$refs.crud.rowView(res.data.data)
+        }
+      })
+    },
     dockingGetList(val){
       this.data=val.records;
       this.page.pageSize=val.size;
@@ -315,14 +335,13 @@
     },
     onLoad(page, params={}) {
       this.loading = true;
-      let createTime = 'desc'
-      var query={}
+      var queryCondition={}
       if (this.query) {
         for (var key in this.query) {
-          query['conditionMap["' + key + '"]'] = this.query[key];
+          queryCondition['conditionMap["' + key + '"]'] = this.query[key];
         }
       }
-      getLogoList(page.currentPage, page.pageSize,'createTime',Object.assign(params,this.params, query,this.query),).then(res => {
+      getLogoList(page.currentPage, page.pageSize,'createTime','desc',Object.assign(params,this.params, queryCondition,this.query),).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;

--
Gitblit v1.9.3