From 032ddb30a8d9d884cc176a4a506580b4a1272586 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 26 十二月 2023 17:14:07 +0800
Subject: [PATCH] 模态框ui调整

---
 src/views/common/ztt-table.vue |   66 +++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index a64ec16..04f5297 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -149,11 +149,7 @@
         v-bind="$attrs"
         v-on="$listeners"
         :highlight-current-row="true"
-        :row-key="
-          (row) => {
-            return row.id
-          }
-        "
+        :row-key="rowKey"
         @row-dblclick="dbClickRow"
         @row-contextmenu="contextMenu"
         @header-click="headClick"
@@ -168,7 +164,7 @@
         :span-method="objectSpanMethod"
         :header-cell-style="tableHeaderStyle"
         v-adaptive="{ bottomOffset: bottomOffset, fixedHeight: fixedHeight }"
-        height="100px"
+        height="300px"
         :class="[
           'commonTable',
           isGeneralSearch && !isEdit
@@ -249,6 +245,7 @@
             :show-overflow-tooltip="!item.noShowTip"
             :width="inMemoryColWidth[item.prop] || item.width"
             :prop="item.prop"
+            align="center"
           >
             <template slot="header" slot-scope="scope">
               <template v-if="item.isSearch">
@@ -327,7 +324,12 @@
               <template v-else>
                 <template v-if="!item.render">
                   <template v-if="item.formatter">
-                    <span
+                    <span v-if="item.isTag" style="text-align: center;">
+                      <el-tag style="width:60px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
+                        <span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
+                      </el-tag>
+                    </span>
+                    <span v-else
                       v-html="
                         item.formatter(scope.row, item, scope.row[item.prop])
                       "
@@ -396,6 +398,7 @@
         @size-change="sizeChangeHandle"
         :page-sizes="[10, 20, 50, 100]"
         :page-size="pagination.pageSize"
+        :page-count="pagination.size"
         :layout="
           size
             ? 'total, prev, pager, next'
@@ -502,11 +505,12 @@
             >
               <i class="el-icon-upload"></i>
               <div class="el-upload__text"><em>鐐瑰嚮瀵煎叆鏁版嵁</em></div>
-              <div class="el-upload__tip" slot="tip">
+              <div class="el-upload__tip" slot="tip" >
                 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button
                   type="text"
                   style="font-size:12px;"
-                  @click="downDataTemplate"
+                  @click="downDataTemplate(uploadInfo.fileName)"   
+                  v-if="uploadInfo.Download"
                   >涓嬭浇妯℃澘</el-button
                 >
               </div>
@@ -558,6 +562,16 @@
   name: 'TTable',
   components: { exSlot, advancedSearchDialog, zttdraggable },
   props: {
+    rowKey: {
+      type: String,
+      default: ()=>{
+        return 'id'
+      }
+    },
+    toolbarMaxLength: {
+      type: Number,
+      default: 5,
+    },
     // 琛ㄦ牸鍨嬪彿锛歮ini,medium,small
     tableSize: { type: String, default: 'small' },
     // 鏁版嵁璇锋眰鏂规硶
@@ -711,6 +725,7 @@
         currentPage:
           this.table.currentPage == null ? 1 : this.table.currentPage,
         pageSize: this.table.pageSize == null ? 20 : this.table.pageSize,
+        size: this.table.size == null ? 7 : this.table.size,
         total: this.table.total == null ? 0 : this.table.total
       }, // 鍒嗛〉淇℃伅
       inMemoryColWidth: {}, // 璁板繂涓垪瀹斤紝榛樿鍒楀
@@ -744,11 +759,11 @@
       return colList
     },
     getToolBarBtn() {
-      return this.table.toolbar ? this.table.toolbar.slice(0, 5) : []
+      return this.table.toolbar ? this.table.toolbar.slice(0, this.toolbarMaxLength) : []
     },
     getToolbarDown() {
-      return this.getToolBarBtn.length === 5
-        ? this.table.toolbar.slice(5, this.table.toolbar.length)
+      return this.getToolBarBtn.length == this.toolbarMaxLength
+        ? this.table.toolbar.slice(this.toolbarMaxLength, this.table.toolbar.length)
         : []
     },
     isRefreshBtn() {
@@ -814,6 +829,7 @@
             this.isCleanInfo = true
           }
         }
+        this.$emit("queryParam",this.queryParam)
       },
       deep: true
     },
@@ -954,15 +970,20 @@
           arr.push(this.paramArr[i])
         }
       }
-
       return this.doCallback(this.ajaxFun, arr, selectedId)
     },
     doCallback(fn, args, selectedId) {
+      this.tableData=[]
       return fn
         .apply(this, args)
         .then((response) => {
           var _this = this
-          _this.tableData = response.data.data.records
+          var resultData = response.data.data.records
+          if(resultData == undefined){
+            _this.tableData = response.data.data
+          }else{
+            _this.tableData = response.data.data.records
+          }
           _this.pagination.total = response.data.data.total
           // 缃┖閫変腑
           this.$refs.lmesTable.setCurrentRow()
@@ -990,6 +1011,7 @@
               this.clickTable(selectObj)
             }
           }
+        this.$emit('change',resultData);
         })
         .catch((error) => {
           this.dataListLoading = false
@@ -1387,7 +1409,6 @@
             }
           }
         }
-        console.log(this.multipleSelection)
         this.$emit('handleSelectionChange', this.multipleSelection)
       } else {
         this.multipleSelection = val
@@ -1563,10 +1584,19 @@
       if (response.code != '0') {
         this.$message.warning(response.msg)
       } else {
+      if(response.data!=""&&response.data!=[]&&response.data!=null){
+        this.$message({
+          message: response.data,
+          type: 'success',
+          dangerouslyUseHTMLString: true,
+        })
+      }else{
         this.$message({
           message: '涓婁紶鎴愬姛',
           type: 'success'
         })
+      }
+        this.importDialogVisible=false
         this.getDataList()
       }
       this.$refs.uploadScan.clearFiles()
@@ -1590,7 +1620,11 @@
         const blob = new Blob([response.data], {
           type: 'application/force-download'
         })
-        const filename = decodeURI('妯℃澘鏂囦欢.xlsx')
+        let fileName="妯℃澘鏂囦欢";
+        if(this.uploadInfo.fileName!=undefined&&this.uploadInfo.fileName!=''&&this.uploadInfo.fileName!=null){
+            fileName=this.uploadInfo.fileName
+        }
+        const filename = decodeURI(fileName+'.xlsx')
         // 鍒涘缓涓�涓秴閾炬帴锛屽皢鏂囦欢娴佽祴杩涘幓锛岀劧鍚庡疄鐜拌繖涓秴閾炬帴鐨勫崟鍑讳簨浠�
         const elink = document.createElement('a')
         elink.download = filename

--
Gitblit v1.9.3