Merge remote-tracking branch 'origin/develop' into develop

src/components/navMenu/index.vue

@@ -706,7 +706,7 @@ export default {
   }
   .el-menu-item {
     padding-left: 29px !important;
-    font-size: 15px;
+    font-size: 14px;
     font-weight: normal;
     height: 40px;
     line-height: 40px;

src/pages/home2/index.vue

@@ -186,7 +186,7 @@ export default {
     padding: 0;
   }
   .footer {
-    height: 90px;
+    height: 70px;
     line-height: 33px;
     //margin-top: 0.3vh;
     //line-height: 5.2vh;

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -1629,19 +1629,6 @@ export default {
         }
       })
     },
-    getTaskId () {
-      queryTaskFirst({
-        bpnId: this.$route.query.bpnId
-      }).then(res => {
-        let mes = JSON.parse(res.mes)
-        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-        this.roleForm = mes.roleForm
-        this.commentText = mes.commentText
-        this.taskIds=mes.taskIds
-        //表单文件处理
-        this.getFormFieldList(mes.form)
-      })
-    },
     choiceZRR1 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag1 = true
@@ -2215,7 +2202,12 @@ export default {
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.commentText = processForm.commentText
-            this.getFormFieldList(processForm)
+            if (processForm.form === undefined) {
+              this.getFormFieldList(processForm)
+            } else {
+              //表单文件处理
+              this.getFormFieldList(processForm.form)
+            }
           }
         }).catch(e => {
           console.log("错误")
@@ -2238,7 +2230,6 @@ export default {
         this.form.prcName = this.prcName
         this.form['id'] = item.id
 
-        console.log("this.form",this.form);
 
         // 遍历对象
         for(const p in this.form) {
@@ -2328,22 +2319,22 @@ export default {
       this.form.country=this.countryArr;
       this.saveLoading = true
       let _formData = new FormData()
-      // _formData.append('id', this.bpnId)
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
-      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('id', this.bpnId)
+      // _formData.append('createUser', this.$store.getters.userInfo.userId)
+      // _formData.append('createUserName', this.$store.getters.userInfo.uName)
       _formData.append('prcType', '1')
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText,
-        taskInfo: '申请人修订',
-        taskIds:this.taskIds
+        // taskInfo: '申请人修订',
+        // taskIds:this.taskIds
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
-        // this.bpnId = res.result
+        this.bpnId = res.result
       }).catch(e => {
         this.saveLoading = false
       })
@@ -2442,7 +2433,6 @@ export default {
     this.getData()
   },
   mounted () {
-    this.getTaskId()
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this

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