上传图片 有效期

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

@@ -104,7 +104,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="有效日期" prop="EffectDate">
-              <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
+              <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期" @change="pickerchange">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -200,6 +200,20 @@
       })
     },
     data () {
+      var effectDate = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择有效日期'))
+        } else {
+          let date = new Date()
+          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+          if (value < nowdata) {
+            callback(new Error('有效日期不能小于当前日期'))
+          } else {
+            callback()
+          }
+        }
+      }
+
       return {
         size: 10,
         currentPage: 1,
@@ -263,7 +277,7 @@
             {required: true, message: '资质名称不能为空', trigger: 'blur'}
           ],
           EffectDate:
-            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
+            [{ required: true, validator: effectDate, trigger: 'change' }]
         }
       }
     },
@@ -273,6 +287,9 @@
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
     },
     methods: {
+      pickerchange () {
+        console.log(this.SubfileForm.EffectDate)
+      },
       getSupplierSceneFile () {
         let params = {
           SupplierId: this.SupplierId
@@ -590,18 +607,30 @@
         this.fileList = files
       },
       beforeAvatarUpload (file) {
-        /* let isLt512K = file.size / 1024 < 512
+        console.log(file, '=====')
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        } */
+        }
+
         if (this.SubfileForm.NeedFileType != this.yasuoname) {
+          if (file.type.indexOf('image') < 0) {
+            this.$message.error('上传图片!')
+            return false
+          }
           let isLt50m = file.size / 1024 / 1024 / 5 < 1
           if (!isLt50m) {
             this.$message.error('上传文件大小不能超过 5MB!')
             return false
           }
           return true
+        } else {
+          if (file.name.indexOf('.rar') < 0 && file.name.indexOf('.zip') < 0) {
+            this.$message.error('文件格式必须为rar或zip')
+            return false
+          }
+          return true
         }
       },
       uploadrequest (option) {

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

@@ -91,6 +91,9 @@
     },
     data () {
       return {
+        SupplierId: '0',
+        SupplierCertId: '0',
+        SupplierTypeCode: '0',
         winningList: [],
         Title: '',
         WinningForm: {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -744,6 +744,29 @@
           </el-card>
         </el-tab-pane>
       </el-tabs>
+
+      <div style="float: right; margin: 20px;">
+        <el-button ref="floatNxtBtn"
+                   type="primary"
+                   plain
+                   size="mini"
+                   @click="backTab"
+                   v-if="parseInt(activeName) > 0">
+          上一步</el-button>
+        <el-button ref="floatBtn"
+                   type="primary"
+                   plain
+                   size="mini"
+                   @click="nextTab"
+                   v-if="parseInt(activeName) < totalTab">下一步</el-button>
+        <el-button type="primary"
+                   size="mini"
+                   @click="nextStep()"
+                   v-if="IsCompanyUser == 1 && parseInt(activeName)==3">
+          提交
+        </el-button>
+      </div>
+
     </el-card>
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
@@ -1007,6 +1030,10 @@
         }
       }
       return {
+        IsCompanyUser: 0,
+        add_flat: true,
+        totalTab: 3,
+        activeName: '0',
         loading: false,
         sizeProject: 10,
         currentPageProject: 1,
@@ -1165,7 +1192,8 @@
           SupplierTypeCode: '',
           SupplierTypeName: '',
           Step: 0,
-          HseTraining: 0
+          HseTraining: 0,
+          AuditIndex: 0
         },
         changedForm: {
           SupplierName: false,
@@ -1373,7 +1401,7 @@
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
-
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       this.AnnualStatus = this.$route.query.AnnualStatus
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.annualId = this.$route.query.annualId
@@ -1388,6 +1416,112 @@
       this.getsubfile()
     },
     methods: {
+      // Tab
+      nextTab () {
+        if (this.formData.AuditIndex > 0) {
+          this.totalTab = 4
+        }
+        if (this.formDataCert.Status > 0) {
+          this.totalTab = 4
+        }
+        if (this.formDataCert.Status < 0) {
+          this.totalTab = 4
+        }
+        if (this.formDataCert.Status >= 5) {
+          this.totalTab = 5
+        }
+
+        let valid = true
+        // this
+        if (this.formDataCert.Status <= 0 && this.activeName === '0') {
+          valid = this.saveEntity()
+        } else if (this.formDataCert.Status <= 0 && this.activeName === '1') {
+          // valid = this.updateNumberEntity()
+          // valid = true// 没办法中的办法
+          if (this.formDataCert.WorkerTotal <= 0) {
+            this.$message({
+              type: 'warning',
+              message: '企业员工总数必须大于0'
+            })
+            return
+          }
+          if (this.formDataCert.TechnicalNum <= 0) {
+            this.$message({
+              type: 'warning',
+              message: '技术、管理人员数量必须大于0'
+            })
+            return
+          }
+          if (this.formDataCert.SkillerTotal <= 0) {
+            this.$message({
+              type: 'warning',
+              message: '技术工人总数必须大于0'
+            })
+            return
+          }
+          if (!this.CheckCompanyBase()) {
+            return
+          }
+          this.formDataCert.InStyle = this.formData.InStyle
+          api
+            .updateNumberEntity(
+              this.formData.Id + '_' + this.certId,
+              this.formDataCert,
+              this.$axios
+            )
+            .then(res => {
+              if (res.data.code === 0) {
+                // 保存成功后，初始化数据，变成修改
+                this.initDatas()
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                })
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                })
+              }
+            })
+            .catch(err => {
+              console.error(err)
+            })
+        }
+        if (!valid) {
+          return false
+        }
+        let activeIdx = parseInt(this.activeName)
+        if (activeIdx < this.totalTab) {
+          this.activeName = (activeIdx + 1) + ''
+        } else {
+          this.activeName = '0'
+        }
+        document.querySelector('.content').scrollTop = 0
+      },
+      backTab () {
+        if (this.formData.AuditIndex > 0) {
+          this.totalTab = 4
+        }
+        if (this.formDataCert.Status > 0) {
+          this.totalTab = 4
+        }
+        if (this.formDataCert.Status < 0) {
+          this.totalTab = 4
+        }
+        if (this.formDataCert.Status >= 5) {
+          this.totalTab = 5
+        }
+
+        let activeIdx = parseInt(this.activeName)
+        if (activeIdx > 0) {
+          this.activeName = (activeIdx - 1) + ''
+        } else {
+          this.activeName = this.totalTab + ''
+        }
+        document.querySelector('.content').scrollTop = 0
+      },
+
       // ======
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -979,6 +979,19 @@ import apiCert from '@/api/oilsupplier/suppliercert'
           }
         }
       }
