|
@@ -9,11 +9,21 @@
|
|
|
style="margin-left: 20px;width: 500px;float: left;">
|
|
|
</el-input>
|
|
|
<el-select style="margin-left: 20px;width: 170px;float: left;" v-model="listQuery.production" clearable
|
|
|
- placeholder="产品类型">
|
|
|
+ placeholder="产品类型" @change="getList()">
|
|
|
<el-option value="STATEMENT" label="价值意见书">价值意见书</el-option>
|
|
|
<el-option value="REPORT" label="报告">报告</el-option>
|
|
|
<el-option value="LETTER" label="复评函">复评函</el-option>
|
|
|
</el-select>
|
|
|
+ <el-select style="margin-left: 20px;width: 170px;float: left;" v-model="listQuery.hasRealAmount" @change="getList()" placeholder="收款状态">
|
|
|
+ <el-option label="(实收款)全部">(实收款)全部</el-option>
|
|
|
+ <el-option :value="true" label="已收款">已收款</el-option>
|
|
|
+ <el-option :value="false" label="未收款">未收款</el-option>
|
|
|
+ </el-select>
|
|
|
+ <el-select style="margin-left: 20px;width: 170px;float: left;" v-model="listQuery.hasAllot" @change="getList()" placeholder="收款状态">
|
|
|
+ <el-option label="(分配)全部">(分配)全部</el-option>
|
|
|
+ <el-option :value="true" label="已收款">已分配</el-option>
|
|
|
+ <el-option :value="false" label="未收款">未分配</el-option>
|
|
|
+ </el-select>
|
|
|
<el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList" round>搜索
|
|
|
</el-button>
|
|
|
<el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
|
|
@@ -85,7 +95,8 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<div>
|
|
|
- <el-select style="margin-right: 15px;width: 20%;" v-model="needAddToPerformanceUsers" placeholder="请选择要添加的人员" multiple filterable clearable>
|
|
|
+ <el-select style="margin-right: 15px;width: 20%;" v-model="needAddToPerformanceUsers"
|
|
|
+ placeholder="请选择要添加的人员" multiple filterable clearable>
|
|
|
<el-option v-for="(u, id) in allUsers" :label="u.name" :value="u" :key="u.id"></el-option>
|
|
|
</el-select>
|
|
|
<el-button type="primary" @click="addToPerformanceUsers()">添加</el-button>
|
|
@@ -142,9 +153,9 @@ export default {
|
|
|
this.needAddToPerformanceUsers.forEach((item) => {
|
|
|
let user = {
|
|
|
ratio: 0,
|
|
|
- isPrincipal:false,
|
|
|
- userId:item.id,
|
|
|
- userName:item.name,
|
|
|
+ isPrincipal: false,
|
|
|
+ userId: item.id,
|
|
|
+ userName: item.name,
|
|
|
id: null,
|
|
|
created: null,
|
|
|
modified: null,
|
|
@@ -154,7 +165,7 @@ export default {
|
|
|
userType: null
|
|
|
}
|
|
|
// 判断要添加的人员是否已经存在了,已存在的跳过
|
|
|
- if(!this.performance.performanceList.some(user => user.userId === item.id)){
|
|
|
+ if (!this.performance.performanceList.some(user => user.userId === item.id)) {
|
|
|
this.performance.performanceList.push(user);
|
|
|
}
|
|
|
});
|