Merge branch 'release2.2' of...

Merge branch 'release2.2' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2

src/views/ecw/supplier/edit.vue

@@ -71,7 +71,7 @@
         </el-form-item>
       </div>
       <div v-if="formData.areaType==1">
-        <el-form-item :label="$t('国家')" prop="cooperationType">
+        <el-form-item :label="$t('国家')" prop="country">
           <el-select v-model="formData.country" :placeholder="$t('请选择国家')">
             <el-option
               v-for="item in treeList"
@@ -742,6 +742,9 @@ export default {
       },
       'formData.companyTypeArr'(val){
         this.$set(this.formData, 'companyType', val.join(","))
+      },
+      'formData.areaType'(){
+        this.$refs["elForm"].clearValidate()
       }
   },
   created() {
@@ -804,6 +807,7 @@ export default {
                   this.$set(this.formData.externalVO,'clearanceRequire',response.data.externalBackVO.clearanceRequire)
                   this.$set(this.formData.externalVO,'provide',response.data.externalBackVO.provide)
                   this.$set(this.formData.externalVO,'badCooperationRecord',response.data.externalBackVO.badCooperationRecord)
+                  this.$set(this.formData.externalVO,'tinNoRcNo',response.data.externalBackVO.tinNoRcNo)
                 }
             });
         }