春风项目四线(合箱线、总装线)
cl
2024-02-02 e0a2b80807cc52e80bf632adba9cfcb6357025aa
jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -116,7 +116,10 @@
        </el-table-column>
        <el-table-column label="颈值" align="center" prop="neckValue">
        </el-table-column>
        <el-table-column label="瓦颜色" align="center" prop="tileColor">
        <el-table-column label="瓦颜色" align="center" prop="tileColor" >
          <template slot-scope="scope">
            <dict-tag :options="dict.type.colour_hex" :value="scope.row.tileColor" :style="{ backgroundColor: scope.row.tileColor }"/>
          </template>
        </el-table-column>
<!--        <el-table-column label="创建用户" align="center" prop="createUser">-->
@@ -199,8 +202,21 @@
        <el-form-item label="颈值" prop="neckValue">
          <el-input v-model="form.neckValue" placeholder="请输入颈值" />
        </el-form-item>
        <el-form-item label="瓦颜色" prop="tileColor">
<!--        <el-form-item label="瓦颜色" prop="tileColor">
          <el-input v-model="form.tileColor" placeholder="请输入瓦颜色" />
        </el-form-item>-->
<!--        <el-form-item label="瓦颜色" prop="tileColor" required>
          <el-color-picker v-model="form.tileColor" size="medium"></el-color-picker>
        </el-form-item>-->
        <el-form-item label="瓦颜色" prop="tileColor">
          <el-select v-model="form.tileColor" placeholder="请选择状态">
            <el-option
              v-for="dict in dict.type.colour_hex"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
<!--        <el-form-item label="创建用户" prop="createUser">-->
<!--          <el-input v-model="form.createUser" placeholder="请输入创建用户" />-->
@@ -232,7 +248,7 @@
export default {
  name: "TileMatchRules",
  dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
  dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable','colour_hex'],
  data() {
    return {
      advancedShowSearch: false,