Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -756,7 +756,7 @@
 
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
- <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
       <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
   </div>
@@ -773,9 +773,8 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue';
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-
- // v-viewer
-  import Vue from 'vue';
+  // v-viewer
+  import Vue from 'vue'
   import Viewer from 'v-viewer'
   import 'viewerjs/dist/viewer.css'
   Vue.use(Viewer)
@@ -1193,7 +1192,7 @@
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.formData.Status === '5') {
             this.textplaceholder = '请填写审批意见'
-          }else{
+          } else {
             this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
           }
         } else {
@@ -1248,8 +1247,8 @@
           SupCertId: this.formData.SupplierCertId,
           SupTypeCode: '01'
         }
-      //访问接口
-      api.getListAppend(params, this.$axios).then(res => {
+        // 访问接口
+        api.getListAppend(params, this.$axios).then(res => {
           this.entityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -1657,14 +1656,12 @@
       },
       auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
-        suppapi
-          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
-          .then(res => {
-            this.secauditerOptions = res.data.item
-          })
-          .catch(err => {
-            console.error(err)
-          })},
+        suppapi.getAuditerByFirst(this.auditer, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
 
       auditOrgChange () {
         let auditstepcode = ''
@@ -1802,21 +1799,21 @@
           console.error(err)
         })
       },
-       imgFormat(val,index){
-         console.log(val)
-        if(val !=null && val != undefined && val !=''){
+      imgFormat (val, index) {
+        console.log(val)
+        if (val != null && val != undefined && val !='') {
           let fileurlall = val.split('$')[index]
           let fileurl = fileurlall.split('|')
-          if(fileurl[1] != null && fileurl[1] !='' && fileurl[1] != undefined){
-            let Format  = fileurl[1].split(".")
-            if(Format[1]!=null && Format[1] !='' && Format[1] != undefined){
-               let pictureFormat = Format[1];
-              if("jpg"== pictureFormat || "bmp" ==pictureFormat || "png" ==pictureFormat || "gif" ==pictureFormat|| "jpeg" ==pictureFormat){
-                return false;
+          if (fileurl[1] != null && fileurl[1] != '' && fileurl[1] != undefined) {
+            let Format = fileurl[1].split('.')
+            if (Format[1] != null && Format[1] != '' && Format[1] != undefined) {
+              let pictureFormat = Format[1]
+              if (pictureFormat == 'jpg' || pictureFormat =='bmp' || pictureFormat =='png' || pictureFormat =='gif'|| pictureFormat =='jpeg') {
+                return false
               }
             }
           }
-          return true;
+          return true
         }
       },
       fileurlcut (val, index) {