Browse Source

添加准入申请时企业情况里时间的限制

baichengfei 5 years ago
parent
commit
b757b50d4e

+ 0 - 1
src/dashoo.cn/frontend_web/src/components/oilsupplier/patentlist.vue

@@ -251,7 +251,6 @@
         }).catch(() => {})
       },
       showDialog () {
-        console.log('1223')
         this.Title = '专利及专有技术'
         this.PatentForm.Id = 0
         this.PatentForm.SupplierCertId = this.SupplierCertId

+ 13 - 8
src/dashoo.cn/frontend_web/src/components/oilsupplier/performancelist.vue

@@ -55,7 +55,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="起始时间" prop="StartTime">
-              <el-date-picker style="width: 100%" v-model="PerformanceForm.StartTime" type="date" placeholder="请选择起始时间">
+              <el-date-picker style="width: 100%" v-model="PerformanceForm.StartTime" type="date" placeholder="请选择起始时间" :picker-options="mainAchieveStartTimeOptions">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -111,6 +111,11 @@
     },
     data () {
       return {
+        mainAchieveStartTimeOptions: {
+          disabledDate (time) {
+            return time.getTime() > Date.now() - 8.64e6
+          }
+        },
         visible: false,
         SupplierId: '0',
         SupplierCertId: '0',
@@ -266,7 +271,7 @@
       },
       deletedata (val) {
         let _this = this
-      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -280,20 +285,20 @@
                     type: 'success',
                     message: response.data.message
                   })
-                _this.initData()
-              } else {
+                  _this.initData()
+                } else {
                   _this.$message({
                     type: 'warning',
                     message: response.data.message
                   })
-              }
+                }
               })
               .catch(function (error) {
                 console.log(error)
-            })
-        })
+              })
+          })
           .catch(() => {})
-    },
+      },
       showDialog () {
         this.Title = '近三年主要业绩'
         this.PerformanceForm.Id = 0

+ 7 - 2
src/dashoo.cn/frontend_web/src/components/oilsupplier/winninglist.vue

@@ -38,7 +38,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="获奖时间" prop="WinningTime">
-              <el-date-picker style="width: 100%" v-model="WinningForm.WinningTime" type="date" placeholder="请选择获奖时间">
+              <el-date-picker style="width: 100%" v-model="WinningForm.WinningTime" type="date" placeholder="请选择获奖时间" :picker-options="winingTimeOptions">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -64,7 +64,7 @@
   export default {
     name: 'WinningList',
     props: {
-      /*SupplierCertId: {
+      /* SupplierCertId: {
         type: String,
         default: '0'
       },
@@ -87,6 +87,11 @@
     },
     data () {
       return {
+        winingTimeOptions: {
+          disabledDate (time) {
+            return time.getTime() > Date.now() - 8.64e6
+          }
+        },
         visible: false,
         SupplierId: '0',
         SupplierCertId: '0',

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/companyaudit/index.vue

@@ -101,6 +101,7 @@
                 <span v-if="scope.row.CheckStatus == -1"
                       style="color:#F56C6C">审核未通过</span>
               </template>
+              <!--TODO 新注册账号待审核状态不对-->
             </el-table-column>
             <el-table-column prop="SupplierName"
                              label="公司名称"