班结信息

.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # 智慧易加管理系统/开发环境
-VUE_APP_BASE_API = 'http://test.huijy.net/prod-api'
-# VUE_APP_BASE_API = '/dev-api'
+#VUE_APP_BASE_API = 'http://test.huijy.net/prod-api'
+ VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/order/Order_Approval.vue

@@ -180,7 +180,7 @@
         align="center"
         class-name="small-padding fixed-width"
         width="240px"
-        v-if="reprint"
+        
       >
         <template slot-scope="scope">
           <el-popconfirm

src/views/order/Order_Refund.vue

@@ -174,7 +174,6 @@
         align="center"
         class-name="small-padding fixed-width"
         width="120px"
-        v-if="reprint"
       >
         <template slot-scope="scope">
           {{ parseExaminStatus(scope.row.examinStatus)}}
@@ -186,7 +185,6 @@
         align="center"
         class-name="small-padding fixed-width"
         width="120px"
-        v-if="reprint"
       >
         <template slot-scope="scope">
           <el-button

src/views/overview/Overview_AccountingReport.vue

@@ -141,9 +141,9 @@
         label-width="68px"
       >
         <el-form-item prop="carNumber">
-          开班时间：{{ opo.classStartDate }} 班结时间：{{
-            opo.classStructureDate
-          }}班结人：{{ opo.classStructureMan }}
+          开班时间：{{ opo.startDate }} 班结时间：{{
+            opo.endDate
+          }}班结人：{{ opo.classesMan }}
         </el-form-item>
       </el-form>
       <!--按员工汇总-->
@@ -189,7 +189,8 @@
         <af-table-column label="微信金额" align="center" prop="wxAmt" />
         <af-table-column label="支付宝金额" align="center" prop="zfbAmt" />
         <af-table-column label="现金金额" align="center" prop="xjAmt" />
-        <af-table-column label="会员卡支付" align="center" prop="memberAmt" />
+        <af-table-column label="会员卡支付" align="center" prop="dzkAmt" />
+        <af-table-column label="退款金额" align="center" prop="refundAmt" />
       </el-table>
     </el-dialog>
   </div>
@@ -228,6 +229,9 @@ export default {
         classesNo: "",
         startDate: null,
         endDate: null,
+        
+        
+        
       },
       // 查询参数
       queryParam: {
@@ -268,7 +272,7 @@ export default {
         dzkAmt: null,
         score: null,
         memberNo: null,
-        memberAmt: null,
+        dzkAmt: null,
         carNo: null,
         customerPhone: null,
         customerGrade: null,
@@ -359,9 +363,11 @@ export default {
       //this.$router.push({path:'/station/structure',query:{classesNo:row.classesNo,stationId:row.stationId,name:row.classesMan}});
       this.open = true;
       this.title = "查看班结明细";
-      this.queryParams.classStructureMan = row.classesMan;
-      this.queryParams.classStructureNo = row.classesNo;
+      this.queryParams.classesMan = row.classesMan;
+      this.queryParams.classesNo = row.classesNo;
       this.queryParams.stationId = row.stationId;
+      this.queryParams.startDate=row.startDate;
+      this.queryParams.endDate=row.endDate;
       listClass(this.queryParams).then((response) => {
         this.opo = response.data;
         this.getStructureList();
@@ -570,7 +576,7 @@ export default {
             }
           }, 0);
           sums[index] = sums[index].toFixed(2);
-        } else if (column.property === "memberAmt") {
+        } else if (column.property === "dzkAmt") {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
@@ -580,7 +586,18 @@ export default {
             }
           }, 0);
           sums[index] = sums[index].toFixed(2);
-        } else {
+        } 
+         else if (column.property === "refundAmt") {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = sums[index].toFixed(2);
+        }else {
           sums[index] = "";
         }
       });

src/views/station/Station_Accounting.vue

@@ -11,7 +11,7 @@
       label-width="68px"
     >
       <el-form-item prop="carNumber"
-        >开班时间：{{ opo.classStartDate }} 班结人：{{ opo.classStructureMan }}
+        >开班时间：{{ opo.startDate }} 班结人：{{ opo.classStructureMan }}
       </el-form-item>
       <el-form-item>
         <el-button
@@ -58,7 +58,7 @@
       <el-table-column label="微信金额" align="center" prop="wxAmt" />
       <el-table-column label="支付宝金额" align="center" prop="zfbAmt" />
       <el-table-column label="现金金额" align="center" prop="xjAmt" />
-      <el-table-column label="会员卡支付" align="center" prop="memberAmt" />
+      <el-table-column label="会员卡支付" align="center" prop="dzkAmt" />
     </el-table>
     <!-- 添加或修改班结管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -106,7 +106,7 @@ export default {
       stationOptions: [],
       opo: {
         classStructureMan: null,
-        classStartDate: null,
+        startDate: null,
       },
       // 表单参数
       form: {},
@@ -128,21 +128,21 @@ export default {
         // 油站第一次班结
         const PayOrderRes = await getPayOrderInfoMin();
         if(PayOrderRes.data==null){
-          this.opo.classStartDate ="";
+          this.opo.startDate ="";
         }else{
-          this.opo.classStartDate = PayOrderRes.data.createdDate;
+          this.opo.startDate = PayOrderRes.data.createdDate;
         }
         this.opo = {
           ...this.opo,
-          classStartDate: PayOrderRes.data.createdDate,
+          startDate: PayOrderRes.data.createdDate,
         };
         return;
       } else {
         // 油站之前班结过
-        this.opo.classStartDate = structureRes.data.classStructureDate;
+        this.opo.startDate = structureRes.data.classStructureDate;
         this.opo = {
           ...this.opo,
-          classStartDate: structureRes.data.classStructureDate,
+          startDate: structureRes.data.classStructureDate,
         };
         return;
       }
@@ -349,7 +349,7 @@ export default {
             }
           }, 0);
           sums[index] = sums[index].toFixed(2);
-        } else if (column.property === "memberAmt") {
+        } else if (column.property === "dzkAmt") {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {