Pine 6 лет назад
Родитель
Сommit
96261ee198

+ 1 - 1
index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>dealer_web</title>
+    <title>经销商管理系统</title>
   </head>
   <body>
     <div id="app"></div>

+ 76 - 81
src/components/dealer/CarBackOrderDetail.vue

@@ -20,87 +20,82 @@
                     width="70"
                     align="center">
             </el-table-column>
-                            <el-table-column
-                        prop="id"
-                        label="主键id"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="backCode"
-                        label="退单号"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="orderId"
-                        label="订单id 对应选配车订单表中的主键id"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="orderCode"
-                        label="订单号 对应选配车订单中的订单号code"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="customerId"
-                        label="会员id"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="backPrice"
-                        label="退定金额"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="status"
-                        label="退单状态 1 待审核 2 审核通过 3 审核不通过 4 已退款"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="reason"
-                        label="退定原因 1 贷款审核不通过 2 车辆选配内容错误 3 地址信息填写错误 4 其他"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="name"
-                        label="收款人户名"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="account"
-                        label="收款人银行账号"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="bank"
-                        label="银行名称"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="auditTime"
-                        label="审核时间"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="auditor"
-                        label="审核人"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="finishTime"
-                        label="完成退定时间"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="delFlag"
-                        label=""
-                        align="center">
-                </el-table-column>
-                        <el-table-column label="操作 " width="250px" fixed="right" align="center">
+            <el-table-column
+                    prop="id"
+                    label="主键id"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="backCode"
+                    label="退单号"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="orderCode"
+                    label="订单号"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="customerId"
+                    label="会员id"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="backPrice"
+                    label="退定金额"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="status"
+                    label="退单状态"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="reason"
+                    label="退定原因"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="name"
+                    label="收款人户名"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="account"
+                    label="收款人银行账号"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="bank"
+                    label="银行名称"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="createTime"
+                    label="创建时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="auditTime"
+                    label="审核时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="auditor"
+                    label="审核人"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="finishTime"
+                    label="完成退定时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="delFlag"
+                    label=""
+                    align="center">
+            </el-table-column>
+            <el-table-column label="操作 " width="250px" fixed="right" align="center">
                 <template slot-scope="scope">
                     <el-button size="small" @click="editRow(scope.row)">编辑</el-button>
                     <el-button size="small" type="danger" @click="deleteRow(scope.row)">删除</el-button>

+ 207 - 241
src/components/dealer/CarOrderDetail.vue

@@ -20,233 +20,196 @@
                     width="70"
                     align="center">
             </el-table-column>
