Merge remote-tracking branch 'origin/master'

cl

2024-01-18 d18622be3bf4c48e9cf17bc4d3254245438ed272

 jcdm-ui/src/views/main/bs/modelNumber/index.vue

@@ -104,7 +104,7 @@
    </el-card>

    <el-card style="margin-top: 10px" class="box-card">
        <el-row :gutter="10" class="mb8">
<!--        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
            <el-button
              type="primary"
@@ -148,7 +148,7 @@
            >导出</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
        </el-row>-->

        <el-table border v-loading="loading" :data="modelNumberList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
@@ -192,7 +192,7 @@
<!--          <el-table-column label="备注" align="center" prop="remarks">-->

<!--          </el-table-column>-->
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
<!--          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
@@ -213,7 +213,7 @@
                v-hasPermi="['bs:modelNumber:remove']"
              >删除</el-button>
            </template>
          </el-table-column>
          </el-table-column>-->
        </el-table>
    </el-card>