添加搜索字段

dist/static/css/chunk-25667d28.4841c13c.css → dist/static/css/chunk-0f26e1a4.4dfc1c7b.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-28f0df5a],.el-button--primary[data-v-28f0df5a]:active,.el-button--primary[data-v-28f0df5a]:focus,.el-button--primary[data-v-28f0df5a]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-28f0df5a] .el-image-viewer__close{color:#fff;opacity:1}[data-v-28f0df5a] .el-date-editor.el-input,[data-v-28f0df5a] .el-select{width:100%!important}[data-v-28f0df5a] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.el-button--primary[data-v-29a34556],.el-button--primary[data-v-29a34556]:active,.el-button--primary[data-v-29a34556]:focus,.el-button--primary[data-v-29a34556]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-29a34556] .el-image-viewer__close{color:#fff;opacity:1}[data-v-29a34556] .el-date-editor.el-input,[data-v-29a34556] .el-select{width:100%!important}[data-v-29a34556] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}

src/views/businessManager/orderManager/financeManager.vue

@@ -14,6 +14,27 @@
       <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
         <el-form-item>
           <el-input
+            placeholder="交易流水号"
+            type="text"
+            v-model.trim="searchForm.transNo"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            placeholder="订单号"
+            type="text"
+            v-model.trim="searchForm.orderNo"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            placeholder="收款账户"
+            type="text"
+            v-model.trim="searchForm.merNos"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input
             placeholder="余额支付大于等于"
             type="number"
             @mousewheel.native.prevent
@@ -170,7 +191,10 @@ export default {
         paymentType: null,
         routingOrganId: null,
         actualAmount: null,
-        balancePaymentAmount: null
+        balancePaymentAmount: null,
+        orderNo: null,
+        transNo: null,
+        merNos: null
       },
       tableList: [],
       organList: [],
@@ -226,6 +250,21 @@ export default {
         orderType: 3
       };
       let searchForm = this.searchForm;
+      if(searchForm.orderNo) {
+        data.orderNo = searchForm.orderNo
+      }
+      if(searchForm.transNo) {
+        data.transNo = searchForm.transNo
+      }
+      if(searchForm.merNos) {
+        data.merNos = searchForm.merNos
+      }
+      if(searchForm.actualAmount) {
+        data.actualAmount = searchForm.actualAmount
+      }
+      if(searchForm.balancePaymentAmount) {
+        data.balancePaymentAmount = searchForm.balancePaymentAmount
+      }
       if (searchForm.paymentStatus) {
         data.paymentStatus = searchForm.paymentStatus;
       }
@@ -292,9 +331,14 @@ export default {
       this.getList();
     },
     getList() {
-      let params = this.searchForm;
+      let params = JSON.parse(JSON.stringify(this.searchForm))
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
+      params.orderNo = params.orderNo ? params.orderNo : null
+      params.transNo = params.transNo ? params.transNo : null
+      params.merNos = params.merNos ? params.merNos : null
+      params.actualAmount = params.actualAmount ? params.actualAmount : null
+      params.balancePaymentAmount = params.balancePaymentAmount ? params.balancePaymentAmount : null
       if (this.orderDate && this.orderDate.length > 0) {
         params.orderStartDate = this.orderDate[0];
         params.orderEndDate = this.orderDate[1];
@@ -331,7 +375,12 @@ export default {
         orderEndDate: null,
         paymentStatus: null,
         paymentType: null,
-        routingOrganId: null
+        routingOrganId: null,
+        actualAmount: null,
+        balancePaymentAmount: null,
+        orderNo: null,
+        transNo: null,
+        merNos: null
       };
       this.getList();
     }

src/views/businessManager/orderManager/income.vue

@@ -13,6 +13,27 @@
       <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
         <el-form-item>
           <el-input
+            placeholder="交易流水号"
+            type="text"
+            v-model.trim="searchForm.transNo"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            placeholder="订单号"
+            type="text"
+            v-model.trim="searchForm.orderNo"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            placeholder="收款账户"
+            type="text"
+            v-model.trim="searchForm.merNos"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input
             placeholder="余额支付大于等于"
             type="number"
             @mousewheel.native.prevent
@@ -183,7 +204,10 @@ export default {
         paymentType: null,
         organId: null,
         actualAmount: null,
-        balancePaymentAmount: null
+        balancePaymentAmount: null,
+        orderNo: null,
+        transNo: null,
+        merNos: null
       },
       tableList: [],
       organList: [],
@@ -239,6 +263,22 @@ export default {
         orderType: 0
       };
       let searchForm = this.searchForm;
+      if(searchForm.orderNo) {
+        data.orderNo = searchForm.orderNo
+      }
+      if(searchForm.transNo) {
+        data.transNo = searchForm.transNo
+      }
+      if(searchForm.merNos) {
+        data.merNos = searchForm.merNos
+      }
+      if(searchForm.actualAmount) {
+        data.actualAmount = searchForm.actualAmount
+      }
+      if(searchForm.balancePaymentAmount) {
+        data.balancePaymentAmount = searchForm.balancePaymentAmount
+      }
+
       if (searchForm.paymentStatus) {
         data.paymentStatus = searchForm.paymentStatus;
       }
@@ -318,9 +358,14 @@ export default {
       this.getList();
     },
     getList() {
-      let params = this.searchForm;
+      let params = JSON.parse(JSON.stringify(this.searchForm))
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
+      params.orderNo = params.orderNo ? params.orderNo : null
+      params.transNo = params.transNo ? params.transNo : null
+      params.merNos = params.merNos ? params.merNos : null
+      params.actualAmount = params.actualAmount ? params.actualAmount : null
+      params.balancePaymentAmount = params.balancePaymentAmount ? params.balancePaymentAmount : null
       if (this.orderDate && this.orderDate.length > 0) {
         params.orderStartDate = this.orderDate[0];
         params.orderEndDate = this.orderDate[1];
@@ -357,7 +402,12 @@ export default {
         orderEndDate: null,
         paymentStatus: null,
         paymentType: null,
-        organId: null
+        organId: null,
+        actualAmount: null,
+        balancePaymentAmount: null,
+        orderNo: null,
+        transNo: null,
+        merNos: null
       };
       this.getList();
     }

src/views/businessManager/orderManager/incomeOne.vue

@@ -4,13 +4,22 @@
       <div class="squrt"></div>订单管理
     </h2>
     <div class="m-core">
-      <div class="newBand"
-           @click="onOrderExport"
-           v-permission="{child: 'export/orderList', parent: '/incomeOne'}">报表导出</div>
+      <div
+        class="newBand"
+        @click="onOrderExport"
+        v-permission="{child: 'export/orderList', parent: '/incomeOne'}"
+      >报表导出</div>
       <!-- 搜索类型 -->
-      <el-form :inline="true"
-               class="searchForm"
-               v-model.trim="searchForm">
+      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+        <el-form-item>
+          <el-input placeholder="交易流水号" type="text" v-model.trim="searchForm.transNo"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="订单号" type="text" v-model.trim="searchForm.orderNo"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="收款账户" type="text" v-model.trim="searchForm.merNos"></el-input>
+        </el-form-item>
         <el-form-item>
           <el-input
             placeholder="余额支付大于等于"
@@ -27,170 +36,142 @@
             v-model.trim="searchForm.actualAmount"
           ></el-input>
         </el-form-item>
-        <el-form-item prop='organId'>
-          <el-select class='multiple'
-                     v-model.trim="searchForm.organId"
-                     @clear="onClear('organId')"
-                     filterable
-                     clearable
-                     placeholder="请选择分部">
-            <el-option v-for="(item,index) in organList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+        <el-form-item prop="organId">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.organId"
+            @clear="onClear('organId')"
+            filterable
+            clearable
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item,index) in organList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-date-picker v-model.trim="orderDate"
-                          style="width:410px;"
-                          type="daterange"
-                          value-format="yyyy-MM-dd"
-                          @change="searchOrderDate"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期">
-          </el-date-picker>
+          <el-date-picker
+            v-model.trim="orderDate"
+            style="width:410px;"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            @change="searchOrderDate"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.paymentType"
-                     @clear="onClear('paymentType')"
-                     clearable
-                     filterable
-                     placeholder="交易类型">
-            <el-option v-for="(item, index) in orderStatus"
-                       :key="index"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.paymentType"
+            @clear="onClear('paymentType')"
+            clearable
+            filterable
+            placeholder="交易类型"
+          >
+            <el-option
+              v-for="(item, index) in orderStatus"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.paymentStatus"
-                     @clear="onClear('paymentStatus')"
-                     clearable
-                     filterable
-                     placeholder="交易状态">
-            <el-option v-for="(item, index) in dealStatus"
-                       :key="index"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.paymentStatus"
+            @clear="onClear('paymentStatus')"
+            clearable
+            filterable
+            placeholder="交易状态"
+          >
+            <el-option
+              v-for="(item, index) in dealStatus"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search"
-                     type="danger">搜索</el-button>
-          <el-button @click="onReSet"
-                     type="primary">重置</el-button>
+          <el-button @click="search" type="danger">搜索</el-button>
+          <el-button @click="onReSet" type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
-        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
-        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        营收金额：{{ totalRevenueAmount }}元
+        <i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元
+        <i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元
+        <i style="width: 10px; display: inline-block"></i>
         预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
-        <el-table :data='tableList'
-                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center'
-                           width="180px"
-                           prop="transNo"
-                           label="交易流水号">
-          </el-table-column>
-          <el-table-column align='center'
-                           width="210px"
-                           prop="orderNo"
-                           label="订单号">
-          </el-table-column>
-            <el-table-column align="center" width="150" prop="createTime" label="订单日期">
+        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align="center" width="180px" prop="transNo" label="交易流水号"></el-table-column>
+          <el-table-column align="center" width="210px" prop="orderNo" label="订单号"></el-table-column>
+          <el-table-column align="center" width="150" prop="createTime" label="订单日期">
             <template slot-scope="scope">{{ scope.row.createTime | dateForMinFormat }}</template>
           </el-table-column>
-          <el-table-column align='center'
-           width="100px"
-                           label="交易类型">
-            <template slot-scope="scope">
-              {{ scope.row.type | orderType }}
-            </template>
-          </el-table-column>
-          <el-table-column align='center'
-                           prop="expectAmount"
-                           label="应付金额">
-          </el-table-column>
-          <el-table-column align='center'
-                           prop="balancePaymentAmount"
-                           label="余额支付">
-          </el-table-column>
-          <el-table-column align='center'
-                           prop="actualAmount"
-                           label="现金支付">
+          <el-table-column align="center" width="100px" label="交易类型">
+            <template slot-scope="scope">{{ scope.row.type | orderType }}</template>
           </el-table-column>
-          <el-table-column align='center'
-                           label="学员姓名">
+          <el-table-column align="center" prop="expectAmount" label="应付金额"></el-table-column>
+          <el-table-column align="center" prop="balancePaymentAmount" label="余额支付"></el-table-column>
+          <el-table-column align="center" prop="actualAmount" label="现金支付"></el-table-column>
+          <el-table-column align="center" label="学员姓名">
             <template slot-scope="scope">
-              {{ scope.row.user.username }}<span v-if="scope.row.user.username && scope.row.user.phone">/</span>{{ scope.row.user.phone }}
+              {{ scope.row.user.username }}
+              <span v-if="scope.row.user.username && scope.row.user.phone">/</span>
+              {{ scope.row.user.phone }}
             </template>
           </el-table-column>
-          <el-table-column align='center'
-           fixed="right"
-                           prop="paymentChannel"
-                           label="交易方式">
-            <template slot-scope="scope">
-              {{ scope.row.paymentChannel | paymentChannelStatus }}
-            </template>
+          <el-table-column align="center" fixed="right" prop="paymentChannel" label="交易方式">
+            <template slot-scope="scope">{{ scope.row.paymentChannel | paymentChannelStatus }}</template>
           </el-table-column>
-          <el-table-column align='center'
-                           label="收款账户">
-            <template slot-scope="scope">
-              {{ scope.row.merNos }}
-            </template>
+          <el-table-column align="center" label="收款账户">
+            <template slot-scope="scope">{{ scope.row.merNos }}</template>
           </el-table-column>
-          <el-table-column align='center'
-                           label="交易状态">
-            <template slot-scope="scope">
-              {{ scope.row.status | dealStatus }}
-            </template>
+          <el-table-column align="center" label="交易状态">
+            <template slot-scope="scope">{{ scope.row.status | dealStatus }}</template>
           </el-table-column>
-          <el-table-column align='center'
-                           label="备注">
-            <template slot-scope="scope">
-              {{ scope.row.memo ? scope.row.memo : '-' }}
-            </template>
+          <el-table-column align="center" label="备注">
+            <template slot-scope="scope">{{ scope.row.memo ? scope.row.memo : '-' }}</template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
-                    :page.sync="pageInfo.page"
-                    :limit.sync="pageInfo.limit"
-                    :page-sizes="pageInfo.page_size"
-                    @pagination="getList" />
+        <pagination
+          :total="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
       </div>
     </div>
   </div>
 </template>
 <script>
-import pagination from '@/components/Pagination/index'
-import {
-  orderQueryPage1
-} from '@/api/orderManager'
-import {
-  getEmployeeOrgan
-} from '@/api/buildTeam'
+import pagination from "@/components/Pagination/index";
+import { orderQueryPage1 } from "@/api/orderManager";
+import { getEmployeeOrgan } from "@/api/buildTeam";
 // import store from '@/store'
-import {
-  orderStatus,
-  dealStatus,
-} from '@/utils/searchArray'
-import axios from 'axios'
-import qs from 'qs'
-import {
-  getToken
-} from '@/utils/auth'
-import load from '@/utils/loading'
+import { orderStatus, dealStatus } from "@/utils/searchArray";
+import axios from "axios";
+import qs from "qs";
+import { getToken } from "@/utils/auth";
+import load from "@/utils/loading";
 export default {
   components: {
     pagination
   },
-  name: 'incomeOne', 
-  data () {
+  name: "incomeOne",
+  data() {
     return {
       orderStatus: orderStatus,
       dealStatus: dealStatus,
@@ -198,7 +179,7 @@ export default {
       searchForm: {
         orderStartDate: null,
         orderEndDate: null,
-        paymentStatus: 'SUCCESS',
+        paymentStatus: "SUCCESS",
         paymentType: null,
         organId: null,
         actualAmount: null,
@@ -216,112 +197,140 @@ export default {
       totalUserBalance: 0,
       totalActualAmount: 0,
       totalAdvanceAmount: 0,
-      totalRevenueAmount: 0,
-    }
+      totalRevenueAmount: 0
+    };
   },
-  mounted () {
+  mounted() {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
       }
-    })
-            var now = new Date();
-var startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
-var endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
-this.orderDate=[];
-this.orderDate.push(startDate)
-this.orderDate.push(endDate)
-    this.getList()
-
+    });
+    var now = new Date();
+    var startDate = new Date(
+      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+    )
+      .toISOString()
+      .slice(0, 10);
+    var endDate = new Date(
+      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+    )
+      .toISOString()
+      .slice(0, 10);
+    this.orderDate = [];
+    this.orderDate.push(startDate);
+    this.orderDate.push(endDate);
+    this.getList();
   },
   methods: {
-    onClear (type) {
-      if (type == 'paymentType') {
-        this.searchForm.paymentType = null
-      } else if (type == 'paymentStatus') {
-        this.searchForm.paymentStatus = null
-      } else if (type == 'organId') {
-        this.searchForm.organId = null
+    onClear(type) {
+      if (type == "paymentType") {
+        this.searchForm.paymentType = null;
+      } else if (type == "paymentStatus") {
+        this.searchForm.paymentStatus = null;
+      } else if (type == "organId") {
+        this.searchForm.organId = null;
       }
     },
-    onOrderExport () { // 报表导出
-      let url = '/api-web/export/orderList'
+    onOrderExport() {
+      // 报表导出
+      let url = "/api-web/export/orderList";
       let data = {
         orderType: 1
-      }
-      let searchForm = this.searchForm
+      };
+      let searchForm = this.searchForm;
       if (searchForm.paymentStatus) {
-        data.paymentStatus = searchForm.paymentStatus
+        data.paymentStatus = searchForm.paymentStatus;
       }
 
       if (searchForm.paymentType) {
-        data.paymentType = searchForm.paymentType
+        data.paymentType = searchForm.paymentType;
       }
 
       if (searchForm.organId) {
-        data.organId = searchForm.organId
+        data.organId = searchForm.organId;
       }
 
       if (searchForm.orderStartDate && searchForm.orderEndDate) {
-        data.orderStartDate = searchForm.orderStartDate
-        data.orderEndDate = searchForm.orderEndDate
+        data.orderStartDate = searchForm.orderStartDate;
+        data.orderEndDate = searchForm.orderEndDate;
       }
       const options = {
-        method: 'POST',
+        method: "POST",
         headers: {
-          'Authorization': getToken()
+          Authorization: getToken()
         },
         data: qs.stringify(data),
         url,
-        responseType: 'blob'
-      }
-      this.$confirm('您确定导出报表', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        load.startLoading()
-        axios(options).then(res => {
-          let blob = new Blob([res.data], {
-            // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-            type: 'application/vnd.ms-excel;charset=utf-8'
-            //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-          })
-          
-          let text = (new Response(blob)).text()
-            text.then(res => {
-              // 判断是否报错
-              if(res.indexOf('code') != -1) {
-                let json = JSON.parse(res)
-                this.$message.error(json.msg)
-              } else {
-                let objectUrl = URL.createObjectURL(blob)
-                let link = document.createElement("a")
-                let nowTime = new Date()
-                let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' + nowTime.getHours() + '' + nowTime.getMinutes()
-                let fname = '报表导出' + new Date().getTime() //下载文件的名字
-                link.href = objectUrl
-                link.setAttribute("download", fname)
-                document.body.appendChild(link)
-                link.click()
-              }
+        responseType: "blob"
+      };
+      this.$confirm("您确定导出报表", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          load.startLoading();
+          axios(options)
+            .then(res => {
+              let blob = new Blob([res.data], {
+                // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+                type: "application/vnd.ms-excel;charset=utf-8"
+                //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+              });
+
+              let text = new Response(blob).text();
+              text.then(res => {
+                // 判断是否报错
+                if (res.indexOf("code") != -1) {
+                  let json = JSON.parse(res);
+                  this.$message.error(json.msg);
+                } else {
+                  let objectUrl = URL.createObjectURL(blob);
+                  let link = document.createElement("a");
+                  let nowTime = new Date();
+                  let ymd =
+                    nowTime.getFullYear() +
+                    "" +
+                    (nowTime.getMonth() + 1) +
+                    "" +
+                    nowTime.getDate() +
+                    "" +
+                    nowTime.getHours() +
+                    "" +
+                    nowTime.getMinutes();
+                  let fname = "报表导出" + new Date().getTime(); //下载文件的名字
+                  link.href = objectUrl;
+                  link.setAttribute("download", fname);
+                  document.body.appendChild(link);
+                  link.click();
+                }
+              });
+              load.endLoading();
             })
-          load.endLoading();
-        }).catch(error => {
-            this.$message.error('导出数据失败，请联系管理员');
-            load.endLoading();
-          })
-      }).catch(() => { })
+            .catch(error => {
+              this.$message.error("导出数据失败，请联系管理员");
+              load.endLoading();
+            });
+        })
+        .catch(() => {});
     },
-    search () {
+    search() {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList () {
-      let params = this.searchForm
+    getList() {
+      let params = JSON.parse(JSON.stringify(this.searchForm))
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
-          if (this.orderDate && this.orderDate.length > 0) {
+      params.orderNo = params.orderNo ? params.orderNo : null;
+      params.transNo = params.transNo ? params.transNo : null;
+      params.merNos = params.merNos ? params.merNos : null;
+      params.actualAmount = params.actualAmount ? params.actualAmount : null;
+      params.balancePaymentAmount = params.balancePaymentAmount
+        ? params.balancePaymentAmount
+        : null;
+      if (this.orderDate && this.orderDate.length > 0) {
         params.orderStartDate = this.orderDate[0];
         params.orderEndDate = this.orderDate[1];
       } else {
@@ -329,39 +338,53 @@ this.orderDate.push(endDate)
         params.orderEndDate = null;
       }
       orderQueryPage1(params).then(res => {
-        let result = res.data
+        let result = res.data;
         if (res.code == 200) {
-          this.tableList = result.rows
-          this.pageInfo.total = result.total
-          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
-          this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
-          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
-          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
+          this.tableList = result.rows;
+          this.pageInfo.total = result.total;
+          this.totalUserBalance = result.totalUserBalance
+            ? result.totalUserBalance
+            : 0;
+          this.totalActualAmount = result.totalActualAmount
+            ? result.totalActualAmount
+            : 0;
+          this.totalAdvanceAmount = result.totalAdvanceAmount
+            ? result.totalAdvanceAmount
+            : 0;
+          this.totalRevenueAmount = result.totalRevenueAmount
+            ? result.totalRevenueAmount
+            : 0;
         }
-      })
+      });
     },
-    searchOrderDate (value) {
+    searchOrderDate(value) {
       if (value) {
-        this.searchForm.orderStartDate = value[0]
-        this.searchForm.orderEndDate = value[1]
+        this.searchForm.orderStartDate = value[0];
+        this.searchForm.orderEndDate = value[1];
       } else {
-        this.searchForm.orderStartDate = null
-        this.searchForm.orderEndDate = null
+        this.searchForm.orderStartDate = null;
+        this.searchForm.orderEndDate = null;
       }
     },
-    onReSet () { // 重置搜索
-      this.orderDate = null
+    onReSet() {
+      // 重置搜索
+      this.orderDate = null;
       this.searchForm = {
         orderStartDate: null,
         orderEndDate: null,
         paymentStatus: null,
         paymentType: null,
-        organId: null
-      }
-      this.getList()
-    },
+        routingOrganId: null,
+        actualAmount: null,
+        balancePaymentAmount: null,
+        orderNo: null,
+        transNo: null,
+        merNos: null
+      };
+      this.getList();
+    }
   }
-}
+};
 </script>
 <style lang="scss" scoped>
 </style>

src/views/businessManager/orderManager/incomeTwo.vue

@@ -4,13 +4,22 @@
       <div class="squrt"></div>订单管理
     </h2>
     <div class="m-core">
-      <div class="newBand"
-           @click="onOrderExport"
-           v-permission="{child: 'export/orderList', parent: '/incomeTwo'}">报表导出</div>
+      <div
+        class="newBand"
+        @click="onOrderExport"
+        v-permission="{child: 'export/orderList', parent: '/incomeTwo'}"
+      >报表导出</div>
       <!-- 搜索类型 -->
-      <el-form :inline="true"
-               class="searchForm"
-               v-model.trim="searchForm">
+      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+        <el-form-item>
+          <el-input placeholder="交易流水号" type="text" v-model.trim="searchForm.transNo"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="订单号" type="text" v-model.trim="searchForm.orderNo"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="收款账户" type="text" v-model.trim="searchForm.merNos"></el-input>
+        </el-form-item>
         <el-form-item>
           <el-input
             placeholder="余额支付大于等于"
@@ -27,159 +36,139 @@
             v-model.trim="searchForm.actualAmount"
           ></el-input>
         </el-form-item>
-        <el-form-item prop='organId'>
-          <el-select class='multiple'
-                     v-model.trim="searchForm.organId"
-                     filterable
-                     clearable
-                     @clear="onClear('organId')"
-                     placeholder="请选择分部">
-            <el-option v-for="(item,index) in organList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+        <el-form-item prop="organId">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.organId"
+            filterable
+            clearable
+            @clear="onClear('organId')"
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item,index) in organList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-date-picker v-model.trim="orderDate"
-                          style="width:410px;"
-                          type="daterange"
-                          value-format="yyyy-MM-dd"
-                          @change="searchOrderDate"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期">
-          </el-date-picker>
+          <el-date-picker
+            v-model.trim="orderDate"
+            style="width:410px;"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            @change="searchOrderDate"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.paymentType"
-                     clearable
-                     filterable
-                     @clear="onClear('paymentType')"
-                     placeholder="交易类型">
-            <el-option v-for="(item, index) in orderStatus"
-                       :key="index"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.paymentType"
+            clearable
+            filterable
+            @clear="onClear('paymentType')"
+            placeholder="交易类型"
+          >
+            <el-option
+              v-for="(item, index) in orderStatus"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.paymentStatus"
-                     clearable
-                     filterable
-                     @clear="onClear('paymentStatus')"
-                     placeholder="交易状态">
-            <el-option v-for="(item, index) in dealStatus"
-                       :key="index"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.paymentStatus"
+            clearable
+            filterable
+            @clear="onClear('paymentStatus')"
+            placeholder="交易状态"
+          >
+            <el-option
+              v-for="(item, index) in dealStatus"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search"
-                     type="danger">搜索</el-button>
-          <el-button @click="onReSet"
-                     type="primary">重置</el-button>
+          <el-button @click="search" type="danger">搜索</el-button>
+          <el-button @click="onReSet" type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
-        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
-        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        营收金额：{{ totalRevenueAmount }}元
+        <i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元
+        <i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元
+        <i style="width: 10px; display: inline-block"></i>
         预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
-        <el-table :data='tableList'
-                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center'
-                           width="180px"
-                           prop="transNo"
-                           label="交易流水号">
-          </el-table-column>
-          <el-table-column align='center'
-                           width="210px"
-                           prop="orderNo"
-                           label="订单号">
-          </el-table-column>
-           <el-table-column align="center" width="150" prop="createTime" label="订单日期">
+        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align="center" width="180px" prop="transNo" label="交易流水号"></el-table-column>
+          <el-table-column align="center" width="210px" prop="orderNo" label="订单号"></el-table-column>
+          <el-table-column align="center" width="150" prop="createTime" label="订单日期">
             <template slot-scope="scope">{{ scope.row.createTime | dateForMinFormat }}</template>
           </el-table-column>
-          <el-table-column align='center'
-          width="100px"
-                           label="交易类型">
-            <template slot-scope="scope">
-              {{ scope.row.type | orderType }}
-            </template>
-          </el-table-column>
-          <el-table-column align='center'
-                           prop="expectAmount"
-                           label="应付金额">
-          </el-table-column>
-          <el-table-column align='center'
-                           prop="balancePaymentAmount"
-                           label="余额支付">
+          <el-table-column align="center" width="100px" label="交易类型">
+            <template slot-scope="scope">{{ scope.row.type | orderType }}</template>
           </el-table-column>
-          <el-table-column align='center'
-                           prop="actualAmount"
-                           label="现金支付">
-          </el-table-column>
-          <el-table-column align='center'
-                           label="学员姓名">
+          <el-table-column align="center" prop="expectAmount" label="应付金额"></el-table-column>
+          <el-table-column align="center" prop="balancePaymentAmount" label="余额支付"></el-table-column>
+          <el-table-column align="center" prop="actualAmount" label="现金支付"></el-table-column>
+          <el-table-column align="center" label="学员姓名">
             <template slot-scope="scope">
-              {{ scope.row.user.username }}<span v-if="scope.row.user.username && scope.row.user.phone">/</span>{{ scope.row.user.phone }}
+              {{ scope.row.user.username }}
+              <span v-if="scope.row.user.username && scope.row.user.phone">/</span>
+              {{ scope.row.user.phone }}
             </template>
           </el-table-column>
-          <el-table-column align='center'
-                           prop="paymentChannel"
-                           label="交易方式">
-            <template slot-scope="scope">
-              {{ scope.row.paymentChannel | paymentChannelStatus }}
-            </template>
+          <el-table-column align="center" prop="paymentChannel" label="交易方式">
+            <template slot-scope="scope">{{ scope.row.paymentChannel | paymentChannelStatus }}</template>
           </el-table-column>
-          <el-table-column align='center'
-                           label="收款账户">
-            <template slot-scope="scope">
-              {{ scope.row.merNos }}
-            </template>
+          <el-table-column align="center" label="收款账户">
+            <template slot-scope="scope">{{ scope.row.merNos }}</template>
           </el-table-column>
-          <el-table-column align='center'
-                           label="交易状态">
-            <template slot-scope="scope">
-              {{ scope.row.status | dealStatus }}
-            </template>
+          <el-table-column align="center" label="交易状态">
+            <template slot-scope="scope">{{ scope.row.status | dealStatus }}</template>
           </el-table-column>
-          <el-table-column align='center'
-                           label="备注">
-            <template slot-scope="scope">
-              {{ scope.row.memo ? scope.row.memo : '-' }}
-            </template>
+          <el-table-column align="center" label="备注">
+            <template slot-scope="scope">{{ scope.row.memo ? scope.row.memo : '-' }}</template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
-                    :page.sync="pageInfo.page"
-                    :limit.sync="pageInfo.limit"
-                    :page-sizes="pageInfo.page_size"
-                    @pagination="getList" />
+        <pagination
+          :total="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
       </div>
     </div>
   </div>
 </template>
 <script>
-import pagination from '@/components/Pagination/index'
-import { orderQueryPage2 } from '@/api/orderManager'
-import { getEmployeeOrgan } from '@/api/buildTeam'
+import pagination from "@/components/Pagination/index";
+import { orderQueryPage2 } from "@/api/orderManager";
+import { getEmployeeOrgan } from "@/api/buildTeam";
 // import store from '@/store'
-import { orderStatus, dealStatus } from '@/utils/searchArray'
-import axios from 'axios'
-import qs from 'qs'
-import {
-  getToken
-} from '@/utils/auth'
+import { orderStatus, dealStatus } from "@/utils/searchArray";
+import axios from "axios";
+import qs from "qs";
+import { getToken } from "@/utils/auth";
 export default {
   components: { pagination },
-  name: 'incomeTwo',
-  data () {
+  name: "incomeTwo",
+  data() {
     return {
       orderStatus: orderStatus,
       dealStatus: dealStatus,
@@ -187,7 +176,7 @@ export default {
       searchForm: {
         orderStartDate: null,
         orderEndDate: null,
-        paymentStatus: 'SUCCESS',
+        paymentStatus: "SUCCESS",
         paymentType: null,
         organId: null,
         actualAmount: null,
@@ -205,99 +194,138 @@ export default {
       totalUserBalance: 0,
       totalActualAmount: 0,
       totalAdvanceAmount: 0,
-      totalRevenueAmount: 0,
-    }
+      totalRevenueAmount: 0
+    };
   },
-  mounted () {
+  mounted() {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
       }
-    })
-            var now = new Date();
-var startDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
-var endDate = new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())).toISOString().slice(0, 10);
-this.orderDate=[];
-this.orderDate.push(startDate)
-this.orderDate.push(endDate)
-    this.getList()
-
+    });
+    var now = new Date();
+    var startDate = new Date(
+      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+    )
+      .toISOString()
+      .slice(0, 10);
+    var endDate = new Date(
+      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+    )
+      .toISOString()
+      .slice(0, 10);
+    this.orderDate = [];
+    this.orderDate.push(startDate);
+    this.orderDate.push(endDate);
+    this.getList();
   },
   methods: {
-    onClear (type) {
-      if (type == 'paymentType') {
-        this.searchForm.paymentType = null
-      } else if (type == 'paymentStatus') {
-        this.searchForm.paymentStatus = null
-      } else if (type == 'organId') {
-        this.searchForm.organId = null
+    onClear(type) {
+      if (type == "paymentType") {
+        this.searchForm.paymentType = null;
+      } else if (type == "paymentStatus") {
+        this.searchForm.paymentStatus = null;
+      } else if (type == "organId") {
+        this.searchForm.organId = null;
       }
     },
-    onOrderExport () { // 报表导出
-      let url = '/api-web/export/orderList'
+    onOrderExport() {
+      // 报表导出
+      let url = "/api-web/export/orderList";
       let data = {
         orderType: 2
+      };
+      let searchForm = this.searchForm;
+      if (searchForm.orderNo) {
+        data.orderNo = searchForm.orderNo;
+      }
+      if (searchForm.transNo) {
+        data.transNo = searchForm.transNo;
+      }
+      if (searchForm.merNos) {
+        data.merNos = searchForm.merNos;
+      }
+      if (searchForm.actualAmount) {
+        data.actualAmount = searchForm.actualAmount;
+      }
+      if (searchForm.balancePaymentAmount) {
+        data.balancePaymentAmount = searchForm.balancePaymentAmount;
       }
-      let searchForm = this.searchForm
       if (searchForm.paymentStatus) {
-        data.paymentStatus = searchForm.paymentStatus
+        data.paymentStatus = searchForm.paymentStatus;
       }
 
       if (searchForm.paymentType) {
-        data.paymentType = searchForm.paymentType
+        data.paymentType = searchForm.paymentType;
       }
 
       if (searchForm.organId) {
-        data.organId = searchForm.organId
+        data.organId = searchForm.organId;
       }
 
       if (searchForm.orderStartDate && searchForm.orderEndDate) {
-        data.orderStartDate = searchForm.orderStartDate
-        data.orderEndDate = searchForm.orderEndDate
+        data.orderStartDate = searchForm.orderStartDate;
+        data.orderEndDate = searchForm.orderEndDate;
       }
       const options = {
-        method: 'POST',
+        method: "POST",
         headers: {
-          'Authorization': getToken()
+          Authorization: getToken()
         },
         data: qs.stringify(data),
         url,
-        responseType: 'blob'
-      }
-      this.$confirm('您确定导出报表', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        axios(options).then(res => {
-          let blob = new Blob([res.data], {
-            // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-            type: 'application/vnd.ms-excel;charset=utf-8'
-            //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-          })
-          let objectUrl = URL.createObjectURL(blob)
-          let link = document.createElement("a")
-          let nowTime = new Date()
-          let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' +
-            nowTime.getHours() +
-            '' + nowTime.getMinutes()
-          let fname = '报表导出' + new Date().getTime() //下载文件的名字
-          link.href = objectUrl
-          link.setAttribute("download", fname)
-          document.body.appendChild(link)
-          link.click()
+        responseType: "blob"
+      };
+      this.$confirm("您确定导出报表", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          axios(options).then(res => {
+            let blob = new Blob([res.data], {
+              // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+              type: "application/vnd.ms-excel;charset=utf-8"
+              //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
+            });
+            let objectUrl = URL.createObjectURL(blob);
+            let link = document.createElement("a");
+            let nowTime = new Date();
+            let ymd =
+              nowTime.getFullYear() +
+              "" +
+              (nowTime.getMonth() + 1) +
+              "" +
+              nowTime.getDate() +
+              "" +
+              nowTime.getHours() +
+              "" +
+              nowTime.getMinutes();
+            let fname = "报表导出" + new Date().getTime(); //下载文件的名字
+            link.href = objectUrl;
+            link.setAttribute("download", fname);
+            document.body.appendChild(link);
+            link.click();
+          });
         })
-      }).catch(() => { })
+        .catch(() => {});
     },
-    search () {
+    search() {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList () {
-      let params = this.searchForm
+    getList() {
+      let params = JSON.parse(JSON.stringify(this.searchForm))
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
-          if (this.orderDate && this.orderDate.length > 0) {
+      params.orderNo = params.orderNo ? params.orderNo : null;
+      params.transNo = params.transNo ? params.transNo : null;
+      params.merNos = params.merNos ? params.merNos : null;
+      params.actualAmount = params.actualAmount ? params.actualAmount : null;
+      params.balancePaymentAmount = params.balancePaymentAmount
+        ? params.balancePaymentAmount
+        : null;
+      if (this.orderDate && this.orderDate.length > 0) {
         params.orderStartDate = this.orderDate[0];
         params.orderEndDate = this.orderDate[1];
       } else {
@@ -305,39 +333,53 @@ this.orderDate.push(endDate)
         params.orderEndDate = null;
       }
       orderQueryPage2(params).then(res => {
-        let result = res.data
+        let result = res.data;
         if (res.code == 200) {
-          this.tableList = result.rows
-          this.pageInfo.total = result.total
-          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
-          this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
-          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
-          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
+          this.tableList = result.rows;
+          this.pageInfo.total = result.total;
+          this.totalUserBalance = result.totalUserBalance
+            ? result.totalUserBalance
+            : 0;
+          this.totalActualAmount = result.totalActualAmount
+            ? result.totalActualAmount
+            : 0;
+          this.totalAdvanceAmount = result.totalAdvanceAmount
+            ? result.totalAdvanceAmount
+            : 0;
+          this.totalRevenueAmount = result.totalRevenueAmount
+            ? result.totalRevenueAmount
+            : 0;
         }
-      })
+      });
     },
-    searchOrderDate (value) {
+    searchOrderDate(value) {
       if (value) {
-        this.searchForm.orderStartDate = value[0]
-        this.searchForm.orderEndDate = value[1]
+        this.searchForm.orderStartDate = value[0];
+        this.searchForm.orderEndDate = value[1];
       } else {
-        this.searchForm.orderStartDate = null
-        this.searchForm.orderEndDate = null
+        this.searchForm.orderStartDate = null;
+        this.searchForm.orderEndDate = null;
       }
     },
-    onReSet () { // 重置搜索
-      this.orderDate = null
+    onReSet() {
+      // 重置搜索
+      this.orderDate = null;
       this.searchForm = {
         orderStartDate: null,
         orderEndDate: null,
         paymentStatus: null,
         paymentType: null,
-        organId: null
-      }
-      this.getList()
-    },
+        routingOrganId: null,
+        actualAmount: null,
+        balancePaymentAmount: null,
+        orderNo: null,
+        transNo: null,
+        merNos: null
+      };
+      this.getList();
+    }
   }
-}
+};
 </script>
 <style lang="scss">
 </style>

src/views/levelManager/levelManager.vue

@@ -40,10 +40,12 @@
                 实收总金额：{{ totalAmount }}元
             </div>
             <div class="tableWrap">
-                <el-table :data="tableList" 
+                <el-table :data="tableList"
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">>
                 <el-table-column width="120px" align="center" prop="id" label="编号"></el-table-column>
                 <el-table-column align="center" prop="name" label="姓名"></el-table-column>
+                <el-table-column align="center" prop="orderNo" label="订单编号"></el-table-column>
+                <el-table-column align="center" prop="transNo" label="交易流水号"></el-table-column>
                 <el-table-column align="center" prop="gender" label="性别">
                     <template slot-scope="scope">
                         {{ scope.row.gender == 1 ? '男' : '女' }}