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

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

@@ -3,13 +3,15 @@
     <Title :title="title">
       <span>*</span>为必填项
     </Title>
-    <div class="basic-info"  v-loading='loading'>
+    <div class="basic-info"
+         v-loading='loading'>
       <ele-form-section v-model="formData"
                         :rules="rules"
-                       
                         :sections="sections">
         <template v-slot:ExtRegisteredCapital_SDK="{ formData }">
-          <el-input v-if="formData.ExtProcessNode_SDK==4"  v-model="formData.ExtRegisteredCapital_SDK" :disabled="!formData.ExtRegisteredCapital_SDK=='' || !formData.ExtRegisteredCapital_SDK==null">
+          <el-input v-if="formData.ExtProcessNode_SDK==4"
+                    v-model="formData.ExtRegisteredCapital_SDK"
+                    :disabled="isEdit">
           </el-input>
         </template>
         <template v-slot:ExtLockRsp_SDK="{ formData }">
@@ -169,8 +171,8 @@ export default {
       loading: false,
       tableData2: [],
       formData: {
-        ExtLockRsp_SDK:[],
-        ExtLockCity_SDK:[],
+        ExtLockRsp_SDK: [],
+        ExtLockCity_SDK: [],
       },
       province: [],
       sections: [
@@ -340,14 +342,15 @@ export default {
       ],
       tableData: [],
       TotalRecords: 0,
+      isEdit: true,
       page: {},
       apptions: [],
       cOptions: [],
       // 同 vue-ele-form
       rules: {
-        ExtChannelType_SDK: {required: true, message: '请选择签约渠道类型',trigger: 'change'  },
-        ExtLockRsp_SDK: { required: true, message: '请选择锁定RSP',trigger: 'change' },
-        ExtLockCity_SDK: { required: true, message: '请选择城市覆盖范围',trigger: 'change' },
+        ExtChannelType_SDK: { required: true, message: '请选择签约渠道类型', trigger: 'change' },
+        ExtLockRsp_SDK: { required: true, message: '请选择锁定RSP', trigger: 'change' },
+        ExtLockCity_SDK: { required: true, message: '请选择城市覆盖范围', trigger: 'change' },
       }
     }
   },
