Skip to content

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

①联调驳回建议接口 

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