|
@@ -6,10 +6,10 @@
|
|
|
<el-option :key="item.dictValue" v-for="item in typeList" :label="item.dictLabel" :value="item.dictValue">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-model="listQuery.category" clearable placeholder="表彰类别" class="filter-item" style="width: 200px">
|
|
|
+ <!-- <el-select v-model="listQuery.category" clearable placeholder="表彰类别" class="filter-item" style="width: 200px">
|
|
|
<el-option :key="item.dictValue" v-for="item in categoryList" :label="item.dictLabel" :value="item.dictValue">
|
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select> -->
|
|
|
<el-input clearable class="filter-item" style="width: 200px;" placeholder="客户名称"
|
|
|
v-model="listQuery.customerName"></el-input>
|
|
|
<el-input clearable class="filter-item" style="width: 200px;" placeholder="表彰名称"
|
|
@@ -38,8 +38,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" prop="typeName" min-width="100" label="表彰类型">
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="categoryName" min-width="100" label="表彰类别">
|
|
|
- </el-table-column>
|
|
|
+ <!-- <el-table-column align="center" prop="categoryName" min-width="100" label="表彰类别">
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column align="center" min-width="100" label="表彰人员">
|
|
|
<template slot-scope="props">
|
|
|
<el-popover trigger="hover">
|
|
@@ -107,14 +107,15 @@
|
|
|
<el-form-item label="表彰类型">
|
|
|
<el-input disabled class="filter-item" v-model="dataForm.typeName"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="表彰类别" prop="category">
|
|
|
+ <!-- <el-form-item label="表彰类别" prop="category">
|
|
|
<el-select v-model="dataForm.category" clearable placeholder="表彰类别" class="filter-item" style="width: 100%" @change="handleClickChangeType">
|
|
|
<el-option :key="item.dictValue" v-for="item in categoryList" :label="item.dictLabel" :value="item.dictValue">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item label="奖励积分" prop="integral">
|
|
|
- <el-input-number style="width: 100%;" :disabled="dataForm.category=='30' && dataForm.type!='1'?false:true" :min="0" :step="1" v-model="dataForm.integral"></el-input-number>
|
|
|
+ <el-input-number style="width: 100%;" :min="0" :step="1" v-model="dataForm.integral"></el-input-number>
|
|
|
+ <!-- <el-input-number style="width: 100%;" :disabled="dataForm.category=='30' && dataForm.type!='1'?false:true" :min="0" :step="1" v-model="dataForm.integral"></el-input-number> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="审批内容" prop="content">
|
|
|
<el-input type="textarea" :rows="2" placeholder="请输入审批内容" v-model="dataForm.content"></el-input>
|