2
3
shihang 6 роки тому
батько
коміт
20abedebc0

+ 0 - 2
src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -4,8 +4,6 @@
       <div slot="header" class="clearfix">
         <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
-          <!-- <el-button type="primary" size="mini" style="margin-right: 3px" @click="nextStep()" v-if="canadd">提交审批
-          </el-button> -->
           <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="canadd">添加
           </el-button>
         </span>

+ 18 - 0
src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist.vue

@@ -3,6 +3,8 @@
     <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="margin-right: 3px" @click="nextStep()" v-if="canadd">提交审批
+        </el-button>
       </div>
       <el-table :data="businessList" border bordertooltip-effect="dark" style="height: calc(100vh - 500px);">
         <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
@@ -324,6 +326,22 @@
           })
           .catch(() => {});
       },
+      nextStep() {
+        if (this.subfileList && this.subfileList.length > 0) {
+          for (var i = 0; i < this.subfileList.length; i++) {
+            if (this.subfileList[i].FileType === '1' && this.subfileList[i].FileUrl === '') {
+              this.$message({
+                type: 'warning',
+                message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+              })
+              return
+            }
+          }
+          this.$emit('close')
+        } else {
+          this.$emit('close')
+        }
+      },
       showDialog() {
         this.Title = '新增文件'
         this.SubfileForm.Id = ''

+ 5 - 8
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -12,7 +12,8 @@
         </span>
         <span style="float: right;">
           <router-link :to="'/oilsupplier/annualaudit'">
-            <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">年审申请</el-button>
+            <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0">
+              年审申请</el-button>
           </router-link>
           <!--v-if="formData.Step>=5"-->
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
@@ -213,13 +214,9 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="审批人">
-              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
-                         style="width: 90%" filterable allow-create default-first-option>
-                <el-option
-                  v-for="item in auditerOption"
-                  :key="item.userid"
-                  :label="item.username"
-                  :value="item.userid">
+              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>