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

src/api/customers.js

@@ -29,6 +29,36 @@ export function customerCreate(data) {
     data
   })
 }
+
+// 查询省
+export function provinceSearch(data) {
+  return request({
+    url: '/province/searchAll',
+    method: 'post',
+    data
+  })
+}
+
+
+//  查询市
+export function citySearch(data){
+  return request({
+    url: '/city/searchAll',
+    method: 'post',
+    data
+  })
+}
+
+//  查询市
+export function districtSearch(data){
+  return request({
+    url: '/district/searchAll',
+    method: 'post',
+    data
+  })
+}
+
+// 客户发布记录
 // 签约产品组
 export function searchProduct(data) {
   return request({
@@ -224,15 +254,14 @@ export const project = {
 //   updateUrl: '/paymentTerm/updateDetail'
 // }
 
-// // 客户附件
-// export const file = {
-//   createUrl: '/file/create',
-//   searchUrl: '/file/search',
-//   detailUrl: '/file/getOne',
-//   updateUrl: '/file/update',
-//   deleteUrl: '/file/delete',
-//   deleteDetailUrl: '/file/deleteDetail'
-// }
+// 客户附件
+export const file = {
+  createUrl: '/create',
+  searchUrl: '/search',
+  detailUrl: '/getOne',
+  updateUrl: '/update',
+  deleteUrl: '/delete',
+}
 
 // export const businessLog = {
 //   searchUrl: '/businessLog/search'

src/api/dictionary.js

@@ -424,6 +424,7 @@ export default {
     'module': 'OpportunityPhaseTask'
   },
 
+
   flowDefinitions: 'flow/definition/getAllEnum',
 
   flowNodesByDefinition: 'flow/node/getAllEnumByDefinitionId?definitionId=1424712643570155522',

src/api/lov-data.js

@@ -182,6 +182,16 @@ export default {
         label: '公司名称',
         type: 'input',
         layout: 12
+      },
+      OperName: {
+        label: '法人',
+        type: 'input',
+        layout: 12
+      },
+      CreditCode: {
+        label: '社会统一信用代码',
+        type: 'input',
+        layout: 12
       }
     }
   }

src/utils/fetch-dictionary.js

@@ -11,7 +11,7 @@ function fetchDictionary(data) {
     return enums[code]
   }
   return request({
-    url: '/enum/queryAll',
+    url: '/commonSession/searchAll',
     method: 'post',
     data
   }).then((res) => {

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

 <template>
   <div v-if="addBtnStart">
-    <BusinessTable v-bind="constant"/>
+    <FileTable :type-code="typeCode" :objectID='objectId' />  
   </div>
 </template>
 
 <script>
-import constant from './constant'
+import { uploadCode } from '@/api/upload'
+import FileTable from '@/views/public/file-info'
 
 export default {
+  components: {
+    FileTable
+  },
   props: {
     addBtnStart: {
       type: Boolean,
       default: false
+    },
+    objectId: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      constant: {}
-    }
-  },
-  created() {
-    // 设置表单的初始搜索条件，该条件一般不会发生改变
-    constant.tableConfig.initialParams = {
-      AccountID: this.$route.query.objectID
+      typeCode: uploadCode.customer
     }
-    this.constant = constant
   },
   watch: {
     addBtnStart: {
@@ -33,6 +34,15 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    objectId: {
+     handler(newVal) {
+        constant.tableConfig.initialParams = {
+          BusinessObjectID: newVal
+        }    
+      },
+      immediate: true,
+      deep: true
     }
   }
 }

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

@@ -12,6 +12,10 @@ export default {
     addBtnStart: {
       type: Boolean,
       default: false
+    },
+    objectId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -19,13 +23,6 @@ export default {
       constant: {}
     }
   },
-  created() {
-    // 设置表单的初始搜索条件，该条件一般不会发生改变
-    constant.tableConfig.initialParams = {
-      AccountID: this.$route.query.objectID
-    }
-    this.constant = constant
-  },
   watch: {
     addBtnStart: {
       handler(newVal) {
@@ -33,7 +30,24 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    objectId: {
+      handler(newVal) {
+        constant.tableConfig.initialParams = {
+          BusinessObjectID: newVal
+        }
+        this.constant = constant
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  created() {
+    // 设置表单的初始搜索条件，该条件一般不会发生改变
+    constant.tableConfig.initialParams = {
+      BusinessObjectID: this.$route.query.objectID
     }
+    this.constant = constant
   }
 }
 </script>

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

@@ -3,7 +3,7 @@
     <Title :title="title">
       <span>*</span>为必填项
     </Title>    
-    <div>
+    <div class="basic-info">
       <ele-form-section
         v-model="formData"
         :request-fn="handleSubmit"
@@ -12,8 +12,8 @@
         @request-success="handleSuccess"
       />
     </div>
-    <customerAddAddress :addBtnStart='addBtnStart'/>
-    <customerAddAccessory :addBtnStart='addBtnStart'/>
+    <customerAddAddress :addBtnStart='addBtnStart' :objectId='objectId'/>
+    <customerAddAccessory :addBtnStart='addBtnStart' :objectId='objectId'/>
     <!-- <div class="btn">
       <el-button type="primary">提交保存</el-button>    
     </div> -->
@@ -22,34 +22,44 @@
 
 <script>
 import Title from '@/components/Title'
-import { customerCreate } from '@/api/customers';
+import { customerCreate, provinceSearch, citySearch, districtSearch } from '@/api/customers';
 import customerAddAddress from './components/customersAdd-adress/index'
 import customerAddAccessory from './components/customersAdd-accessory/index'
+// import dictionary from '@/api/dictionary'
+import path from 'path';
+
 
 export default {
   components: {
     Title,
     customerCreate,
     customerAddAddress,
-    customerAddAccessory
+    customerAddAccessory,
+    provinceSearch,
+    citySearch,
+    districtSearch
   },
-   data () {
+  data () {
     return {
       title: '代理商新增',
       addBtnStart: false,
+      objectId: '',
       formData: {},
+      province: [],
       sections: [
         {
           title: '基本信息',
           formDesc: {
             Name: {
-              type: 'lov',
+              type: 'input',
               label: '公司企称',
               layout: 24,
               code: 'qcc',
               returnFn: function(row) {
                 return {
-                  Name: row.Name
+                  Name: row.Name,
+                  ExtSocialUnifiedCreditCode_SDK: row.CreditCode,
+                  ExtCorporateName_SDK: row.OperName
                 }
               },
             },
@@ -83,21 +93,65 @@ export default {
         {
           title: '地址信息',
           formDesc: {
-            // Name: {
-            //   type: 'select',
-            //   label: '省份',
-            //   layout: 12
-            // },
-            // ExtSecondName_SDK: {
-            //   type: 'select',
-            //   label: '城市',
-            //   layout: 12,
-            // },
-            // ExtSocialUnifiedCreditCode_SDK: {
-            //   type: 'select',
-            //   label: '县市',
-            //   layout: 12
-            // },
+            ExtProvinceCode_SDK: {
+              type: 'select',
+              label: '省份',
+              layout: 12,
+              options: async data => {
+                const res = await provinceSearch({})
+                var result = res.results.map(item => {
+                  return {
+                    text: item.Name,
+                    value: item.Code
+                  }
+                })
+                return result
+              },
+            },
+            ExtCityCode_SDK: {
+              type: 'select',
+              label: '城市',
+              layout: 12,
+              isOptions: true,
+              optionsLinkageFields: ['ExtProvinceCode_SDK'],
+              options: async data => {
+                if (!data.ExtProvinceCode_SDK) {
+                  return []
+                }
+                const res = await citySearch({
+                  provinceCode: data.ExtProvinceCode_SDK
+                })
+                var result = res.results.map(item => {
+                  return {
+                    text: item.Name,
+                    value: item.Code
+                  }
+                })
+                return result
+              },
+            },
+            ExtDistrictCode_SDK: {
+              type: 'select',
+              label: '县市',
+              layout: 12,
+              isOptions: true,
+              optionsLinkageFields: ['ExtProvinceCode_SDK', 'ExtCityCode_SDK'],
+              options: async data => {
+                if (!data.ExtCityCode_SDK) {
+                  return []
+                }
+                const res = await districtSearch({
+                  cityCode: data.ExtCityCode_SDK
+                })
+                var result = res.results.map(item => {
+                  return {
+                    text: item.Name,
+                    value: item.Code
+                  }
+                })
+                return result
+              },
+            },
             ExtAddressDetail_SDK: {
               type: 'input',
               label: '详细经营地址',
@@ -158,17 +212,28 @@ export default {
       ],
       // 同 vue-ele-form
       rules: {
-        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' }
+        Name: {required: true, message: '名称必填'},
+        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' },
+        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' },
+        ExtRegisteredCapital_SDK: {required: true, message: '名称必填' },
+        ExtCorporateName_SDK: { required: true, message: '名称必填' },
+
       }
     }
   },
   methods: {
     handleSubmit (data) {
       console.log(data)
-      this.addBtnStart = true  
+      // this.addBtnStart = true  
       customerCreate(this.paramsToFormData(data)).then(res => {
-        console.log(res)
-        this.addBtnStart = true  
+        // console.log(res)
+        this.addBtnStart = true
+        this.objectId = res.results
+        const objectID = res.results
+        this.$router.push({
+          path: '/customersAdd',
+          query: { objectID: objectID }
+        })
         this.$message.success('创建成功')
       })
       // return Promise.resolve()
@@ -201,9 +266,11 @@ export default {
       width: 90%;
     }
   }
-  ::v-deep .ele-form-btns{
-    .el-form-item__content {
-      margin-left: 45% !important;
+  .basic-info {
+    ::v-deep .ele-form-btns{
+      .el-form-item__content {
+        margin-left: 45% !important;
+      }
     }
   }
   .btn {

src/views/customers/customers-overview/constant.js

@@ -31,7 +31,8 @@ const tableConfig = {
     },
     Name: {
       label: '公司名称',
-      type: 'input'
+      type: 'input',
+      showInSearch: true,
     },
     ExtCorporateName_SDK: {
       label: '法定人代表',

src/views/public/file-info/index.vue

@@ -111,7 +111,7 @@ export default {
   created() {
     this.tableConfig.columns.handle.vif = this.isShowEditBtn
     constant.tableConfig.initialParams = {
-      AccountID: this.objectID || this.$route.query.objectID,
+      BusinessObjectID: this.objectID || this.$route.query.objectID,
       TypeCode: this.typeCode
     }
     if (this.moduleType) {