更新优化

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,36 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="date" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -1,15 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="283b96a2-01c3-41ea-bf44-67be6caf2356" name="Default Changelist" comment="" />
+    <list default="true" id="283b96a2-01c3-41ea-bf44-67be6caf2356" name="Default Changelist" comment="更新优化">
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dist/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/dist/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dist/static/css/app.b0dae92a186585506402ed7ac43bfb42.css" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dist/static/css/app.b0dae92a186585506402ed7ac43bfb42.css.map" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dist/static/js/app.68e66a9d3a3b1057b5be.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dist/static/js/app.68e66a9d3a3b1057b5be.js.map" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/fullPay.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/fullPay.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/loanPay.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/loanPay.vue" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="ProjectId" id="1Qg4UmlO7UDVJprCOrGwv5bYBke" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/src/components" />
@@ -49,11 +67,38 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1568178923572</updated>
-      <workItem from="1568178925952" duration="11567000" />
+      <workItem from="1568178925952" duration="12433000" />
+      <workItem from="1568250969105" duration="9310000" />
+      <workItem from="1568271545466" duration="6585000" />
+    </task>
+    <task id="LOCAL-00001" summary="更新优化">
+      <created>1568258861313</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1568258861313</updated>
     </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="更新优化" />
+    <option name="LAST_COMMIT_MESSAGE" value="更新优化" />
+  </component>
 </project>

dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>经销商管理系统</title><link href=/static/css/app.b0dae92a186585506402ed7ac43bfb42.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.8eeaeadc93aa4929ae06.js></script><script type=text/javascript src=/static/js/app.68e66a9d3a3b1057b5be.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>经销商管理系统</title><link href=/static/css/app.f1eb59a2df2790aaa0a94513f6e6e1bb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.8eeaeadc93aa4929ae06.js></script><script type=text/javascript src=/static/js/app.a4c9a379ab1b1f2eae98.js></script></body></html>

src/components/fullPay.vue

@@ -13,8 +13,14 @@
                             :value="item.value">
                     </el-option>
                 </el-select>
-<!--                <el-input v-model="queryData.payStatus" placeholder="首款/尾款支付" style="width: 200px"></el-input>-->
-
+                <el-select v-model="queryData.offlinePayType" filterable placeholder="请选择尾款支付状态">
+                    <el-option
+                            v-for="item in payStatusData"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
                 <el-button type="primary" @click="getRows">搜索</el-button>
                 <el-button type="warning" @click="refreshTable">清空</el-button>
             </el-col>
@@ -46,7 +52,7 @@
                     </el-button>
                 </template>
             </el-table-column>
-            <el-table-column prop="carSupplier" label="4S供应商" width="280"></el-table-column>
+            <el-table-column prop="carSupplier" label="提车供应商" width="280"></el-table-column>
             <el-table-column prop="carSupplierNo" label="ERP" width="160"></el-table-column>
             <el-table-column prop="totalPrice" label="总价"></el-table-column>
             <el-table-column prop="depositPrice" label="订金"></el-table-column>
@@ -56,33 +62,31 @@
                 </template>
             </el-table-column>
 
-<!--            <el-table-column prop="downPaymentPrice" label="首付款"></el-table-column>-->
-<!--            <el-table-column prop="downPaymentRate" label="首付比例"></el-table-column>-->
-<!--            <el-table-column prop="realDownPaymentPrice" label="实际首付款"></el-table-column>-->
-<!--            <el-table-column prop="realDownPaymentRate" label="实际首付比例"></el-table-column>-->
+            <!--            <el-table-column prop="downPaymentPrice" label="首付款"></el-table-column>-->
+            <!--            <el-table-column prop="downPaymentRate" label="首付比例"></el-table-column>-->
+            <!--            <el-table-column prop="realDownPaymentPrice" label="实际首付款"></el-table-column>-->
+            <!--            <el-table-column prop="realDownPaymentRate" label="实际首付比例"></el-table-column>-->
             <el-table-column prop="finalPaymentPrice" label="尾款"></el-table-column>