+      var effectDate = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择有效日期'))
+        } else {
+          let date = new Date()
+          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+          if (value < nowdata) {
+            callback(new Error('有效日期不能小于当前日期'))
+          } else {
+            callback()
+          }
+        }
+      }
       return {
         sizeProject: 10,
         currentPageProject: 1,
@@ -1404,7 +1417,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
             {required: true, message: '资质名称不能为空', trigger: 'blur'}
           ],
           EffectDate:
-            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
+            [{ required: true, validator: effectDate, trigger: 'change' }]
         }
       }
     },
@@ -1484,18 +1497,28 @@ import apiCert from '@/api/oilsupplier/suppliercert'
         }
       },
       beforeAvatarUpload (file) {
-        /* let isLt512K = file.size / 1024 < 512
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        } */
+        }
         if (this.SubfileForm.NeedFileType !== this.yasuoname) {
+          if (file.type.indexOf('image') < 0) {
+            this.$message.error('上传图片!')
+            return false
+          }
           let isLt50m = file.size / 1024 / 1024 / 5 < 1
           if (!isLt50m) {
             this.$message.error('上传文件大小不能超过 5MB!')
             return false
           }
           return true
+        } else {
+          if (file.name.indexOf('.rar') < 0 && file.name.indexOf('.zip') < 0) {
+            this.$message.error('文件格式必须为rar或zip')
+            return false
+          }
+          return true
         }
       },
       iconclear (row) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -1080,6 +1080,19 @@
           }
         }
       }
+      var effectDate = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择有效日期'))
+        } else {
+          let date = new Date()
+          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+          if (value < nowdata) {
+            callback(new Error('有效日期不能小于当前日期'))
+          } else {
+            callback()
+          }
+        }
+      }
       return {
         loading: false,
         ProfAuditThen: '',
@@ -1507,7 +1520,7 @@
             {required: true, message: '资质名称不能为空', trigger: 'blur'}
           ],
           EffectDate:
-            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
+            [{ required: true, validator: effectDate, trigger: 'change' }]
         }
       }
     },
@@ -1592,18 +1605,28 @@
         }
       },
       beforeAvatarUpload (file) {
-        /* let isLt512K = file.size / 1024 < 512
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        } */
+        }
         if (this.SubfileForm.NeedFileType !== this.yasuoname) {
+          if (file.type.indexOf('image') < 0) {
+            this.$message.error('上传图片!')
+            return false
+          }
           let isLt50m = file.size / 1024 / 1024 / 5 < 1
           if (!isLt50m) {
             this.$message.error('上传文件大小不能超过 5MB!')
             return false
           }
           return true
+        } else {
+          if (file.name.indexOf('.rar') < 0 && file.name.indexOf('.zip') < 0) {
+            this.$message.error('文件格式必须为rar或zip')
+            return false
+          }
+          return true
         }
       },
       iconclear (row) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -897,6 +897,20 @@
         }
       }
 
+      var effectDate = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择有效日期'))
+        } else {
+          let date = new Date()
+          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+          if (value < nowdata) {
+            callback(new Error('有效日期不能小于当前日期'))
+          } else {
+            callback()
+          }
+        }
+      }
+
       return {
         loading: false,
         sizeProject: 10,
@@ -1320,7 +1334,7 @@
             {required: true, message: '资质名称不能为空', trigger: 'blur'}
           ],
           EffectDate:
-            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
+            [{ required: true, validator: effectDate, trigger: 'change' }]
         }
       }
     },
@@ -1400,18 +1414,28 @@
         }
       },
       beforeAvatarUpload (file) {
-        /* let isLt512K = file.size / 1024 < 512
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        } */
+        }
         if (this.SubfileForm.NeedFileType !== this.yasuoname) {
+          if (file.type.indexOf('image') < 0) {
+            this.$message.error('上传图片!')
+            return false
+          }
           let isLt50m = file.size / 1024 / 1024 / 5 < 1
           if (!isLt50m) {
             this.$message.error('上传文件大小不能超过 5MB!')
             return false
           }
           return true
+        } else {
+          if (file.name.indexOf('.rar') < 0 && file.name.indexOf('.zip') < 0) {
+            this.$message.error('文件格式必须为rar或zip')
+            return false
+          }
+          return true
         }
       },
       iconclear (row) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -888,6 +888,19 @@
           }
         }
       }
+      var effectDate = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择有效日期'))
+        } else {
+          let date = new Date()
+          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+          if (value < nowdata) {
+            callback(new Error('有效日期不能小于当前日期'))
+          } else {
+            callback()
+          }
+        }
+      }
       return {
         lineheightpx: '23',
         IsMust: false,
@@ -1319,7 +1332,7 @@
             {required: true, message: '资质名称不能为空', trigger: 'blur'}
           ],
           EffectDate:
-            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
+            [{ required: true, validator: effectDate, trigger: 'change' }]
         }
       }
     },
@@ -2136,18 +2149,28 @@
         this.fileList = files
       },
       beforeAvatarUpload (file) {
-        /* let isLt512K = file.size / 1024 < 512
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        } */
+        }
         if (this.SubfileForm.NeedFileType !== this.yasuoname) {
+          if (file.type.indexOf('image') < 0) {
+            this.$message.error('上传图片!')
+            return false
+          }
           let isLt50m = file.size / 1024 / 1024 / 5 < 1
           if (!isLt50m) {
             this.$message.error('上传文件大小不能超过 5MB!')
             return false
           }
           return true
+        } else {
+          if (file.name.indexOf('.rar') < 0 && file.name.indexOf('.zip') < 0) {
+            this.$message.error('文件格式必须为rar或zip')
+            return false
+          }
+          return true
         }
       },
       uploadrequest (option) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/operation.vue

