Skip to content

D
data-collect
Commit 2e39b6e2 by wenyi.chen
Options

0507 处理指标名称问题

parent 08448d2b
Showing with 105 additions and 81 deletions
src/api/norm/index.js
......@@ -35,6 +35,13 @@ export function normApi() {
data,
});
},
normWholeDetail: (data) => {
return request({
url: '/api/norm/normWholeDetail',
method: 'post',
data,
});
},
normPartDetail: (data) => {
return request({
url: '/api/norm/partDetail',
......
src/views/auditManagement/admin/notPassed/details.vue
......@@ -6,8 +6,8 @@
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
<el-input type="textarea" v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable :disabled="true"></el-input>
......
src/views/auditManagement/admin/notPassed/index.vue
......@@ -34,8 +34,8 @@
<el-table-column prop="taskInfo.unit" label="单位" width="200" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="normInfo.name" label="子任务名称" width="300" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.name" label="指标名称" width="200" show-overflow-tooltip align="center">
</el-table-column>
<!-- <el-table-column prop="norm_list_info.name" label="指标名称" width="200" show-overflow-tooltip align="center">
</el-table-column> -->
<el-table-column prop="norm_list_info.sort" label="优先级" width="100" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #909399;" v-if="scope.row.norm_list_info.sort=='1'">低</span>
......
src/views/auditManagement/admin/reviewed/details.vue
......@@ -6,8 +6,8 @@
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
<el-input type="textarea" v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable :disabled="true"></el-input>
......
src/views/auditManagement/admin/reviewed/index.vue
......@@ -34,8 +34,8 @@
<el-table-column prop="taskInfo.unit" label="单位" width="200" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="normInfo.name" label="子任务名称" width="300" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.name" label="指标名称" width="200" show-overflow-tooltip align="center">
</el-table-column>
<!-- <el-table-column prop="norm_list_info.name" label="指标名称" width="200" show-overflow-tooltip align="center">
</el-table-column> -->
<el-table-column prop="norm_list_info.sort" label="优先级" width="100" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #909399;" v-if="scope.row.norm_list_info.sort=='1'">低</span>
......
src/views/auditManagement/admin/unaudited/details.vue
......@@ -6,8 +6,8 @@
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
<el-input type="textarea" v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable :disabled="true"></el-input>
......
src/views/auditManagement/admin/unaudited/index.vue
......@@ -34,8 +34,8 @@
<el-table-column prop="taskInfo.unit" label="单位" width="200" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="normInfo.name" label="子任务名称" width="300" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.name" label="指标名称" width="200" show-overflow-tooltip align="center">
</el-table-column>
<!-- <el-table-column prop="norm_list_info.name" label="指标名称" width="200" show-overflow-tooltip align="center">
</el-table-column> -->
<el-table-column prop="norm_list_info.sort" label="优先级" width="100" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #909399;" v-if="scope.row.norm_list_info.sort=='1'">低</span>
......
src/views/auditManagement/user/completed/details.vue
......@@ -4,10 +4,10 @@
<el-form ref="dialogFormRef" :model="state.formItem.addItem" :rules="state.rules" size="default" label-width="100px"
v-loading="state.dataLoading" label-position="right" style="width: 90%;text-align: center;">
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
<el-input v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable :disabled="true"></el-input>
......
src/views/auditManagement/user/completed/index.vue
......@@ -21,7 +21,7 @@
<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="norm_list_info.name" label="指标名称" show-overflow-tooltip align="center">
<el-table-column prop="norm_list_info.name" label="子任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.sort" label="优先级" show-overflow-tooltip align="center">
<template #default="scope">
......
src/views/auditManagement/user/incomplete/details.vue
......@@ -4,10 +4,10 @@
<el-form ref="dialogFormRef" :model="state.formItem.addItem" :rules="state.rules" size="default" label-width="100px"
v-loading="state.dataLoading" label-position="right" style="width: 90%;text-align: center;">
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
<el-input v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable :disabled="true"></el-input>
......
src/views/auditManagement/user/incomplete/index.vue
......@@ -21,7 +21,7 @@
<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="norm_list_info.name" label="指标名称" show-overflow-tooltip align="center">
<el-table-column prop="norm_list_info.name" label="子任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.sort" label="优先级" show-overflow-tooltip align="center">
<template #default="scope">
......
src/views/auditManagement/user/list/dialog.vue
......@@ -10,7 +10,7 @@
<el-form-item label="单位名称" prop="unit">
<el-input v-model="state.ruleForm.taskPackageInfo.unit" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.ruleForm.name" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="难度等级" prop="level">
......
src/views/auditManagement/user/list/index.vue
......@@ -23,7 +23,7 @@
<el-table-column label="序号" prop="id" width="100" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="taskPackageInfo.name" label="任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="name" label="指标名称" show-overflow-tooltip align="center">
<el-table-column prop="name" label="子任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="sort" label="优先级" show-overflow-tooltip align="center">
<template #default="scope">
......
src/views/auditManagement/user/list/settled.vue
......@@ -23,7 +23,7 @@
<el-table-column label="序号" prop="id" width="100" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="taskPackageInfo.name" label="任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="name" label="指标名称" show-overflow-tooltip align="center">
<el-table-column prop="name" label="子任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="sort" label="优先级" show-overflow-tooltip align="center">
<template #default="scope">
......
src/views/balance/settlementStatement/details.vue
......@@ -6,7 +6,7 @@
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
......
src/views/balance/settlementStatement/index.vue
......@@ -38,7 +38,7 @@
<el-table-column prop="taskInfo.name" label="任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="taskInfo.unit" label="单位" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="norm_list_info.name" label="指标名称" show-overflow-tooltip align="center">
<el-table-column prop="norm_list_info.name" label="子任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.sort" label="优先级" show-overflow-tooltip align="center">
<template #default="scope">
......
src/views/claimTasks/user/approved/details.vue
......@@ -6,8 +6,8 @@
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="state.formItem.addItem.price" :disabled="true"></el-input>
......
src/views/claimTasks/user/approved/index.vue
......@@ -29,10 +29,10 @@
<el-table :data="state.tableData.data" style="width: 100%" :height="state.tableHeight"
ref="multipleTableRef">
<el-table-column label="序号" type="index" width="80" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="taskInfo.name" label="任务名称" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="normInfo.name" label="子任务名称" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="norm_list_info.name" label="指标名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="taskInfo.name" width="200" label="任务名称" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="normInfo.name" width="200" label="子任务名称" show-overflow-tooltip align="center"></el-table-column>
<!-- <el-table-column prop="norm_list_info.name" label="指标名称" show-overflow-tooltip align="center">
</el-table-column> -->
<el-table-column prop="norm_list_info.sort" width="80" label="优先级" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #909399;" v-if="scope.row.norm_list_info.sort=='1'">低</span>
......@@ -41,14 +41,14 @@
</template>
</el-table-column>
<el-table-column prop="norm_list_info.level" width="100" label="难度等级" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="norm_list_info.refer" label="信源" show-overflow-tooltip align="center">
<el-table-column prop="norm_list_info.refer" width="200" label="信源" show-overflow-tooltip align="center">
<template #default="scope">
<el-link type="danger" v-if="checkUrl(scope.row.norm_list_info.refer)" :href="scope.row.norm_list_info.refer" target ="_blank">点击查看</el-link>
<span v-else>{{scope.row.norm_list_info.refer}}</span>
</template>
</el-table-column>
<el-table-column prop="norm_list_info.price" width="80" label="单价" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="status" label="完成情况" show-overflow-tooltip align="center">
<el-table-column prop="status" width="200" label="完成情况" show-overflow-tooltip align="center">
<template #default="scope">
<el-tag type='warning' v-if="scope.row.status==0" effect="plain" size="small">已领取未填写</el-tag>
<el-tag type='success' v-if="scope.row.status==1" effect="plain" size="small">已完成未审核</el-tag>
......@@ -57,13 +57,13 @@
<el-tag type='info' v-if="scope.row.status==4" effect="plain" size="small">已结算</el-tag>
</template>
</el-table-column>
<el-table-column prop="not_collectible" label="是否可采集" show-overflow-tooltip align="center">
<el-table-column prop="not_collectible" width="200" label="是否可采集" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #F56C6C" v-if="scope.row.not_collectible==1" effect="plain" size="small">{{scope.row.not_collectible_remarks}}</span>
<span style="color: #909399" v-else effect="plain" size="small">是</span>
</template>
</el-table-column>
<el-table-column prop="review_remarks" label="审核备注" show-overflow-tooltip align="center">
<el-table-column prop="review_remarks" width="200" label="审核备注" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #409EFF;" effect="plain" size="small">{{scope.row.review_remarks}}</span>
</template>
......
src/views/claimTasks/user/approved/modify.vue
......@@ -4,10 +4,10 @@
<el-form ref="dialogFormRef" :model="state.formItem.addItem" :rules="state.rules" size="default" label-width="100px"
v-loading="state.dataLoading" label-position="right" style="width: 90%;text-align: center;">
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
<el-input type="textarea" v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable :disabled="true"></el-input>
......
src/views/claimTasks/user/completed/details.vue
......@@ -4,10 +4,10 @@
<el-form ref="dialogFormRef" :model="state.formItem.addItem" :rules="state.rules" size="default" label-width="100px"
v-loading="state.dataLoading" label-position="right" style="width: 90%;text-align: center;">
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="state.formItem.addItem.price" :disabled="true"></el-input>
......
src/views/claimTasks/user/completed/index.vue
......@@ -21,24 +21,26 @@
<el-table :data="state.tableData.data" 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="norm_list_info.name" label="指标名称" show-overflow-tooltip align="center">
<el-table-column prop="taskInfo.name" width="200" label="任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.sort" label="优先级" show-overflow-tooltip align="center">
<el-table-column prop="normInfo.name" width="200" label="子任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.sort" width="200" label="优先级" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #909399;" v-if="scope.row.norm_list_info.sort=='1'">低</span>
<span style="color: #409EFF;" v-if="scope.row.norm_list_info.sort=='2'">中</span>
<span style="color: #F56C6C;" v-if="scope.row.norm_list_info.sort=='3'">高</span>
</template>
</el-table-column>
<el-table-column prop="norm_list_info.level" label="难度等级" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="norm_list_info.refer" label="信源" show-overflow-tooltip align="center">
<el-table-column prop="norm_list_info.level" width="200" label="难度等级" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="norm_list_info.refer" width="200" label="信源" show-overflow-tooltip align="center">
<template #default="scope">
<el-link type="danger" v-if="checkUrl(scope.row.norm_list_info.refer)" :href="scope.row.norm_list_info.refer" target ="_blank">点击查看</el-link>
<span v-else>{{scope.row.norm_list_info.refer}}</span>
</template>
</el-table-column>
<el-table-column prop="norm_list_info.price" label="单价" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="status" label="完成情况" show-overflow-tooltip align="center">
<el-table-column prop="norm_list_info.price" width="200" label="单价" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="status" label="完成情况" width="200" show-overflow-tooltip align="center">
<template #default="scope">
<el-tag type='warning' v-if="scope.row.status==0" effect="plain" size="small">已领取未填写</el-tag>
<el-tag type='success' v-if="scope.row.status==1" effect="plain" size="small">已完成未审核</el-tag>
......@@ -47,13 +49,13 @@
<el-tag type='info' v-if="scope.row.status==4" effect="plain" size="small">已结算</el-tag>
</template>
</el-table-column>
<el-table-column prop="not_collectible" label="是否可采集" show-overflow-tooltip align="center">
<el-table-column prop="not_collectible" width="200" label="是否可采集" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #F56C6C" v-if="scope.row.not_collectible==1" effect="plain" size="small">{{scope.row.not_collectible_remarks}}</span>
<span style="color: #909399" v-else effect="plain" size="small">是</span>
</template>
</el-table-column>
<el-table-column prop="review_remarks" label="审核备注" show-overflow-tooltip align="center">
<el-table-column prop="review_remarks" width="200" label="审核备注" show-overflow-tooltip align="center">
<template #default="scope">
<span style="color: #409EFF;" effect="plain" size="small">{{scope.row.review_remarks}}</span>
</template>
......
src/views/claimTasks/user/completed/modify.vue
......@@ -4,10 +4,10 @@
<el-form ref="dialogFormRef" :model="state.formItem.addItem" :rules="state.rules" size="default" label-width="100px"
v-loading="state.dataLoading" label-position="right" style="width: 90%;text-align: center;">
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="state.formItem.addItem.price" :disabled="true"></el-input>
......
src/views/claimTasks/user/incomplete/details.vue
......@@ -4,10 +4,10 @@
<el-form ref="dialogFormRef" :model="state.formItem.addItem" :rules="state.rules" size="default" label-width="100px"
v-loading="state.dataLoading" label-position="right" style="width: 90%;text-align: center;">
<el-form-item label="任务名称" prop="task_name">
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-input v-model="state.formItem.addItem.task_name" placeholder="请输入任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入子任务名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="state.formItem.addItem.price" :disabled="true"></el-input>
......
src/views/claimTasks/user/incomplete/index.vue
......@@ -21,7 +21,9 @@
<el-table :data="state.tableData.data" 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="norm_list_info.name" label="指标名称" show-overflow-tooltip align="center">
<el-table-column prop="taskInfo.name" width="300" label="任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="normInfo.name" width="300" label="子任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="norm_list_info.sort" label="优先级" show-overflow-tooltip align="center">
<template #default="scope">
......
src/views/claimTasks/user/list/dialog.vue
......@@ -10,7 +10,7 @@
<el-form-item label="单位名称" prop="unit">
<el-input v-model="state.ruleForm.taskPackageInfo.unit" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="指标名称" prop="name">
<el-form-item label="子任务名称" prop="name">
<el-input v-model="state.ruleForm.name" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="难度等级" prop="level">
......
src/views/claimTasks/user/list/index.vue
......@@ -33,8 +33,8 @@
</el-table-column>
<el-table-column prop="normInfo.name" width="300" label="子任务名称" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="name" label="指标名称" width="300" show-overflow-tooltip align="center">
</el-table-column>
<!-- <el-table-column prop="name" label="指标名称" width="300" show-overflow-tooltip align="center">
</el-table-column> -->
<el-table-column prop="price" label="单价" show-overflow-tooltip align="center">
</el-table-column>
<el-table-column prop="sort" label="优先级" show-overflow-tooltip align="center">
......
src/views/dataScreening/list/whole.vue
......@@ -55,7 +55,7 @@
id:'',
page: 1,
limit: 10,
shouw:1,
shou:1,
},
total: 0,
tableData:[],
......@@ -245,6 +245,10 @@
return value;
}
}
const backToPreviousPage = () => {
// this.$router.push('/target')
router.go(-1);
}
// /**
// * 检查数据类型并且将多个逗号分隔成数组
// * @param {*} value
......
src/views/norm/list/whole.vue
......@@ -28,7 +28,11 @@
</el-table-column>
<el-table-column label="状态" prop="status" fixed="right" min-width="230">
<template #default="scope">
<span style="color:#409EFF">{{scope.row.status}}</span>
<span style="color:#909399" v-if="scope.row.status==0">已领取、未填写</span>
<span style="color:#E6A23C" v-if="scope.row.status==1">已完成、未审核</span>
<span style="color:#F56C6C" v-if="scope.row.status==2">已审核、未通过</span>
<span style="color:#409EFF" v-if="scope.row.status==3">已通过、未结算</span>
<span style="color:#67C23A" v-if="scope.row.status==4">已通过、已结算</span>
</template>
</el-table-column>
<el-table-column label="是否可采集" prop="not_collectible" fixed="right" min-width="230"></el-table-column>
......@@ -66,6 +70,7 @@
id:'',
page: 1,
limit: 10,
status:'0,1,2,3,4'
},
total: 0,
tableData:[],
......@@ -82,7 +87,7 @@
state.collectsTableData=[],
state.collectsColumns=[],
state.loading = true
normApi().normWhole(state.apiData).then(res => {
normApi().normWholeDetail(state.apiData).then(res => {
state.total = res.data.total;
let custom = res.data.custom;
let addItem = res.data.addItem
......@@ -107,7 +112,6 @@
titleColumn.forEach(function(item, index, arr) {
state.columns.push({ label:item, prop: 'extend_name'+index,width:350});
});
//领取列表
let receivesList = res.data.receivesList
receivesList.forEach(function(item, index, arr) {
......@@ -143,21 +147,22 @@
}
}
});
if(item.status == 0){
list['status'] ='已领取、未填写'
}
if(item.status == 1){
list['status'] ='已完成、未审核'
}
if(item.status == 2){
list['status'] ='已审核、未通过'
}
if(item.status == 3){
list['status'] ='已通过、未结算'
}
if(item.status == 4){
list['status'] ='已通过、已结算'
}
list['status'] = item.status
// if(item.status == 0){
// list['status'] ='已领取、未填写'
// }
// if(item.status == 1){
// list['status'] ='已完成、未审核'
// }
// if(item.status == 2){
// list['status'] ='已审核、未通过'
// }
// if(item.status == 3){
// list['status'] ='已通过、未结算'
// }
// if(item.status == 4){
// list['status'] ='已通过、已结算'
// }
if(item.not_collectible==null){
list['not_collectible'] ='待采集'
list['not_collectible_remarks'] ='/'
......@@ -169,9 +174,6 @@
list['not_collectible_remarks'] ='/'
}
});
// state.columns.push( { label: '状态', prop:'status',width:350 })
// state.columns.push( { label: '是否可采集', prop:'not_collectible',width:200 })
// state.columns.push( { label: '不可采集原因', prop:'not_collectible_remarks',width:350 ,fixed:"right"})
state.loading = false
}).catch(() => {
......@@ -267,6 +269,13 @@
// return [value];
// }
// }
/**
* 返回上一级页面
*/
const backToPreviousPage = () => {
// this.$router.push('/target')
router.go(-1);
}
// 暴露变量
defineExpose({
......
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