From f6482afcd2d5359fa2e9f81587160655c3554cd8 Mon Sep 17 00:00:00 2001
From: wangjiadong <1654135867@qq.com>
Date: Mon, 12 Dec 2022 10:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BE=E5=AE=A2=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/CustomerInvoiceList.vue            | 233 ++++++++++++++++
 .../custom/modules/CustomerInvoiceForm.vue    | 158 +++++++++++
 .../custom/modules/CustomerInvoiceModal.vue   |  60 ++++
 .../CustomerInvoiceModal__Style#Drawer.vue    |  84 ++++++
 .../custo/CustomerMeasureList.vue             | 258 ++++++++++++++++++
 .../custo/modules/CustomerMeasureForm.vue     | 199 ++++++++++++++
 .../custo/modules/CustomerMeasureModal.vue    |  60 ++++
 .../CustomerMeasureModal__Style#Drawer.vue    |  84 ++++++
 .../custom/CustomerPaymentList.vue            | 246 +++++++++++++++++
 .../custom/modules/CustomerPaymentForm.vue    | 119 ++++++++
 .../custom/modules/CustomerPaymentModal.vue   |  60 ++++
 .../CustomerPaymentModal__Style#Drawer.vue    |  84 ++++++
 .../custom/CustomerReceivingAddressList.vue   | 250 +++++++++++++++++
 .../modules/CustomerReceivingAddressForm.vue  | 143 ++++++++++
 .../modules/CustomerReceivingAddressModal.vue |  60 ++++
 ...merReceivingAddressModal__Style#Drawer.vue |  84 ++++++
 .../custum/CustomerShoppingCartList.vue       | 257 +++++++++++++++++
 .../modules/CustomerShoppingCartForm.vue      | 150 ++++++++++
 .../modules/CustomerShoppingCartModal.vue     |  60 ++++
 ...ustomerShoppingCartModal__Style#Drawer.vue |  84 ++++++
 20 files changed, 2733 insertions(+)
 create mode 100644 ant-design-vue-jeecg/src/views/customerinvoice/custom/CustomerInvoiceList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceForm.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceModal__Style#Drawer.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customermeasure/custo/CustomerMeasureList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureForm.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureModal__Style#Drawer.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerpayment/custom/CustomerPaymentList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentForm.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentModal__Style#Drawer.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/CustomerReceivingAddressList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressForm.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressModal__Style#Drawer.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customershoppingcart/custum/CustomerShoppingCartList.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartForm.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartModal.vue
 create mode 100644 ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartModal__Style#Drawer.vue

diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/custom/CustomerInvoiceList.vue b/ant-design-vue-jeecg/src/views/customerinvoice/custom/CustomerInvoiceList.vue
new file mode 100644
index 00000000..b349ef77
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/custom/CustomerInvoiceList.vue
@@ -0,0 +1,233 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('客户发票信息')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <customer-invoice-modal ref="modalForm" @ok="modalFormOk"></customer-invoice-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CustomerInvoiceModal from './modules/CustomerInvoiceModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CustomerInvoiceList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CustomerInvoiceModal
+    },
+    data () {
+      return {
+        description: '客户发票信息管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'客户类型',
+            align:"center",
+            dataIndex: 'customerType_dictText'
+          },
+          {
+            title:'发票类型',
+            align:"center",
+            dataIndex: 'invoiceType_dictText'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'纳税人识别号',
+            align:"center",
+            dataIndex: 'taxIdentificationNumber'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'telephone'
+          },
+          {
+            title:'开户行',
+            align:"center",
+            dataIndex: 'bankDeposit'
+          },
+          {
+            title:'账号',
+            align:"center",
+            dataIndex: 'accountNumber'
+          },
+          {
+            title:'排序',
+            align:"center",
+            sorter: true,
+            dataIndex: 'sort'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/customerinvoice/customerInvoice/listcustom",
+          delete: "/customerinvoice/customerInvoice/delete",
+          deleteBatch: "/customerinvoice/customerInvoice/deleteBatch",
+          exportXlsUrl: "/customerinvoice/customerInvoice/exportXls",
+          importExcelUrl: "customerinvoice/customerInvoice/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'sel_user',value:'userId',text:'用户'})
+        fieldList.push({type:'string',value:'customerType',text:'客户类型',dictCode:'khlx'})
+        fieldList.push({type:'string',value:'invoiceType',text:'发票类型',dictCode:'fplx'})
+        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+        fieldList.push({type:'string',value:'taxIdentificationNumber',text:'纳税人识别号',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'telephone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'bankDeposit',text:'开户行',dictCode:''})
+        fieldList.push({type:'string',value:'accountNumber',text:'账号',dictCode:''})
+        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceForm.vue b/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceForm.vue
new file mode 100644
index 00000000..b4cc1fdd
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceForm.vue
@@ -0,0 +1,158 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="创建日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
+              <j-date placeholder="请选择创建日期"  v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-select-user-by-dep v-model="model.userId" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="客户类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="customerType">
+              <j-dict-select-tag type="list" v-model="model.customerType" dictCode="khlx" placeholder="请选择客户类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发票类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="invoiceType">
+              <j-dict-select-tag type="list" v-model="model.invoiceType" dictCode="fplx" placeholder="请选择发票类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="纳税人识别号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taxIdentificationNumber">
+              <a-input v-model="model.taxIdentificationNumber" placeholder="请输入纳税人识别号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
+              <a-input v-model="model.telephone" placeholder="请输入电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankDeposit">
+              <a-input v-model="model.bankDeposit" placeholder="请输入开户行"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accountNumber">
+              <a-input v-model="model.accountNumber" placeholder="请输入账号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
+              <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CustomerInvoiceForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           telephone: [
+              { required: false},
+              { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+           ],
+        },
+        url: {
+          add: "/customerinvoice/customerInvoice/add",
+          edit: "/customerinvoice/customerInvoice/edit",
+          queryById: "/customerinvoice/customerInvoice/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceModal.vue b/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceModal.vue
new file mode 100644
index 00000000..cab496ec
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <customer-invoice-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-invoice-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CustomerInvoiceForm from './CustomerInvoiceForm'
+  export default {
+    name: 'CustomerInvoiceModal',
+    components: {
+      CustomerInvoiceForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceModal__Style#Drawer.vue
new file mode 100644
index 00000000..e354afe6
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/custom/modules/CustomerInvoiceModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <customer-invoice-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></customer-invoice-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CustomerInvoiceForm from './CustomerInvoiceForm'
+
+  export default {
+    name: 'CustomerInvoiceModal',
+    components: {
+      CustomerInvoiceForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customermeasure/custo/CustomerMeasureList.vue b/ant-design-vue-jeecg/src/views/customermeasure/custo/CustomerMeasureList.vue
new file mode 100644
index 00000000..276cfa7b
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customermeasure/custo/CustomerMeasureList.vue
@@ -0,0 +1,258 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="用户">
+              <j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="量体店铺">
+              <j-select-depart placeholder="请选择量体店铺" v-model="queryParam.storeId"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="量体设备">
+                <j-search-select-tag placeholder="请选择量体设备" v-model="queryParam.deviceId" dict="se_equipmenttype,name,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="量体师">
+                <j-select-user-by-dep placeholder="请选择量体师" v-model="queryParam.measurerId"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('顾客测体管理')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <customer-measure-modal ref="modalForm" @ok="modalFormOk"></customer-measure-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CustomerMeasureModal from './modules/CustomerMeasureModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CustomerMeasureList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CustomerMeasureModal
+    },
+    data () {
+      return {
+        description: '顾客测体管理管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'排序',
+            align:"center",
+            dataIndex: 'sort'
+          },
+          {
+            title:'身高（厘米）',
+            align:"center",
+            dataIndex: 'height'
+          },
+          {
+            title:'体重（千克）',
+            align:"center",
+            dataIndex: 'weight'
+          },
+          {
+            title:'胸围（厘米）',
+            align:"center",
+            dataIndex: 'bust'
+          },
+          {
+            title:'腰围（厘米）',
+            align:"center",
+            dataIndex: 'theWaist'
+          },
+          {
+            title:'肩宽（厘米）',
+            align:"center",
+            dataIndex: 'shoulderWidth'
+          },
+          {
+            title:'量体时间',
+            align:"center",
+            dataIndex: 'measurementTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/customermeasure/customerMeasure/listcustom",
+          delete: "/customermeasure/customerMeasure/delete",
+          deleteBatch: "/customermeasure/customerMeasure/deleteBatch",
+          exportXlsUrl: "/customermeasure/customerMeasure/exportXls",
+          importExcelUrl: "customermeasure/customerMeasure/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_user',value:'userId',text:'用户'})
+        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
+        fieldList.push({type:'double',value:'height',text:'身高（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'weight',text:'体重（千克）',dictCode:''})
+        fieldList.push({type:'double',value:'hem',text:'下摆（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'cuff',text:'袖口（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'sleeveLength',text:'袖长（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'bust',text:'胸围（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'theWaist',text:'腰围（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'shoulderWidth',text:'肩宽（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'forebodyLength',text:'前身长（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'neck',text:'领围（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'hipline',text:'臀围（厘米）',dictCode:''})
+        fieldList.push({type:'double',value:'length',text:'衣长',dictCode:''})
+        fieldList.push({type:'double',value:'sternalDistance',text:'胸距',dictCode:''})
+        fieldList.push({type:'string',value:'measurementMethod',text:'量体方式',dictCode:'ctfs'})
+        fieldList.push({type:'sel_depart',value:'storeId',text:'量体店铺'})
+        fieldList.push({type:'sel_search',value:'deviceId',text:'量体设备',dictTable:'se_equipmenttype', dictText:'name', dictCode:'id'})
+        fieldList.push({type:'sel_user',value:'measurerId',text:'量体师'})
+        fieldList.push({type:'datetime',value:'measurementTime',text:'量体时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureForm.vue b/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureForm.vue
new file mode 100644
index 00000000..c5d86e26
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureForm.vue
@@ -0,0 +1,199 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-select-user-by-dep v-model="model.userId" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
+              <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身高（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="height">
+              <a-input-number v-model="model.height" placeholder="请输入身高（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="体重（千克）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="weight">
+              <a-input-number v-model="model.weight" placeholder="请输入体重（千克）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下摆（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hem">
+              <a-input-number v-model="model.hem" placeholder="请输入下摆（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="袖口（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuff">
+              <a-input-number v-model="model.cuff" placeholder="请输入袖口（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="袖长（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sleeveLength">
+              <a-input-number v-model="model.sleeveLength" placeholder="请输入袖长（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="胸围（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bust">
+              <a-input-number v-model="model.bust" placeholder="请输入胸围（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="腰围（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="theWaist">
+              <a-input-number v-model="model.theWaist" placeholder="请输入腰围（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="肩宽（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shoulderWidth">
+              <a-input-number v-model="model.shoulderWidth" placeholder="请输入肩宽（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="前身长（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="forebodyLength">
+              <a-input-number v-model="model.forebodyLength" placeholder="请输入前身长（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="领围（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="neck">
+              <a-input-number v-model="model.neck" placeholder="请输入领围（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="臀围（厘米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hipline">
+              <a-input-number v-model="model.hipline" placeholder="请输入臀围（厘米）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="衣长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="length">
+              <a-input-number v-model="model.length" placeholder="请输入衣长" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="胸距" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sternalDistance">
+              <a-input-number v-model="model.sternalDistance" placeholder="请输入胸距" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="量体方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurementMethod">
+              <j-dict-select-tag type="list" v-model="model.measurementMethod" dictCode="ctfs" placeholder="请选择量体方式" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="量体店铺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="storeId">
+              <j-select-depart v-model="model.storeId" multi  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="量体设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceId">
+              <j-search-select-tag v-model="model.deviceId" dict="se_equipmenttype,name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="量体师" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurerId">
+              <j-select-user-by-dep v-model="model.measurerId" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="量体时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurementTime">
+              <j-date placeholder="请选择量体时间"  v-model="model.measurementTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CustomerMeasureForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/customermeasure/customerMeasure/add",
+          edit: "/customermeasure/customerMeasure/edit",
+          queryById: "/customermeasure/customerMeasure/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureModal.vue b/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureModal.vue
new file mode 100644
index 00000000..9d99c79d
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <customer-measure-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-measure-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CustomerMeasureForm from './CustomerMeasureForm'
+  export default {
+    name: 'CustomerMeasureModal',
+    components: {
+      CustomerMeasureForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureModal__Style#Drawer.vue
new file mode 100644
index 00000000..c83433ad
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customermeasure/custo/modules/CustomerMeasureModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <customer-measure-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></customer-measure-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CustomerMeasureForm from './CustomerMeasureForm'
+
+  export default {
+    name: 'CustomerMeasureModal',
+    components: {
+      CustomerMeasureForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerpayment/custom/CustomerPaymentList.vue b/ant-design-vue-jeecg/src/views/customerpayment/custom/CustomerPaymentList.vue
new file mode 100644
index 00000000..84e5c579
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerpayment/custom/CustomerPaymentList.vue
@@ -0,0 +1,246 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="用户">
+              <j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="支付类型">
+              <j-dict-select-tag placeholder="请选择支付类型" v-model="queryParam.paymentType" dictCode="zflx"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="账号/卡号">
+                <a-input placeholder="请输入账号/卡号" v-model="queryParam.accountNo"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="开户银行">
+                <a-input placeholder="请输入开户银行" v-model="queryParam.bankDeposit"></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('顾客支付信息管理')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <customer-payment-modal ref="modalForm" @ok="modalFormOk"></customer-payment-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CustomerPaymentModal from './modules/CustomerPaymentModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CustomerPaymentList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CustomerPaymentModal
+    },
+    data () {
+      return {
+        description: '顾客支付信息管理管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建人',
+            align:"center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title:'更新人',
+            align:"center",
+            dataIndex: 'updateBy'
+          },
+          {
+            title:'更新日期',
+            align:"center",
+            dataIndex: 'updateTime'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'支付类型',
+            align:"center",
+            dataIndex: 'paymentType_dictText'
+          },
+          {
+            title:'账号/卡号',
+            align:"center",
+            dataIndex: 'accountNo'
+          },
+          {
+            title:'开户银行',
+            align:"center",
+            dataIndex: 'bankDeposit'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/customerpayment/customerPayment/listcustom",
+          delete: "/customerpayment/customerPayment/delete",
+          deleteBatch: "/customerpayment/customerPayment/deleteBatch",
+          exportXlsUrl: "/customerpayment/customerPayment/exportXls",
+          importExcelUrl: "customerpayment/customerPayment/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
+        fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
+        fieldList.push({type:'sel_user',value:'userId',text:'用户'})
+        fieldList.push({type:'string',value:'paymentType',text:'支付类型',dictCode:'zflx'})
+        fieldList.push({type:'string',value:'accountNo',text:'账号/卡号',dictCode:''})
+        fieldList.push({type:'string',value:'bankDeposit',text:'开户银行',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentForm.vue b/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentForm.vue
new file mode 100644
index 00000000..66ab7602
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentForm.vue
@@ -0,0 +1,119 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-select-user-by-dep v-model="model.userId" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="支付类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paymentType">
+              <j-dict-select-tag type="list" v-model="model.paymentType" dictCode="zflx" placeholder="请选择支付类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="账号/卡号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accountNo">
+              <a-input v-model="model.accountNo" placeholder="请输入账号/卡号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankDeposit">
+              <a-input v-model="model.bankDeposit" placeholder="请输入开户银行"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CustomerPaymentForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/customerpayment/customerPayment/add",
+          edit: "/customerpayment/customerPayment/edit",
+          queryById: "/customerpayment/customerPayment/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentModal.vue b/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentModal.vue
new file mode 100644
index 00000000..23e63743
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <customer-payment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-payment-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CustomerPaymentForm from './CustomerPaymentForm'
+  export default {
+    name: 'CustomerPaymentModal',
+    components: {
+      CustomerPaymentForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentModal__Style#Drawer.vue
new file mode 100644
index 00000000..1131f243
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerpayment/custom/modules/CustomerPaymentModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <customer-payment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></customer-payment-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CustomerPaymentForm from './CustomerPaymentForm'
+
+  export default {
+    name: 'CustomerPaymentModal',
+    components: {
+      CustomerPaymentForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/CustomerReceivingAddressList.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/CustomerReceivingAddressList.vue
new file mode 100644
index 00000000..fc7e7b4a
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/CustomerReceivingAddressList.vue
@@ -0,0 +1,250 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="用户">
+              <j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="收货人">
+              <a-input placeholder="请输入收货人" v-model="queryParam.receiver"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="联系电话">
+                <a-input placeholder="请输入联系电话" v-model="queryParam.mobile"></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('顾客地址表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="pcaSlot" slot-scope="text">
+          <div>{{ getPcaText(text) }}</div>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <customer-receiving-address-modal ref="modalForm" @ok="modalFormOk"></customer-receiving-address-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CustomerReceivingAddressModal from './modules/CustomerReceivingAddressModal'
+  import Area from '@/components/_util/Area'
+
+  export default {
+    name: 'CustomerReceivingAddressList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CustomerReceivingAddressModal
+    },
+    data () {
+      return {
+        description: '顾客地址表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'城市',
+            align:"center",
+            dataIndex: 'cityId',
+            scopedSlots: {customRender: 'pcaSlot'}
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'邮编',
+            align:"center",
+            dataIndex: 'zipCode'
+          },
+          {
+            title:'收货人',
+            align:"center",
+            dataIndex: 'receiver'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'mobile'
+          },
+          {
+            title:'排序',
+            align:"center",
+            dataIndex: 'sort'
+          },
+          {
+            title:'标识',
+            align:"center",
+            dataIndex: 'labelcl'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/customerreceivingaddress/customerReceivingAddress/listcustom",
+          delete: "/customerreceivingaddress/customerReceivingAddress/delete",
+          deleteBatch: "/customerreceivingaddress/customerReceivingAddress/deleteBatch",
+          exportXlsUrl: "/customerreceivingaddress/customerReceivingAddress/exportXls",
+          importExcelUrl: "customerreceivingaddress/customerReceivingAddress/importExcel",
+
+        },
+        dictOptions:{},
+        pcaData:'',
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.pcaData = new Area()
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      getPcaText(code){
+        return this.pcaData.getText(code);
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_user',value:'userId',text:'用户'})
+        fieldList.push({type:'pca',value:'cityId',text:'城市'})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'zipCode',text:'邮编',dictCode:''})
+        fieldList.push({type:'string',value:'receiver',text:'收货人',dictCode:''})
+        fieldList.push({type:'string',value:'mobile',text:'联系电话',dictCode:''})
+        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
+        fieldList.push({type:'string',value:'labelcl',text:'标识',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressForm.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressForm.vue
new file mode 100644
index 00000000..64802266
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressForm.vue
@@ -0,0 +1,143 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-select-user-by-dep v-model="model.userId" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="城市" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cityId">
+             <j-area-linkage type="cascader" v-model="model.cityId" placeholder="请输入省市区"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zipCode">
+              <a-input v-model="model.zipCode" placeholder="请输入邮编"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收货人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiver">
+              <a-input v-model="model.receiver" placeholder="请输入收货人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mobile">
+              <a-input v-model="model.mobile" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
+              <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="labelcl">
+              <a-input v-model="model.labelcl" placeholder="请输入标识"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CustomerReceivingAddressForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+           mobile: [
+              { required: false},
+              { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+           ],
+        },
+        url: {
+          add: "/customerreceivingaddress/customerReceivingAddress/add",
+          edit: "/customerreceivingaddress/customerReceivingAddress/edit",
+          queryById: "/customerreceivingaddress/customerReceivingAddress/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressModal.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressModal.vue
new file mode 100644
index 00000000..40d6de4b
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <customer-receiving-address-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-receiving-address-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CustomerReceivingAddressForm from './CustomerReceivingAddressForm'
+  export default {
+    name: 'CustomerReceivingAddressModal',
+    components: {
+      CustomerReceivingAddressForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressModal__Style#Drawer.vue
new file mode 100644
index 00000000..e7b8eaa1
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customerreceivingaddress/custom/modules/CustomerReceivingAddressModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <customer-receiving-address-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></customer-receiving-address-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CustomerReceivingAddressForm from './CustomerReceivingAddressForm'
+
+  export default {
+    name: 'CustomerReceivingAddressModal',
+    components: {
+      CustomerReceivingAddressForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customershoppingcart/custum/CustomerShoppingCartList.vue b/ant-design-vue-jeecg/src/views/customershoppingcart/custum/CustomerShoppingCartList.vue
new file mode 100644
index 00000000..937151f8
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customershoppingcart/custum/CustomerShoppingCartList.vue
@@ -0,0 +1,257 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="用户">
+              <j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="商品">
+              <j-search-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dict="zy_goods,goods_name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('购物车')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect: onSelect}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+      <div class="card-end">
+        总计：<span style="color: red;font-size: 20px">{{ totalPrice }}</span
+      >元
+      </div>
+
+
+    </div>
+
+    <customer-shopping-cart-modal ref="modalForm" @ok="modalFormOk"></customer-shopping-cart-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CustomerShoppingCartModal from './modules/CustomerShoppingCartModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+
+    name: 'CustomerShoppingCartList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CustomerShoppingCartModal
+    },
+    data () {
+      return {
+        selectedRows: [],
+        totalPrice: 0,
+        description: '购物车管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          /*{
+            title:'图片',
+            align:"center",
+            dataIndex: 'temiimg',
+            scopedSlots: {customRender: 'imgSlot'}
+          },*/
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'商品',
+            align:"center",
+            dataIndex: 'goodsId_dictText'
+          },
+          {
+            title:'当前单价',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'number'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/customershoppingcart/customerShoppingCart/listcust",
+          delete: "/customershoppingcart/customerShoppingCart/delete",
+          deleteBatch: "/customershoppingcart/customerShoppingCart/deleteBatch",
+          exportXlsUrl: "/customershoppingcart/customerShoppingCart/exportXls",
+          importExcelUrl: "customershoppingcart/customerShoppingCart/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      onSelectChange(selectedRowKeys) {
+        this.selectedRowKeys = selectedRowKeys
+      },
+      onSelect(record, selected) {
+        // 若选中，直接push
+        if (selected) {
+          this.selectedRows.push(record)
+          this.totalPrice=this.totalPrice+(record.number*record.price)
+        } else {
+          // 若取消选中，则查找到这条数据删除
+          let index = this.selectedRows.findIndex((item) => item.id == record.id)
+          if (index >= 0) {
+            this.selectedRows.splice(index, 1)
+            this.totalPrice=this.totalPrice- record.number*record.price
+
+          }
+        }
+
+
+
+
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'sel_user',value:'userId',text:'用户'})
+        fieldList.push({type:'sel_search',value:'goodsId',text:'商品',dictTable:'zy_goods', dictText:'goods_name', dictCode:'id'})
+        fieldList.push({type:'double',value:'price',text:'当前单价',dictCode:''})
+        fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
+        fieldList.push({type:'string',value:'temp1',text:'中间字段临时存储',dictCode:''})
+        fieldList.push({type:'string',value:'temp2',text:'中间字段临时存储',dictCode:''})
+        fieldList.push({type:'string',value:'temp3',text:'中间字段临时存储',dictCode:''})
+        fieldList.push({type:'string',value:'temp4',text:'中间字段临时存储',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartForm.vue b/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartForm.vue
new file mode 100644
index 00000000..7f9a42f6
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartForm.vue
@@ -0,0 +1,150 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+
+          <a-col :span="24">
+            <a-form-model-item label="图片字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temiimg">
+              <j-image-upload isMultiple  v-model="model.temiimg" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="创建日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
+              <j-date placeholder="请选择创建日期"  v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-select-user-by-dep v-model="model.userId" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
+              <j-search-select-tag v-model="model.goodsId" dict="zy_goods,goods_name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="当前单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入当前单价" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
+              <a-input-number v-model="model.number" placeholder="请输入数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="面料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temp1">
+              <a-input v-model="model.temp1" placeholder="请输入面料"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发货地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temp2">
+              <a-input v-model="model.temp2" placeholder="请输入中间字段临时存储"  disabled></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="中间字段临时存储" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temp3">
+              <a-input v-model="model.temp3" placeholder="发货地"  disabled ></a-input>
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">
+            <a-form-model-item label="中间字段临时存储" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temp4">
+              <a-input v-model="model.temp4" placeholder="请输入中间字段临时存储"  ></a-input>
+            </a-form-model-item>
+          </a-col>-->
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CustomerShoppingCartForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/customershoppingcart/customerShoppingCart/add",
+          edit: "/customershoppingcart/customerShoppingCart/edit",
+          queryById: "/customershoppingcart/customerShoppingCart/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartModal.vue b/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartModal.vue
new file mode 100644
index 00000000..cb2eca2b
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <customer-shopping-cart-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-shopping-cart-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CustomerShoppingCartForm from './CustomerShoppingCartForm'
+  export default {
+    name: 'CustomerShoppingCartModal',
+    components: {
+      CustomerShoppingCartForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartModal__Style#Drawer.vue
new file mode 100644
index 00000000..767f052a
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/customershoppingcart/custum/modules/CustomerShoppingCartModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <customer-shopping-cart-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></customer-shopping-cart-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CustomerShoppingCartForm from './CustomerShoppingCartForm'
+
+  export default {
+    name: 'CustomerShoppingCartModal',
+    components: {
+      CustomerShoppingCartForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file