Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -65,22 +65,22 @@
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column :label="this.$t('m.textState')" width="150" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
scope.row.fileType === "STAND_FILE"
|
||||
? "标准文本"
|
||||
: scope.row.fileType === "DRAFT_FILE"
|
||||
? "草案"
|
||||
: scope.row.fileType === "OPINION_FILE"
|
||||
? "征求意见稿"
|
||||
: scope.row.fileType === "SENT_SCREEN_FILE"
|
||||
? "送审稿"
|
||||
: scope.row.fileType === "APPROVAL_FILE"
|
||||
? "报批稿"
|
||||
: "关联文件"
|
||||
}}
|
||||
</template>
|
||||
<el-table-column :label="this.$t('m.textState')" width="150" align="center" prop="fileType">
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- {{-->
|
||||
<!-- scope.row.fileType === "STAND_FILE"-->
|
||||
<!-- ? "标准文本"-->
|
||||
<!-- : scope.row.fileType === "DRAFT_FILE"-->
|
||||
<!-- ? "草案"-->
|
||||
<!-- : scope.row.fileType === "OPINION_FILE"-->
|
||||
<!-- ? "征求意见稿"-->
|
||||
<!-- : scope.row.fileType === "SENT_SCREEN_FILE"-->
|
||||
<!-- ? "送审稿"-->
|
||||
<!-- : scope.row.fileType === "APPROVAL_FILE"-->
|
||||
<!-- ? "报批稿"-->
|
||||
<!-- : "关联文件"-->
|
||||
<!-- }}-->
|
||||
<!-- </template>-->
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="resultContent"
|
||||
@@ -203,9 +203,9 @@
|
||||
<el-select class="bead-input" v-model="uploadFilesdfEo.fileType">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
:key="item.id"
|
||||
:label="item.attrName"
|
||||
:value="item.attrName"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
@@ -713,6 +713,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import axios from 'axios'
|
||||
export default {
|
||||
name: "StandardRecognition",
|
||||
components: {},
|
||||
@@ -784,30 +785,30 @@ export default {
|
||||
]
|
||||
},
|
||||
options: [
|
||||
{
|
||||
value: "STAND_FILE",
|
||||
label: "标准文本",
|
||||
},
|
||||
{
|
||||
value: "DRAFT_FILE",
|
||||
label: "草案",
|
||||
},
|
||||
{
|
||||
value: "OPINION_FILE",
|
||||
label: "征求意见稿",
|
||||
},
|
||||
{
|
||||
value: "SENT_SCREEN_FILE",
|
||||
label: "送审稿",
|
||||
},
|
||||
{
|
||||
value: "APPROVAL_FILE",
|
||||
label: "报批稿",
|
||||
},
|
||||
{
|
||||
value: "RELEVANCE_FILE",
|
||||
label: "关联文件",
|
||||
},
|
||||
// {
|
||||
// value: "STAND_FILE",
|
||||
// label: "标准文本",
|
||||
// },
|
||||
// {
|
||||
// value: "DRAFT_FILE",
|
||||
// label: "草案",
|
||||
// },
|
||||
// {
|
||||
// value: "OPINION_FILE",
|
||||
// label: "征求意见稿",
|
||||
// },
|
||||
// {
|
||||
// value: "SENT_SCREEN_FILE",
|
||||
// label: "送审稿",
|
||||
// },
|
||||
// {
|
||||
// value: "APPROVAL_FILE",
|
||||
// label: "报批稿",
|
||||
// },
|
||||
// {
|
||||
// value: "RELEVANCE_FILE",
|
||||
// label: "关联文件",
|
||||
// },
|
||||
],
|
||||
/* standRecoColumn: [
|
||||
{
|
||||
@@ -1340,8 +1341,8 @@ export default {
|
||||
).standName;
|
||||
// this.uploadFilesdfEo.fileType = JSON.parse(JSON.stringify(row)).fileType
|
||||
this.options.map((item) => {
|
||||
if (item.value === JSON.parse(JSON.stringify(row)).fileType) {
|
||||
this.uploadFilesdfEo.fileType = item.label;
|
||||
if (item.attrName === JSON.parse(JSON.stringify(row)).fileType) {
|
||||
this.uploadFilesdfEo.fileType = item.attrName;
|
||||
}
|
||||
});
|
||||
this.uploadFilesdfEo.id = JSON.parse(JSON.stringify(row)).id;
|
||||
@@ -1528,6 +1529,12 @@ export default {
|
||||
computed: {},
|
||||
created() {},
|
||||
mounted() {
|
||||
this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.options = res.data
|
||||
console.log(this.options);
|
||||
})
|
||||
this.getTableData();
|
||||
},
|
||||
destroyed() {},
|
||||
|
||||
Reference in New Issue
Block a user