2 Commity 89830811e0 ... cc27e5c43b

Autor SHA1 Wiadomość Data
  sufan cc27e5c43b Merge branch 'dev' of http://222.90.211.174:3000/suf/domestic--e-commerc-c into dev 5 dni temu
  sufan b12e5c3ca8 feat(开户):开户联调 5 dni temu

+ 9 - 0
src/api/accountCenter/openInfoManage.js

@@ -9,6 +9,15 @@ export function getList(data) {
   })
 }
 
+// 获取已准入未开户的企业
+export function getEnterpriseCompany(params) {
+  return request({
+    url: '/bocomBasic/getCompany',
+    method: 'get',
+    params
+  })
+}
+
 // 获取详情
 export function getDetails(params) {
   return request({

+ 1 - 0
src/components/Upload/index.vue

@@ -539,6 +539,7 @@ export default {
     min-height: 20px;
     margin-top: 6px;
     margin-right: 5px;
+    z-index: 10;
   }
   .upload-default {
     display: flex;

+ 3 - 2
src/styles/element/ruleForm.scss

@@ -204,8 +204,9 @@ $orangeColor: #E9423A;
 
 /* disable开始 */
 .el-textarea.is-disabled .el-textarea__inner,
-.el-input.is-disabled .el-input__inner  {
-  background-color: #fff;
+.el-input.is-disabled .el-input__inner,
+.el-range-editor.is-disabled input{
+  // background-color: #fff;
   color: #333;
 }
 

+ 26 - 10
src/views/accountCenter/openInfoManage/components/BaseInfo.vue

@@ -31,7 +31,21 @@
       </el-form-item>
       <template v-if="ruleForm.customerType !== 2">
         <el-form-item label="客户名称" prop="customerName">
-          <custom-select
+          <el-select
+            v-model="ruleForm.customerName"
+            :disabled="disabled"
+            :placeholder="placeholder"
+            :clearable="false"
+            @change="searchChange"
+          >
+            <el-option
+              v-for="item in listData"
+              :key="item.customerName"
+              :label="item.customerName"
+              :value="item.customerName"
+            />
+          </el-select>
+          <!-- <custom-select
             :value.sync="ruleForm.customerName"
             :disabled="disabled"
             :placeholder="placeholder"
@@ -45,7 +59,7 @@
               :label="item.corporateName"
               :value="item.corporateName"
             />
-          </custom-select>
+          </custom-select> -->
         </el-form-item>
         <el-form-item label="证件种类" prop="certificateType">
           <el-select
@@ -253,14 +267,14 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { getEnterpriseInspectionInfo } from '@/api/dictionary'
+import { getEnterpriseCompany } from '@/api/accountCenter/openInfoManage'
 import { getCompanyInfoFormSocialCreditCode } from '@/api/dictionary'
 import qichachaInfo from '../../mixins/qichachaInfo'
 import { validPhone } from '@/utils/validate'
 
 export default {
   components: {
-    CustomSelect: () => import('@/components/CustomSelect/index.vue')
+    // CustomSelect: () => import('@/components/CustomSelect/index.vue')
   },
   mixins: [qichachaInfo],
   props: {
@@ -281,7 +295,7 @@ export default {
     },
     placeholder: {
       type: String,
-      default: '请选择公司名称'
+      default: '请选择客户名称'
     }
   },
   data() {
@@ -368,6 +382,7 @@ export default {
           this.backFileList = deepData.backFile ? [deepData.backFile] : []
 
           this.ruleForm.periodValidityDate = this.ruleForm.periodOfValidityFrom ? [this.ruleForm.periodOfValidityFrom, this.ruleForm.periodOfValidity] : []
+          this.searchClick(this.ruleForm.customerType)
         }
       },
       immediate: true,
@@ -389,26 +404,27 @@ export default {
       }
       this.ruleForm.customerType = val
       this.key += 1
+      this.searchClick(val)
       // this.getConpanyInfo()
     },
     searchClick(val) {
-      getEnterpriseInspectionInfo({ keyword: val }).then(({ data }) => {
+      getEnterpriseCompany({ customerType: val }).then(({ data }) => {
         this.listData = data
       })
     },
     searchChange(val) {
-      const obj = this.listData.find((item) => item.corporateName === val)
+      const obj = this.listData.find((item) => item.customerName === val)
       if (!obj) return
       const {
         socialCreditCode,
-        address,
+        registeredAddress,
         legalRepresentative
       } = obj
       this.ruleForm = {
         ...this.ruleForm,
         socialCreditCode,
-        registeredAddress: address,
-        businessAddress: address
+        registeredAddress: registeredAddress,
+        businessAddress: registeredAddress
       }
       // 法定代表人
       this.$emit('getLegalRepresentative', legalRepresentative)

+ 2 - 2
src/views/accountCenter/openInfoManage/mainContent.vue

@@ -64,8 +64,8 @@ export default {
       }
       this.loading = true
       const params = {
-        page: this.page || 1,
-        rows: this.size || 10
+        // page: this.page || 1,
+        // rows: this.size || 10
       }
       getList(params).then(({ data }) => {
         this.loading = false