-                            <el-table-column
-                        prop="id"
-                        label="主键id"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="code"
-                        label="订单号"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="customerId"
-                        label="订单所属会员id"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="payType"
-                        label="支付方式  1 全款 2 贷款"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="status"
-                        label="订单状态 1 待支付定金 2 已支付定金 3 已完成 4 取消订单 5 退定金完成"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="loanStatus"
-                        label="贷款状态 0 暂无 1 线上待审核 2 线上审核通过 3 线上审核不通过 4 线下待审核 5 线下审核通过 6 线下审核不通过"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="isUse"
-                        label="是否被工厂使用过 0 否 1 是 默认0 "
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="carId"
-                        label="车型id"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="carJson"
-                        label="车型信息 json字符串格式"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="pickedCarInformation"
-                        label="车辆选配信息  json信息如下: var a = {
-    // 卡钳
-    "carCaliper": {
-        // 名称
-        "name": "卡钳",
-        // 价格
-        "price": 10,
-        // 类型5 卡钳
-        "type": "5",
-        // 选择的卡钳值
-        "value": "黑色卡钳"
-    },
-    // 车身颜色
-    "carColor": {
-        // 名称
-        "name": "车身颜色",
-        // 价格
-        "price": 10,
-        // 类型2 车身颜色
-        "type": "2",
-        // 颜色和材质值 用/分割
-        "value": "红色/基础版"
-    },
-    // 座椅
-    "carSeat": {
-        // 名称
-        "name": "座椅布局",
-        // 价格
-        "price": 10,
-        // 类型1 座椅
-        "type": "1",
-        // 座椅值
-        "value": "5座"
-    },
-    // 轮廓
-    "carWheelHub": {
-        // 名称
-        "name": "轮毂",
-        // 价格
-        "price": 10,
-        // 类型4 轮廓
-        "type": "4",
-        // 轮廓值
-        "value": "轮毂型号名称"
-    },
-    // 内饰
-    "catUpholstery": {
-        // 名称
-        "name": "内饰",
-        // 价格
-        "price": 10,
-        // 类型3 内饰
-        "type": "3",
-        // 内饰值
-        "value": "红黑条纹软包套件"
-    }
-};"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="loanInstalmentCount"
-                        label="贷款分期次数(例如 12,24,36)"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="loanRate"
-                        label="贷款利率"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="downPaymentRate"
-                        label="首付比例  (系统后台配置的首付比例)"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="realDownPaymentRate"
-                        label="实际首付比例(线下审核通过金融公司返回实际首付比例)"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="totalPrice"
-                        label="总价  车型价格+各项选配价格"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="depositPrice"
-                        label="定金"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="finalPaymentPrice"
-                        label="尾款(全款支付)总价-定金"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="downPaymentPrice"
-                        label="首付款(不包含定金) 总价*首付比例-定金"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="loanPrice"
-                        label="贷款总额  总价-总价*首付比例"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="monthlyInstallmentPaymentPrice"
-                        label="月供金额(贷款金额+贷款金额*贷款利率)/贷款分期次数"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="name"
-                        label="收货人姓名"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="mobile"
-                        label="收货人联系方式"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="idCard"
-                        label="收货人身份证号"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="pickCity"
-                        label="取车城市"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="carSupplier"
-                        label="4S供应商"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="carSupplierNo"
-                        label="4S供应商编码"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="orderCancelTime"
-                        label="订单取消时间"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="payDepositTime"
-                        label="支付定金时间"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="onlineAuditTime"
-                        label="线上审核结果时间"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="orderFinishTime"
-                        label="订单完成时间"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="url"
-                        label="填写申请金融公司贷款资料链接地址"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="cancelReason"
-                        label="订单取消原因 1 不需要了 2 车辆选配内容错误 3 地址信息填写错误 4 其他"
-                        align="center">
-                </el-table-column>
-                            <el-table-column
-                        prop="delFlag"
-                        label=""
-                        align="center">
-                </el-table-column>
-                        <el-table-column label="操作 " width="250px" fixed="right" align="center">
+            <!--<el-table-column-->
+                    <!--prop="id"-->
+                    <!--label="主键id"-->
+                    <!--align="center">-->
+            <!--</el-table-column>-->
+            <el-table-column
+                    prop="code"
+                    label="订单号"
+                    align="center"
+                    width="180px"
+            >
+            </el-table-column>
+            <el-table-column
+                    prop="customerId"
+                    label="订单所属会员id"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="payType"
+                    label="支付方式"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="status"
+                    label="订单状态"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="loanStatus"
+                    label="贷款状态"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="isUse"
+                    label="是否被工厂使用过"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="carId"
+                    label="车型id"
+                    align="center">
+            </el-table-column>
+            <!--<el-table-column-->
+                    <!--prop="carJson"-->
+                    <!--label="车型信息"-->
+                    <!--align="center">-->
+            <!--</el-table-column>-->
+            <!---->
+            <!--<el-table-column-->
+                    <!--prop="pickedCarInformation"-->
+                    <!--label="车辆选配信息"-->
+                    <!--align="center">-->
+            <!--</el-table-column>-->
+
+            <el-table-column
+                    prop="loanInstalmentCount"
+                    label="贷款分期次数"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="loanRate"
+                    label="贷款利率"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="downPaymentRate"
+                    label="首付比例"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="realDownPaymentRate"
+                    label="实际首付比例"
+                    align="center"
+                    width="110">
+            </el-table-column>
+            <el-table-column
+                    prop="totalPrice"
+                    label="总价"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="depositPrice"
+                    label="定金"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="finalPaymentPrice"
+                    label="尾款"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="downPaymentPrice"
+                    label="首付款"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="realDownPaymentPrice"
+                    label="实际首付款
+                    width="110"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="loanPrice"
+                    label="贷款总额"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="monthlyInstallmentPaymentPrice"
+                    label="月供金额"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="name"
+                    label="收货人姓名"
+                    width="110"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="mobile"
+                    label="收货人联系方式"
+                    width="130"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="idCard"
+                    label="收货人身份证号"
+                    width="130"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="pickCity"
+                    label="取车城市"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="carSupplier"
+                    label="4S供应商"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="carSupplierNo"
+                    label="4S供应商编码"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="createTime"
+                    label="创建时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="orderCancelTime"
+                    label="订单取消时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="payDepositTime"
+                    label="支付定金时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="onlineAuditTime"
+                    label="线上审核时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="offlineAuditTime"
+                    label="线下审核时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="orderFinishTime"
+                    label="订单完成时间"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="url"
+                    label="填写申请金融公司贷款资料链接地址"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="cancelReason"
+                    label="订单取消原因"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="isSend"
+                    label="订单是否发送给金融公司"
+                    align="center">
+            </el-table-column>
+            <el-table-column label="操作 " width="250px" fixed="right" align="center">
                 <template slot-scope="scope">
                     <el-button size="small" @click="editRow(scope.row)">编辑</el-button>
                     <el-button size="small" type="danger" @click="deleteRow(scope.row)">删除</el-button>