@@ -373,14 +376,19 @@ export default {
       })
     },
     getList() {
-      this.loading=true
+      this.loading = true
       getCustomer({ objectID: this.id }).then((resp) => {
-        this.loading=false
+        this.loading = false
         this.formData = resp.results[0]
-        if(this.formData.ExtProcessNode_SDK==2){
-          this.formData.extChannelType_SDK=''
-           this.formData.ExtLockRsp_SDK=[]
-          this.formData.ExtLockCity_SDK=[]
+        if (this.formData.ExtProcessNode_SDK == 4) {
+          if (!this.formData.ExtRegisteredCapital_SDK) {
+             this.isEdit = false
+          }
+        }
+        if (this.formData.ExtProcessNode_SDK == 2) {
+          this.formData.extChannelType_SDK = ''
+          this.formData.ExtLockRsp_SDK = []
+          this.formData.ExtLockCity_SDK = []
         }
         lockRsp({ extProvince_SDK: resp.results[0].ExtProvince_SDK }).then((resp) => {
           this.province = resp.results
@@ -436,15 +444,19 @@ export default {
       // this.$message.success('创建成功')
     },
     approve() {
-      if(this.formData.ExtLockRsp_SDK.length==0||this.formData.ExtLockCity_SDK.length==0||this.formData.ExtChannelType_SDK.length==0){
+      if (this.formData.ExtLockRsp_SDK.length == 0 || this.formData.ExtLockCity_SDK.length == 0 || this.formData.ExtChannelType_SDK.length == 0) {
         return this.$message.warning('请输入必填信息')
-      }else if(formData.ExtRegisteredCapital_SDK=='' || formData.ExtRegisteredCapital_SDK==null){
+      } else if (this.formData.ExtProcessNode_SDK == 4) {
+        if (!this.formData.ExtRegisteredCapital_SDK) {
           return this.$message.warning('请输入注册资金')
         }else{
           this.dialogFormVisible = true
           this.status = 1
         }
-    
+      } else {
+        this.dialogFormVisible = true
+        this.status = 1
+      }
     },
     reject() {
       this.dialogFormVisible = true
@@ -456,7 +468,7 @@ export default {
       const extLockCity_SDK = this.formData.ExtLockCity_SDK.toString()
       const extLockCityName_SDK = this.formData.ExtLockCityName_SDK.toString()
       const cc = {
-        extRegisteredCapital_SDK:this.formData.ExtRegisteredCapital_SDK,
+        extRegisteredCapital_SDK: this.formData.ExtRegisteredCapital_SDK,
         extProcessNode_SDK: this.formData.ExtProcessNode_SDK,
         extCustomerType_SDK: this.formData.ExtCustomerType_SDK,
         extProvince_SDK: this.formData.ExtProvince_SDK,

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

@@ -3,12 +3,15 @@
     <Title :title="title">
       <span>*</span>为必填项
     </Title>
-    <div class="basic-info" v-loading='loading'>
+    <div class="basic-info"
+         v-loading='loading'>
       <ele-form-section v-model="formData"
                         :rules="rules"
                         :sections="sections">
         <template v-slot:ExtRegisteredCapital_SDK="{ formData }">
-          <el-input  v-if="formData.ExtProcessNode_SDK==5"  v-model="formData.ExtRegisteredCapital_SDK" :disabled="!formData.ExtRegisteredCapital_SDK=='' || !formData.ExtRegisteredCapital_SDK==null">
+          <el-input v-if="formData.ExtProcessNode_SDK==5"
+                    v-model="formData.ExtRegisteredCapital_SDK"
+                    :disabled="isEdit">
           </el-input>
         </template>
         <template v-slot:ExtLockCity_SDK="{ formData }">
@@ -131,7 +134,7 @@ export default {
       status: 0,
       loading: false,
       formData: {
-        ExtLockCity_SDK:[]
+        ExtLockCity_SDK: []
       },
       province: [],
       tableData2: [],
@@ -307,11 +310,12 @@ export default {
         },
       ],
       tableData: [],
+      isEdit: true,
       TotalRecords: 0,
       page: {},
       // 同 vue-ele-form
       rules: {
-        ExtLockCity_SDK: { required: true, message: '请选择覆盖城市范围',trigger:  'change'},
+        ExtLockCity_SDK: { required: true, message: '请选择覆盖城市范围', trigger: 'change' },
       }
     }
   },
@@ -345,12 +349,17 @@ export default {
       window.open(row.FileURL)
     },
     getList() {
-      this.loading=true
+      this.loading = true
       getCustomer({ objectID: this.id }).then((resp) => {
-        this.loading=false
+        this.loading = false
         this.formData = resp.results[0]
-        if(this.formData.ExtProcessNode_SDK==2){
-             this.formData.ExtLockCity_SDK=[]
+        if (this.formData.ExtProcessNode_SDK == 5) {
+          if (!this.formData.ExtRegisteredCapital_SDK) {
+            this.isEdit = false
+          }
+        }
+        if (this.formData.ExtProcessNode_SDK == 2) {
+          this.formData.ExtLockCity_SDK = []
         }
         const app = { provinceCode: resp.results[0].ExtProvince_SDK }
         this.$request(Country.searchCity, app).then((resp) => {
@@ -381,14 +390,19 @@ export default {
       // this.$message.success('创建成功')
     },
     approve() {
-      if(this.formData.ExtLockCity_SDK.length==0){
+      if (this.formData.ExtLockCity_SDK.length == 0) {
         return this.$message.warning('请输入必填信息')
-      }else if(formData.ExtRegisteredCapital_SDK=='' || formData.ExtRegisteredCapital_SDK==null){
+      } else if (this.formData.ExtProcessNode_SDK == 5) {
+        if (!this.formData.ExtRegisteredCapital_SDK) {
           return this.$message.warning('请输入注册资金')
         }else{
           this.dialogFormVisible = true
           this.status = 1
         }
+      } else {
+         this.dialogFormVisible = true
+          this.status = 1
+      }
 
     },
     reject() {
@@ -400,7 +414,7 @@ export default {
       const ExtLockCityName_SDK = this.formData.ExtLockCityName_SDK.toString()
 
       const cc = {
-        extRegisteredCapital_SDK:this.formData.ExtRegisteredCapital_SDK,
+        extRegisteredCapital_SDK: this.formData.ExtRegisteredCapital_SDK,
         extProcessNode_SDK: this.formData.ExtProcessNode_SDK,
         extCustomerType_SDK: this.formData.ExtCustomerType_SDK,
         extProvince_SDK: this.formData.ExtProvince_SDK,