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

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

@@ -392,7 +392,7 @@ export default {
         }
         if (this.formData.ExtProcessNode_SDK == 2) {
           this.formData.extChannelType_SDK = ''
-          if(!this.formData.extLockRsp_SDK){
+          if(!this.formData.ExtLockRsp_SDK){
             this.formData.ExtLockRsp_SDK =[]
           }else{
              this.formData.ExtLockRsp_SDK = this.formData.ExtLockRsp_SDK.split(',')
@@ -486,6 +486,7 @@ export default {
         extProcessNode_SDK: this.formData.ExtProcessNode_SDK,
         extCustomerType_SDK: this.formData.ExtCustomerType_SDK,
         extProvince_SDK: this.formData.ExtProvince_SDK,
+        extCity_SDK: this.formData.ExtCity_SDK,
         objectID: this.formData.ObjectID,
         extLockRsp_SDK: extLockRsp_SDK,
         extLockRspName_SDK: extLockRspName_SDK,

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

@@ -429,6 +429,7 @@ export default {
         extProcessNode_SDK: this.formData.ExtProcessNode_SDK,
         extCustomerType_SDK: this.formData.ExtCustomerType_SDK,
         extProvince_SDK: this.formData.ExtProvince_SDK,
+        extCity_SDK: this.formData.ExtCity_SDK,
         objectID: this.formData.ObjectID,
         extLockRsp_SDK: this.formData.extLockRsp_SDK,
         extLockCity_SDK: ExtLockCity_SDK,

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

@@ -293,6 +293,7 @@
                  :visible.sync="dialogTableVisible"
                  width="50%"
                  :before-close="handleClose">
+        <div v-loading="selLoading">
           <el-form :inline="true"
                    :model="formInline"
                    class="demo-form-inline">
@@ -333,6 +334,8 @@
                       :page.sync="page.currentPage"
                       :limit.sync="page.pageSize"
                       @pagination="getList" />
+        </div>
+
       </el-dialog>
 
     </div>
@@ -354,6 +357,7 @@ export default {
       countryArea: '',
       title: '城市代理商注册',
       btnloading: false,
+      selLoading: false,
       formInline: {},
       recordList: [],
       tableData: [],
@@ -462,14 +466,16 @@ export default {
     select(row, column, event) {
       this.page.extSocialUnifiedCreditCode_SDK = row.CreditCode
       this.page.searchKey = row.CreditCode
+      this.selLoading = true
       this.$request(Qcc.onlyDetailUrl, this.page).then((resp) => {
+        this.selLoading = false
         this.formData.extCorporateName_SDK = row.OperName
         this.formData.extSocialUnifiedCreditCode_SDK = row.CreditCode
         this.formData.name = row.Name
         this.formData.extRegisteredCapital_SDK = resp.results.Result.RegistCapi
         this.dialogTableVisible = false
-      }).catch((err)=>{
-         
+      }).catch((err) => {
+        this.selLoading = false
       })
     },
     handleApprove() {
@@ -478,7 +484,7 @@ export default {
         if (valid) {
 
           this.formData.extCustomerType_SDK = 111
-          const dataList=this.formData
+          const dataList = this.formData
           this.btnloading = true
           this.$request(Customer.searchUrl, this.paramsToFormData(dataList)).then((resp) => {
             this.btnloading = false

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

@@ -391,6 +391,7 @@
                  :visible.sync="dialogTableVisible"
                  width="50%"
                  :before-close="handleClose">
+        <div v-loading="selLoading">
           <el-form :inline="true"
                    :model="formInline"
                    class="demo-form-inline">
@@ -431,6 +432,8 @@
                       :page.sync="page.currentPage"
                       :limit.sync="page.pageSize"
                       @pagination="getList" />
+        </div>
+
       </el-dialog>
 
     </div>
@@ -494,7 +497,8 @@ export default {
       },
       dialogTableVisible: false,
       isShow: true,
-      formDataList:{},
+      selLoading: false,
+      formDataList: {},
       TotalRecords: 0,
       page: {
         pageSize: 10,
@@ -624,22 +628,24 @@ export default {
     },
     select(row, column, event) {
       this.page.extSocialUnifiedCreditCode_SDK = row.CreditCode
-      this.page.searchKey=row.CreditCode
+      this.page.searchKey = row.CreditCode
+      this.selLoading = true
       this.$request(Qcc.onlyDetailUrl, this.page).then((resp) => {
+        this.selLoading = false
         this.formData.extCorporateName_SDK = row.OperName
         this.formData.extSocialUnifiedCreditCode_SDK = row.CreditCode
         this.formData.name = row.Name
         this.formData.extRegisteredCapital_SDK = resp.results.Result.RegistCapi
         this.dialogTableVisible = false
-      }).catch((err)=>{
-         
+      }).catch((err) => {
+        this.selLoading = false
       })
     },
     handleApprove() {
       this.$refs.formData.validate((valid) => {
         if (valid) {
           this.formData.extCustomerType_SDK = 101
-          let dataList=this.formData
+          let dataList = this.formData
           const ExtProductGroup_KUT = this.formDataList.extProductGroup_KUT
           const ExtProductGroup_SDK = this.formDataList.extProductGroup_SDK
           const ExtTotalAgent_KUT = this.formDataList.extTotalAgent_KUT
@@ -647,19 +653,19 @@ export default {
           dataList.extProductGroup_KUT = ExtProductGroup_KUT.toString()
           dataList.extProductGroup_SDK = ExtProductGroup_SDK.toString()
           dataList.extTotalAgent_KUT = ExtTotalAgent_KUT.toString()
-          dataList.extTotalAgent_SDK = ExtTotalAgent_SDK .toString()
+          dataList.extTotalAgent_SDK = ExtTotalAgent_SDK.toString()
           this.btnloading = true
           this.$request(Customer.searchUrl, this.paramsToFormData(dataList)).then((resp) => {
             this.btnloading = false
             this.$message.success('提交成功！')
-            this.formData.extProductGroup_KUT=this.formData.extProductGroup_KUT.split(',')
-            this.formData.extTotalAgent_KUT=this.formData.extTotalAgent_KUT.split(',')
+            this.formData.extProductGroup_KUT = this.formData.extProductGroup_KUT.split(',')
+            this.formData.extTotalAgent_KUT = this.formData.extTotalAgent_KUT.split(',')
             console.log(this.formData)
             this.isShow = false
           }).catch((err) => {
             this.btnloading = false
-            this.formData.extProductGroup_KUT=this.formData.extProductGroup_KUT.split(',')
-            this.formData.extTotalAgent_KUT=this.formData.extTotalAgent_KUT.split(',')
+            this.formData.extProductGroup_KUT = this.formData.extProductGroup_KUT.split(',')
+            this.formData.extTotalAgent_KUT = this.formData.extTotalAgent_KUT.split(',')
           })
         } else {
           this.btnloading = false