-<!--            <el-table-column prop="loanPrice" label="贷款总额"></el-table-column>-->
-<!--            <el-table-column prop="loanRate" label="贷款利率"></el-table-column>-->
-<!--            <el-table-column prop="monthlyInstallmentPaymentPrice" label="月供金额"></el-table-column>-->
-<!--            <el-table-column prop="loanInstalmentCount" label="分期次数"></el-table-column>-->
+            <!--            <el-table-column prop="loanPrice" label="贷款总额"></el-table-column>-->
+            <!--            <el-table-column prop="loanRate" label="贷款利率"></el-table-column>-->
+            <!--            <el-table-column prop="monthlyInstallmentPaymentPrice" label="月供金额"></el-table-column>-->
+            <!--            <el-table-column prop="loanInstalmentCount" label="分期次数"></el-table-column>-->
 
-<!--            <el-table-column label="贷款状态" width="120">-->
-<!--                <template slot-scope="scope">{{loanState(scope.row)}}</template>-->
-<!--            </el-table-column>-->
-
-<!--            <el-table-column label="首付状态" width="120">-->
-<!--                <template slot-scope="scope">-->
-<!--                    {{(scope.row.offlinePayments?scope.row.offlinePayments.downPaymentStatus:"0" == 0)?'未支付':'已支付'}}-->
-<!--                </template>-->
-<!--            </el-table-column>-->
+            <!--            <el-table-column label="贷款状态" width="120">-->
+            <!--                <template slot-scope="scope">{{loanState(scope.row)}}</template>-->
+            <!--            </el-table-column>-->
 
+            <!--            <el-table-column label="首付状态" width="120">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{(scope.row.offlinePayments?scope.row.offlinePayments.downPaymentStatus:"0" == 0)?'未支付':'已支付'}}-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="尾款状态" width="120">
-                <template slot-scope="scope">{{(scope.row.offlinePayments?scope.row.offlinePayments.tailStatus:"0")==
-                    0?'未支付':'线下已支付'}}
+                <template slot-scope="scope">
+                    {{OfflinePay(scope.row)}}
                 </template>
             </el-table-column>
 
-
             <el-table-column
                     label="发票信息"
                     align="center">
@@ -122,34 +126,34 @@
                 </template>
             </el-table-column>
             <el-table-column prop="pickCity" label="取车城市" width="120"></el-table-column>
-            <el-table-column prop="name" label="收货人姓名" width="100"></el-table-column>
-            <el-table-column prop="mobile" label="收货人联系方式" width="120"></el-table-column>
-            <el-table-column prop="idCard" label="收货人身份证号" width="170"></el-table-column>
-<!--            <el-table-column label="订单是否发送给金融公司">-->
-<!--                <template slot-scope="scope">-->
-<!--                    {{scope.row.isSend == 0?'否' :'是'}}-->
-<!--                </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column label="是否被工厂使用过">-->
-<!--                <template slot-scope="scope">-->
-<!--                    {{scope.row.isUse == 0?'否' :'是'}}-->
-<!--                </template>-->
-<!--            </el-table-column>-->
+            <el-table-column prop="name" label="购车人姓名" width="100"></el-table-column>
+            <el-table-column prop="mobile" label="购车人联系方式" width="120"></el-table-column>
+            <el-table-column prop="idCard" label="购车人身份证号" width="170"></el-table-column>
+            <!--            <el-table-column label="订单是否发送给金融公司">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{scope.row.isSend == 0?'否' :'是'}}-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
+            <!--            <el-table-column label="是否被工厂使用过">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{scope.row.isUse == 0?'否' :'是'}}-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
 
-<!--            <el-table-column label="金融公司链接地址" width="300">-->
-<!--                <template slot-scope="scope">-->
-<!--                    <a v-if="scope.row.url" :href="scope.row.url" target="_blank" class="link">{{scope.row.url}}</a>-->
-<!--                    <span v-else>无</span>-->
-<!--                </template>-->
-<!--            </el-table-column>-->
+            <!--            <el-table-column label="金融公司链接地址" width="300">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    <a v-if="scope.row.url" :href="scope.row.url" target="_blank" class="link">{{scope.row.url}}</a>-->
+            <!--                    <span v-else>无</span>-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
 
