From a966685370bb3520f37cbb78013fb0a60e0e1df4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 11 May 2024 19:44:01 +0800
Subject: [PATCH] md

---
 src/views/emis/emisBrand/index.vue     | 31 ++++++++++++++++++--------
 src/views/emis/emisTransLine/index.vue |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/views/emis/emisBrand/index.vue b/src/views/emis/emisBrand/index.vue
index 29d89638..2999e799 100644
--- a/src/views/emis/emisBrand/index.vue
+++ b/src/views/emis/emisBrand/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="" prop="name">
+      <el-form-item label="品牌名称" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="品牌名称"
@@ -9,14 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="code">
+      <!-- <el-form-item label="" prop="code">
         <el-input
           v-model="queryParams.name"
           placeholder="品牌编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -91,11 +91,11 @@
              </template>
       </el-table-column>
        -->
-       <el-table-column label="品牌编码" align="left" prop="code" min-width="100">
+       <!-- <el-table-column label="品牌编码" align="left" prop="code" min-width="100">
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.code}}</div>
          </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="品牌名称" align="left" prop="name" min-width="100">
         <template slot-scope="scope">
             <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.name}}</div>
@@ -111,7 +111,7 @@
       </el-table-column>
       <el-table-column label="url" align="center" prop="url" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
-      <el-table-column label="启用" align="center" prop="status" min-width="100" >
+      <!-- <el-table-column label="启用" align="center" prop="status" min-width="100" >
       <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -120,7 +120,14 @@
             @change="handleStatusChange(scope.row)"
           ></el-switch>
         </template>
-      </el-table-column>
+      </el-table-column> -->
+      <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
+              <el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
+            <!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
+          </template>
+        </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -148,11 +155,11 @@
               <el-input v-model="form.nameEn" placeholder="请输入英文名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="品牌编码" prop="code">
               <el-input v-model="form.code" placeholder="品牌编码" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="官方网址" prop="url">
               <el-input v-model="form.url" placeholder="url" />
@@ -318,6 +325,12 @@ export default {
         // row.status = row.status === "0" ? "1" : "0";
       });
 
+    },
+      // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
     },
 
     /** 查询品牌列表 */
diff --git a/src/views/emis/emisTransLine/index.vue b/src/views/emis/emisTransLine/index.vue
index 5815d2f7..1b86c1b4 100644
--- a/src/views/emis/emisTransLine/index.vue
+++ b/src/views/emis/emisTransLine/index.vue
@@ -123,7 +123,7 @@
           <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
         </template>
       </el-table-column>
-      <el-table-column label="品牌" align="center" prop="logoType" width="80" />
+      <el-table-column label="品牌" align="center" prop="logoTypeName" width="150" />
       <el-table-column label="泡重比" align="center" prop="meterRate" width="80" />
       <!-- <el-table-column label="启用状态" align="center" prop="status" width="80" >
         <template slot-scope="scope">