Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-11 e0ff382cd71d451190021e3ed12af99b9a965ee9

 src/components/view/standard-table/material.vue

@@ -1,7 +1,7 @@
<template>
    <div class="standard">
      <div>
            <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
            <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="id" border
              @selection-change="handleSelectionChange" default-expand-all
              :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
              <el-table-column type="selection" width="55">
@@ -10,27 +10,19 @@
              </el-table-column>
              <el-table-column prop="father" label="工序" sortable width="200px">
                <template slot-scope="scope">
                      <el-tag v-if="scope.row.children" :type="scope.row.children ? 'primary' : 'success'">
                        <div class="firstDiv" :style="{ color: scope.row.children ? '#16a7ff' : '#58c173' }">
                          01
                        </div>
                      </el-tag>
                      <span style="color: black">
                      <el-tag v-if="scope.row.children" type="primary">01</el-tag>
                      <span style="color: #000000">
                        {{ scope.row.father }}
                      </span>
              </template>
              </el-table-column>
              <el-table-column prop="tanme" sortable label="工艺名称">
                <!-- <template slot-scope="scope">
                          <el-tag v-if="!scope.row.children">
                              <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
                                02
                              </div>
                          </el-tag>
              <el-table-column prop="name" sortable label="工艺名称">
                <template slot-scope="scope">
                          <el-tag type="success" v-if="!scope.row.children">02</el-tag>
                          <span style="color: black">
                            {{ scope.row.tname  }}
                            {{ scope.row.name  }}
                          </span>
                          </template> -->
                          </template>
              </el-table-column>
              <el-table-column prop="mname" label="材料名称">
              </el-table-column>