Merge remote-tracking branch 'origin/master'

wente

2024-06-07 4bff52e938ae2c260fe54d32ef680908868bb27e

 web/src/views/modules/sysPictureBase/SysPictureBase.vue

@@ -9,7 +9,7 @@

          </el-form-item>
          <el-form-item>
            <zt-dict v-model="dataForm.productType" dict="product" placeholder="请选择产品类型" clearable></zt-dict>
            <zt-dict v-model="dataForm.productType" dict="product" :additional=additional placeholder="请选择产品类型" clearable></zt-dict>
          </el-form-item>
          <el-form-item>
            <zt-button type="query" @click="table.query()"/>
@@ -29,10 +29,14 @@
            </template>
          </el-table-column>
          <el-table-column prop="contentType" label="检索关键字"/>
          <el-table-column prop="remark" label="备注"/>
          <zt-table-column-dict prop="productType" label="产品类型" dict="product"/>
          <zt-table-column-handle :table="table"
                                  delete-perm="sysPictureBase::delete"/>
          <zt-table-column-dict prop="productType" label="产品类型" dict="product" :additional=additional />
          <zt-table-column-handle :table="table"  edit-perm="sysPictureBase::delete"
                                  delete-perm="sysPictureBase::delete">
            <template slot-scope="scope">
              <zt-table-button size="small" type="primary" @click="edit(scope.row)">修改
              </zt-table-button>
            </template>
          </zt-table-column-handle>
        </el-table>
        <!-- 弹窗, 新增 / 修改 -->
        <add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
@@ -47,6 +51,7 @@
  export default {
    data() {
      return {
        additional: [{dictValue: '20', dictLabel: '运算图元', remark: ''}],
        url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
        dataForm: {
          contentType: '',
@@ -72,6 +77,9 @@
          await this.$tip.success()
          this.$refs.tableObj.query()
        }
      },
      edit(row){
        this.$refs.addOrUpdate.$refs.dialog.init(row.id,row)
      }
    }
  }