Explorar el Código

前:增项提交文案;保存不检查资质,提交才检查

wd hace 4 años
padre
commit
bf3642215d

+ 2 - 35
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -25,13 +25,13 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
-                     v-if="formData.Id != '' && currentStatus <= 0" @click="saveinfochange">保存
+                     v-if="formData.Id != '' && currentStatus <= 0" @click="saveInfoChange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
                       v-if="formData.Id !='' && currentStatus <= 0" @click="checkFileList">检查资质
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id != '' && currentStatus <= 0 && parseInt(IsCompanyUser) === 0">提交审核
+            v-if="formData.Id != '' && currentStatus <= 0 && parseInt(IsCompanyUser) === 0">提交
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
             v-if="formData.Id != '' && currentStatus <= 0 && parseInt(IsCompanyUser) === 1">提交
@@ -2311,14 +2311,6 @@
       // 提交审核保存信息
       saveInfoChange (val) {
         return new Promise((resolve, reject) => {
-          if (this.formData.InStyle == '4' && !(this.subfileList1[0]['OldFileUrl'] != '' || this.subfileList1[0]['FileUrl'] != '')) {
-            this.$message({
-              duration: 10000,
-              type: 'warning',
-              message: '战略合作准入企业资质不能为空!'
-            })
-            return resolve(false)
-          }
           let valid1 = false
           let valid2 = false
           // 企业基本情况
@@ -2365,7 +2357,6 @@
       // 二级分办单位提交审批
       separateUnitSubmitAuditMakeSure () {
         console.log('二级分办单位,确认提交审批')
-        // this.saveinfochange(1)
         let checkRes = this.separateUnitSubmitAuditParamsCheck()
         if (!checkRes) {
           return false
@@ -3007,30 +2998,6 @@
         this.$refs.checkFile.type = 1
         this.$refs.checkFile.getValue(this.formData.SupplierId, this.formData.SupplierCertId, this.supplierData.OperType === '制造商' ? 1 : 2)
       },
-      // 保存信息变更数据
-      saveinfochange (val) {
-        this.$refs['supplierData'].validate((valid) => {
-          if (valid) {
-            suppapi.checkBack(this.supplierData.BankAccount, this.supplierData.Id, this.$axios).then(res => {
-              if (res.data.item) {
-                this.$message({
-                    duration: 10000,
-                    type: 'warning',
-                  message: '该银行账号与其他公司重复'
-                })
-              } else {
-                this.$refs['EntityFormCert'].validate((valid) => {
-                  if (valid) {
-                    this.addInfoChangeItemCh(val)
-                  }
-                })
-              }
-            }).catch(err => {
-              console.error(err)
-            })
-          }
-        })
-      },
       addInfoChangeItemCh (val) {
         let AllInfochangeItemList = {
           SupplierId: this.formData.SupplierId + '',

+ 2 - 26
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -24,11 +24,11 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id !='' && currentStatus <= 0" @click="saveinfochange">保存
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id !='' && currentStatus <= 0" @click="saveInfoChange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id !='' && currentStatus <= 0" @click="checkFileList">检查资质</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 0">提交审核
+            v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 0">提交
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
             v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 1">提交
@@ -2671,30 +2671,6 @@
           }
         })
       },
-      // 保存信息变更数据
-      saveinfochange (val) {
-        this.$refs['supplierData'].validate((valid) => {
-          if (valid) {
-            suppapi.checkBack(this.supplierData.BankAccount, this.supplierData.Id, this.$axios).then(res => {
-              if (res.data.item) {
-                this.$message({
-                    duration: 10000,
-                    type: 'warning',
-                  message: '该银行账号与其他公司重复'
-                })
-              } else {
-                this.$refs['EntityFormCert'].validate((valid) => {
-                  if (valid) {
-                    this.addInfoChangeItemCh(val)
-                  }
-                })
-              }
-            }).catch(err => {
-              console.error(err)
-            })
-          }
-        })
-      },
       addInfoChangeItemCh (val) {
         let AllInfochangeItemList = {
           SupplierId: this.formData.SupplierId + '',

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

@@ -25,13 +25,13 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
-                     v-if="formData.Id !='' && currentStatus <= 0" @click="saveinfochange">保存
+                     v-if="formData.Id !='' && currentStatus <= 0" @click="saveInfoChange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
                      v-if="formData.Id !='' && currentStatus <= 0" @click="checkFileList">检查资质
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 0">提交审核
+            v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 0">提交
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
             v-if="formData.Id !='' && currentStatus <= 0 && IsCompanyUser == 1">提交