Преглед изворни кода

【bug修复】修复字典项重置查询条件后查询出所有字典项问题

俞宝山 пре 4 година
родитељ
комит
97f3f69f3b
1 измењених фајлова са 43 додато и 53 уклоњено
  1. 43 53
      _web/src/views/system/dict/dictdata/index.vue

+ 43 - 53
_web/src/views/system/dict/dictdata/index.vue

@ -6,62 +6,55 @@
    :footer="null"
    @cancel="handleCancel"
  >
  <a-card :bordered="false">
    <div class="table-page-search-wrapper" v-if="hasPerm('sysDictData:page')">
      <a-form layout="inline">
        <a-row :gutter="48">
          <a-col :md="8" :sm="24">
            <a-form-item label="字典值" >
              <a-input v-model="queryParam.value" allow-clear placeholder="请输入字典值"/>
            </a-form-item>
          </a-col>
          <a-col :md="8" :sm="24">
            <a-form-item label="唯一编码" >
              <a-input v-model="queryParam.code" allow-clear placeholder="请输入唯一编码"/>
            </a-form-item>
          </a-col>
          <a-col :md="!advanced && 8 || 24" :sm="24">
    <a-card :bordered="false">
      <div class="table-page-search-wrapper" v-if="hasPerm('sysDictData:page')">
        <a-form layout="inline">
          <a-row :gutter="48">
            <a-col :md="8" :sm="24">
              <a-form-item label="字典值" >
                <a-input v-model="queryParam.value" allow-clear placeholder="请输入字典值"/>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="24">
              <a-form-item label="唯一编码" >
                <a-input v-model="queryParam.code" allow-clear placeholder="请输入唯一编码"/>
              </a-form-item>
            </a-col>
            <a-col :md="!advanced && 8 || 24" :sm="24">
            <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
              <a-button  type="primary" @click="$refs.table.refresh(true)">查询</a-button>
               <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
            </span>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <div class="table-operator" v-if="hasPerm('sysDictData:add')" >
      <a-button type="primary" v-if="hasPerm('sysDictData:add')" icon="plus" @click="$refs.addForm.add(typeId)">新增数据</a-button>
    </div>
    <s-table
      ref="table"
      size="default"
      :columns="columns"
      :data="loadData"
      :alert="false"
      :rowKey="(record) => record.code"
      :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
    >
            </a-col>
          </a-row>
        </a-form>
      </div>
      <div class="table-operator" v-if="hasPerm('sysDictData:add')" >
        <a-button type="primary" v-if="hasPerm('sysDictData:add')" icon="plus" @click="$refs.addForm.add(typeId)">新增数据</a-button>
      </div>
      <s-table
        ref="table"
        size="default"
        :columns="columns"
        :data="loadData"
        :alert="false"
        :rowKey="(record) => record.code"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
      >
      <span slot="status" slot-scope="text">
        {{ statusFilter(text) }}
      </span>
          <span slot="action" slot-scope="text, record">
            <a v-if="hasPerm('sysDictData:edit')" @click="$refs.editForm.edit(record)">编辑</a>
            <a-divider type="vertical" v-if="hasPerm('sysDictData:edit') & hasPerm('sysDictData:delete')"/>
            <a-popconfirm v-if="hasPerm('sysDictData:delete')" placement="topRight" title="确认删除?" @confirm="() => sysDictDataDelete(record)">
            <a>删除</a>
            </a-popconfirm>
          </span>
    </s-table>
    <add-form ref="addForm" @ok="handleOk" />
    <edit-form ref="editForm" @ok="handleOk" />
  </a-card>
        <span slot="action" slot-scope="text, record">
        <a v-if="hasPerm('sysDictData:edit')" @click="$refs.editForm.edit(record)">编辑</a>
        <a-divider type="vertical" v-if="hasPerm('sysDictData:edit') & hasPerm('sysDictData:delete')"/>
        <a-popconfirm v-if="hasPerm('sysDictData:delete')" placement="topRight" title="确认删除?" @confirm="() => sysDictDataDelete(record)">
        <a>删除</a>
        </a-popconfirm>
      </span>
      </s-table>
      <add-form ref="addForm" @ok="handleOk" />
      <edit-form ref="editForm" @ok="handleOk" />
    </a-card>
  </a-modal>
</template>
@ -81,7 +74,6 @@
    data () {
      return {
        // 高级搜索 展开/关闭
        advanced: false,
        // 查询参数
@ -115,6 +107,7 @@
        typeId:[],
        // 加载数据方法 必须为 Promise 对象
        loadData:parameter => {
          this.queryParam.typeId=this.typeId
          return sysDictDataPage(Object.assign(parameter, this.queryParam)).then((res) => {
            return res.data
          })
@ -183,7 +176,6 @@
          this.$message.error('删除错误:'+err.message)
        })
      },
      toggleAdvanced () {
        this.advanced = !this.advanced
      },
@ -195,7 +187,6 @@
        this.selectedRows = selectedRows
      }
    }
  }
</script>
@ -206,5 +197,4 @@
  button {
    margin-right: 8px;
  }
</style>