-<!--            <el-table-column label="取消原因" width="140">-->
-<!--                <template slot-scope="scope">-->
-<!--                    {{scope.row.cancelReason == 1?'不需要了'-->
-<!--                    :scope.row.cancelReason==2?'车辆选配内容错误'-->
-<!--                    :scope.row.cancelReason==3?'地址信息填写错误':'其他'}}-->
-<!--                </template>-->
-<!--            </el-table-column>-->
+            <!--            <el-table-column label="取消原因" width="140">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{scope.row.cancelReason == 1?'不需要了'-->
+            <!--                    :scope.row.cancelReason==2?'车辆选配内容错误'-->
+            <!--                    :scope.row.cancelReason==3?'地址信息填写错误':'其他'}}-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
 
 
             <el-table-column prop="isRefund" label="是否退款" width="120">
@@ -174,7 +178,7 @@
                             size="small"
                             @click="payForBtn(scope.row,scope.$index)">上传尾款发票
                     </el-button>
-                    <el-button v-show="scope.row.offlinePayments && scope.row.offlinePayments && scope.row.status != 3"
+                    <el-button v-show="scope.row.offlinePayments && scope.row.status == 3 &&  (scope.row.offlinePayments.deliveryPath == null || scope.row.offlinePayments.deliveryPath == '')"
                                type="warning"
                                size="small"
                                @click="deliveryVehicles(scope.row,scope.$index)">上传交车图片
@@ -337,12 +341,12 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="购车人手机号" prop="orderCode" >
+                            <el-form-item label="购车人手机号" prop="orderCode">
                                 <el-input v-model="refundForm.mobile" disabled></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="订单号" prop="orderCode" >
+                            <el-form-item label="订单号" prop="orderCode">
                                 <el-input v-model="refundForm.orderCode" disabled></el-input>
                             </el-form-item>
                         </el-col>
@@ -369,7 +373,7 @@
 
             <el-dialog id="refundDeaDialog" title="退款详情" :visible.sync="refundDeaDialog" min-width="600px">
                 <el-form label-width="100px" :model="refundDealtis" ref="refundForm" status-icon
-                         >
+                >
                     <el-row>
                         <el-col :span="12" width="210px">
                             <el-form-item label="会员号">
@@ -506,13 +510,13 @@
                 carInfo: {}, // 车辆信息
                 matchingInfo: {}, // 选配信息
                 tableData: [],
-                queryData:{
+                queryData: {
                     orderNumber: '', //搜索条件 订单号
-                    mobile:'',//搜索条件 手机号
-                    name:'',//搜索条件 购车人姓名
-                    name:'',//搜索条件 购车人姓名
-                    status:'',//搜索条件 订单状态
-                    payStatus:'',//搜索条件 首付/尾款支付状态
+                    mobile: '',//搜索条件 手机号
+                    name: '',//搜索条件 购车人姓名
+                    name: '',//搜索条件 购车人姓名
+                    status: '',//搜索条件 订单状态
+                    offlinePayType: '',//搜索条件 首付/尾款支付状态
                 },
                 loading: true,
                 totalNumber: null,
@@ -532,7 +536,7 @@
                         {validator: this.$validator.downPaymentRate, trigger: 'blur'}
                     ]
                 },
