Merge branch 'dev' of http://222.90.211.174:3000/suf/domestic--e-commerc-c into dev

src/views/myStoreEnterprise/EnterpriseAddInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="enterprise-supplement">
-    <basic-info ref="baseInfo" :base-info="baseInfo" class="base-info" />
+    <basic-info ref="baseInfoRef" :base-info="baseInfo" class="base-info" />
     <PersonInfo ref="legalPersonInfoRef" :regionList="regionList" :person-type="'legal'" :details-info="legalPersonInfo" class="legal-info" />
     <PersonInfo ref="controlPersonInfoRef" :regionList="regionList" :person-type="'control'" :details-info="controlPersonInfo" />
     <ContactInfo ref="contactInfoRef" :details-info="contactInfo" />
@@ -35,20 +35,17 @@ export default {
     }
   },
   created() {
-    // this.getDetails()
-
-    const { typeName, code, name  } = this.$route.query
-
-    this.baseInfo = {
-      typeName: typeName || '',
-      socialCreditCode: code || '',
-      enterpriseName: name || ''
-    }
-
     this.queryReginList()
 
     if (this.$route.query.id && this.$route.query.companyZrId) {
       this.getDetails(this.$route.query.id)
+    } else {
+      const { code, name } = this.$route.query
+      this.baseInfo = {
+        companyType: '',
+        socialCreditCode: code || '',
+        enterpriseName: name || ''
+      }
     }
   },
   methods: {
@@ -59,8 +56,14 @@ export default {
     },
     async getDetails(queryId) {
       const res = await getEnterpriseDetail(queryId)
+      const { code, name  } = this.$route.query
 
       if (res.success) {
+        this.baseInfo = {
+          companyType: res.data.companyZrVo.companyType || '',
+          socialCreditCode: code || '',
+          enterpriseName: name || ''
+        }
         this.legalPersonInfo = res.data.companyZrVo
         this.controlPersonInfo =  res.data.companyZrVo
         this.contactInfo = res.data.companyZrVo
@@ -104,13 +107,14 @@ export default {
       const contactReqParams = {
         ...contactParams
       }
-
+      const baseInfoParams = await this.$refs.baseInfoRef.getPrams(type)
       const supParams = {
         Loading: true,
         companyId: this.$route.query.id,
         ...legalReqParams,
         ...controlReqParams,
         ...contactReqParams,
+        companyType: baseInfoParams.companyType,
         fileIds,
         flag: type === 'temp' ? 0 : 1
       }
@@ -119,6 +123,10 @@ export default {
         supParams.companyZrId = this.$route.query.companyZrId
       }
 
+      if (this.$route.query.taskId) {
+        supParams.taskId = this.$route.query.taskId
+      }
+
       const res = await enterpriseAccessStepOne(supParams)
 
       if (res.success) {

src/views/myStoreEnterprise/EnterpriseEdit.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="enterprise-edit">
-    <basic-info ref="baseInfo" :base-info="baseInfo" />
-    <PersonInfo ref="legalPersonInfoRef" :regionList="regionList" :person-type="'legal'" :details-info="legalPersonInfo" />
-    <PersonInfo ref="controlPersonInfoRef" :regionList="regionList" :person-type="'control'" :details-info="controlPersonInfo" />
-    <ContactInfo ref="contactInfoRef" :details-info="contactInfo" />
+    <basic-info ref="baseInfoRef" :base-info="baseInfo" />
+    <PersonInfo ref="legalPersonInfoRef" :regionList="regionList" :person-type="'legal'" :details-info="legalPersonInfo" style="margin-top: 20px;" />
+    <PersonInfo ref="controlPersonInfoRef" :regionList="regionList" :person-type="'control'" :details-info="controlPersonInfo" style="margin-top: 20px;" />
+    <ContactInfo ref="contactInfoRef" :details-info="contactInfo" style="margin-top: 20px;" />
     <div class="submit-btn">
       <el-button @click="() => { $router.push({ name: 'MyStoreEnterprise', query: { activeName: 'enterprise' } }) }">关闭</el-button>
       <el-button type="primary" @click="submitClick('temp')">暂存</el-button>
@@ -34,14 +34,6 @@ export default {
     }
   },
   created() {
-    const { typeName, code, name  } = this.$route.query
-
-    this.baseInfo = {
-      typeName: typeName || '',
-      socialCreditCode: code || '',
-      enterpriseName: name || ''
-    }
-
     this.queryReginList()
 
     if (this.$route.query.id && this.$route.query.companyZrId) {
@@ -56,8 +48,14 @@ export default {
     },
     async getDetails(queryId) {
       const res = await getEnterpriseDetail(queryId)
+      const { code, name  } = this.$route.query
 
       if (res.success) {
+        this.baseInfo = {
+          companyType: res.data.companyZrVo.companyType || '',
+          socialCreditCode: code || '',
+          enterpriseName: name || ''
+        }
         this.legalPersonInfo = res.data.companyZrVo
         this.controlPersonInfo =  res.data.companyZrVo
         this.contactInfo = res.data.companyZrVo
@@ -101,17 +99,22 @@ export default {
       const contactReqParams = {
         ...contactParams
       }
-
+      const baseInfoParams = await this.$refs.baseInfoRef.getPrams(type)
       const supParams = {
         Loading: true,
         companyId: this.$route.query.id,
         ...legalReqParams,
         ...controlReqParams,
         ...contactReqParams,
+        companyType: baseInfoParams.companyType,
         fileIds,
         flag: type === 'temp' ? 0 : 1
       }
 
+      if (this.$route.query.taskId) {
+        supParams.taskId = this.$route.query.taskId
+      }
+
       if (this.$route.query.companyZrId) {
         supParams.companyZrId = this.$route.query.companyZrId
       }

src/views/myStoreEnterprise/EnterpriseReInvite.vue

@@ -98,6 +98,10 @@ export default {
         flag: type === 'temp' ? 0 : 1
       }
 
+      if (this.$route.query.taskId) {
+        supParams.taskId = this.$route.query.taskId
+      }
+
       if (this.$route.query.companyZrId) {
         supParams.companyZrId = this.$route.query.companyZrId
       }

src/views/myStoreEnterprise/EnterpriseView.vue

@@ -50,14 +50,6 @@ export default {
     }
   },
   created() {
-    const { typeName, code, name  } = this.$route.query
-
-    this.baseInfo = {
-      typeName: typeName || '',
-      socialCreditCode: code || '',
-      enterpriseName: name || ''
-    }
-
     this.queryReginList()
 
     if (this.$route.query.id && this.$route.query.companyZrId) {
@@ -72,8 +64,15 @@ export default {
     },
     async getDetails(queryId) {
       const res = await getEnterpriseDetail(queryId)
+      const { code, name  } = this.$route.query
 
       if (res.success) {
+        this.baseInfo = {
+          companyType: res.data.companyZrVo.companyType || '',
+          socialCreditCode: code || '',
+          enterpriseName: name || ''
+        }
+
         this.legalPersonInfo = res.data.companyZrVo
         this.controlPersonInfo =  res.data.companyZrVo
         this.contactInfo = res.data.companyZrVo

src/views/myStoreEnterprise/components/BasicInfo.vue

@@ -9,8 +9,19 @@
       label-width="150px"
       class="rule-form-orange"
     >
-      <el-form-item label="企业类别" prop="typeName">
-        <el-input v-model="ruleForm.typeName" placeholder="请输入企业公司名称" disabled />
+      <el-form-item label="企业类别" prop="companyType">
+        <el-select v-model="ruleForm.companyType" placeholder="请选择企业类别" :disabled="disabled">
+          <el-option
+            :key="1"
+            label="企业"
+            value="企业">
+          </el-option>
+          <el-option
+            :key="2"
+            label="个体工商户"
+            value="个体工商户">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="企业名称" prop="enterpriseName">
         <el-input v-model="ruleForm.enterpriseName" placeholder="请输入企业公司名称" disabled />
@@ -37,12 +48,12 @@ export default {
   data() {
     return {
       ruleForm: {
-        typeName: '',
+        companyType: '',
         enterpriseName: '',
         socialCreditCode: ''
       },
       rules: {
-        typeName: [{ required: true, message: '请选择企业类别', trigger: 'blur' }],
+        companyType: [{ required: true, message: '请选择企业类别', trigger: 'blur' }],
         enterpriseName: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
         socialCreditCode: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }]
       }
@@ -52,9 +63,9 @@ export default {
     baseInfo: {
       handler(newV) {
         if (newV && Object.keys(newV)) {
-          const { typeName, enterpriseName, socialCreditCode } = JSON.parse(JSON.stringify(newV))
+          const { companyType, enterpriseName, socialCreditCode } = JSON.parse(JSON.stringify(newV))
           this.ruleForm = {
-            typeName,
+            companyType,
             enterpriseName,
             socialCreditCode
           }

src/views/myStoreEnterprise/components/Enterprise.vue

@@ -237,9 +237,9 @@ export default {
             query: {
               type: 'supInfo',
               id: row.id,
-              typeName: row.type,
               name: row.name,
               code: row.code,
+              taskId: row.taskId || '',
               companyZrId: row.companyZrId
             }
           })
@@ -250,9 +250,9 @@ export default {
           query: {
             type: 'edit',
             id: row.id,
-            typeName: row.type,
             name: row.name,
             code: row.code,
+            taskId: row.taskId || '',
             companyZrId: row.companyZrId
           }
         })
@@ -262,9 +262,9 @@ export default {
           query: {
             type: 'reAdd',
             id: row.id,
-            typeName: row.type,
             name: row.name,
             code: row.code,
+            taskId: row.taskId || '',
             companyZrId: row.companyZrId
           }
         })
@@ -274,7 +274,6 @@ export default {
           query: {
             type: 'see',
             id: row.id,
-            typeName: row.type,
             name: row.name,
             code: row.code,
             companyZrId: row.companyZrId