Merge remote-tracking branch 'origin/master'

王震

2023-09-14 d46f3b348ab5f913cd15be977ce16137ee4343d0

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

@@ -9,26 +9,25 @@
              </el-table-column>
              <el-table-column type="index" width="60" label="序号">
              </el-table-column>
              <el-table-column prop="father" label="工序" sortable width="200px">
              <el-table-column prop="father" label="工序" width="200" :resizable="false">
                <template slot-scope="scope">
                  <el-tag v-if="scope.row.father != null" type="primary">01</el-tag>
                  <el-tag class="tag" v-if="scope.row.father != null" type="primary">01</el-tag>
                  <span style="color: #000000">
                    {{ scope.row.father }}
                  </span>
              </template>
              </el-table-column>
              <el-table-column prop="tname" sortable label="工艺名称">
              <el-table-column prop="tname" label="工艺名称" width="200" :resizable="false">
                <template slot-scope="scope">
                  <el-tag type="success" v-if="scope.row.tname != null"
                  style="margin-left:20px;">02</el-tag>
                  <el-tag type="success" v-if="scope.row.tname != null" class="tag">02</el-tag>
                  <span style="color: #000000">
                    {{ scope.row.tname  }}
                  </span>
                  </template>
              </el-table-column>
              <el-table-column prop="mname" label="材料名称">
              <el-table-column prop="mname" label="材料名称" width="200" :resizable="false">
                <template slot-scope="scope">
                  <el-tag type="info" color="#faf2ff" v-if="scope.row.mname != null">
                  <el-tag type="info" class="tag" color="#faf2ff" v-if="scope.row.mname != null">
                    <span style="color: #e1affb">03</span>
                  </el-tag>
                  <span>
@@ -36,11 +35,11 @@
                  </span>
                </template>
              </el-table-column>
              <el-table-column prop="specifications" label="规格">
              <el-table-column prop="specifications" label="规格" :resizable="false">
              </el-table-column>
              <el-table-column prop="unit" label="单位">
              <el-table-column prop="unit" label="单位" :resizable="false">
              </el-table-column>
              <el-table-column prop="num" label="数量">
              <el-table-column prop="num" label="数量" :resizable="false">
                <template slot-scope="scope">
                  <el-input v-model="scope.row.num" 
                    v-if="scope.row.mname != null" size="small"
@@ -149,6 +148,17 @@
      width: 100%;
      height: 100%;
    }
    .tag{
      line-height:24px;
      text-align:center;
      width:36px;
      height:24px;
      
      border-radius:12px;
    }
    .tag:nth-child(1){
      margin-left:20px;
    }
  </style>
  <style>
    .standard * {