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

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

@@ -356,6 +356,11 @@ export default {
   },
   watch: {
 
+  },
+    computed: {
+    visitedViews() {
+      return this.$store.state.tagsView.visitedViews
+    },
   },
   created() {
 
@@ -387,9 +392,18 @@ export default {
         }
         if (this.formData.ExtProcessNode_SDK == 2) {
           this.formData.extChannelType_SDK = ''
+          if(!this.formData.extLockRsp_SDK){
+            this.formData.ExtLockRsp_SDK =[]
+          }else{
              this.formData.ExtLockRsp_SDK = this.formData.ExtLockRsp_SDK.split(',')
+          }
+          if(!this.formData.ExtLockCity_SDK){
+            this.formData.ExtLockCity_SDK = []
+          }else{
             this.formData.ExtLockCity_SDK =  this.formData.ExtLockCity_SDK.split(',')
           }
+         
+        }
         lockRsp({ extProvince_SDK: resp.results[0].ExtProvince_SDK }).then((resp) => {
           this.province = resp.results
         })
@@ -486,7 +500,7 @@ export default {
           this.loading = false
           this.$message.success("审批成功!")
           this.dialogFormVisible = false
-          this.$router.back()
+          this.handleClickGoBack()
         })
       } else {
         const bdd = { customerDTO: cc, note: this.form.note, result: "reject" }
@@ -495,11 +509,17 @@ export default {
           this.loading = false
           this.$message.success("退回成功!")
           this.dialogFormVisible = false
-          this.$router.back()
+          this.handleClickGoBack()
         })
       }
 
     },
+    handleClickGoBack() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+        .then((visitedViews) => {
+          this.$router.back(-1)
+        })
+    },
     //  对象格式转化为键值对
     paramsToFormData(obj) {
       const formData = new FormData();

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

@@ -328,6 +328,11 @@ export default {
     //    deep:true
 
     //  }
+  },
+    computed: {
+    visitedViews() {
+      return this.$store.state.tagsView.visitedViews
+    },
   },
   created() {
     this.id = this.$route.query.id
@@ -360,8 +365,13 @@ export default {
           }
         }
         if (this.formData.ExtProcessNode_SDK == 2) {
+          if(!this.formData.ExtLockCity_SDK){
+            this.formData.ExtLockCity_SDK = []
+          }else{
             this.formData.ExtLockCity_SDK = this.formData.ExtLockCity_SDK.split(',')
           }
+         
+        }
         const app = { provinceCode: resp.results[0].ExtProvince_SDK }
         this.$request(Country.searchCity, app).then((resp) => {
           this.province = resp.results
@@ -432,7 +442,7 @@ export default {
           this.loading = false
           this.$message.success("审批成功!")
           this.dialogFormVisible = false
-          this.$router.back()
+         this.handleClickGoBack()
         })
       } else {
         this.loading = true
@@ -441,10 +451,16 @@ export default {
           this.loading = false
           this.$message.success("退回成功!")
           this.dialogFormVisible = false
-          this.$router.back()
+         this.handleClickGoBack()
         })
       }
 
+    },
+      handleClickGoBack() {
+     this.$store.dispatch('tagsView/delView', this.$route)
+        .then((visitedViews) => {
+          this.$router.back(-1)
+        })
     },
     //  对象格式转化为键值对
     paramsToFormData(obj) {

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

@@ -314,12 +314,14 @@
                   @row-click="select"
                   style="width: 100%">
           <el-table-column prop="Status"
+                           width="80"
                            label="状态">
           </el-table-column>
           <el-table-column prop="Name"
                            label="公司">
           </el-table-column>
           <el-table-column prop="OperName"
+                           width="120"
                            label="法定代表人">
           </el-table-column>
           <el-table-column prop="CreditCode"

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

@@ -412,12 +412,14 @@
                   @row-click="select"
                   style="width: 100%">
           <el-table-column prop="Status"
+                          width="80"
                            label="状态">
           </el-table-column>
           <el-table-column prop="Name"
                            label="公司">
           </el-table-column>
           <el-table-column prop="OperName"
+                            width="120"
                            label="法定代表人">
           </el-table-column>
           <el-table-column prop="CreditCode"