Merge branch 'feature/9月迭代' into dev

src/view/manualTag/syncTagHistory.vue

@@ -10,10 +10,10 @@
         </div>
         <div class="sync-content">
           <el-table :data="tableData">
-            <el-table-column label="标签分类" prop="">
+            <el-table-column label="标签分类" prop="levelName"></el-table-column>
+            <el-table-column label="标签分组" prop="">
               <template slot-scope="{ row }"> {{ row.parentLevelGroupId ? groupName(row.parentLevelGroupId) : "--" }} </template>
             </el-table-column>
-            <el-table-column label="标签分组" prop="levelName"></el-table-column>
             <el-table-column label="添加时间" prop="createTime">
               <template slot-scope="{ row }">{{ row.createTime ? dateformat(new Date(row.createTime), 'yyyy-MM-dd hh:mm:ss') : '--' }}</template>
             </el-table-column>
@@ -45,7 +45,9 @@
           <el-table :data="dialogData.tagTableData">
             <el-table-column label="序号" prop="index"></el-table-column>
             <el-table-column label="标签分类" prop="levelName"></el-table-column>
-            <el-table-column label="标签分组" prop=""></el-table-column>
+            <el-table-column label="标签分组" prop="">
+              <template slot-scope="{ row }"> {{ row.parentLevelGroupId ? groupName(row.parentLevelGroupId) : "--" }} </template>
+            </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="{ row }">
                 <el-button type="text" @click="addSyncTag(row)">添加</el-button>