Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/views/login/city-register/index.vue

@@ -327,7 +327,7 @@
         </el-table>
         <pagination v-show="TotalRecords>0"
                     :total="TotalRecords"
-                    :page.sync="page.currentPage"
+                    :page.sync="page.PageIndex"
                     :limit.sync="page.pageSize"
                     @pagination="getList" />
       </el-dialog>
@@ -359,9 +359,9 @@ export default {
       cityOptions: [],
       disOptions: [],
       supplierBaseRules: {
-        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码' }],
-        extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)' }],
-        extCorporateName_SDK: [{ required: true, message: '请输入法人' }],
+        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码',trigger:'blur' }],
+        // extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)',trigger:'blur' }],
+        extCorporateName_SDK: [{ required: true, message: '请输入法人',trigger:'blur' }],
         extProvince_SDK: [{ required: true, message: '请选择省份' }],
         extCity_SDK: [{ required: true, message: '请选择市' }],
         extDistrict_SDK: [{ required: true, message: '请选择区' }],
@@ -465,10 +465,12 @@ export default {
 
       this.$refs.formData.validate((valid) => {
         if (valid) {
-          if (this.formData.file == null || this.formData.file == '' || this.formData.file == []) {
-            return this.$message.warning('请上传附件')
-          }
           this.formData.extCustomerType_SDK = 111
+           this.$confirm('确认是否提交', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText:'取消',
+                  type: 'warning'
+                }).then(() => {
                   this.btnloading = true
                 this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
                 this.btnloading = false
@@ -476,15 +478,21 @@ export default {
                 this.$router.back()
                }).catch((err) => {
                   this.btnloading = false
-            // this.$message({
-            //   type: 'warning',
-            //   message: err
-            // })
                    })     
+                }).catch((err)=>{
+                  this.btnloading = false
+                  this.loading = false
+                })
+        
         } else {
             this.btnloading = false
+           if (this.formData.file == null || this.formData.file == '' || this.formData.file == []) {
+            return this.$message.warning('请上传附件')
+          }else{
             this.$message.warning('请输入必填信息！')
           }
+          
+        }
       });
 
     },
@@ -525,7 +533,8 @@ export default {
       this.supplierBaseRules.file = []
     },
     handleRemoveFile(res, file) {
-      this.supplierBaseRules.file = [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }]
+      this.formData.file=null
+      this.supplierBaseRules.file = [{ required: true, message: '请上传附件'}]
     },
   }
 }

src/views/login/prov-register/index.vue

@@ -460,9 +460,9 @@ export default {
       bOptions: [],
       cOptions: [],
       supplierBaseRules: {
-        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码' }],
-        extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)' }],
-        extCorporateName_SDK: [{ required: true, message: '请输入法人' }],
+        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码',trigger:'blur' }],
+        // extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)' }],
+        extCorporateName_SDK: [{ required: true, message: '请输入法人',trigger:'blur' }],
         extProvince_SDK: [{ required: true, message: '请选择省份' }],
         extCity_SDK: [{ required: true, message: '请选择市' }],
         extDistrict_SDK: [{ required: true, message: '请选择区' }],
@@ -617,9 +617,6 @@ export default {
     handleApprove() {
       this.$refs.formData.validate((valid) => {
         if (valid) {
-          if (this.formData.file == null || this.formData.file == '' || this.formData.file == []) {
-            return this.$message.warning('请上传附件')
-          }
           this.formData.extCustomerType_SDK = 101
           const ExtProductGroup_KUT = this.formData.extProductGroup_KUT.toString()
           const ExtProductGroup_SDK = this.formData.extProductGroup_SDK.toString()
@@ -629,6 +626,10 @@ export default {
           this.formData.extProductGroup_SDK = ExtProductGroup_SDK
           this.formData.extTotalAgent_KUT = ExtTotalAgent_KUT
           this.formData.extTotalAgent_SDK = ExtTotalAgent_SDK
+         
+          this.$confirm('确认是否提交', '提示',{confirmButtonText: '确定',
+                  cancelButtonText:'取消',
+                  type: 'warning'}).then(()=>{
                      this.btnloading = true
                 this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
                 this.btnloading = false
@@ -637,15 +638,20 @@ export default {
 
           }).catch((err) => {
             this.btnloading = false
-            // this.$message({
-            //   type: 'warning',
-            //   message: err
-            // })
           })
+             }).catch(()=>{
+               this.btnloading = false
+                this.loading = false
+             })
+          
         } else {
            this.btnloading = false
+           if (this.formData.file == null || this.formData.file == '' || this.formData.file == []) {
+            return this.$message.warning('请上传附件')
+          }else{
             this.$message.warning('请输入必填信息！')
           }
+        }
       });
 
     },
@@ -685,7 +691,8 @@ export default {
         this.supplierBaseRules.file=[]
     },
     handleRemoveFile(res,file){ 
-      this.supplierBaseRules.file = [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }]
+      this.formData.file = null
+      this.supplierBaseRules.file = [{ required: true, message: '请上传附件' }]
     },
     onSubmit() { },
     handlePreview() { },

src/views/models/total-models.vue

@@ -41,7 +41,7 @@ export default {
      this.page.fileLabel='1'
      this.btnloading=true
       getModels(this.page).then((resp)=>{
-        this.btnloadin=false
+        this.btnloading=false
          this.tableData=resp.results
       })
     },