From d309b8a29915a90830192f9e88e726996a906d60 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 16 Mar 2023 16:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=89=80=E6=9C=89=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E7=A9=BA=E9=A1=B9=E9=BB=98=E8=AE=A4=E6=A8=AA=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/member/info/detail.vue   |  48 ++------
 jsowell-ui/src/views/order/order/index.vue    |  48 ++------
 .../src/views/order/order/orderDetail.vue     | 103 ++----------------
 .../views/pile/station/stationOrderList.vue   |  52 ++-------
 4 files changed, 31 insertions(+), 220 deletions(-)

diff --git a/jsowell-ui/src/views/member/info/detail.vue b/jsowell-ui/src/views/member/info/detail.vue
index 394340e70..fbe5ebf1c 100644
--- a/jsowell-ui/src/views/member/info/detail.vue
+++ b/jsowell-ui/src/views/member/info/detail.vue
@@ -132,11 +132,7 @@
               <el-table-column label="电话号码" align="center" prop="mobileNumber" width="120px"/>
               <el-table-column label="站点" align="center" prop="stationName"/>
               <el-table-column label="充电桩枪口号" align="center" prop="pileConnectorCode" width="200px"/>
-              <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px">
-                <template slot-scope="scope">
-                  <span>{{scope.row.payMode === '1' ? '一' : scope.row.outTradeNo === null ? '一' : scope.row.outTradeNo}}</span>
-                </template>
-              </el-table-column>
+              <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px"/>
               <el-table-column label="启动方式" align="center" prop="startMode" width="100px">
                 <template slot-scope="scope">
                   <dict-tag
