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

src/views/customers/citypotenial-list/index.vue

@@ -79,7 +79,7 @@
   </el-form>
   <div slot="footer" class="dialog-footer">
     <el-button @click="dialogFormVisible = false">取 消</el-button>
-    <el-button type="primary" @click="approveClick">确 定</el-button>
+    <el-button type="primary" :loading="loading" @click="approveClick">确 定</el-button>
   </div>
 </el-dialog>
     </div>
@@ -106,6 +106,7 @@ export default {
       objectId: '',
       id:'',
       status:0,
+      loading:false,
       formData: {},
       province: [],
       sections: [
@@ -367,14 +368,18 @@ extLockCity_SDK:extLockCity_SDK,
 extChannelType_SDK:this.formData.ExtChannelType_SDK}
       if(this.status==1){
          const add={customerDTO:cc,note:this.form.note,result:"approve"}
+         this.loading=true
           ProcessApproval(add).then((resp)=>{
+            this.loading=false
             this.$message.success("审批成功!")
             this.dialogFormVisible=false
             this.$router.back()
        })
       }else{
          const bdd={customerDTO:cc,note:this.form.note,result:"reject"}
+         this.loading=true
           ProcessApproval(bdd).then((resp)=>{
+            this.loading=false
             this.$message.success("退回成功!")
             this.dialogFormVisible=false
             this.$router.back()

src/views/customers/potential-list/index.vue

@@ -57,7 +57,7 @@
   </el-form>
   <div slot="footer" class="dialog-footer">
     <el-button @click="dialogFormVisible = false">取 消</el-button>
-    <el-button type="primary" @click="approveClick">确 定</el-button>
+    <el-button type="primary" :loading="loading" @click="approveClick">确 定</el-button>
   </div>
 </el-dialog>
     </div>
@@ -84,6 +84,7 @@ export default {
       objectId: '',
       id:'',
       status:0,
+      loading:false,
       formData: {},
       province: [],
       sections: [
@@ -337,14 +338,18 @@ extLockCity_SDK:ExtLockCity_SDK,
 extChannelType_SDK:this.formData.ExtChannelType_SDK}
       if(this.status==1){
          const add={customerDTO:cc,note:this.form.note,result:"approve"}
+         this.loading=true
           ProcessApproval(add).then((resp)=>{
+            this.loading=false
             this.$message.success("审批成功!")
             this.dialogFormVisible=false
             this.$router.back()
        })
       }else{
+        this.loading=true
          const bdd={customerDTO:cc,note:this.form.note,result:"reject"}
           ProcessApproval(bdd).then((resp)=>{
+            this.loading=false
             this.$message.success("退回成功!")
             this.dialogFormVisible=false
             this.$router.back()