Skip to content

D
data-collect
Commit 23171721 by cwy
Options

0402

parent 5d00424c
Showing with 106 additions and 16 deletions
src/router/route.js
......@@ -42,7 +42,7 @@ export const notFoundAndNoPower = [
{
path: '/:path(.*)*',
name: 'notFound',
component: () => import('/@/views/error/404.vue'),
component: () => import('/@/views/claimTasks/user/list/index.vue'),
meta: {
title: '页面找不到',
isHide: true,
......
src/utils/request.js
......@@ -44,11 +44,11 @@ service.interceptors.response.use(
if (res.code && res.code !== 200) {
if (res.code === 401) {
Session.clear(); // 清除浏览器全部临时缓存
window.location.href = '/login'; // 去登录页
window.location.href = '/data-collect/#/login'; // 去登录页
ElMessageBox.alert('你已被登出，请重新登录', '提示', {})
}else if (res.code ===99){
Session.clear(); // 清除浏览器全部临时缓存
window.location.href = '/login'; // 去登录页
window.location.href = '/data-collect/#/login'; // 去登录页
ElMessageBox.alert('登陆失效', '提示', {})
}else if (res.code === 101){
ElMessageBox.alert('账户不存在', '提示', {})
......
src/views/claimTasks/user/approved/details.vue
......@@ -9,6 +9,9 @@
<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>
</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>
</el-form-item>
......@@ -173,6 +176,7 @@ const openDialog = (data) => {
state.formItem.addItem.name = addItem.name;
state.formItem.addItem.task_name = addItem.task_name;
state.formItem.addItem.refer = addItem.refer;
state.formItem.addItem.price = addItem.price;
state.formItem.addItem.guide = addItem.guide;
state.not_collectible_remarks = data.not_collectible_remarks
state.not_collectible = data.not_collectible
......@@ -208,6 +212,30 @@ const openDialog = (data) => {
// 关闭弹窗
const closeDialog = () => {
state.index=0
state.userIndex=0
state.formItem.addItem.task_id = '';
state.formItem.addItem.norm_id = '';
state.formItem.addItem.norm_list_id = '';
state.formItem.addItem.name = '';
state.formItem.addItem.task_name = '';
state.formItem.addItem.refer = '';
state.formItem.addItem.refer_type = '';
state.formItem.addItem.remark = '';
state.formItem.addItem.guide = '';
state.formItem.dynamicItem = [];
state.formItem.userFilled = [];
state.formItem.editorImgList = [];
state.formItem.editorContent = '';
state.not_collectible_remarks = ''
state.not_collectible = ''
if(state.formItem.addItem.refer_type){
state.formItem.addItem.refer_type ='';
}
if(state.formItem.addItem.remark)
{
state.formItem.addItem.remark = '';
}
dialogFormRef.value.resetFields();
state.dialog.isShowDialog = false;
};
......
src/views/claimTasks/user/completed/details.vue
......@@ -9,6 +9,9 @@
<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>
</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>
</el-form-item>
......@@ -174,6 +177,7 @@ const openDialog = (data) => {
state.formItem.addItem.task_name = addItem.task_name;
state.formItem.addItem.refer = addItem.refer;
state.formItem.addItem.guide = addItem.guide;
state.formItem.addItem.price= addItem.price;
state.not_collectible_remarks = data.not_collectible_remarks
state.not_collectible = data.not_collectible
//富文本内容相关
......@@ -208,6 +212,30 @@ const openDialog = (data) => {
// 关闭弹窗
const closeDialog = () => {
state.index=0
state.userIndex=0
state.formItem.addItem.task_id = '';
state.formItem.addItem.norm_id = '';
state.formItem.addItem.norm_list_id = '';
state.formItem.addItem.name = '';
state.formItem.addItem.task_name = '';
state.formItem.addItem.refer = '';
state.formItem.addItem.refer_type = '';
state.formItem.addItem.remark = '';
state.formItem.addItem.guide = '';
state.formItem.dynamicItem = [];
state.formItem.userFilled = [];
state.formItem.editorImgList = [];
state.formItem.editorContent = '';
state.not_collectible_remarks = ''
state.not_collectible = ''
if(state.formItem.addItem.refer_type){
state.formItem.addItem.refer_type ='';
}
if(state.formItem.addItem.remark)
{
state.formItem.addItem.remark = '';
}
dialogFormRef.value.resetFields();
state.dialog.isShowDialog = false;
};
......
src/views/claimTasks/user/completed/modify.vue
......@@ -9,6 +9,9 @@
<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>
</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>
</el-form-item>
......@@ -182,6 +185,7 @@ const openDialog = (data) => {
state.formItem.addItem.task_name = addItem.task_name;
state.formItem.addItem.refer = addItem.refer;
state.formItem.addItem.guide = addItem.guide;
state.formItem.addItem.price= addItem.price;
state.not_collectible_remarks = data.not_collectible_remarks
state.not_collectible = data.not_collectible
//富文本内容相关
......@@ -202,7 +206,7 @@ const openDialog = (data) => {
state.index = 0;
console.log(state.formItem.addItem)
userFilled.forEach(item => {
state.formItem.userFilled.push({id:item.id,name:item.extend_name,radio:item.required+"",value:item.extend_value});
state.formItem.userFilled.push({id:item.id,name:item.extend_name,radio:item.required+"",value:item.extend_value,remark:item.extend_remarks,});
state.userIndex++
});
adminFilled.forEach(item => {
......
src/views/claimTasks/user/incomplete/details.vue
......@@ -9,6 +9,9 @@
<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>
</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>
</el-form-item>
......@@ -140,6 +143,7 @@ const state = reactive({
],
editorImgList:[], // 富文本里的内容
editorContent:'', // 富文本所有内容
},
});
// 编辑器实例，必须用 shallowRef
......@@ -347,6 +351,7 @@ const originalData= (res) => {
state.formItem.addItem.guide = addItem.guide;
state.formItem.addItem.task_name = addItem.task_name;
state.formItem.addItem.refer = addItem.refer;
state.formItem.addItem.price = addItem.price;
state.formItem.addItem.refer_type = addItem.refer_type+''
state.formItem.addItem.remark = addItem.remark
state.userIndex = 0;
......@@ -378,6 +383,7 @@ const newData= (data) => {
state.formItem.addItem.guide = addItem.guide;
state.formItem.addItem.task_name = addItem.task_name;
state.formItem.addItem.refer = addItem.refer;
state.formItem.addItem.price = addItem.price;
state.formItem.addItem.refer_type = ''
state.formItem.addItem.remark = ''
state.userIndex = 0;
......
src/views/claimTasks/user/incomplete/index.vue
......@@ -47,6 +47,7 @@
<el-tag type='info' v-if="scope.row.status==4" effect="plain" size="small">已结算</el-tag>
</template>
</el-table-column>
<el-table-column prop="created_at" width="180" label="发布时间" show-overflow-tooltip align="center"></el-table-column>
<el-table-column label="操作" width="250" fixed="right" align="center">
<template #default="scope">
<el-button size="small" @click="details(scope.row)" type="primary">填写任务</el-button>
......
src/views/claimTasks/user/list/index.vue
......@@ -33,6 +33,8 @@
</el-table-column>
<el-table-column prop="name" label="指标名称" 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">
<template #default="scope">
<span style="color: #909399;" v-if="scope.row.sort=='1'">低</span>
......@@ -42,12 +44,19 @@
</el-table-column>
<el-table-column prop="level" label="难度等级" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="refer" label="信源" show-overflow-tooltip align="center">
<el-table-column prop="refer" label="参考信源" show-overflow-tooltip align="center">
<template #default="scope">
<el-link type="danger" v-if="checkUrl(scope.row.refer)" :href="scope.row.refer" target ="_blank">点击查看</el-link>
<span v-else>{{scope.row.refer}}</span>
</template>
</el-table-column>
<el-table-column prop="guide" label="参考指南" show-overflow-tooltip align="center">
<template #default="scope">
<el-link type="danger" v-if="checkUrl(scope.row.guide)" :href="scope.row.guide" target ="_blank">点击查看</el-link>
<span v-else>{{scope.row.guide}}</span>
</template>
</el-table-column>
<el-table-column prop="created_at" width="180" label="发布时间" show-overflow-tooltip align="center"></el-table-column>
<el-table-column label="操作" width="180" fixed="right" align="center">
<template #default="scope">
<el-button size="small" @click="receive(scope.row)" type="primary">领取</el-button>
......
src/views/norm/list/details.vue
......@@ -4,7 +4,7 @@
<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="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
<el-input type="textarea" v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="难度等级">
<el-select v-model="state.formItem.addItem.level" :disabled="true" placeholder="请选择难度等级">
......@@ -21,13 +21,13 @@
</el-select>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
<el-input v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable :disabled="true"></el-input>
<el-input type="textarea" v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="price" prop="price">
<el-input v-model="state.formItem.addItem.price" placeholder="请输入单价" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="参考指南" prop="guide">
<el-input v-model="state.formItem.addItem.guide" placeholder="请输入参考指南" clearable :disabled="true"></el-input>
<el-input type="textarea" v-model="state.formItem.addItem.guide" placeholder="请输入参考指南" clearable :disabled="true"></el-input>
</el-form-item>
<el-form-item label="名称" :prop="'dynamicItem.' + index+ '.name'" v-for="(item, index) in state.formItem.dynamicItem" :key="index">
<el-input v-model="item.name" placeholder="请输入标题" clearable style="width: 40%;" :disabled="true"></el-input>
......@@ -163,7 +163,7 @@ const openDialog = (norm_id) => {
// 数据详情
state.formItem.addItem.name = addItem.name;
state.formItem.addItem.level = addItem.level;
state.formItem.addItem.sort = addItem.sort;
state.formItem.addItem.sort = addItem.sort+'';
state.formItem.addItem.refer = addItem.refer;
state.formItem.addItem.price =addItem.price;
state.formItem.addItem.task_id= addItem.task_id
......@@ -274,5 +274,19 @@ onMounted(() => {
color: var(--el-radio-text-color) !important;
-webkit-text-fill-color: var(--el-radio-text-color) !important;
}
.el-textarea.is-disabled{
background:#fff !important;
color: var(--el-radio-text-color) !important;
-webkit-text-fill-color: var(--el-radio-text-color) !important;
}
:deep(.el-textarea .el-textarea__inner){
background:#fff !important;
color: var(--el-radio-text-color) !important;
-webkit-text-fill-color: var(--el-radio-text-color) !important;
}
:deep(.el-textarea .el-textarea__wrapper){
background:#fff !important;
color: var(--el-radio-text-color) !important;
-webkit-text-fill-color: var(--el-radio-text-color) !important;
}
</style>
src/views/norm/list/dialog.vue
......@@ -24,7 +24,7 @@
<el-input type="textarea" v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable></el-input>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="state.formItem.addItem.price" placeholder="请输入单价" clearable prop="price"></el-input>
<el-input-number v-model="state.formItem.addItem.price" :precision="2" :step="0.1" :max="10" placeholder="请输入单价"></el-input-number>
</el-form-item>
<el-form-item label="参考指南" prop="guide">
<el-input type="textarea" v-model="state.formItem.addItem.guide" placeholder="请输入参考指南" clearable></el-input>
......
src/views/norm/list/edit.vue
......@@ -4,7 +4,7 @@
<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="name">
<el-input v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable></el-input>
<el-input type="textarea" v-model="state.formItem.addItem.name" placeholder="请输入指标名称" clearable></el-input>
</el-form-item>
<el-form-item label="难度等级">
<el-select v-model="state.formItem.addItem.level" placeholder="请选择难度等级">
......@@ -21,13 +21,13 @@
</el-select>
</el-form-item>
<el-form-item label="参考信源" prop="refer">
<el-input v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable></el-input>
<el-input type="textarea" v-model="state.formItem.addItem.refer" placeholder="请输入参考信源" clearable></el-input>
</el-form-item>
<el-form-item label="price" prop="price">
<el-input v-model="state.formItem.addItem.price" placeholder="请输入单价" clearable></el-input>
<el-input-number v-model="state.formItem.addItem.price" :precision="2" :step="0.1" :max="10" placeholder="请输入单价"></el-input-number>
</el-form-item>
<el-form-item label="参考指南" prop="guide">
<el-input v-model="state.formItem.addItem.guide" placeholder="请输入参考指南" clearable></el-input>
<el-input type="textarea" v-model="state.formItem.addItem.guide" placeholder="请输入参考指南" clearable></el-input>
</el-form-item>
<el-form-item label="名称" :prop="'dynamicItem.' + index+ '.name'" v-for="(item, index) in state.formItem.dynamicItem" :key="index">
<el-input v-model="item.name" placeholder="请输入标题" clearable style="width: 40%;"></el-input>
......@@ -160,7 +160,7 @@ const openDialog = (norm_id) => {
// 数据详情
state.formItem.addItem.name = addItem.name;
state.formItem.addItem.level = addItem.level;
state.formItem.addItem.sort = addItem.sort;
state.formItem.addItem.sort = addItem.sort+'';
state.formItem.addItem.refer = addItem.refer;
state.formItem.addItem.price =addItem.price;
state.formItem.addItem.task_id= addItem.task_id
......
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