提交判断考察报告是否上传;待办表头居中

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -85,7 +85,7 @@
 
           <el-table-column label="执行人" prop="UserName" align="center"></el-table-column>
 
-          <el-table-column label="提交时间" prop="CreateTime">
+          <el-table-column label="提交时间" prop="CreateTime" align="center">
             <template slot-scope="scope">
               {{ jstimehandle(timestampToTime(scope.row.CreateTime)) }}
             </template>
@@ -134,7 +134,7 @@
             :stripe="true"
             style="width: 100%">
 
-            <el-table-column label="已办类型" prop="Type">
+            <el-table-column label="已办类型" prop="Type" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span>
                 <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{scope.row.TaskName}}</span>
@@ -145,7 +145,7 @@
                 <span v-if="scope.row.Type=='9'" style="color:#E6A23C">目录申请-{{scope.row.TaskName}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="类别" prop="SupplierTypeCode">
+            <el-table-column label="类别" prop="SupplierTypeCode" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.SupplierTypeCode=='01'">物资类</span>
                 <span v-if="scope.row.SupplierTypeCode=='02'">基建类</span>
@@ -158,11 +158,11 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="公司名称" prop="SupplierName"></el-table-column>
+            <el-table-column label="公司名称" prop="SupplierName" align="center"></el-table-column>
 
-            <el-table-column label="执行人" prop="UserName"></el-table-column>
+            <el-table-column label="执行人" prop="UserName" align="center"></el-table-column>
 
-            <el-table-column label="完成时间" prop="CreateTime">
+            <el-table-column label="完成时间" prop="CreateTime" align="center">
               <template slot-scope="scope">
                 {{ jstimehandle(timestampToTime(scope.row.CreateTime)) }}
               </template>

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

@@ -53,7 +53,7 @@
                      size="mini"
                      @click="commitAudit()"
                      v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3">
-            提交
+            提2交
           </el-button>
           <el-button v-if="parseInt(IsCompanyUser) !== 1 && (this.formData.Status == '' || parseInt(this.formData.Status) === 0) " type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
@@ -1831,6 +1831,17 @@ export default {
       }
     },
     commitAudit () {
+      if (this.formDataCert.InStyle != '2' && this.formDataCert.InStyle != '3') {
+        // 准入方式，除一级二级外其他需要考察报告
+        if (this.$refs['GoodsInfo'].scenefile.FileUrl.length <= 0) {
+          this.$notify({
+            title: '提示',
+            message: '请上传现场考察报告！',
+            type: 'warning'
+          })
+          return false
+        }
+      }
       this.saveEntity(1)
       this.updateNumberEntityNoInfo()
       apiCert.checkSupplierCertCanSubmit(this.formData.CertId, this.$axios)