-                status:[
+                status: [
                     {
                         label: '线下审核通过',
                         value: 5
@@ -542,6 +546,20 @@
                         value: 6
                     }
                 ],
+                payStatusData: [
+                    {
+                        label: '未支付',
+                        value: 3
+                    },
+                    {
+                        label: '线下已支付',
+                        value: 1
+                    },
+                    {
+                        label: '线上已支付',
+                        value: 2
+                    }
+                ],
                 orderStatus: [
                     {
                         label: '待支付定金',
@@ -581,8 +599,8 @@
                     orderId: '',         //订单主键
                     orderCode: '',          //订单code
                     backPrice: '',           //价格
-                    name:'',     //  退货人姓名
-                    mobile:'',  //   退货人手机号
+                    name: '',     //  退货人姓名
+                    mobile: '',  //   退货人手机号
                 },
                 refundDealtis: {},
                 // refundFormRules: {
@@ -749,12 +767,12 @@
             // 获取订单列表信息
             getRows() {
                 let data = {
-                    payType:1,
+                    payType: 1,
                     code: this.queryData.orderNumber,
                     name: this.queryData.name,
                     mobile: this.queryData.mobile,
                     status: this.queryData.status,
-                    payStatus: this.queryData.payStatus,
+                    offlinePayType: this.queryData.offlinePayType,
                     currentPage: this.currentPage,
                     pageNumber: this.pageSize
                 };
@@ -780,12 +798,25 @@
                 this.carInfoDialog = true;
                 this.carInfo = Object.assign({}, JSON.parse(info));
             },
+
             // 查看选配信息
             queryMatchingInfo(info, index) {
                 this.matchingDialog = true;
                 let jsInfo = JSON.parse(info);
                 this.matchingInfo = jsInfo;
             },
+            //首付款线下支付状态
+            OfflinePay(data) {
+                //判断有没有线下支付信息 如果没有有就根据订单状态判断
+                if (data.offlinePayments == undefined) {
+                    if (data.status == 3) {
+                        return '线上已支付';
+                    }
+                } else {
+                    return data.offlinePayments.downPaymentStatus == 0 ? '未支付' : '线下已支付';
+                }
+                return "未支付";
+            },
             // 单款状态
             loanState(data) {
                 var data = data;

src/components/loanPay.vue

@@ -13,7 +13,15 @@
                             :value="item.value">
                     </el-option>
                 </el-select>
-<!--                <el-input v-model="queryData.payStatus" placeholder="首款/尾款支付" style="width: 200px"></el-input>-->
+                <el-select v-model="queryData.offlinePayType" filterable placeholder="请选择首付支付状态">
+                    <el-option
+                            v-for="item in payStatusData"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+
                 <el-button type="primary" @click="getRows">搜索</el-button>
                 <el-button type="warning" @click="refreshTable">清空</el-button>
             </el-col>
@@ -45,7 +53,7 @@
                     </el-button>
                 </template>
             </el-table-column>
-            <el-table-column prop="carSupplier" label="4S供应商" width="280"></el-table-column>
+            <el-table-column prop="carSupplier" label="提车供应商" width="280"></el-table-column>
             <el-table-column prop="carSupplierNo" label="ERP" width="160"></el-table-column>
             <el-table-column prop="totalPrice" label="总价"></el-table-column>
             <el-table-column prop="depositPrice" label="订金"></el-table-column>
@@ -59,11 +67,11 @@
             <el-table-column prop="downPaymentRate" label="首付比例"></el-table-column>
             <el-table-column prop="realDownPaymentPrice" label="实际首付款"></el-table-column>
             <el-table-column prop="realDownPaymentRate" label="实际首付比例"></el-table-column>
-            <el-table-column prop="finalPaymentPrice" label="尾款"></el-table-column>
+            <!--            <el-table-column prop="finalPaymentPrice" label="尾款"></el-table-column>-->
             <el-table-column prop="loanPrice" label="贷款总额"></el-table-column>
-<!--            <el-table-column prop="loanRate" label="贷款利率"></el-table-column>-->
-<!--            <el-table-column prop="monthlyInstallmentPaymentPrice" label="月供金额"></el-table-column>-->
-<!--            <el-table-column prop="loanInstalmentCount" label="分期次数"></el-table-column>-->
+            <!--            <el-table-column prop="loanRate" label="贷款利率"></el-table-column>-->
+            <!--            <el-table-column prop="monthlyInstallmentPaymentPrice" label="月供金额"></el-table-column>-->
+            <!--            <el-table-column prop="loanInstalmentCount" label="分期次数"></el-table-column>-->
 
             <el-table-column label="贷款状态" width="120">
                 <template slot-scope="scope">{{loanState(scope.row)}}</template>
@@ -71,17 +79,17 @@
 
             <el-table-column label="首付状态" width="120">
                 <template slot-scope="scope">
-                    {{OfflinePay(scope.row,1)}}
-<!--                    {{(scope.row.offlinePayments?scope.row.offlinePayments.downPaymentStatus:"0" == 0)?'未支付':'线下已支付'}}-->
+                    {{OfflinePay(scope.row)}}
+                    <!--                    {{(scope.row.offlinePayments?scope.row.offlinePayments.downPaymentStatus:"0" == 0)?'未支付':'线下已支付'}}-->
                 </template>
             </el-table-column>
 
-            <el-table-column label="尾款状态" width="120">
-                <template slot-scope="scope">
-                    {{OfflinePay(scope.row,2)}}
-                    <!--                    {{(scope.row.offlinePayments?scope.row.offlinePayments.tailStatus:"0")== 0?'未支付':'线下已支付'}}-->
-                </template>
-            </el-table-column>
+            <!--            <el-table-column label="尾款状态" width="120">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{OfflinePay(scope.row,2)}}-->
+            <!--                    &lt;!&ndash;                    {{(scope.row.offlinePayments?scope.row.offlinePayments.tailStatus:"0")== 0?'未支付':'线下已支付'}}&ndash;&gt;-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
 
 
             <el-table-column
@@ -123,34 +131,34 @@
                 </template>
             </el-table-column>
             <el-table-column prop="pickCity" label="取车城市" width="120"></el-table-column>
-            <el-table-column prop="name" label="收货人姓名" width="100"></el-table-column>
-            <el-table-column prop="mobile" label="收货人联系方式" width="120"></el-table-column>
-            <el-table-column prop="idCard" label="收货人身份证号" width="170"></el-table-column>
-<!--            <el-table-column label="订单是否发送给金融公司">-->
-<!--                <template slot-scope="scope">-->
-<!--                    {{scope.row.isSend == 0?'否' :'是'}}-->
-<!--                </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column label="是否被工厂使用过">-->
-<!--                <template slot-scope="scope">-->
-<!--                    {{scope.row.isUse == 0?'否' :'是'}}-->
-<!--                </template>-->
-<!--            </el-table-column>-->
-
-<!--            <el-table-column label="金融公司链接地址" width="300">-->
-<!--                <template slot-scope="scope">-->
-<!--                    <a v-if="scope.row.url" :href="scope.row.url" target="_blank" class="link">{{scope.row.url}}</a>-->
-<!--                    <span v-else>无</span>-->
-<!--                </template>-->
-<!--            </el-table-column>-->
-
-<!--            <el-table-column label="取消原因" width="140">-->
-<!--                <template slot-scope="scope">-->
-<!--                    {{scope.row.cancelReason == 1?'不需要了'-->
-<!--                    :scope.row.cancelReason==2?'车辆选配内容错误'-->
-<!--                    :scope.row.cancelReason==3?'地址信息填写错误':'其他'}}-->
-<!--                </template>-->
-<!--            </el-table-column>-->
+            <el-table-column prop="name" label="购车人姓名" width="100"></el-table-column>
+            <el-table-column prop="mobile" label="购车人联系方式" width="120"></el-table-column>
+            <el-table-column prop="idCard" label="购车人身份证号" width="170"></el-table-column>
+            <!--            <el-table-column label="订单是否发送给金融公司">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{scope.row.isSend == 0?'否' :'是'}}-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
+            <!--            <el-table-column label="是否被工厂使用过">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{scope.row.isUse == 0?'否' :'是'}}-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
+
+            <!--            <el-table-column label="金融公司链接地址" width="300">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    <a v-if="scope.row.url" :href="scope.row.url" target="_blank" class="link">{{scope.row.url}}</a>-->
+            <!--                    <span v-else>无</span>-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
+
+            <!--            <el-table-column label="取消原因" width="140">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    {{scope.row.cancelReason == 1?'不需要了'-->
+            <!--                    :scope.row.cancelReason==2?'车辆选配内容错误'-->
+            <!--                    :scope.row.cancelReason==3?'地址信息填写错误':'其他'}}-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
 
 
             <el-table-column prop="isRefund" label="是否退款" width="120">
