diff --git a/src/components/TabComponents/index.vue b/src/components/TabComponents/index.vue index 6b296a85e4ea2d6b93cff61d9f60d5fec9eb6dda..8d57849550792d994e020ea2fd33dda0f830bb25 100644 --- a/src/components/TabComponents/index.vue +++ b/src/components/TabComponents/index.vue @@ -100,7 +100,9 @@ " > - + {{ - 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] }} @@ -167,9 +169,7 @@ " /> - {{ - scope.row[col2.value] - }} + {{ scope.row[col2.value] }} @@ -203,9 +203,7 @@ " /> - {{ - scope.row[col2.value] - }} + {{ scope.row[col2.value] }} @@ -292,11 +290,8 @@ trigger="click" > - {{ op.title || "更多操作" - }} - + {{ op.title || "更多操作" }} + {{ - child.formatter - ? child.formatter(scope.row).label - : child.label + child.formatter + ? child.formatter(scope.row).label + : child.label }} @@ -347,32 +342,40 @@ :inactive-value="op.inactiveValue" > - - {{ - op.formatter - ? op.formatter(scope.row).label - : op.label - ? op.label - : scope.row[column.value] - }} - + + + + {{ + op.formatter + ? op.formatter(scope.row).label + : op.label + ? op.label + : scope.row[column.value] + }} + + @@ -382,7 +385,9 @@ ? column.operations.formatter(scope.row) : column.operations" > - + - {{ - scope.row[column.value] - }} + {{ scope.row[column.value] }} @@ -491,9 +494,7 @@ " /> - {{ - scope.row[column.value] - }} + {{ scope.row[column.value] }} @@ -512,9 +513,7 @@ :size="column.size" > - {{ - scope.row[column.value] - }} + {{ scope.row[column.value] }} @@ -565,7 +564,9 @@ - + @@ -629,7 +630,8 @@ style="float: left" type="primary" @click="column.func(scope.$index)" - >上传 + >上传 {{ scope.row.imgUrl }} + >{{ scope.row.imgUrl }} 删除 + >删除 @@ -664,16 +668,27 @@ - {{ scope.row[column.value1] }} - {{ scope.row[column.value2] }} + + {{ scope.row[column.value1] }} + + + {{ scope.row[column.value2] }} + - + - + { if (valid) { - this.putScreeningCheck("4", () => { + let status = this.curBtn == 2 ? "4" : this.curBtn == 3 ? "2" : "" + this.putScreeningCheck(status, () => { this.$message.success("提交审核成功") this.nextExample() }) diff --git a/src/views/audit-qualitycontrol/index.vue b/src/views/audit-qualitycontrol/index.vue index 57e8f331274dc0dd75ef8e7884cf14cceb714079..1441fbddd65ea08ca26e78183d22052068b29fd1 100644 --- a/src/views/audit-qualitycontrol/index.vue +++ b/src/views/audit-qualitycontrol/index.vue @@ -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 = "--" diff --git a/src/views/screening/index.vue b/src/views/screening/index.vue index 58440ba862ad9a44cdf827616993720b53d7efa1..80e19f19659ab82ea572374e3aabc0e95ae1bcd2 100644 --- a/src/views/screening/index.vue +++ b/src/views/screening/index.vue @@ -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", },