Skip to content

D
data-collect
Commit c349df84 by wenyi.chen
Options

0402需求变动

parent 4562bbdf
Showing with 46 additions and 160 deletions
src/views/auditManagement/admin/reviewed/details.vue
...@@ -152,9 +152,7 @@ const openDialog = (data) => { ...@@ -152,9 +152,7 @@ const openDialog = (data) => {
state.formItem.addItem.refer = addItem.refer; state.formItem.addItem.refer = addItem.refer;
state.formItem.addItem.guide = addItem.guide; state.formItem.addItem.guide = addItem.guide;
state.not_collectible_remarks = data.not_collectible_remarks state.not_collectible_remarks = data.not_collectible_remarks
if(review.review_remarks){
state.review.review_remarks = review.review_remarks; state.review.review_remarks = review.review_remarks;
}
state.userIndex = 0; state.userIndex = 0;
state.index = 0; state.index = 0;
userFilled.forEach(item => { userFilled.forEach(item => {
......
src/views/auditManagement/admin/reviewed/index.vue
...@@ -10,7 +10,10 @@ ...@@ -10,7 +10,10 @@
<el-option v-for="(item, index) in state.taskList" :key="index" :label="item.name" <el-option v-for="(item, index) in state.taskList" :key="index" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
<el-button size="default" type="primary" @click="searchChange()" >查询</el-button> <el-select v-model="state.apiListParam.norm_id" placeholder="请选择指标" size="default" @change="searchChange" clearable filterable style="width:300px;margin-right: 20px;">
<el-option v-for="(item, index) in state.normList" :key="index" :label="item.name"
:value="item.id"></el-option>
</el-select>
</div> </div>
</div> </div>
...@@ -91,6 +94,7 @@ ...@@ -91,6 +94,7 @@
<script setup name="taskPackage-list"> <script setup name="taskPackage-list">
import { getCurrentInstance } from 'vue'; import { getCurrentInstance } from 'vue';
import { claimTasksApi } from '/@/api/claimTasks/index'; import { claimTasksApi } from '/@/api/claimTasks/index';
import { normApi } from '/@/api/norm/index';
import { taskPackageApi } from '/@/api/taskPackage/index'; import { taskPackageApi } from '/@/api/taskPackage/index';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { Session } from '/@/utils/storage'; import { Session } from '/@/utils/storage';
...@@ -109,6 +113,7 @@ const state = reactive({ ...@@ -109,6 +113,7 @@ const state = reactive({
status:'2,3', status:'2,3',
task_id:'', task_id:'',
admin:1, admin:1,
norm_id:'',
}, },
// 任务领取参数 // 任务领取参数
apiAuditingParam: { apiAuditingParam: {
...@@ -124,6 +129,7 @@ const state = reactive({ ...@@ -124,6 +129,7 @@ const state = reactive({
normListExtend:[], normListExtend:[],
testIndex:0, testIndex:0,
taskList:[], taskList:[],
normList:[],
}); });
// 获取任务列表 // 获取任务列表
...@@ -132,9 +138,17 @@ const getTaskList = () => { ...@@ -132,9 +138,17 @@ const getTaskList = () => {
state.taskList = res.data state.taskList = res.data
}) })
} }
// 获取指标列表
const getNormList = () => {
normApi().normList({page:-1,limit:-1}).then(res => {
state.normList = res.data
})
}
// 页面加载时 // 页面加载时
onMounted(() => { onMounted(() => {
getTaskList() getTaskList()
getNormList()
getList() getList()
state.tableHeight = getCurrentInstance().refs.pageMain.offsetHeight - 130 - 52 + "px"; state.tableHeight = getCurrentInstance().refs.pageMain.offsetHeight - 130 - 52 + "px";
}); });
......
src/views/auditManagement/admin/unaudited/index.vue
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<div class="header-search flex space-between"> <div class="header-search flex space-between">
<div> <div>
<el-select v-model="state.apiListParam.task_id" placeholder="请选择任务" size="default" @change="searchChange" clearable filterable style="width:200px;margin-right: 20px;"> <el-select v-model="state.apiListParam.task_id" placeholder="请选择任务" size="default" @change="searchChange" clearable filterable style="width:300px;margin-right: 20px;">
<el-option v-for="(item, index) in state.taskList" :key="index" :label="item.name" <el-option v-for="(item, index) in state.taskList" :key="index" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
<el-select v-model="state.apiListParam.norm_id" placeholder="请选择指标" size="default" @change="searchChange" clearable filterable style="width:200px;margin-right: 20px;"> <el-select v-model="state.apiListParam.norm_id" placeholder="请选择指标" size="default" @change="searchChange" clearable filterable style="width:300px;margin-right: 20px;">
<el-option v-for="(item, index) in state.normList" :key="index" :label="item.name" <el-option v-for="(item, index) in state.normList" :key="index" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
...@@ -113,6 +113,7 @@ const state = reactive({ ...@@ -113,6 +113,7 @@ const state = reactive({
status:1, status:1,
task_id:'', task_id:'',
admin:1, admin:1,
norm_id:'',
}, },
// 任务领取参数 // 任务领取参数
apiAuditingParam: { apiAuditingParam: {
......
src/views/balance/settlementStatement/index.vue
...@@ -14,6 +14,10 @@ ...@@ -14,6 +14,10 @@
<el-option v-for="(item, index) in state.userList" :key="index" :label="item.name" <el-option v-for="(item, index) in state.userList" :key="index" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
<el-select v-model="state.apiListParam.norm_id" placeholder="请选择指标" size="default" @change="searchChange" clearable filterable style="width:300px;margin-right: 20px;">
<el-option v-for="(item, index) in state.normList" :key="index" :label="item.name"
:value="item.id"></el-option>
</el-select>
<el-button size="default" type="primary" @click="searchChange()" >查询</el-button> <el-button size="default" type="primary" @click="searchChange()" >查询</el-button>
</div> </div>
...@@ -98,6 +102,7 @@ import { getCurrentInstance } from 'vue'; ...@@ -98,6 +102,7 @@ import { getCurrentInstance } from 'vue';
import { claimTasksApi } from '/@/api/claimTasks/index'; import { claimTasksApi } from '/@/api/claimTasks/index';
import { normOrdersApi } from '/@/api/normOrders/index'; import { normOrdersApi } from '/@/api/normOrders/index';
import { taskPackageApi } from '/@/api/taskPackage/index'; import { taskPackageApi } from '/@/api/taskPackage/index';
import { normApi } from '/@/api/norm/index';
import { systemApi } from '/@/api/system/index'; import { systemApi } from '/@/api/system/index';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { Session } from '/@/utils/storage'; import { Session } from '/@/utils/storage';
...@@ -117,6 +122,7 @@ const state = reactive({ ...@@ -117,6 +122,7 @@ const state = reactive({
task_id:'', task_id:'',
admin:1, admin:1,
user_id:'', user_id:'',
norm_id:'',
}, },
// 任务领取参数 // 任务领取参数
apiAuditingParam: { apiAuditingParam: {
...@@ -137,6 +143,7 @@ const state = reactive({ ...@@ -137,6 +143,7 @@ const state = reactive({
testIndex:0, testIndex:0,
taskList:[], taskList:[],
userList:[], userList:[],
normList:[],
}); });
// 获取任务列表 // 获取任务列表
...@@ -145,6 +152,13 @@ const getTaskList = () => { ...@@ -145,6 +152,13 @@ const getTaskList = () => {
state.taskList = res.data state.taskList = res.data
}) })
} }
// 获取指标列表
const getNormList = () => {
normApi().normList({page:-1,limit:-1}).then(res => {
state.normList = res.data
})
}
// 获取用户列表
const getUserList = () => { const getUserList = () => {
systemApi().systemUserList({page:-1,limit:-1}).then(res => { systemApi().systemUserList({page:-1,limit:-1}).then(res => {
state.userList = res.data state.userList = res.data
...@@ -154,6 +168,7 @@ const getUserList = () => { ...@@ -154,6 +168,7 @@ const getUserList = () => {
onMounted(() => { onMounted(() => {
getTaskList() getTaskList()
getUserList() getUserList()
getNormList()
getList() getList()
state.tableHeight = getCurrentInstance().refs.pageMain.offsetHeight - 130 - 52 + "px"; state.tableHeight = getCurrentInstance().refs.pageMain.offsetHeight - 130 - 52 + "px";
}); });
......
src/views/claimTasks/user/list/index.vue
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
<el-option v-for="(item, index) in state.taskList" :key="index" :label="item.name" <el-option v-for="(item, index) in state.taskList" :key="index" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
<el-select v-model="state.apiListParam.norm_id" placeholder="请选择指标" size="default" @change="searchChange" clearable filterable style="width:300px;margin-right: 20px;">
<el-option v-for="(item, index) in state.normList" :key="index" :label="item.name"
:value="item.id"></el-option>
</el-select>
<el-input class="search-item" placeholder="输入指标名称" v-model="state.apiListParam.name" size="default" <el-input class="search-item" placeholder="输入指标名称" v-model="state.apiListParam.name" size="default"
style="width: 220px;" clearable @change="searchChange()"> style="width: 220px;" clearable @change="searchChange()">
</el-input> </el-input>
...@@ -72,6 +76,7 @@ ...@@ -72,6 +76,7 @@
import { getCurrentInstance } from 'vue'; import { getCurrentInstance } from 'vue';
import { claimTasksApi } from '/@/api/claimTasks/index'; import { claimTasksApi } from '/@/api/claimTasks/index';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
import { normApi } from '/@/api/norm/index';
import { taskPackageApi } from '/@/api/taskPackage/index'; import { taskPackageApi } from '/@/api/taskPackage/index';
import { Session } from '/@/utils/storage'; import { Session } from '/@/utils/storage';
// 引入组件 // 引入组件
...@@ -89,6 +94,7 @@ const state = reactive({ ...@@ -89,6 +94,7 @@ const state = reactive({
receives:1, receives:1,
task_id:'', task_id:'',
sort:'desc', sort:'desc',
norm_id:'',
}, },
// 任务领取参数 // 任务领取参数
apiReceiveParam: { apiReceiveParam: {
...@@ -115,10 +121,17 @@ const getTaskList = () => { ...@@ -115,10 +121,17 @@ const getTaskList = () => {
state.taskList = res.data state.taskList = res.data
}) })
} }
// 获取指标列表
const getNormList = () => {
normApi().normList({page:-1,limit:-1}).then(res => {
state.normList = res.data
})
}
// 页面加载时 // 页面加载时
onMounted(() => { onMounted(() => {
// getDepatment() // getDepatment()
getList() getList()
getNormList()
getTaskList(); getTaskList();
state.tableHeight = getCurrentInstance().refs.pageMain.offsetHeight - 130 - 52 + "px"; state.tableHeight = getCurrentInstance().refs.pageMain.offsetHeight - 130 - 52 + "px";
}); });
......
src/views/claimTasks/user/settled/index.vue deleted 100644 → 0
<template>
<div class="system-menu-container">
<div class="breadcrumb-box">
<Breadcrumb />
</div>
<div class="page-main" v-loading="state.tableData.loading" ref="pageMain">
<el-card shadow="hover" style="height:100%;">
<el-table :data="state.tableData.data" border style="width: 100%" :height="state.tableHeight"
ref="multipleTableRef">
<el-table-column label="序号" type="index" width="100" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="userInfo.name" label="用户名称" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #409EFF;">{{scope.row.userInfo.name}}</span>
</template>
</el-table-column>
<el-table-column prop="time" label="结算时间" show-overflow-tooltip align="center">
<template #default="scope">
<span>{{scope.row.time}}</span>
</template>
</el-table-column>
<el-table-column prop="num" label="数量" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="amount" label="总金额" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="status" label="状态" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #909399;" v-if="scope.row.status=='0'">未确认</span>
<span style="color: #409EFF;" v-if="scope.row.status=='1'">已确认</span>
<span style="color: #F56C6C;" v-if="scope.row.status=='2'">确认收款</span>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="300" fixed="right" align="center">
<template #default="scope">
<el-button size="small" @click="details(scope.row.id)">查看详情</el-button>
</template>
</el-table-column> -->
</el-table>
<div class="pagination-box">
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
:pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.apiListParam.page" background
v-model:page-size="state.apiListParam.limit" layout="total, sizes, prev, pager, next, jumper"
:total="state.tableData.total">
</el-pagination>
</div>
</el-card>
</div>
</div>
</template>
<script setup name="taskPackage-list">
import { getCurrentInstance } from 'vue';
import { normOrdersApi } from '/@/api/normOrders/index';
import { ElMessageBox, ElMessage } from 'element-plus';
import { Session } from '/@/utils/storage';
// 引入组件
const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/breadcrumb.vue'));
const router = useRouter();
// 定义变量内容
const DetailDialogRef = ref()
const state = reactive({
// 查询列表参数
apiListParam: {
page: 1,
limit: 10,
name: '',
user_id:'',
},
tableData: {
data: [],
loading: false,
total: 0
},
tableHeight: '30vh',
normListExtend:[],
testIndex:0,
taskList:[],
});
// 页面加载时
onMounted(() => {
getList()
state.tableHeight = getCurrentInstance().refs.pageMain.offsetHeight - 130 - 52 + "px";
});
/**
* 搜索按钮
*/
const test = () => {
return state.testIndex+1;
}
/**
* 搜索按钮
*/
const searchChange = () => {
state.apiListParam.page = 1
getList()
}
/**
* 重置按钮
*/
const reset = () => {
state.apiListParam.page = 1
state.apiListParam.name = '';
getList()
}
// 分页改变
const onHandleSizeChange = (val) => {
state.apiListParam.limit = val;
getList();
};
const onHandleCurrentChange = (val) => {
state.apiListParam.page = val;
getList();
};
// 获取列表
const getList = () => {
state.tableData.loading = true
state.apiListParam.user_id= Session.get('userInfo').id
normOrdersApi().normOrdersList(state.apiListParam).then(res => {
state.tableData.loading = false
let data =res.data.data;
state.tableData.data = res.data.data
state.tableData.total = res.data.total
}).catch(() => {
state.tableData.loading = false
})
}
/**
* 点击查看
*/
const details = (id) => {
// this.$router.push('/target')
router.push({
path: '/balance/settlementList/details',query: {id:id}
});
}
</script>
<style lang="scss" scoped>
.page-main {
height: calc(100vh - 50px - 106px);
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment