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

src/api/lov-data.js

@@ -192,6 +192,11 @@ export default {
         label: '社会统一信用代码',
         type: 'input',
         layout: 12
+      },
+      Status: {
+        label: '状态',
+        type: 'input',
+        layout: 12
       }
     }
   }

src/api/qcc.js

 
+import request from '@/utils/request'
+
 export const Qcc = {
   searchUrl: '/qcc/search',
   detailUrl: '/qcc/getOne'
@@ -14,4 +16,12 @@ export const Customer = {
 
 export const Common = {
   searchUrl: '/commonSession/searchAll',
-}
+}
\ No newline at end of file
+
+export function qccGetOne(data) {
+  return request({
+    url: '/qcc/getOne',
+    method: 'post',
+    data
+  })
+}

src/components/Lov/index.vue

@@ -197,7 +197,7 @@ export default {
       tableData: [],
       pageData: {
         total: 0,
-        currentPage: 0,
+        pageIndex: 0,
         pageSize: 10
       },
       text: this.value,
@@ -249,7 +249,8 @@ export default {
       delete params.total
       this.$request(url, params).then(res => {
         this.tableData = res.results.Result || []
-        this.pageData.total = Number(res.totalSize || 0)
+        this.pageData.total = Number(res.results.Paging.TotalRecords || 0)
+        // this.pageData.total = 100
         this.loading = false
       })
     },

src/views/customers/customers-add/components/customersAdd-accessory/index.vue

@@ -24,8 +24,7 @@ export default {
   },
   data() {
     return {
-      typeCode: uploadCode.customer,
-      objectId: 'aaaaaa'
+      typeCode: uploadCode.customer
     }
   },
   watch: {
@@ -45,16 +44,6 @@ export default {
       immediate: true,
       deep: true
     }
-  },
-  created() {
-    // 设置表单的初始搜索条件，该条件一般不会发生改变
-    if (this.$attrs['form-data'] && this.$attrs['form-data'].BusinessObjectID) {
-      config.tableConfig.initialParams = {
-        BusinessObjectID: this.$attrs['form-data'].BusinessObjectID,
-      }
-    } else {
-      config.tableConfig.url = ''
-    }
   }
 }
 </script>

src/views/customers/customers-add/index.vue

@@ -22,7 +22,7 @@ import Title from '@/components/Title'
 import { customerCreate, provinceSearch, citySearch, districtSearch } from '@/api/customers';
 import customerAddAddress from './components/customersAdd-adress/index'
 import customerAddAccessory from './components/customersAdd-accessory/index'
-// import constant from '@/components/ExportBtn/constant';
+import { qccGetOne } from '@/api/qcc'
 
 export default {
   components: {
@@ -32,7 +32,8 @@ export default {
     customerAddAccessory,
     provinceSearch,
     citySearch,
-    districtSearch
+    districtSearch,
+    qccGetOne
   },
   data () {
     return {
@@ -46,10 +47,19 @@ export default {
           formDesc: {
             Name: {
               type: 'lov',
-              label: '公司企称',
+              label: '公司全称',
               layout: 24,
               code: 'qcc',
               returnFn: function(row) {
+                // let resDate = await qccGetOne({searchKey:row.CreditCode})
+                // let resDates = {
+                //   Name: resDate.results.Result.Name,
+                //   ExtSocialUnifiedCreditCode_SDK: resDate.results.Result.CreditCode,
+                //   ExtCorporateName_SDK: resDate.results.Result.OperName,
+                //   ExtRegisteredCapital_SDK: resDate.results.Result.RegistCapi
+                // }
+                // console.log(resDates)
+                // return resDates
                 return {
                   Name: row.Name,
                   ExtSocialUnifiedCreditCode_SDK: row.CreditCode,
@@ -59,7 +69,7 @@ export default {
             },
             ExtSecondName_SDK: {
               type: 'input',
-              label: '公司企称曾用名',
+              label: '公司全称曾用名',
               layout: 12,
             },
             ExtSocialUnifiedCreditCode_SDK: {
@@ -87,7 +97,7 @@ export default {
         {
           title: '地址信息',
           formDesc: {
-            ExtProvinceCode_SDK: {
+            ExtProvince_SDK: {
               type: 'select',
               label: '省份',
               layout: 12,
@@ -102,18 +112,18 @@ export default {
                 return result
               },
             },
-            ExtCityCode_SDK: {
+            ExtCity_SDK: {
               type: 'select',
               label: '城市',
               layout: 12,
               isOptions: true,
-              optionsLinkageFields: ['ExtProvinceCode_SDK'],
+              optionsLinkageFields: ['ExtProvince_SDK'],
               options: async data => {
-                if (!data.ExtProvinceCode_SDK) {
+                if (!data.ExtProvince_SDK) {
                   return []
                 }
                 const res = await citySearch({
-                  provinceCode: data.ExtProvinceCode_SDK
+                  provinceCode: data.ExtProvince_SDK
                 })
                 var result = res.results.map(item => {
                   return {
@@ -124,18 +134,18 @@ export default {
                 return result
               },
             },
-            ExtDistrictCode_SDK: {
+            ExtDistrict_SDK: {
               type: 'select',
               label: '县市',
               layout: 12,
               isOptions: true,
-              optionsLinkageFields: ['ExtProvinceCode_SDK', 'ExtCityCode_SDK'],
+              optionsLinkageFields: ['ExtProvince_SDK', 'ExtCity_SDK'],
               options: async data => {
-                if (!data.ExtCityCode_SDK) {
+                if (!data.ExtCity_SDK) {
                   return []
                 }
                 const res = await districtSearch({
-                  cityCode: data.ExtCityCode_SDK
+                  cityCode: data.ExtCity_SDK
                 })
                 var result = res.results.map(item => {
                   return {
@@ -206,14 +216,13 @@ export default {
       ],
       // 同 vue-ele-form
       rules: {
-        Name: {required: true, message: '名称必填'},
-        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' },
-        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' },
-        ExtRegisteredCapital_SDK: {required: true, message: '名称必填' },
-        ExtCorporateName_SDK: { required: true, message: '名称必填' },
-        ExtProvinceCode_SDK: { required: true, message: '名称必填' },
-        ExtDistrictCode_SDK: {required: true, message: '名称必填'  },
-        ExtCityCode_SDK: { required: true, message: '名称必填' },
+        Name: {required: true, message: '公司名称必填'},
+        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '社会统一信用代码必填' },
+        ExtRegisteredCapital_SDK: {required: true, message: '注册资本必填' },
+        ExtCorporateName_SDK: { required: true, message: '法人必填' },
+        ExtProvince_SDK: { required: true, message: '省份必填' },
+        ExtDistrict_SDK: {required: true, message: '城市必填'  },
+        ExtCity_SDK: { required: true, message: '县区必填' },
       }
     }
   },