commit

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1766,6 +1766,7 @@
                 :visible.sync="OCRModel"
                 size="900px"
                 custom-class="demo-drawer"
+                :before-close="OCRclose"
         >
             <div class="OCRstandardForComments">
                 <div class="content" style="height: calc(100% - 57px);">
@@ -1790,6 +1791,14 @@
                                         label="文件名"
                                         align="center">
                                 </el-table-column>
+                                <el-table-column
+                                        prop="standFileClassify"
+                                        label="文本状态"
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <div>{{setWBType(scope.row.standFileClassify)}}</div>
+                                    </template>
+                                </el-table-column>
                             </el-table>
                         </div>
                     </div>
@@ -2553,10 +2562,20 @@
             }
         },
         methods: {
+            setWBType (type) {
+                let text = ''
+                for (let a = 0; a < this.OCRoptions.length; a++) {
+                    if (this.OCRoptions[a].attrField === type) {
+                        text = this.OCRoptions[a].attrName
+                    }
+                }
+                return text
+            },
             selectOCRChange (val) {
                 this.OCRDatas = val
             },
             OCRclose () {
+                this.OCRData = []
                 this.OCRModel = false
             },
             OCRsubmit () {
@@ -2622,21 +2641,20 @@
                     this.$message.warning('请选择一条数据进行' + text)
                 } else {
                     this.OCRModel = true
-                    this.OCRLoading = false
+                    this.OCRLoading = true
                     this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
                         type: type,
                         standId: this.selectedList[0]
                     },{
                         _this: this
                     }, res => {
+                        this.OCRLoading = false
                         if (res.ok) {
                             if (res.data.length > 0) {
                                 this.OCRData = res.data
-                                this.OCRLoading = false
                             } else {
                                 this.$message.warning('当前标准没有' + text + '文件')
                                 this.this.OCRData = []
-                                this.OCRLoading = false
                             }
                         }
                     })
@@ -5302,6 +5320,7 @@
                 _this: this
             }, res => {
                 this.OCRoptions = res.data
+                console.log(res.data);
             })
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this