@@ -266,6 +229,8 @@
     export default {
         name: 'ZhaoPin',
         created() {
+            console.log("getRows")
+
             this.getRows();
         },
         data() {
@@ -293,51 +258,52 @@
         methods: {
             getRows() {
 
-                this.丨http.get(this.丨store.state.httpApi + 'business/carorder/page?currentPage=' + this.currentPage + '&pageNumber=' + this.pageSize).then(response => {
+                this.$http.get(this.$store.state.httpApi + 'business/CarOrder/page?currentPage=' + this.currentPage + '&pageNumber=' + this.pageSize).then(response => {
 
                     if (response.status == 200) {
                         this.rows = response.data.data.pp;
                         this.totalNumber = response.data.data.page.totalNumber;
-                        this.丨message.success('数据加载成功');
+                        console.log(this.rows)
+                        this.$message.success('数据加载成功');
                     } else {
-                        this.message.success('服务器连接异常');
+                        this.$message.success('服务器连接异常');
                     }
                 }, response => {
-                    this.message.success('服务器连接异常');
+                    this.$message.success('服务器连接异常');
                 })
             },
 
             deleteRow(data) {
-                this.confirm('确定要删除吗?', '提示', {
+                this.$confirm('确定要删除吗?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-                    var httpApi = this.store.state.httpApi;
-                    this.丨http.post(this.丨store.state.httpApi + 'business/carorder/del?id=' + data.id).then(response => {
+                    var httpApi = this.$store.state.httpApi;
+                    this.$http.post(this.$store.state.httpApi + 'business/CarOrder/del?id=' + data.id).then(response => {
                         if (response.status == 200) {
                             console.log(response)
                             if (response.data.success) {
-                                this.message.success('删除成功');
+                                this.$message.success('删除成功');
                                 this.getRows();
                             } else {
-                                this.message.success('删除失败');
+                                this.$message.success('删除失败');
                             }
                         } else {
-                            this.message.success('服务器连接异常');
+                            this.$message.success('服务器连接异常');
                         }
                     }, response => {
-                        this.message.success('服务器连接异常');
+                        this.$message.success('服务器连接异常');
                     })
                 }).catch(() => {
-                    this.message({
+                    this.$message({
                         type: 'info',
                         message: '已取消删除'
                     });
                 });
             },
             editRow(data) {
-                this.router.push({path: '/home/carorders', query: {id: data.id}})
+                this.$router.push({path: '/home/carorders', query: {id: data.id}})
             },
             pageChange: function (page) {
                 this.currentPage = page;
@@ -348,7 +314,7 @@
                 this.getRows();
             },
             create() {
-                this.router.push({path: '/home/carorders'})
+                this.$router.push({path: '/home/carorders'})
             },
         },
     }

+ 2 - 1
src/components/home.vue

@@ -5,7 +5,8 @@
         <div class="logo">
           <!-- <img src="https://ask-image.zhaopin.cn/other_files/kh_1530093270375.jpg"> -->
 
-     <img src="http://39.108.234.18/img/bg1.jpg">
+     <img src="http://img0.imgtn.bdimg.com/it/u=357183115,1935157108&fm=214&gp=0.jpg">
+            <!--<h6>经销商管理系统</h6>-->
         </div>
         <el-menu default-active="0" class="el-menu-vertical-demo">
           <el-menu-item :index="j+''" v-for="(item,j) in menuList" :key="j+''" @click="showMenu(item)">