提交审批按钮

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -5,7 +5,11 @@
            class="clearfix">
         <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
-          <el-button style="float: right; padding: 3px 0px"
+          <el-button type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()"
+                     v-if="canadd && IsCompanyUser == 0">
+          提交审批
+        </el-button>
+          <el-button style="float: right; padding: 3px 0px;"
                      type="text"
                      @click="deletedata()"
                      v-if="candelete">删除</el-button>
@@ -218,15 +222,16 @@
         default: ''
       }
     },
-    created () {
-      // this.initData2019()
-    },
-    /*
     computed: {
       ...mapGetters({
-        session: 'session'
+        session: 'session',
+        authUser: 'authUser'
       })
-    }, */
+    },
+    created () {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
+      // this.initData2019()
+    },
     watch: {
       filterText (val) {
         this.$refs.orgmanagetree.filter(val)
@@ -234,6 +239,7 @@
     },
     data () {
       return {
+        IsCompanyUser: '',
         loading: false,
         tableloading:false,
         keyword: '',
@@ -422,6 +428,9 @@
         } else {
         }
       },
+      commitAudit () {
+        this.$emit('commitAudit')
+      },
       handleSelectionChange (val) {
         this.Ids = []
         for (var i = 0; i < val.length; i++) {

src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist2.vue

@@ -3,10 +3,10 @@
     <el-card class="box-card" style="margin-top: 10px;">
       <div slot="header" class="clearfix">
         <span style="font-weight: bold"> 企业资质</span>
-        <el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"
+        <!--<el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"
                    v-if="canadd && IsCompanyUser == 0">
           提交审批
-        </el-button>
+        </el-button>-->
         <el-button style="float: right; padding: 6px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
       </div>
       <el-table :data="subfileList" border size="mini">
@@ -34,12 +34,12 @@
             </div> -->
             <viewer :images="scope.row.FileUrlList">
                     <div  v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    
+
                       <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                        v-if="scope.row.FileUrl==''?false:imgFormat(scope.row.FileUrl, index)" 
+                        v-if="scope.row.FileUrl==''?false:imgFormat(scope.row.FileUrl, index)"
                       >
                       {{scope.row.FileName.split('$')[index]}}</el-link>
-                      <img 
+                      <img
                         v-if="scope.row.FileUrl==''?false:!imgFormat(scope.row.FileUrl, index)"
                         class="photoStyle" alt=""
                         :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
@@ -92,7 +92,7 @@
                 <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType ==yasuoname">请上传压缩文件
                 </div>
               </el-upload>  -->
-              <el-upload 
+              <el-upload
                 :multiple="false" style="margin-top: 10px;" class="attach-uploader"
                 action=""
                 :before-upload="beforeAvatarUpload"
@@ -102,7 +102,7 @@
                 :file-list="fileList"
                 :on-remove="filremove"
                 :http-request="uploadrequest"
-                limit = "5"
+                :limit="5"
                 :on-exceed="uploadExceed">
                 <i class="el-icon-plus"></i>
                 <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType !=yasuoname">请上传图片（大小为512KB-5MB），最多可上传五张图片

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -320,6 +320,7 @@
                       :Grade="formData.Grade"
                       height="360px"
                       @tab-click="tabclick()"
+                      @commitAudit="commitAudit"
                       style="margin-top: 20px"></goods-list2>
         </el-tab-pane>
 
@@ -936,6 +937,9 @@ export default {
         })
     },
     orgunitChange (val) {
+      if (!val) {
+        return false
+      }
       let deptid = val
       let auditstepcode = 'SUB_OFFICE_WZ'
       api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
@@ -1403,7 +1407,7 @@ export default {
       api.getDictListByStatus(params, this.$axios).then(res => {
         this.dictData = res.data.items
         this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
-        
+
 
         var selectID = res.data.items['Register'].CheckUnitId;
         var item     = res.data.items['UnitOrgList'].find(n=>n.Id == selectID)
@@ -1700,6 +1704,9 @@ export default {
         this.dialogVisibleCom = true
       }
     },
+    commitAudit () {
+      this.$refs['subfileList'].nextStep()
+    },
     // chooseAuditorShow () {
     //   this.$refs['chooseAuditor'].getorgtreelist(
     //     this.formData.SupplierTypeCode