瀏覽代碼

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

# Conflicts:
#	vue.config.js
lilei 4 年之前
父節點
當前提交
02869acd7c

+ 8 - 0
src/api/custType.js

@@ -20,6 +20,14 @@ export const custTypeAllList = (params) => {
     method: 'post'
   })
 }
+//  客户类型列表  下拉
+export const custTypeFindAllList = (params) => {
+  return axios({
+    url: `/custType/findAll`,
+    data: {},
+    method: 'post'
+  })
+}
 
 // 新增/编辑客户类型
 export const custTypeSave = params => {

+ 8 - 0
src/api/customer.js

@@ -45,3 +45,11 @@ export const custDel = params => {
     method: 'get'
   })
 }
+//  收款方式  下拉
+export const settleStyleFindAllList = (params) => {
+  return axios({
+    url: `/settleStyle/findAll`,
+    data: {},
+    method: 'post'
+  })
+}

+ 2 - 1
src/views/customerManagement/customerInfo/detailModal.vue

@@ -20,7 +20,8 @@
         <a-descriptions-item label="是否卫星仓客户:">{{ detailData.satelliteFlagDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="价格类型:">{{ detailData.priceTypeDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="支付方式:">{{ detailData.payTypeDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="收款方式:">{{ detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款方式:">{{ detailData.settleStyleName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="客户类型:">{{ detailData.customerTypeName || '--' }}</a-descriptions-item>
       </a-descriptions>
       <div class="btn-cont"><a-button id="customer-management-detail-modal-back" @click="isShow = false">返回列表</a-button></div>
     </div>

+ 23 - 7
src/views/customerManagement/customerInfo/edit.vue

@@ -103,7 +103,9 @@
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="收款方式" prop="settleStyleSn">
-              <v-select code="SETTLE_STYLE_NAME" id="customerManagementEdit-settleStyleSn" v-model="form.settleStyleSn" allowClear placeholder="请选择收款方式"></v-select>
+              <a-select id="customerManagementEdit-settleStyleSn" v-model="form.settleStyleSn" allowClear placeholder="请选择收款方式">
+                <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -111,7 +113,7 @@
           <a-col :span="8">
             <a-form-model-item label="客户类型" prop="customerTypeSn">
               <a-select id="customerManagementEdit-customerTypeSn" v-model="form.customerTypeSn" allowClear placeholder="请选择客户类型">
-                <a-select-option v-for="item in custTypeList" :value="item.customersTypeSn" :key="item.customersTypeSn">{{ item.customersTypeName }}</a-select-option>
+                <a-select-option v-for="item in custTypeList" :value="item.customerTypeSn" :key="item.customerTypeSn">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
@@ -127,8 +129,8 @@
 <script>
 import { STable, VSelect } from '@/components'
 import { getArea } from '@/api/data'
-import { custSave, custFindById } from '@/api/customer'
-import { custTypeAllList } from '@/api/custType'
+import { custSave, custFindById, settleStyleFindAllList } from '@/api/customer'
+import { custTypeFindAllList } from '@/api/custType'
 export default {
   name: 'CustomerManagementEdit',
   components: { STable, VSelect },
@@ -155,7 +157,7 @@ export default {
         customerTypeSn: undefined, //  客户类型
         priceType: '', //  价格类型
         payType: '', //  支付方式
-        settleStyleSn: '' //  收款方式
+        settleStyleSn: undefined //  收款方式
       },
       rules: {
         customerName: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
@@ -170,7 +172,8 @@ export default {
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
-      custTypeList: [] //  客户类型  下拉数据
+      custTypeList: [], //  客户类型  下拉数据
+      settleStyleList: [] //  收款方式  下拉数据
     }
   },
   methods: {
@@ -188,9 +191,21 @@ export default {
     },
     //  客户类型
     getCustTypeList () {
-      custTypeAllList({}).then(res => {
+      custTypeFindAllList().then(res => {
         if (res.status == 200) {
           this.custTypeList = res.data
+        } else {
+          this.custTypeList = []
+        }
+      })
+    },
+    // 收款方式
+    getSettleStyleList () {
+      settleStyleFindAllList().then(res => {
+        if (res.status == 200) {
+          this.settleStyleList = res.data
+        } else {
+          this.settleStyleList = []
         }
       })
     },
@@ -285,6 +300,7 @@ export default {
     next(vm => {
       vm.getArea('province') //  省市区
       vm.getCustTypeList() //  客户类型
+      vm.getSettleStyleList() // 收款方式
       vm.$refs.ruleForm.resetFields()
       if (vm.$route.params.id) {
         //  编辑页

+ 6 - 4
src/views/customerManagement/customerInfo/list.vue

@@ -8,6 +8,7 @@
             <a-form-item label="创建时间">
               <a-range-picker
                 style="width:100%"
+                allowClear
                 id="customerManagementList-creatTime"
                 :disabledDate="disabledDate"
                 v-model="creatTime"
@@ -31,6 +32,7 @@
               <a-form-item label="最后销售时间">
                 <a-range-picker
                   style="width:100%"
+                  allowClear
                   id="customerManagementList-lastSaleTime"
                   :disabledDate="disabledDate"
                   v-model="lastSaleTime"
@@ -74,8 +76,8 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户类型">
-                <a-select v-model="queryParam.customerTypeSn" placeholder="请选择客户类型">
-                  <a-select-option v-for="item in custTypeList" :value="item.customersTypeSn" :key="item.customersTypeSn">{{ item.customersTypeName }}</a-select-option>
+                <a-select v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型">
+                  <a-select-option v-for="item in custTypeList" :value="item.customerTypeSn" :key="item.customerTypeSn">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -127,7 +129,7 @@
 import moment from 'moment'
 import { getArea } from '@/api/data'
 import { custList, custDel } from '@/api/customer'
-import { custTypeAllList } from '@/api/custType'
+import { custTypeFindAllList } from '@/api/custType'
 import { STable, VSelect } from '@/components'
 import customerManagementDetailModal from './detailModal.vue'
 export default {
@@ -258,7 +260,7 @@ export default {
     //  获取客户类型列表
     getCustTypeList () {
       const _this = this
-      custTypeAllList().then(res => {
+      custTypeFindAllList().then(res => {
         if (res.status == 200) {
           _this.custTypeList = res.data || []
         } else {

+ 1 - 0
vue.config.js

@@ -110,6 +110,7 @@ const vueConfig = {
       '/api': {
         // target: 'http://192.168.16.217:8503/qpls-md',
         target: 'http://qpls-md.360arrow.com.cn/qpls-md',
+        // target: 'http://380d150d.nat123.fun:38226/qpls-md',
         ws: false,
         changeOrigin: true,
         pathRewrite: {