@@ -161,41 +157,13 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column label="支付金额" align="center" prop="payAmount" >
-                <template slot-scope="scope">
-                  <span>{{scope.row.payAmount === null ? '一' : scope.row.payAmount}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="充电度数" align="center" prop="chargingDegree" width="100px">
-                <template slot-scope="scope">
-                  <span>{{scope.row.chargingDegree === null ? '一' : scope.row.chargingDegree}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="起始soc" align="center" prop="startSoc" >
-                <template slot-scope="scope">
-                  <span>{{scope.row.startSoc === null ? '一' : scope.row.startSoc}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="终止soc" align="center" prop="endSoc" >
-                <template slot-scope="scope">
-                  <span>{{scope.row.endSoc === null ? '一' : scope.row.endSoc}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180">
-                <template slot-scope="scope">
-                  <span>{{scope.row.chargeStartTime === null ? '一' : scope.row.chargeStartTime}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180">
-                <template slot-scope="scope">
-                  <span>{{scope.row.chargeEndTime === null ? '一' : scope.row.chargeEndTime}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px">
-                <template slot-scope="scope">
-                  <span>{{scope.row.orderAmount === '0.00' ? '一' : scope.row.orderAmount}}</span>
-                </template>
-              </el-table-column>
+              <el-table-column label="支付金额" align="center" prop="payAmount" />
+              <el-table-column label="充电度数" align="center" prop="chargingDegree" width="100px"/>
+              <el-table-column label="起始soc" align="center" prop="startSoc" />
+              <el-table-column label="终止soc" align="center" prop="endSoc" />
+              <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180"/>
+              <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180"/>
+              <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px"/>
             </el-table>
 
             <pagination
diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index edf6f3b15..bfd8f5721 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -160,11 +160,7 @@
       <el-table-column label="电话号码" align="center" prop="mobileNumber" width="120px"/>
       <el-table-column label="站点" align="center" prop="stationName"/>
       <el-table-column label="充电桩枪口号" align="center" prop="pileConnectorCode" width="200px"/>
-      <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px">
-        <template slot-scope="scope">
-          <span>{{scope.row.payMode === '1' ? '一' : scope.row.outTradeNo === null ? '一' : scope.row.outTradeNo}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px"/>
       <el-table-column label="启动方式" align="center" prop="startMode" width="100px">
       <template slot-scope="scope">
         <dict-tag
@@ -189,41 +185,13 @@
         />
       </template>
       </el-table-column>
-      <el-table-column label="支付金额" align="center" prop="payAmount" >
-        <template slot-scope="scope">
-          <span>{{scope.row.payAmount === null ? '一' : scope.row.payAmount}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="充电度数" align="center" prop="chargingDegree" width="100px">
-        <template slot-scope="scope">
-          <span>{{scope.row.chargingDegree === null ? '一' : scope.row.chargingDegree}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="起始soc" align="center" prop="startSoc" >
-        <template slot-scope="scope">
-          <span>{{scope.row.startSoc === null ? '一' : scope.row.startSoc}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="终止soc" align="center" prop="endSoc" >
-        <template slot-scope="scope">
-          <span>{{scope.row.endSoc === null ? '一' : scope.row.endSoc}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180">
-        <template slot-scope="scope">
-          <span>{{scope.row.chargeStartTime === null ? '一' : scope.row.chargeStartTime}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180">
-        <template slot-scope="scope">
-          <span>{{scope.row.chargeEndTime === null ? '一' : scope.row.chargeEndTime}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px">
-        <template slot-scope="scope">
-          <span>{{scope.row.orderAmount === '0.00' ? '一' : scope.row.orderAmount}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="支付金额" align="center" prop="payAmount" />
+      <el-table-column label="充电度数" align="center" prop="chargingDegree" width="100px"/>
+      <el-table-column label="起始soc" align="center" prop="startSoc" />
+      <el-table-column label="终止soc" align="center" prop="endSoc" />
+      <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180"/>
+      <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180"/>
+      <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px"/>
       <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 4aa03f845..1a4a6a177 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -56,34 +56,10 @@
 <!--        ></el-table-column>-->
         <el-table-column prop="createTime" label="创建时间" align="center"/>
         <el-table-column prop="startTime" label="开始时间" align="center"/>
-        <el-table-column prop="endTime" label="结束时间" align="center">
-          <template slot-scope="scope">
-            <span>{{
-                scope.row.endTime === "" ? "一" : scope.row.endTime
-              }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="startSOC" label="起始SOC" align="center">
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.startSOC === null ? "一" : scope.row.startSOC
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="endSOC" label="终止SOC" align="center">
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.endSOC === null ? "一" : scope.row.endSOC
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="stopReasonMsg" label="订单停止原因" align="center">
-          <template slot-scope="scope">
-            <span>{{
-                scope.row.stopReasonMsg === null ? "一" : scope.row.stopReasonMsg
-              }}</span>
-          </template>
-          </el-table-column>
+        <el-table-column prop="endTime" label="结束时间" align="center"/>
+        <el-table-column prop="startSOC" label="起始SOC" align="center"/>
+        <el-table-column prop="endSOC" label="终止SOC" align="center"/>
+        <el-table-column prop="stopReasonMsg" label="订单停止原因" align="center"/>
       </el-table>
       <div class="marginTop"></div>
     </el-card>
@@ -127,22 +103,6 @@
           </template>
         </el-table-column>
 
-<!--        <el-table-column prop="totalElectricityAmount" label="总电费" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{-->
-<!--                scope.row.totalElectricityAmount === null ? "一" : scope.row.totalElectricityAmount-->
-<!--              }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column prop="totalServiceAmount" label="总服务费" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{-->
-<!--                scope.row.totalServiceAmount === null ? "一" : scope.row.totalServicedAmount-->
-<!--              }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
         <el-table-column prop="chargedDegree" label="充电度数" align="center">
           <template slot-scope="scope">
             <span>{{
@@ -150,51 +110,8 @@
               }}</span>
           </template>
         </el-table-column>
-
-        <el-table-column prop="chargingTime" label="充电时长" align="center">
-          <template slot-scope="scope">
-            <span>{{
-                scope.row.chargingTime === null ? "一" : scope.row.chargingTime
-              }} min</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="soc" label="当前soc" align="center">
-          <template slot-scope="scope">
-            <span>{{
-                scope.row.soc === null ? "一" : scope.row.soc
-              }}</span>
-          </template>
-        </el-table-column>
-<!--        <el-table-column-->
-<!--          prop="startTime"-->
-<!--          label=""-->
-<!--          align="center"-->
-<!--        ></el-table-column>-->
-<!--        <el-table-column-->
-<!--          prop="endTime"-->
-<!--          label="结束时间"-->
-<!--          align="center"-->
-<!--        ></el-table-column>-->
-<!--        <el-table-column prop="startSOC" label="起始SOC" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{-->
-<!--                scope.row.startSOC === null ? "一" : scope.row.startSOC-->
-<!--              }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column prop="endSOC" label="终止SOC" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{-->
-<!--                scope.row.endSOC === null ? "一" : scope.row.endSOC-->
-<!--              }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column-->
-<!--          prop="stopReasonMsg"-->
-<!--          label="订单停止原因"-->
-<!--          align="center"-->
-<!--        ></el-table-column>-->
+        <el-table-column prop="chargingTime" label="充电时长" align="center"/>
+        <el-table-column prop="soc" label="当前soc" align="center"/>
       </el-table>
       <div class="marginTop"></div>
     </el-card>
@@ -215,13 +132,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="payTime" label="支付时间" align="center"/>
-        <el-table-column prop="outTradeNo" label="商务单号" align="center">
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.outTradeNo === null ? "一" : scope.row.outTradeNo
-            }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="outTradeNo" label="商务单号" align="center"/>
       </el-table>
       <div class="marginTop"></div>
     </el-card>
diff --git a/jsowell-ui/src/views/pile/station/stationOrderList.vue b/jsowell-ui/src/views/pile/station/stationOrderList.vue
index 7782e5712..fcd5cfa6a 100644
--- a/jsowell-ui/src/views/pile/station/stationOrderList.vue
+++ b/jsowell-ui/src/views/pile/station/stationOrderList.vue
@@ -91,11 +91,7 @@
 
       <el-table-column label="站点" align="center" prop="stationName"/>
       <el-table-column label="充电桩枪口号" align="center" prop="pileConnectorCode" width="200px"/>
-      <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px">
-        <template slot-scope="scope">
-          <span>{{scope.row.payMode === '1' ? '一' : scope.row.outTradeNo === null ? '一' : scope.row.outTradeNo}}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="微信商户订单号" align="center" prop="outTradeNo" width="165px"/>
       <el-table-column label="启动方式" align="center" prop="startMode" width="100px">
         <template slot-scope="scope">
           <dict-tag
@@ -123,46 +119,14 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="支付金额" align="center" prop="payAmount">
-        <template slot-scope="scope">
-          <span>{{scope.row.payAmount === null ? '一' : scope.row.payAmount}}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="充电度数" align="center" prop="chargingDegree" width="100px">
-        <template slot-scope="scope">
-          <span>{{scope.row.chargingDegree === null ? '一' : scope.row.chargingDegree}}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="起始soc" align="center" prop="startSoc" >
-        <template slot-scope="scope">
-          <span>{{scope.row.startSoc === null ? '一' : scope.row.startSoc}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="终止soc" align="center" prop="endSoc" >
-        <template slot-scope="scope">
-          <span>{{scope.row.endSoc === null ? '一' : scope.row.endSoc}}</span>
-        </template>
-      </el-table-column>
-
+      <el-table-column label="支付金额" align="center" prop="payAmount"/>
+      <el-table-column label="充电度数" align="center" prop="chargingDegree" width="100px"/>
+      <el-table-column label="起始soc" align="center" prop="startSoc" />
+      <el-table-column label="终止soc" align="center" prop="endSoc" />
       <!--<el-table-column label="订单生成日期" align="center" prop="createTime" width="180"/>-->
-      <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180">
-        <template slot-scope="scope">
-          <span>{{scope.row.chargeStartTime === null ? '一' : scope.row.chargeStartTime}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180">
-        <template slot-scope="scope">
-          <span>{{scope.row.chargeEndTime === null ? '一' : scope.row.chargeEndTime}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px">
-        <template slot-scope="scope">
-          <span>{{scope.row.orderAmount === '0.00' ? '一' : scope.row.orderAmount}}</span>
-        </template>
-      </el-table-column>
-
+      <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180"/>
+      <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180"/>
+      <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px"/>
     </el-table>
 
     <pagination