Merge branch 'master' of http://git.cc-lotus.info/financial_platform/admin-cms

src/views/companyidentify/detail.vue

@@ -50,30 +50,13 @@ export default {
   },
   methods: {
     ...companyidentify(['query', 'delete', 'fetch', 'update', 'updateStatus']),
-    ...profession({ professionquery: 'query', create: 'create' }),
-    ...dictionary({ dictionaryquery: 'query' }),
     async search() {
       const res = await this.fetch(this.id);
       if (res.errcode === 0) {
-        this.serchProfession(res.data);
+        this.$set(this, `ruleForm`, res.data);
       }
     },
-    // 根据存储的行业code查询对应的name
-    async serchProfession(data) {
-      const profession_one = await this.professionquery({ code: data.profession_one });
-      const profession_two = await this.professionquery({ code: data.profession_two });
-      const profession_three = await this.professionquery({ code: data.profession_three });
-      const profession_four = await this.professionquery({ code: data.profession_four });
-      const belong_addr_city = await this.dictionaryquery({ code: data.belong_addr_city });
-      const belong_addr_area = await this.dictionaryquery({ code: data.belong_addr_area });
-      data.profession_one = profession_one.data[0].name;
-      data.profession_two = profession_two.data[0].name;
-      data.profession_three = profession_three.data[0].name;
-      data.profession_four = profession_four.data[0].name;
-      data.belong_addr_city = belong_addr_city.data[0].name;
-      data.belong_addr_area = belong_addr_area.data[0].name;
-      this.$set(this, `ruleForm`, data);
-    },
+
     // 提交
     async submitForm({ data }) {
       data.status = '1';

src/views/companyup/detail.vue

@@ -49,25 +49,12 @@ export default {
   },
   methods: {
     ...companyup({ companyupStatus: 'updateStatus', companyupFetch: 'fetch' }),
-    ...profession({ queryType: 'query', create: 'create' }),
     async search() {
       const res = await this.companyupFetch(this.id);
       if (res.errcode === 0) {
-        this.serchProfession(res.data);
+        this.$set(this, `ruleForm`, res.data);
       }
     },
-    // 根据存储的行业code查询对应的name
-    async serchProfession(data) {
-      const profession_one = await this.queryType({ code: data.profession_one });
-      const profession_two = await this.queryType({ code: data.profession_two });
-      const profession_three = await this.queryType({ code: data.profession_three });
-      const profession_four = await this.queryType({ code: data.profession_four });
-      data.profession_one = profession_one.data[0].name;
-      data.profession_two = profession_two.data[0].name;
-      data.profession_three = profession_three.data[0].name;
-      data.profession_four = profession_four.data[0].name;
-      this.$set(this, `ruleForm`, data);
-    },
     // 审核企业修改信息+通过
     submitForm({ data }) {
       data.status = '1';