Browse Source

客户管理对接

chenrui 4 years ago
parent
commit
6402ddae94

+ 3 - 3
src/api/customer.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  客户列表  分页
 export const custList = (params) => {
-  let url = `/cust/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/cust/findPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -14,7 +14,7 @@ export const custList = (params) => {
 
 //  客户列表  无分页
 export const custFindAll = (params) => {
-  let url = `/cust/findAll`
+  const url = `/cust/findAll`
   return axios({
     url: url,
     data: params,
@@ -37,4 +37,4 @@ export const custDel = params => {
     url: `/cust/del/${params.id}`,
     method: 'post'
   })
-}
+}

+ 10 - 6
src/views/salesManagement/customerManagement/edit.vue

@@ -115,13 +115,13 @@
           <a-col :span="8">
             <a-form-model-item label="客户类型" prop="custType">
               <a-select id="customerManagementEdit-custType" v-model="form.custType" allowClear placeholder="请选择客户类型">
-                <a-select-option v-for="item in addrAreaList" :value="item.id" :key="item.id">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in custTypeList" :value="item.id" :key="item.id">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item label="价格类型" prop="priceType">
-              <v-select code="PRICE_TYPE" id="customerManagementEdit-priceType" v-model="form.priceType" allowClear placeholder="请选择价格类型"></v-select>
+            <a-form-model-item label="价格类型" ref="priceType" prop="priceType">
+              <v-select code="PRICE_TYPE" id="customerManagementEdit-priceType" v-model="form.priceType" @change="changess" allowClear placeholder="请选择价格类型"></v-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
@@ -206,13 +206,13 @@ export default {
           { required: true, message: '请选择区/县', trigger: 'change' }
         ],
         priceType: [
-          { required: true, message: '请选择价格类型', trigger: ['change', 'blur'] }
+          { required: true, message: '请选择价格类型', trigger: 'change' }
         ],
         payType: [
-          { required: true, message: '请选择支付方式', trigger: ['change', 'blur'] }
+          { required: true, message: '请选择支付方式', trigger: 'change' }
         ],
         paymentType: [
-          { required: true, message: '请选择收款方式', trigger: ['change', 'blur'] }
+          { required: true, message: '请选择收款方式', trigger: 'change' }
         ]
       },
       addrProvinceList: [], //  省下拉
@@ -222,6 +222,10 @@ export default {
     }
   },
   methods: {
+    changess(val){
+      console.log(val)
+      console.log(this.form.priceType)
+    },
     //  获取客户信息
     getDetail () {
       // goodsFind({ id: this.$route.params.id }).then(res => {

+ 15 - 15
src/views/salesManagement/customerManagement/list.vue

@@ -44,24 +44,24 @@
             <a-col :md="12" :sm="24">
               <a-row>
                 <!-- 客户地址 -->
-                <a-form-item prop="provinceCode" label="客户地址">
+                <a-form-item label="客户地址">
                   <a-col span="7">
-                    <a-form-item prop="provinceCode" style="margin: 0;">
-                      <a-select v-model="queryParam.provinceCode" @change="getCityList" placeholder="请选择省">
+                    <a-form-item prop="provinceId" style="margin: 0;">
+                      <a-select v-model="queryParam.provinceId" @change="getCityList" placeholder="请选择省">
                         <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
                       </a-select>
                     </a-form-item>
                   </a-col>
                   <a-col span="7" offset="1">
-                    <a-form-item prop="cityCode" style="margin: 0;">
-                      <a-select v-model="queryParam.cityCode" @change="getAreaList" placeholder="请选择市">
+                    <a-form-item prop="cityId" style="margin: 0;">
+                      <a-select v-model="queryParam.cityId" @change="getAreaList" placeholder="请选择市">
                         <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
                       </a-select>
                     </a-form-item>
                   </a-col>
                   <a-col span="7" offset="1">
-                    <a-form-item prop="districtCode" style="margin: 0;">
-                      <a-select v-model="queryParam.districtCode" placeholder="请选择区/县">
+                    <a-form-item prop="areaId" style="margin: 0;">
+                      <a-select v-model="queryParam.areaId" placeholder="请选择区/县">
                         <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
                       </a-select>
                     </a-form-item>
@@ -89,7 +89,7 @@
     <!-- 操作按钮 -->
     <div class="table-operator">
       <a-button id="customerManagementList-add" type="primary" @click="handleEdit()">新增客户</a-button>
-      <a-button id="customerManagementList-merge" @click="handleMerge" style="margin: 0 0 0 15px;">客户合并</a-button>
+      <!-- <a-button id="customerManagementList-merge" @click="handleMerge" style="margin: 0 0 0 15px;">客户合并</a-button> -->
     </div>
     <!-- 列表 -->
     <s-table
@@ -128,11 +128,11 @@ export default {
     return {
       advanced: false,  // 高级搜索 展开/关闭
       queryParam: { //  查询条件
-        name: '', //  客户名称
+        name: undefined, //  客户名称
         contact: '', //  联系人
-        province: undefined,  //  省
-        city: undefined,  //  市
-        district: undefined,  //  区
+        provinceId: undefined,  //  省
+        cityId: undefined,  //  市
+        areaId: undefined,  //  区
         // itemName: '', //  是否卫星仓客户
       },
       exportLoading: false, // 导出loading
@@ -181,9 +181,9 @@ export default {
     resetSearchForm () {
       this.queryParam.name = ''
       this.queryParam.contact = ''
-      this.queryParam.province = undefined
-      this.queryParam.city = undefined
-      this.queryParam.district = undefined
+      this.queryParam.provinceId = undefined
+      this.queryParam.cityId = undefined
+      this.queryParam.areaId = undefined
       this.creatTime = []
       this.salesTime = []
       this.$refs.table.refresh(true)