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

src/components/EleForm/components/EleFormSelect.vue

@@ -23,7 +23,7 @@
     </template>
     <el-option
       v-for="option in options"
-      :key="option.value"
+      :key="option.id || option.value"
       :label="option.text"
       :value="option.value"
       v-bind="option.attrs"
@@ -67,6 +67,31 @@ export default {
     }
   },
   methods: {
+    // 变化处理
+    handleChange(value) {
+      var result = {}
+      if (!this.attrs.multiple) {
+        this.options.forEach(item => {
+          if (item.value === value) {
+            result = item
+          }
+        })
+      } else {
+        result = {
+          value: [],
+          text: []
+        }
+        this.options.forEach(item => {
+          value.forEach(jtem => {
+            if (item.value === jtem) {
+              result.value.push(item.value)
+              result.text.push(item.text)
+            }
+          })
+        })
+      }
+      this.$emit('input', result)
+    },
     changeOptions(q) {
       if (this.remoteMethod) {
         this.loading = true

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

@@ -11,18 +11,18 @@
       >
        <template v-slot:ExtLockRsp_SDK="{ formData }">
       <!-- 插槽内容有el-form-item组件包裹 -->
-      <el-select v-model="formData.ExtLockRsp_SDK" :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+      <el-select v-model="formData.ExtLockRsp_SDK" :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据"  @change="handleSelectRSP">
                 <el-option
                   v-for="item in province"
-                  :key="item.AccountID"
+                  :key="item.ExtProcessStatus_SDK"
                   :label="item.Name"
-                  :value="item.ExtSocialUnifiedCreditCode_SDK"
+                  :value="item.ExtProcessStatus_SDK"
                 />
               </el-select>
     </template>
       <template v-slot:ExtLockCity_SDK="{ formData }">
       <!-- 插槽内容有el-form-item组件包裹 -->
-      <el-select v-model="formData.ExtLockCity_SDK"  :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+      <el-select v-model="formData.ExtLockCity_SDK"  :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据" @change='handleSelectCity'>
                 <el-option
                   v-for="item in apptions"
                   :key="item.Code"
@@ -36,7 +36,7 @@
       <el-select v-model="formData.ExtChannelType_SDK"  :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in cOptions"
-                  :key="item.id"
+                  :key="item.keyword"
                   :label="item.content"
                   :value="item.keyword"
                 />
@@ -161,14 +161,14 @@ export default {
         {
           title: '地址信息',
           formDesc: {
-            ExtProvince_SDK: {
+            ExtProvinceName_SDK: {
               type: 'input',
               label: '省份',
               layout: 12,
               disabled:true,
           
             },
-            ExtCity_SDK: {
+            ExtCityName_SDK: {
               type: 'input',
               label: '城市',
               layout: 12,
@@ -176,7 +176,7 @@ export default {
               disabled:true,
               
             },
-            ExtDistrict_SDK: {
+            ExtDistrictName_SDK: {
               type: 'input',
               label: '县市',
               layout: 12,
@@ -344,7 +344,34 @@ export default {
             this.tableData=resp.results
        })
     },
-
+    handleSelectRSP(value){
+         let cont=[]
+          let val=[]
+          this.province.forEach((el)=>{
+             value.forEach((item)=>{
+               if(el.ExtProcessStatus_SDK==item){
+                   cont.push(el.Name)
+                   val.push(el.ExtProcessStatus_SDK)
+               }
+             })
+          })
+			     this.formData.ExtLockRspName_SDK=cont//获取的 name
+			     this.formData.ExtLockRsp_SDK=val//获取的 id
+    },
+        handleSelectCity(value){
+       let cont=[]
+          let val=[]
+          this.apptions.forEach((el)=>{
+             value.forEach((item)=>{
+               if(el.Code==item){
+                   cont.push(el.Name)
+                   val.push(el.Code)
+               }
+             })
+          })
+			     this.formData.ExtLockCityName_SDK=cont//获取的 name
+			     this.formData.ExtLockCity_SDK=val//获取的 id
+   },
     handleSuccess () {
       // this.$message.success('创建成功')
     },
@@ -358,13 +385,17 @@ export default {
     },
     approveClick(){
       const extLockRsp_SDK=this.formData.ExtLockRsp_SDK.toString()
+      const extLockRspName_SDK=this.formData.ExtLockRspName_SDK.toString()
       const extLockCity_SDK=this.formData.ExtLockCity_SDK.toString()
+      const extLockCityName_SDK=this.formData.ExtLockCityName_SDK.toString()
      const cc={extProcessNode_SDK:this.formData.ExtProcessNode_SDK,
 extCustomerType_SDK:this.formData.ExtCustomerType_SDK,
 extProvince_SDK:this.formData.ExtProvince_SDK,
 objectID:this.formData.ObjectID,
 extLockRsp_SDK:extLockRsp_SDK,
+extLockRspName_SDK:extLockRspName_SDK,
 extLockCity_SDK:extLockCity_SDK,
+extLockCityName_SDK:extLockCityName_SDK,
 extChannelType_SDK:this.formData.ExtChannelType_SDK}
       if(this.status==1){
          const add={customerDTO:cc,note:this.form.note,result:"approve"}

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

@@ -11,7 +11,7 @@
       >
       <template v-slot:ExtLockCity_SDK="{ formData }">
       <!-- 插槽内容有el-form-item组件包裹 -->
-      <el-select v-model="formData.ExtLockCity_SDK" :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+      <el-select v-model="formData.ExtLockCity_SDK" :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据"  @change="handleSelectCity">
                 <el-option
                   v-for="item in province"
                  :key="item.Code"
@@ -139,14 +139,14 @@ export default {
         {
           title: '地址信息',
           formDesc: {
-            ExtProvince_SDK: {
+            ExtProvinceName_SDK: {
               type: 'input',
               label: '省份',
               layout: 12,
               disabled:true,
           
             },
-            ExtCity_SDK: {
+            ExtCityName_SDK: {
               type: 'input',
               label: '城市',
               layout: 12,
@@ -154,7 +154,7 @@ export default {
               disabled:true,
               
             },
-            ExtDistrict_SDK: {
+            ExtDistrictName_SDK: {
               type: 'input',
               label: '县市',
               layout: 12,
@@ -232,19 +232,19 @@ export default {
           {
           title: '签约信息',
           formDesc: {
-            ExtChannelType_SDK : {
+            ExtChannelType_SDKText : {
               type: 'input',
               label: '签约渠道类型',
               layout: 12,
               disabled:true
             },
-            ExtLockRsp_KUT: {
+            ExtProductGroup_SDK: {
               type: 'input',
               label: '签约产品组',
               layout: 12,
               disabled:true
             },
-            ExtTotalAgent_KUT: {
+            ExtTotalAgent_SDK: {
               type: 'input',
               label: '签约总代',
               layout: 12,
@@ -316,6 +316,20 @@ export default {
             this.tableData=resp.results
        })
     },
+     handleSelectCity(value){
+       let cont=[]
+          let val=[]
+          this.province.forEach((el)=>{
+             value.forEach((item)=>{
+               if(el.Code==item){
+                   cont.push(el.Name)
+                   val.push(el.Code)
+               }
+             })
+          })
+			     this.formData.ExtLockCityName_SDK=cont//获取的 name
+			     this.formData.ExtLockCity_SDK=val//获取的 id
+   },
     handleSuccess () {
       // this.$message.success('创建成功')
     },
@@ -329,12 +343,15 @@ export default {
     },
     approveClick(){
       const ExtLockCity_SDK=this.formData.ExtLockCity_SDK.toString()
+      const ExtLockCityName_SDK=this.formData.ExtLockCityName_SDK.toString()
+   
      const cc={extProcessNode_SDK:this.formData.ExtProcessNode_SDK,
 extCustomerType_SDK:this.formData.ExtCustomerType_SDK,
 extProvince_SDK:this.formData.ExtProvince_SDK,
 objectID:this.formData.ObjectID,
 extLockRsp_SDK:this.formData.extLockRsp_SDK,
 extLockCity_SDK:ExtLockCity_SDK,
+extLockCityName_SDK:ExtLockCityName_SDK,
 extChannelType_SDK:this.formData.ExtChannelType_SDK}
       if(this.status==1){
          const add={customerDTO:cc,note:this.form.note,result:"approve"}

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

@@ -198,14 +198,14 @@ export default {
         {
           title: '地址信息',
           formDesc: {
-            ExtProvince_SDK: {
+            ExtProvinceName_SDK: {
               type: 'input',
               label: '省份',
               layout: 12,
               disabled:true,
           
             },
-            ExtCity_SDK: {
+            ExtCityName_SDK: {
               type: 'input',
               label: '城市',
               layout: 12,
@@ -213,7 +213,7 @@ export default {
               disabled:true,
               
             },
-            ExtDistrict_SDK: {
+            ExtDistrictName_SDK: {
               type: 'input',
               label: '县市',
               layout: 12,
@@ -306,13 +306,14 @@ export default {
 
   },
   created(){
-     this.id=this.$route.query.objectId
+     this.id=this.$route.query.objectID
      this.getList()
      this.getHistoryList()
      this.getChannelType()
   },
   methods: {
     getList(){
+     
        getCustomer({objectID:this.id}).then((resp)=>{
             this.formData=resp.results[0]
             lockRsp({extProvince_SDK: resp.results[0].ExtProvince_SDK}).then((resp)=>{

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

@@ -135,7 +135,7 @@
                           prop="extDistrict_SDK"
                           label-width="80px"
                           required>
-              <el-select v-model="formData.extDistrict_SDK" style="width: 91%" filterable placeholder="请选择区" no-match-text="无匹配数据">
+              <el-select v-model="formData.extDistrict_SDK" style="width: 91%" filterable placeholder="请选择区" no-match-text="无匹配数据"  @change="handleSelectDis">
                 <el-option
                   v-for="item in disOptions"
                   :key="item.Code"
@@ -410,12 +410,32 @@ export default {
      this.$request(Country.searchCity,app).then((resp) => {
         this.cityOptions=resp.results
       })
+      let obj = {};
+			      obj = this.countryOptions.find((item)=>{//这里的userList就是上面遍历的数据源
+			        return item.Code === value;//筛选出匹配数据
+			      });
+			     this.formData.extProvinceName_SDK=obj.Name//获取的 name
+			     this.formData.extProvince_SDK=value//获取的 id
    },
    handleSelectCity(value){
      const app={cityCode:value}
      this.$request(Country.searchDis,app).then((resp) => {
         this.disOptions=resp.results
       })
+       let obj = {};
+			    obj = this.cityOptions.find((item)=>{//这里的userList就是上面遍历的数据源
+			      return item.Code === value;//筛选出匹配数据
+			    });
+			     this.formData.extCityName_SDK=obj.Name//获取的 name
+			     this.formData.extCity_SDK=value//获取的 id
+   },
+   handleSelectDis(value){
+      let obj = {};
+			    obj = this.disOptions.find((item)=>{//这里的userList就是上面遍历的数据源
+			      return item.Code === value;//筛选出匹配数据
+			    });
+			     this.formData.extDistrictName_SDK=obj.Name//获取的 name
+			     this.formData.extDistrict_SDK=value//获取的 id
    },
     createLovTable() {
       this.dialogTableVisible = true

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

@@ -172,14 +172,14 @@ export default {
         {
           title: '地址信息',
           formDesc: {
-            ExtProvince_SDK: {
+            ExtProvinceName_SDK: {
               type: 'input',
               label: '省份',
               layout: 12,
               disabled:true,
           
             },
-            ExtCity_SDK: {
+            ExtCityName_SDK: {
               type: 'input',
               label: '城市',
               layout: 12,
@@ -187,7 +187,7 @@ export default {
               disabled:true,
               
             },
-            ExtDistrict_SDK: {
+            ExtDistrictName_SDK: {
               type: 'input',
               label: '县市',
               layout: 12,
@@ -271,19 +271,19 @@ export default {
               layout: 12,
               disabled:true
             },
-            ExtLockRsp_KUT: {
+            ExtProductGroup_SDK: {
               type: 'input',
               label: '签约产品组',
               layout: 12,
               disabled:true
             },
-            ExtTotalAgent_KUT: {
+            ExtTotalAgent_SDK: {
               type: 'input',
               label: '签约总代',
               layout: 12,
               disabled:true
             },
-            ExtLockCity_SDK: {
+            ExtLockCityName_SDK: {
               type: 'input',
               label: '覆盖范围(城市)',
               layout: 12,
@@ -311,12 +311,13 @@ export default {
     //  }
   },
   created(){
-     this.id=this.$route.query.objectId
+     this.id=this.$route.query.objectID
      this.getList()
      this.getHistoryList()
   },
   methods: {
     getList(){
+       console.log('objectId',this.id)
        getCustomer({objectID:this.id}).then((resp)=>{
             this.formData=resp.results[0]
        const app={provinceCode:resp.results[0].ExtProvince_SDK}

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

@@ -287,8 +287,8 @@
             </el-form-item>
           </el-col>
           <el-col  :span="12"  class="padding-bottom">
-            <el-form-item label="签约产品组:" prop="extProductGroup_KUT" label-width="120px">
-              <el-select v-model="formData.extProductGroup_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+            <el-form-item label="签约产品组:" prop="extProductGroup_KUT" label-width="120px" >
+              <el-select v-model="formData.extProductGroup_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据"  @change="handSelect2">
                 <el-option
                   v-for="item in bOptions"
                   :key="item.id"
@@ -299,8 +299,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="11"  :offset="1" class="padding-bottom">
-            <el-form-item label="签约总代:" prop="extTotalAgent_KUT" label-width="100px">
-             <el-select v-model="formData.extTotalAgent_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+            <el-form-item label="签约总代:" prop="extTotalAgent_KUT" label-width="100px" >
+             <el-select v-model="formData.extTotalAgent_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据" @change="handSelect3">
                 <el-option
                   v-for="item in cOptions"
                   :key="item.id"
@@ -521,7 +521,35 @@ export default {
 			     this.formData.extDistrictName_SDK=obj.Name//获取的 name
 			     this.formData.extDistrict_SDK=value//获取的 id
    },
-   
+   handSelect2(value){
+          let cont=[]
+          let val=[]
+          this.bOptions.forEach((el)=>{
+             value.forEach((item)=>{
+               if(el.keyword==item){
+                   cont.push(el.content)
+                   val.push(el.keyword)
+               }
+             })
+          })
+			     this.formData.extProductGroup_SDK=cont//获取的 name
+			     this.formData.extProductGroup_KUT=val//获取的 id
+   },
+    handSelect3(value){
+      let cont=[]
+          let val=[]
+          this.cOptions.forEach((el)=>{
+             value.forEach((item)=>{
+               if(el.keyword==item){
+                   cont.push(el.content)
+                   val.push(el.keyword)
+               }
+             })
+          })
+			     this.formData.extTotalAgent_SDK=cont//获取的 name
+			     this.formData.extTotalAgent_KUT=val//获取的 id
+   },
+  
     createLovTable() {
       this.dialogTableVisible = true
     },
@@ -549,9 +577,13 @@ export default {
         // })
         this.formData.extCustomerType_SDK=101
         const ExtProductGroup_KUT=this.formData.extProductGroup_KUT.toString()
+        const ExtProductGroup_SDK=this.formData.extProductGroup_SDK.toString()
         const ExtTotalAgent_KUT=this.formData.extTotalAgent_KUT.toString()
+        const ExtTotalAgent_SDK=this.formData.extTotalAgent_SDK.toString()
         this.formData.extProductGroup_KUT=ExtProductGroup_KUT
+        this.formData.extProductGroup_SDK=ExtProductGroup_SDK
         this.formData.extTotalAgent_KUT=ExtTotalAgent_KUT
+        this.formData.extTotalAgent_SDK=ExtTotalAgent_SDK
         this.btnloading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
             this.btnloading=false