@@ -176,7 +184,7 @@
                             size="small"
                             @click="payForBtn(scope.row,scope.$index)">上传尾款发票
                     </el-button>
-                    <el-button v-show="scope.row.offlinePayments && scope.row.offlinePayments && scope.row.status != 3"
+                    <el-button v-show="scope.row.offlinePayments && scope.row.status == 3 &&  (scope.row.offlinePayments.deliveryPath == null || scope.row.offlinePayments.deliveryPath == '')"
                                size="small"
                                @click="deliveryVehicles(scope.row,scope.$index)">上传交车图片
                     </el-button>
@@ -330,7 +338,7 @@
             </el-dialog>
             <el-dialog id="refundDialog" title="退款" :visible.sync="refundDialog" width="30%"
                        :before-close="clearForm('refundForm')">
-                <el-form label-width="100px" :model="refundForm" ref="refundForm" status-icon >
+                <el-form label-width="100px" :model="refundForm" ref="refundForm" status-icon>
                     <el-row>
                         <el-col :span="14">
                             <el-form-item label="会员号">
@@ -338,7 +346,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="14">
-                            <el-form-item label="订单号" prop="orderCode" >
+                            <el-form-item label="订单号" prop="orderCode">
                                 <el-input v-model="refundForm.orderCode" disabled></el-input>
                             </el-form-item>
                         </el-col>