@@ -432,18 +432,28 @@
       },
 
       beforeAvatarUpload(file) {
-        /*let isLt512K = file.size / 1024 < 512
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        }*/
+        }
         if (this.SubfileForm.NeedFileType != this.yasuoname) {
+          if (file.type.indexOf('image') < 0) {
+            this.$message.error('上传图片!')
+            return false
+          }
           let isLt50m = file.size / 1024 / 1024 / 5 < 1
           if (!isLt50m) {
             this.$message.error('上传文件大小不能超过 5MB!')
             return false
           }
           return true
+        } else {
+          if (file.name.indexOf('.rar') < 0 && file.name.indexOf('.zip') < 0) {
+            this.$message.error('文件格式必须为rar或zip')
+            return false
+          }
+          return true
         }
       },
       uploadrequest(option) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -902,6 +902,19 @@
           }
         }
       }
+      var effectDate = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择有效日期'))
+        } else {
+          let date = new Date()
+          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+          if (value < nowdata) {
+            callback(new Error('有效日期不能小于当前日期'))
+          } else {
+            callback()
+          }
+        }
+      }
       return {
         fileList: [],
         myitemsshow: false,
@@ -1292,7 +1305,7 @@
             {required: true, message: '资质名称不能为空', trigger: 'blur'}
           ],
           EffectDate:
-            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
+            [{ required: true, validator: effectDate, trigger: 'change' }]
         },
         // 增项信息表
         formData: {
@@ -1864,18 +1877,28 @@
         this.fileList = files
       },
       beforeAvatarUpload (file) {
-        /* let isLt512K = file.size / 1024 < 512
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        } */
+        }
         if (this.SubfileForm.NeedFileType != this.yasuoname) {
+          if (file.type.indexOf('image') < 0) {
+            this.$message.error('上传图片!')
+            return false
+          }
           let isLt50m = file.size / 1024 / 1024 / 5 < 1
           if (!isLt50m) {
             this.$message.error('上传文件大小不能超过 5MB!')
             return false
           }
           return true
+        } else {
+          if (file.name.indexOf('.rar') < 0 && file.name.indexOf('.zip') < 0) {
+            this.$message.error('文件格式必须为rar或zip')
+            return false
+          }
+          return true
         }
       },
       uploadrequest (option) {

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

@@ -1162,6 +1162,19 @@
           }
         }
       }
+      var effectDate = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择有效日期'))
+        } else {
+          let date = new Date()
+          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+          if (value < nowdata) {
+            callback(new Error('有效日期不能小于当前日期'))
+          } else {
+            callback()
+          }
+        }
+      }
       return {
         // 456
         fileList: [],
@@ -1671,7 +1684,7 @@
             {required: true, message: '资质名称不能为空', trigger: 'blur'}
           ],
           EffectDate:
-            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
+            [{ required: true, validator: effectDate, trigger: 'change' }]
         }
       }
     },
@@ -2548,11 +2561,15 @@
         this.fileList = files
       },
       beforeAvatarUpload (file) {
-        /* let isLt512K = file.size / 1024 < 512
+        if (file.type.indexOf('image') < 0) {
+          this.$message.error('上传图片!')
+          return false
+        }
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        } */
+        }
         let isLt50m = file.size / 1024 / 1024 / 5 < 1
         if (!isLt50m) {
           this.$message.error('上传文件大小不能超过 5MB!')

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -880,6 +880,19 @@
           }
         }
       }
+      var effectDate = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择有效日期'))
+        } else {
+          let date = new Date()
+          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
+          if (value < nowdata) {
+            callback(new Error('有效日期不能小于当前日期'))
+          } else {
+            callback()
+          }
+        }
+      }
       return {
         myitemsshow: false,
         disabled: false,
@@ -1345,7 +1358,7 @@
             {required: true, message: '资质名称不能为空', trigger: 'blur'}
           ],
           EffectDate:
-            [{ required: true, message: '请选择有效日期', trigger: 'change' }]
+            [{ required: true, validator: effectDate, trigger: 'change' }]
         }
       }
     },
@@ -2125,11 +2138,15 @@
         this.fileList = files
       },
       beforeAvatarUpload (file) {
-        /* let isLt512K = file.size / 1024 < 512
+        if (file.type.indexOf('image') < 0) {
+          this.$message.error('上传图片!')
+          return false
+        }
+        let isLt512K = file.size / 1024 < 512
         if (isLt512K) {
           this.$message.error('上传文件大小不能小于 512KB!')
           return false
-        } */
+        }
         let isLt50m = file.size / 1024 / 1024 / 5 < 1
         if (!isLt50m) {
           this.$message.error('上传文件大小不能超过 5MB!')