Skip to content

A
agcs2.0-web
Commit d8c62966 authored by miaojiale's avatar miaojiale
Browse files
Options

①联调驳回建议接口 

②增加筛查查询修改查看的功能图入口
parent 695590b1
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 154 deletions
src/components/TabComponents/index.vue
View file @ d8c62966
...@@ -100,7 +100,9 @@ ...@@ -100,7 +100,9 @@
" "
> >
<template v-for="(op, opIndex) in col2.operations"> <template v-for="(op, opIndex) in col2.operations">
<template v-if="!op.isHidden || !op.isHidden(scope.row)"> <template
v-if="!op.isHidden || !op.isHidden(scope.row)"
>
<el-button <el-button
:key="opIndex" :key="opIndex"
:disabled=" :disabled="
...@@ -167,9 +169,7 @@ ...@@ -167,9 +169,7 @@
" "
/> />
<span v-else class="tableSpan"> <span v-else class="tableSpan">
{{ {{ scope.row[col2.value] }}
scope.row[col2.value]
}}
</span> </span>
</template> </template>
<template v-else> <template v-else>
...@@ -203,9 +203,7 @@ ...@@ -203,9 +203,7 @@
" "
/> />
<span v-else class="tableSpan"> <span v-else class="tableSpan">
{{ {{ scope.row[col2.value] }}
scope.row[col2.value]
}}
</span> </span>
</template> </template>
</template> </template>
...@@ -292,11 +290,8 @@ ...@@ -292,11 +290,8 @@
trigger="click" trigger="click"
> >
<el-button type="primary" :size="size"> <el-button type="primary" :size="size">
{{ op.title || "更多操作" {{ op.title || "更多操作" }}
}} <i class="el-icon-arrow-down el-icon--right"></i>
<i
class="el-icon-arrow-down el-icon--right"
></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item <el-dropdown-item
...@@ -347,6 +342,13 @@ ...@@ -347,6 +342,13 @@
:inactive-value="op.inactiveValue" :inactive-value="op.inactiveValue"
></el-switch> ></el-switch>
</div> </div>
<template v-else>
<template
v-if="
op.formatter &&
op.formatter(scope.row).type == 'none'
"
></template>
<el-button <el-button
v-else v-else
:key="opIndex" :key="opIndex"
...@@ -376,13 +378,16 @@ ...@@ -376,13 +378,16 @@
</template> </template>
</template> </template>
</template> </template>
</template>
<template v-if="column.operType === 'svg'"> <template v-if="column.operType === 'svg'">
<template <template
v-for="(operate, operIndex) in column.operations.formatter v-for="(operate, operIndex) in column.operations.formatter
? column.operations.formatter(scope.row) ? column.operations.formatter(scope.row)
: column.operations" : column.operations"
> >
<template v-if="!operate.isHidden || !operate.isHidden(scope.row)"> <template
v-if="!operate.isHidden || !operate.isHidden(scope.row)"
>
<el-tooltip <el-tooltip
v-if="operate.tips" v-if="operate.tips"
:key="operIndex + Date.parse(new Date())" :key="operIndex + Date.parse(new Date())"
...@@ -455,9 +460,7 @@ ...@@ -455,9 +460,7 @@
" "
/> />
<span v-else class="tableSpan"> <span v-else class="tableSpan">
{{ {{ scope.row[column.value] }}
scope.row[column.value]
}}
</span> </span>
</template> </template>
<template v-else> <template v-else>
...@@ -491,9 +494,7 @@ ...@@ -491,9 +494,7 @@
" "
/> />
<span v-else class="tableSpan"> <span v-else class="tableSpan">
{{ {{ scope.row[column.value] }}
scope.row[column.value]
}}
</span> </span>
</template> </template>
</template> </template>
...@@ -512,9 +513,7 @@ ...@@ -512,9 +513,7 @@
:size="column.size" :size="column.size"
></el-date-picker> ></el-date-picker>
<span v-else class="tableSpan"> <span v-else class="tableSpan">
{{ {{ scope.row[column.value] }}
scope.row[column.value]
}}
</span> </span>
</template> </template>
...@@ -565,7 +564,9 @@ ...@@ -565,7 +564,9 @@
</template> </template>
<template v-if="column.operType === 'checkbox'"> <template v-if="column.operType === 'checkbox'">
<el-checkbox v-model="scope.row[column.value]"></el-checkbox> <el-checkbox
v-model="scope.row[column.value]"
></el-checkbox>
</template> </template>
<!-- 模糊查询输入 --> <!-- 模糊查询输入 -->
...@@ -629,7 +630,8 @@ ...@@ -629,7 +630,8 @@
style="float: left" style="float: left"
type="primary" type="primary"
@click="column.func(scope.$index)" @click="column.func(scope.$index)"
>上传</el-button> >上传</el-button
>
<span <span
v-if="scope.row.imgUrl" v-if="scope.row.imgUrl"
style=" style="
...@@ -640,13 +642,15 @@ ...@@ -640,13 +642,15 @@
color: #409eff; color: #409eff;
" "
@click="column.enlargeFunc(scope.row.imgUrl)" @click="column.enlargeFunc(scope.row.imgUrl)"
>{{ scope.row.imgUrl }}</span> >{{ scope.row.imgUrl }}</span
>
<el-button <el-button
v-if="scope.row.imgUrl" v-if="scope.row.imgUrl"
style="float: left; margin-left: 5px" style="float: left; margin-left: 5px"
type="primary" type="primary"
@click="column.delFunc(scope.row, scope.$index)" @click="column.delFunc(scope.row, scope.$index)"
>删除</el-button> >删除</el-button
>
</template> </template>
<!-- 图片 --> <!-- 图片 -->
<template v-if="column.operType === 'img'"> <template v-if="column.operType === 'img'">
...@@ -664,16 +668,27 @@ ...@@ -664,16 +668,27 @@
<!-- 消息 --> <!-- 消息 -->
<template v-if="column.operType === 'txt'"> <template v-if="column.operType === 'txt'">
<div :style="column.style1">{{ scope.row[column.value1] }}</div> <div :style="column.style1">
<div :style="column.style2">{{ scope.row[column.value2] }}</div> {{ scope.row[column.value1] }}
</div>
<div :style="column.style2">
{{ scope.row[column.value2] }}
</div>
</template> </template>
<!-- html --> <!-- html -->
<template v-if="column.type === 'html'"> <template v-if="column.type === 'html'">
<div class="highlight" v-html="scope.row[column.value]"></div> <div
class="highlight"
v-html="scope.row[column.value]"
></div>
</template> </template>
<!-- 展开列表 --> <!-- 展开列表 -->
<template v-if="column.tabType === 'expand'"> <template v-if="column.tabType === 'expand'">
<el-form label-position="right" class="demo-table-expand" label-width="130px"> <el-form
label-position="right"
class="demo-table-expand"
label-width="130px"
>
<template v-for="(expand, index) in column.expandColumns"> <template v-for="(expand, index) in column.expandColumns">
<el-form-item <el-form-item
v-if="!expand.hidden" v-if="!expand.hidden"
......
src/views/Home/index.vue
View file @ d8c62966
...@@ -205,48 +205,7 @@ export default { ...@@ -205,48 +205,7 @@ export default {
title: "浙江省典型案例", title: "浙江省典型案例",
}, },
], ],
exampleList: [ exampleList: [],
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
],
tabList: [ tabList: [
{ {
title: "新闻会议", title: "新闻会议",
...@@ -258,48 +217,7 @@ export default { ...@@ -258,48 +217,7 @@ export default {
title: "学术动态", title: "学术动态",
}, },
], ],
noticeList: [ noticeList: [],
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
{
title: "典型案例小标题典型案例小标题",
date: "2022-09-26",
},
],
curTab: "1", curTab: "1",
listLoading: false, listLoading: false,
rangeList: [], // 上报排名 rangeList: [], // 上报排名
......
src/views/audit-detail/index.vue
View file @ d8c62966
...@@ -373,7 +373,8 @@ export default { ...@@ -373,7 +373,8 @@ export default {
if (this.curBtn != 1) { if (this.curBtn != 1) {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
this.putScreeningCheck("4", () => { let status = this.curBtn == 2 ? "4" : this.curBtn == 3 ? "2" : ""
this.putScreeningCheck(status, () => {
this.$message.success("提交审核成功") this.$message.success("提交审核成功")
this.nextExample() this.nextExample()
}) })
......
src/views/audit-qualitycontrol/index.vue
View file @ d8c62966
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
text = "合格" text = "合格"
} else if (row.checkStatus == 4) { } else if (row.checkStatus == 4) {
text = "不合格" text = "不合格"
} else if (row.checkStatus == 5) { } else if (row.checkStatus == 2) {
text = "驳回修改" text = "驳回修改"
} else if (row.checkStatus) { } else if (row.checkStatus) {
text = "--" text = "--"
......
src/views/screening/index.vue
View file @ d8c62966
...@@ -216,10 +216,20 @@ export default { ...@@ -216,10 +216,20 @@ export default {
{ {
func: this.handleView, func: this.handleView,
formatter(row) { formatter(row) {
if (row.checkStatus != 2) {
return { return {
label: "查看", label: "查看",
type: "text", type: "text",
} }
} else {
return {
label: "",
type: "none",
style: {
display: "none",
},
}
}
}, },
}, },
{ {
...@@ -233,7 +243,7 @@ export default { ...@@ -233,7 +243,7 @@ export default {
} else { } else {
return { return {
label: "", label: "",
type: "text", type: "none",
style: { style: {
display: "none", display: "none",
}, },
......
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