@@ -365,7 +373,7 @@
 
             <el-dialog id="refundDeaDialog" title="退款详情" :visible.sync="refundDeaDialog" min-width="600px">
                 <el-form label-width="100px" :model="refundDealtis" ref="refundForm" status-icon
-                         >
+                >
                     <el-row>
                         <el-col :span="12" width="210px">
                             <el-form-item label="会员号">
@@ -513,13 +521,13 @@
                     loanStatus: '',  // 状态
                     downPaymentRate: ''  // 比例
                 },
-                queryData:{
+                queryData: {
                     orderNumber: '', //搜索条件 订单号
-                    mobile:'',//搜索条件 手机号
-                    name:'',//搜索条件 购车人姓名
-                    name:'',//搜索条件 购车人姓名
-                    status:'',//搜索条件 订单状态
-                    payStatus:'',//搜索条件 首付/尾款支付状态
+                    mobile: '',//搜索条件 手机号
+                    name: '',//搜索条件 购车人姓名
+                    name: '',//搜索条件 购车人姓名
+                    status: '',//搜索条件 订单状态
+                    offlinePayType: '',//搜索条件 首付/尾款支付状态
                 },
                 examineFormRules: {
                     loanStatus: [
@@ -539,6 +547,20 @@
                         value: 6
                     }
                 ],
+                payStatusData: [
+                    {
+                        label: '未支付',
+                        value: 3
+                    },
+                    {
+                        label: '线下已支付',
+                        value: 1
+                    },
+                    {
+                        label: '线上已支付',
+                        value: 2
+                    }
+                ],
                 orderStatus: [
                     {
                         label: '待支付定金',
@@ -561,9 +583,7 @@
                         value: 5
                     }
                 ],
-                payStatus:[
-
-                ],
+                payStatus: [],
                 index: null, // 当前列表Id
                 uploadUrl: Api.imgUrl,
                 imgUrl: '',
@@ -739,18 +759,18 @@
                     })
             },
             refreshTable() {
-                this.orderNumber = '';
+                this.queryData = {};
                 this.getRows();
             },
             // 获取订单列表信息
             getRows() {
                 let data = {
-                    payType:2,
+                    payType: 2,
                     code: this.queryData.orderNumber,
                     name: this.queryData.name,
                     mobile: this.queryData.mobile,
                     status: this.queryData.status,
-                    payStatus: this.queryData.payStatus,
+                    offlinePayType: this.queryData.offlinePayType,
                     currentPage: this.currentPage,
                     pageNumber: this.pageSize
                 };
@@ -783,20 +803,15 @@
                 this.matchingInfo = jsInfo;
             },
             //首付款线下支付状态
-            OfflinePay(data,type){
+            OfflinePay(data) {
                 //判断有没有线下支付信息 如果没有有就根据订单状态判断
-                if (data.offlinePayments==undefined){
-                    if (data.status == 2 || data.statu == 3){
+                if (data.offlinePayments == undefined) {
+                    if (data.status == 3) {
                         return '线上已支付';
                     }
-                }else {
-                 if (type == 1){
-                     return data.offlinePayments.downPaymentStatus == 0?'未支付':'线下已支付';
-                 }
-                 if (type ==2){
-                     return data.offlinePayments.tailStatus == 0?'未支付':'线下已支付';
-
-                 }
+                } else {
+
+                    return data.offlinePayments.downPaymentStatus == 0 ? '未支付' : '线下已支付';
                 }
                 return "未支付";
             },
@@ -1059,7 +1074,7 @@
             open: function (file) {
 
 
-                if (file == 0  || file == undefined){
+                if (file == 0 || file == undefined) {
                     Message.warning("没有图片上传");
                     return;
                 }