Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

stdiet-ui/src/views/custom/commision/detail/index.vue

@@ -180,7 +180,7 @@ export default {
         pageSize: 10,
         userId: null,
         postId: null,
-        reviewStatus: null
+        reviewStatus: "yes"
       },
     };
   },

stdiet-ui/src/views/custom/commision/detail_day/index.vue

@@ -157,6 +157,11 @@
             @click="openFormDialog('查看发放计划', scope.row)"
             >查看发放计划</el-button
           >
+          <el-button
+            type="text"
+            @click="handleDetailClick(scope.row)"
+            >查看订单详情</el-button
+          >
         </template>
       </el-table-column>
 
@@ -181,6 +186,7 @@
         :data="sendCommissionPlan.list"
         show-summary
         :summary-method="getSummaries"
+        style="height:400px;overflow: auto"
       >
         <el-table-column
           property="nickName"
@@ -205,7 +211,11 @@
         </el-table-column>
       </el-table>
     </el-dialog>
+
+    <OrdercommissDetail ref="ordercommissDetailRef"></OrdercommissDetail>
   </div>
+
+
 </template>
 
 <style>
@@ -226,6 +236,8 @@ import { getOptions } from "@/api/custom/global";
 
 import dayjs from "dayjs";
 
+import OrdercommissDetail from "@/components/OrdercommissDetail";
+
 export default {
   name: "CommisionDayDetail",
   data() {
@@ -266,13 +278,16 @@ export default {
         pageSize: 20,
         userId: null,
         postId: null,
-        reviewStatus: null,
+        reviewStatus: "yes",
       },
       sendCommissionPlanTable: false,
       sendCommissionPlan: {},
       fixLength: 2,
     };
   },
+  components: {
+    OrdercommissDetail
+  },
   created() {
     this.getList();
     getOptions().then((response) => {
@@ -399,6 +414,14 @@ export default {
       this.sendCommissionPlan.total = row.totalNotSentCommissionAmount;
       this.sendCommissionPlanTable = true;
     },
+    handleDetailClick(row) {
+      // console.log(row);
+      const dateRange = [
+        dayjs(this.month).startOf("month").format("YYYY-MM-DD"),
+        dayjs(this.month).endOf("month").format("YYYY-MM-DD"),
+      ];
+      this.$refs["ordercommissDetailRef"].showDrawer(this.addDateRange({'yearMonth': dayjs(this.month).endOf("month").format("YYYY-MM-DD"),'name': row.nickName, 'userId': row.userId, 'reviewStatus': this.queryParams.reviewStatus}, dateRange));
+    },
     getSummaries(param) {
       //param 是固定的对象，里面包含 columns与 data参数的对象 {columns: Array[4], data: Array[5]},包含了表格的所有的列与数据信息
       const { columns, data } = param;