修改

src/api/orderManager.js

@@ -118,3 +118,12 @@ export function tenantPaymentOrder (data) {
     params: data
   })
 }
+
+// 查询订单状态
+export function getOrderStatus (data) {
+  return request({
+    url: api + '/order/getOrderStatus',
+    method: 'GET',
+    params: data
+  })
+}

src/views/businessManager/orderManager/financeManager.vue

@@ -4,103 +4,95 @@
       <div class="squrt"></div>财务管理
     </h2>
     <div class="m-core">
-      <div
-        class="newBand"
-        @click="onOrderExport"
-        v-permission="{child: 'export/orderList', parent: '/financeManager'}"
-      >报表导出</div>
-      <div class="newBand" v-permission="{child: 'routeOrder/add', parent: '/financeManager'}" @click="routeOrderStatus = true">添加订单</div>
+      <div class="newBand"
+           @click="onOrderExport"
+           v-permission="{child: 'export/routeOrderList', parent: '/financeManager'}">报表导出</div>
+      <div class="newBand"
+           v-permission="{child: 'routeOrder/add', parent: '/financeManager'}"
+           @click="routeOrderStatus = true">添加订单</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-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-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-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
-            v-model.trim="searchForm.balancePaymentAmount"
-          ></el-input>
+          <el-input placeholder="余额支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.balancePaymentAmount"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input
-            placeholder="现金支付大于等于"
-            type="number"
-            @mousewheel.native.prevent
-            v-model.trim="searchForm.actualAmount"
-          ></el-input>
+          <el-input placeholder="现金支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.actualAmount"></el-input>
         </el-form-item>
         <el-form-item prop="routingOrganId">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.routingOrganId"
-            filterable
-            clearable
-            @clear="onClear('routingOrganId')"
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.routingOrganId"
+                     filterable
+                     clearable
+                     @clear="onClear('routingOrganId')"
+                     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>
       <!-- 列表 -->
@@ -114,64 +106,94 @@
         预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
-        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align="center" prop="transNo" label="交易流水号"></el-table-column>
-          <el-table-column align="center" 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"
+                           prop="transNo"
+                           label="交易流水号"></el-table-column>
+          <el-table-column align="center"
+                           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="交易类型">
+          <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>
-          <el-table-column align="center" prop="routeAmount" label="分润金额"></el-table-column>
-          <el-table-column align="center" prop="routeBalanceAmount" 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"
+                           prop="routeAmount"
+                           label="分润金额"></el-table-column>
+          <el-table-column align="center"
+                           prop="routeBalanceAmount"
+                           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>
+              <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="交易方式">
+          <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.merNo }}</template>
           </el-table-column>
-          <el-table-column align="center" label="交易状态">
+          <el-table-column align="center"
+                           label="交易状态">
             <template slot-scope="scope">{{ scope.row.status | dealStatus }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
+          <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>
 
-      <el-dialog title="添加订单" :visible.sync="routeOrderStatus" @close="onFormClose('ruleForm')" width="500px">
-        <el-form :model="form" :rules="rules" ref="ruleForm">
-          <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
-            <el-select v-model.trim="form.organId" style="width: 100% !important;">
-              <el-option
-                v-for="(item,index) in organList"
-                :key="index"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
+      <el-dialog title="添加订单"
+                 :visible.sync="routeOrderStatus"
+                 @close="onFormClose('ruleForm')"
+                 width="500px">
+        <el-form :model="form"
+                 :rules="rules"
+                 ref="ruleForm">
+          <el-form-item label="所属分部"
+                        prop="organId"
+                        :label-width="formLabelWidth">
+            <el-select v-model.trim="form.organId"
+                       style="width: 100% !important;">
+              <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 label="金额(元)" prop="actualAmount" :label-width="formLabelWidth">
+          <el-form-item label="金额(元)"
+                        prop="actualAmount"
+                        :label-width="formLabelWidth">
             <!-- <el-input-number
               style="width: 100%;"
               v-model="form.actualAmount"
@@ -180,30 +202,49 @@
               :min="1"
               :max="999999999"
             ></el-input-number> -->
-            <el-input v-model="form.actualAmount" type="number" v-number placeholder="请输入金额"></el-input>
+            <el-input v-model="form.actualAmount"
+                      type="number"
+                      v-number
+                      placeholder="请输入金额"></el-input>
           </el-form-item>
-          <el-form-item label="交易流水号" prop="transNo" :label-width="formLabelWidth">
-            <el-input placeholder="请输入交易流水号" type="text" v-model.trim="form.transNo"></el-input>
+          <el-form-item label="交易流水号"
+                        prop="transNo"
+                        :label-width="formLabelWidth">
+            <el-input placeholder="请输入交易流水号"
+                      type="text"
+                      v-model.trim="form.transNo"></el-input>
           </el-form-item>
-          <el-form-item label="收款账户" prop="merNos" :label-width="formLabelWidth">
-            <el-input placeholder="请输入收款账户" type="text" v-model.trim="form.merNos"></el-input>
+          <el-form-item label="收款账户"
+                        prop="merNos"
+                        :label-width="formLabelWidth">
+            <el-input placeholder="请输入收款账户"
+                      type="text"
+                      v-model.trim="form.merNos"></el-input>
           </el-form-item>
-          <el-form-item label="交易日期" prop="payTime" :label-width="formLabelWidth">
+          <el-form-item label="交易日期"
+                        prop="payTime"
+                        :label-width="formLabelWidth">
             <el-date-picker style="width: 100%;"
-              v-model="form.payTime"
-              type="datetime"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择交易日期">
+                            v-model="form.payTime"
+                            type="datetime"
+                            format="yyyy-MM-dd HH:mm:ss"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择交易日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="备注" :label-width="formLabelWidth">
-            <el-input placeholder="请输入备注" v-model.trim="form.memo" type="textarea" :rows="2"></el-input>
+          <el-form-item label="备注"
+                        :label-width="formLabelWidth">
+            <el-input placeholder="请输入备注"
+                      v-model.trim="form.memo"
+                      type="textarea"
+                      :rows="2"></el-input>
           </el-form-item>
         </el-form>
-        <span slot="footer" class="dialog-footer">
+        <span slot="footer"
+              class="dialog-footer">
           <el-button @click="routeOrderStatus = false">取 消</el-button>
-          <el-button @click="onOrderSubmit('ruleForm')" type="primary">确 定</el-button>
+          <el-button @click="onOrderSubmit('ruleForm')"
+                     type="primary">确 定</el-button>
         </span>
       </el-dialog>
     </div>
@@ -222,7 +263,7 @@ import load from "@/utils/loading";
 export default {
   components: { pagination },
   name: "incomeTwo",
-  data() {
+  data () {
     return {
       orderStatus: orderStatus,
       dealStatus: dealStatus,
@@ -282,7 +323,7 @@ export default {
       }
     };
   },
-  mounted() {
+  mounted () {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -305,7 +346,7 @@ export default {
     this.getList();
   },
   methods: {
-    onClear(type) {
+    onClear (type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
       } else if (type == "paymentStatus") {
@@ -314,7 +355,7 @@ export default {
         this.searchForm.routingOrganId = null;
       }
     },
-    onOrderSubmit(formName) { // 添加订单
+    onOrderSubmit (formName) { // 添加订单
       this.$refs[formName].validate(valid => {
         if (valid) {
           routeOrderAdd(this.form).then(res => {
@@ -331,7 +372,7 @@ export default {
         }
       });
     },
-    onFormClose(formName) {
+    onFormClose (formName) {
       this.form = {
         organId: null,
         transNo: null,
@@ -344,27 +385,27 @@ export default {
       // 关闭弹窗重置验证
       this.$refs[formName].resetFields();
     },
-    onOrderExport() {
+    onOrderExport () {
       // 报表导出
-      let url = "/api-web/export/orderList";
+      let url = "/api-web/export/routeOrderList";
       let data = {
         orderType: 3
       };
       let searchForm = this.searchForm;
       if (searchForm.orderNo) {
-        data.orderNo = searchForm.orderNo;
+        data.orderNo = searchForm.orderNo
       }
       if (searchForm.transNo) {
-        data.transNo = searchForm.transNo;
+        data.transNo = searchForm.transNo
       }
       if (searchForm.merNos) {
-        data.merNos = searchForm.merNos;
+        data.merNos = searchForm.merNos
       }
       if (searchForm.actualAmount) {
-        data.actualAmount = searchForm.actualAmount;
+        data.actualAmount = searchForm.actualAmount
       }
       if (searchForm.balancePaymentAmount) {
-        data.balancePaymentAmount = searchForm.balancePaymentAmount;
+        data.balancePaymentAmount = searchForm.balancePaymentAmount
       }
       if (searchForm.paymentStatus) {
         data.paymentStatus = searchForm.paymentStatus;
@@ -378,9 +419,12 @@ export default {
         data.routingOrganId = searchForm.routingOrganId;
       }
 
-      if (searchForm.orderStartDate && searchForm.orderEndDate) {
-        data.orderStartDate = searchForm.orderStartDate;
-        data.orderEndDate = searchForm.orderEndDate;
+      if (this.orderDate && this.orderDate.length > 0) {
+        data.orderStartDate = this.orderDate[0];
+        data.orderEndDate = this.orderDate[1];
+      } else {
+        data.orderStartDate = null;
+        data.orderEndDate = null;
       }
       const options = {
         method: "POST",
@@ -425,13 +469,13 @@ export default {
             load.endLoading();
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let params = JSON.parse(JSON.stringify(this.searchForm));
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
@@ -469,7 +513,7 @@ export default {
         }
       });
     },
-    searchOrderDate(value) {
+    searchOrderDate (value) {
       if (value) {
         this.searchForm.orderStartDate = value[0];
         this.searchForm.orderEndDate = value[1];
@@ -478,7 +522,7 @@ export default {
         this.searchForm.orderEndDate = null;
       }
     },
-    onReSet() {
+    onReSet () {
       // 重置搜索
       this.orderDate = null;
       this.searchForm = {

src/views/businessManager/orderManager/income.vue

@@ -4,114 +4,92 @@
       <div class="squrt"></div>订单管理
     </h2>
     <div class="m-core">
-      <div
-        class="newBand"
-        @click="onOrderExport"
-        v-permission="{child: 'export/orderList', parent: '/income'}"
-      >报表导出</div>
+      <div class="newBand"
+           @click="onOrderExport"
+           v-permission="{child: 'export/orderList', parent: '/income'}">报表导出</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-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-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-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
-            v-model.trim="searchForm.balancePaymentAmount"
-          ></el-input>
+          <el-input placeholder="余额支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.balancePaymentAmount"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input
-            placeholder="现金支付大于等于"
-            type="number"
-            @mousewheel.native.prevent
-            v-model.trim="searchForm.actualAmount"
-          ></el-input>
+          <el-input placeholder="现金支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    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-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>
       <!-- 列表 -->
@@ -134,54 +112,84 @@
         预收余额：{{ 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="交易类型">
+          <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>
-          <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>
+              <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="交易方式">
+          <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="收款账户">
+          <el-table-column align="center"
+                           label="收款账户">
             <template slot-scope="scope">{{ scope.row.merNos }}</template>
           </el-table-column>
-          <el-table-column align="center" label="交易状态">
+          <el-table-column align="center"
+                           label="交易状态">
             <template slot-scope="scope">{{ scope.row.status | dealStatus }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
+          <el-table-column align="center"
+                           label="备注">
             <template slot-scope="scope">{{ scope.row.memo ? scope.row.memo : '-' }}</template>
           </el-table-column>
+          <el-table-column align="center"
+                           width="150px"
+                           label="操作">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.status != 'SUCCESS' && scope.row.actualAmount > 0"
+                         v-permission="'order/getOrderStatus'"
+                         @click="onGetOrderStatus(scope.row)"
+                         type="text">查询订单状态</el-button>
+            </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 { orderQueryPage } from '@/api/orderManager'
+import { orderQueryPage, getOrderStatus } from '@/api/orderManager'
 import { getEmployeeOrgan } from '@/api/buildTeam'
 import store from '@/store'
 import { orderStatus, dealStatus } from '@/utils/searchArray'
@@ -192,7 +200,7 @@ import load from '@/utils/loading'
 export default {
   components: { pagination },
   name: "income",
-  data() {
+  data () {
     return {
       orderStatus: orderStatus,
       dealStatus: dealStatus,
@@ -224,7 +232,7 @@ export default {
       totalRevenueAmount: 0,
     };
   },
-  mounted() {
+  mounted () {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -236,7 +244,7 @@ export default {
       new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate()))
         .toISOString()
         .slice(0, 10);
-        //  + " 00:00:00"  + " 23:59:59"
+    //  + " 00:00:00"  + " 23:59:59"
     var endDate =
       new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate()))
         .toISOString()
@@ -247,7 +255,7 @@ export default {
     this.getList();
   },
   methods: {
-    onClear(type) {
+    onClear (type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
       } else if (type == "paymentStatus") {
@@ -256,26 +264,26 @@ export default {
         this.searchForm.organId = null;
       }
     },
-    onOrderExport() {
+    onOrderExport () {
       // 报表导出
       let url = "/api-web/export/orderList";
       let data = {
         orderType: 0
       };
       let searchForm = this.searchForm;
-      if(searchForm.orderNo) {
+      if (searchForm.orderNo) {
         data.orderNo = searchForm.orderNo
       }
-      if(searchForm.transNo) {
+      if (searchForm.transNo) {
         data.transNo = searchForm.transNo
       }
-      if(searchForm.merNos) {
+      if (searchForm.merNos) {
         data.merNos = searchForm.merNos
       }
-      if(searchForm.actualAmount) {
+      if (searchForm.actualAmount) {
         data.actualAmount = searchForm.actualAmount
       }
-      if(searchForm.balancePaymentAmount) {
+      if (searchForm.balancePaymentAmount) {
         data.balancePaymentAmount = searchForm.balancePaymentAmount
       }
 
@@ -290,10 +298,12 @@ export default {
       if (searchForm.organId) {
         data.organId = searchForm.organId;
       }
-
-      if (searchForm.orderStartDate && searchForm.orderEndDate) {
-        data.orderStartDate = searchForm.orderStartDate;
-        data.orderEndDate = searchForm.orderEndDate;
+      if (this.orderDate && this.orderDate.length > 0) {
+        data.orderStartDate = this.orderDate[0];
+        data.orderEndDate = this.orderDate[1];
+      } else {
+        data.orderStartDate = null;
+        data.orderEndDate = null;
       }
       const options = {
         method: "POST",
@@ -320,7 +330,7 @@ export default {
             let text = (new Response(blob)).text()
             text.then(res => {
               // 判断是否报错
-              if(res.indexOf('code') != -1) {
+              if (res.indexOf('code') != -1) {
                 let json = JSON.parse(res)
                 this.$message.error(json.msg)
               } else {
@@ -351,13 +361,13 @@ export default {
             load.endLoading();
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let params = JSON.parse(JSON.stringify(this.searchForm))
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
@@ -385,7 +395,18 @@ export default {
         }
       });
     },
-    searchOrderDate(value) {
+    onGetOrderStatus(row) {
+      this.$confirm("您确定查询该订单状态", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        getOrderStatus({ id: row.id }).then(res => {
+          this.getList()
+        })
+      }).catch(err => { })
+    },
+    searchOrderDate (value) {
       if (value) {
         this.searchForm.orderStartDate = value[0];
         this.searchForm.orderEndDate = value[1];
@@ -394,7 +415,7 @@ export default {
         this.searchForm.orderEndDate = null;
       }
     },
-    onReSet() {
+    onReSet () {
       // 重置搜索
       this.orderDate = null;
       this.searchForm = {

src/views/businessManager/orderManager/incomeOne.vue

@@ -4,102 +4,92 @@
       <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-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-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-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
-            v-model.trim="searchForm.balancePaymentAmount"
-          ></el-input>
+          <el-input placeholder="余额支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.balancePaymentAmount"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input
-            placeholder="现金支付大于等于"
-            type="number"
-            @mousewheel.native.prevent
-            v-model.trim="searchForm.actualAmount"
-          ></el-input>
+          <el-input placeholder="现金支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    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-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>
       <!-- 列表 -->
@@ -113,45 +103,68 @@
         预收余额：{{ 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="交易类型">
+          <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>
-          <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 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" fixed="right" prop="paymentChannel" label="交易方式">
+          <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="收款账户">
+          <el-table-column align="center"
+                           label="收款账户">
             <template slot-scope="scope">{{ scope.row.merNos }}</template>
           </el-table-column>
-          <el-table-column align="center" label="交易状态">
+          <el-table-column align="center"
+                           label="交易状态">
             <template slot-scope="scope">{{ scope.row.status | dealStatus }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
+          <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>
@@ -171,7 +184,7 @@ export default {
     pagination
   },
   name: "incomeOne",
-  data() {
+  data () {
     return {
       orderStatus: orderStatus,
       dealStatus: dealStatus,
@@ -200,7 +213,7 @@ export default {
       totalRevenueAmount: 0
     };
   },
-  mounted() {
+  mounted () {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -223,7 +236,7 @@ export default {
     this.getList();
   },
   methods: {
-    onClear(type) {
+    onClear (type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
       } else if (type == "paymentStatus") {
@@ -232,7 +245,7 @@ export default {
         this.searchForm.organId = null;
       }
     },
-    onOrderExport() {
+    onOrderExport () {
       // 报表导出
       let url = "/api-web/export/orderList";
       let data = {
@@ -251,9 +264,12 @@ export default {
         data.organId = searchForm.organId;
       }
 
-      if (searchForm.orderStartDate && searchForm.orderEndDate) {
-        data.orderStartDate = searchForm.orderStartDate;
-        data.orderEndDate = searchForm.orderEndDate;
+      if (this.orderDate && this.orderDate.length > 0) {
+        data.orderStartDate = this.orderDate[0];
+        data.orderEndDate = this.orderDate[1];
+      } else {
+        data.orderStartDate = null;
+        data.orderEndDate = null;
       }
       const options = {
         method: "POST",
@@ -313,13 +329,13 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let params = JSON.parse(JSON.stringify(this.searchForm))
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
@@ -357,7 +373,7 @@ export default {
         }
       });
     },
-    searchOrderDate(value) {
+    searchOrderDate (value) {
       if (value) {
         this.searchForm.orderStartDate = value[0];
         this.searchForm.orderEndDate = value[1];
@@ -366,7 +382,7 @@ export default {
         this.searchForm.orderEndDate = null;
       }
     },
-    onReSet() {
+    onReSet () {
       // 重置搜索
       this.orderDate = null;
       this.searchForm = {

src/views/businessManager/orderManager/incomeOut.vue

@@ -4,15 +4,17 @@
       <div class="squrt"></div>对外订单管理
     </h2>
     <div class="m-core">
-      <div
-        class="newBand"
-        @click="onOrderExport"
-        v-permission="{child: 'export/tenantPaymentOrder', parent: '/incomeOut'}"
-      >报表导出</div>
+      <div class="newBand"
+           @click="onOrderExport"
+           v-permission="{child: 'export/tenantPaymentOrder', parent: '/incomeOut'}">报表导出</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 v-model.trim="searchForm.phone" @keyup.enter.native="search" placeholder="手机号"></el-input>
+          <el-input v-model.trim="searchForm.phone"
+                    @keyup.enter.native="search"
+                    placeholder="手机号"></el-input>
         </el-form-item>
         <!-- <el-form-item prop="organId">
           <el-select
@@ -40,24 +42,20 @@
           ></el-input>
         </el-form-item> -->
         <el-form-item>
-          <el-input
-            placeholder="现金支付大于等于"
-            type="number"
-            @mousewheel.native.prevent
-            v-model.trim="searchForm.actualAmount"
-          ></el-input>
+          <el-input placeholder="现金支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.actualAmount"></el-input>
         </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
@@ -76,24 +74,22 @@
           </el-select>
         </el-form-item>-->
         <el-form-item>
-          <el-select
-            v-model.trim="searchForm.status"
-            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.status"
+                     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>
       <!-- 列表 -->
@@ -103,51 +99,72 @@
         <!-- 余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元  -->
       </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="时间/分钟">
+          <el-table-column align="center"
+                           width="100px"
+                           label="时间/分钟">
             <template slot-scope="scope">
               <p>{{ '购买'+scope.row.transMinutes+'分钟' }}</p>
               <p>{{ '赠送'+scope.row.giveMinutes+'分钟' }}</p>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="expectAmount" label="应付金额"></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>
-          <el-table-column align="center" label="用户姓名">
+          <el-table-column align="center"
+                           prop="actualAmount"
+                           label="现金支付"></el-table-column>
+          <el-table-column align="center"
+                           label="用户姓名">
             <template slot-scope="scope">
               <div v-if="scope.row.user">{{ scope.row.user.username }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center"  label="手机号">
-              <template slot-scope="scope">
+          <el-table-column align="center"
+                           label="手机号">
+            <template slot-scope="scope">
               <div v-if="scope.row.user">{{ scope.row.user.phone }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="paymentChannel" label="交易方式">
+          <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="收款账户">
+          <el-table-column align="center"
+                           label="收款账户">
             <template slot-scope="scope">{{ scope.row.merNos }}</template>
           </el-table-column>
-          <el-table-column align="center" label="交易状态">
+          <el-table-column align="center"
+                           label="交易状态">
             <template slot-scope="scope">{{ scope.row.status | dealStatus }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
+          <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>
@@ -165,7 +182,7 @@ import load from "@/utils/loading";
 export default {
   components: { pagination },
   name: "income",
-  data() {
+  data () {
     return {
       orderStatus: orderStatus,
       dealStatus: dealStatus,
@@ -176,7 +193,7 @@ export default {
         status: "SUCCESS",
         paymentType: null,
         organId: null,
-        phone:null,
+        phone: null,
         actualAmount: null,
         balancePaymentAmount: null
       },
@@ -193,7 +210,7 @@ export default {
       totalActualAmount: 0 //实收总金额
     };
   },
-  mounted() {
+  mounted () {
     // getEmployeeOrgan().then(res => {
     //   if (res.code == 200) {
     //     this.organList = res.data;
@@ -218,7 +235,7 @@ export default {
     this.getList();
   },
   methods: {
-    onClear(type) {
+    onClear (type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
       } else if (type == "paymentStatus") {
@@ -227,7 +244,7 @@ export default {
         this.searchForm.organId = null;
       }
     },
-    onOrderExport() {
+    onOrderExport () {
       // 报表导出
       let url = "/api-web/export/tenantPaymentOrder";
       let data = {
@@ -241,11 +258,14 @@ export default {
       if (searchForm.paymentType) {
         data.paymentType = searchForm.paymentType;
       }
-      if (searchForm.orderStartDate && searchForm.orderEndDate) {
-        data.orderStartDate = searchForm.orderStartDate;
-        data.orderEndDate = searchForm.orderEndDate;
+      if (this.orderDate && this.orderDate.length > 0) {
+        data.orderStartDate = this.orderDate[0];
+        data.orderEndDate = this.orderDate[1];
+      } else {
+        data.orderStartDate = null;
+        data.orderEndDate = null;
       }
-      if(searchForm.phone){
+      if (searchForm.phone) {
         data.phone = searchForm.phone
       }
       const options = {
@@ -305,13 +325,13 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let params = this.searchForm;
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
@@ -336,7 +356,7 @@ export default {
         }
       });
     },
-    searchOrderDate(value) {
+    searchOrderDate (value) {
       if (value) {
         this.searchForm.orderStartDate = value[0];
         this.searchForm.orderEndDate = value[1];
@@ -345,7 +365,7 @@ export default {
         this.searchForm.orderEndDate = null;
       }
     },
-    onReSet() {
+    onReSet () {
       // 重置搜索
       this.orderDate = null;
       this.searchForm = {
@@ -354,7 +374,7 @@ export default {
         paymentStatus: null,
         paymentType: null,
         organId: null,
-        phone:null
+        phone: null
       };
       this.getList();
     }

src/views/businessManager/orderManager/incomeTwo.vue

@@ -4,102 +4,92 @@
       <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-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-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-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
-            v-model.trim="searchForm.balancePaymentAmount"
-          ></el-input>
+          <el-input placeholder="余额支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.balancePaymentAmount"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input
-            placeholder="现金支付大于等于"
-            type="number"
-            @mousewheel.native.prevent
-            v-model.trim="searchForm.actualAmount"
-          ></el-input>
+          <el-input placeholder="现金支付大于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    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-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>
       <!-- 列表 -->
@@ -113,45 +103,67 @@
         预收余额：{{ 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="交易类型">
+          <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>
-          <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 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="paymentChannel" label="交易方式">
+          <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="收款账户">
+          <el-table-column align="center"
+                           label="收款账户">
             <template slot-scope="scope">{{ scope.row.merNos }}</template>
           </el-table-column>
-          <el-table-column align="center" label="交易状态">
+          <el-table-column align="center"
+                           label="交易状态">
             <template slot-scope="scope">{{ scope.row.status | dealStatus }}</template>
           </el-table-column>
-          <el-table-column align="center" label="备注">
+          <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>
@@ -168,7 +180,7 @@ import { getToken } from "@/utils/auth";
 export default {
   components: { pagination },
   name: "incomeTwo",
-  data() {
+  data () {
     return {
       orderStatus: orderStatus,
       dealStatus: dealStatus,
@@ -197,7 +209,7 @@ export default {
       totalRevenueAmount: 0
     };
   },
-  mounted() {
+  mounted () {
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -220,7 +232,7 @@ export default {
     this.getList();
   },
   methods: {
-    onClear(type) {
+    onClear (type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
       } else if (type == "paymentStatus") {
@@ -229,7 +241,7 @@ export default {
         this.searchForm.organId = null;
       }
     },
-    onOrderExport() {
+    onOrderExport () {
       // 报表导出
       let url = "/api-web/export/orderList";
       let data = {
@@ -263,9 +275,12 @@ export default {
         data.organId = searchForm.organId;
       }
 
-      if (searchForm.orderStartDate && searchForm.orderEndDate) {
-        data.orderStartDate = searchForm.orderStartDate;
-        data.orderEndDate = searchForm.orderEndDate;
+      if (this.orderDate && this.orderDate.length > 0) {
+        data.orderStartDate = this.orderDate[0];
+        data.orderEndDate = this.orderDate[1];
+      } else {
+        data.orderStartDate = null;
+        data.orderEndDate = null;
       }
       const options = {
         method: "POST",
@@ -308,13 +323,13 @@ export default {
             link.click();
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let params = JSON.parse(JSON.stringify(this.searchForm))
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
@@ -352,7 +367,7 @@ export default {
         }
       });
     },
-    searchOrderDate(value) {
+    searchOrderDate (value) {
       if (value) {
         this.searchForm.orderStartDate = value[0];
         this.searchForm.orderEndDate = value[1];
@@ -361,7 +376,7 @@ export default {
         this.searchForm.orderEndDate = null;
       }
     },
-    onReSet() {
+    onReSet () {
       // 重置搜索
       this.orderDate = null;
       this.searchForm = {

src/views/chargeManager/one.vue

@@ -13,7 +13,7 @@
           <el-table-column align="center" prop="yqMerNo" label="双乾商户号"></el-table-column>
           <el-table-column align="center" label="收款比例">
             <template slot-scope="scope">
-              {{ scope.row.type == 1 ? '数比例' : null }}
+              {{ scope.row.type == 1 ? '笔数比例' : null }}
               {{ scope.row.type == 2 ? '金额比例' : null }}
             </template>
           </el-table-column>
@@ -61,15 +61,14 @@
         </el-form-item>
         <el-form-item label="收款方式" prop="payType" :label-width="formLabelWidth">
           <el-select v-model.trim="form.payType" @change="onPayTypeChange" placeholder="请选择收款方式">
-            <el-option value="YQPAY" label="双乾"></el-option>
             <el-option value="ADAPAY" label="汇付"></el-option>
+            <el-option value="YQPAY" label="双乾"></el-option>
           </el-select>
         </el-form-item>
-        <!-- prop="yqMerNo" -->
+        <!-- prop="yqMerNo" :error="result.yqError" -->
         <el-form-item
           label="双乾商户号"
           :required="form.payType === 'YQPAY'"
-          :error="result.yqError"
           :label-width="formLabelWidth"
         >
           <el-input
@@ -79,11 +78,10 @@
             v-model.trim="form.yqMerNo"
           ></el-input>
         </el-form-item>
-        <!--  prop="hfMerNo" -->
+        <!--  prop="hfMerNo" :error="result.hfError" -->
         <el-form-item
           label="汇付商户号"
           :required="form.payType === 'ADAPAY'"
-          :error="result.hfError"
           :label-width="formLabelWidth"
         >
           <el-input
@@ -114,10 +112,9 @@
         <div class="moreRule">
           <div class="moreRuleIn" v-for="(domain, index) in result.domains" :key="domain.key">
             <el-form-item class="setWidth" :label="'第' + (index + 1)" :label-width="formLabelWidth">
+              <!-- @change="onBranchChange" -->
               <el-select
                 v-model.trim="domain.organId"
-                @change="onBranchChange"
-                :disabled="domain.disabled"
                 placeholder="请选择分部"
                 clearable
               >
@@ -138,7 +135,6 @@
                 clearable
                 :max="form.type === 1 ? 10 : 100"
                 placeholder="请输入比例"
-                :disabled="domain.disabled"
                 @mousewheel.native.prevent
                 v-model.trim="domain.scale"
               >
@@ -150,14 +146,13 @@
                 v-model.trim="domain.feeFlag"
                 placeholder="请选择是否承担手续费"
                 style="width: 150px !important;"
-                :disabled="domain.disabled"
                 clearable
               >
                 <el-option value="Y" label="是"></el-option>
                 <el-option value="N" label="否"></el-option>
               </el-select>
               <el-button
-                v-if="index != 0 && !domain.disabled"
+                v-if="index != 0"
                 @click.prevent="removeDomain(result, domain)"
               >删除</el-button>
             </el-form-item>
@@ -302,13 +297,13 @@ export default {
         let params = JSON.parse(JSON.stringify(this.form));
         let result = this.result;
         params.routeScale = null;
-        if (params.payType === "YQPAY" && !params.yqMerNo) {
-          result.yqError = "请输入双乾商户号";
-          return;
-        } else if (params.payType === "ADAPAY" && !params.hfMerNo) {
-          result.hfError = "请输入汇付商户号";
-          return;
-        }
+        // if (params.payType === "YQPAY" && !params.yqMerNo) {
+        //   result.yqError = "请输入双乾商户号";
+        //   return;
+        // } else if (params.payType === "ADAPAY" && !params.hfMerNo) {
+        //   result.hfError = "请输入汇付商户号";
+        //   return;
+        // }
         this.addDomain(result, true);
         if (valid && !result.errorText) {
           let tempResult = [];
@@ -323,6 +318,16 @@ export default {
           });
           params.routeScale =
             tempResult.length > 0 ? JSON.stringify(tempResult) : null;
+          if (params.payType === "YQPAY" && !params.yqMerNo && !params.routeScale) {
+            // result.yqError = "请输入双乾商户号";
+            this.$message.error('请输入双乾商户号或比例')
+            return;
+          } else if (params.payType === "ADAPAY" && !params.hfMerNo && !params.routeScale) {
+            // result.hfError = "请输入汇付商户号";
+            this.$message.error('请输入汇付商户号或比例')
+            return;
+          }
+
           if (this.formActionTitle == "create") {
             if (params.id) {
               // 判断有没有Id，如果有则删除
@@ -350,34 +355,68 @@ export default {
         this.$message.error(res.msg);
       }
     },
-    onBranchChange(val) {
-      this.calcBranchList.forEach(item => {
-        if (val == item.value) {
-          item.disabled = true;
-        } else {
-          item.disabled = false;
-        }
-      });
-    },
+    // onBranchChange(val) {
+    //   this.calcBranchList.forEach(item => {
+    //     if (val == item.value) {
+    //       item.disabled = true;
+    //     } else {
+    //       item.disabled = false;
+    //     }
+    //   });
+    // },
     addDomain(form, checked) {
       let domains = form.domains,
         forms = this.form,
         singleLength = domains.length,
         lastDate = domains[singleLength - 1]; // 获取倒数一个对象
-      let countScale = 0;
-      domains.forEach(item => {
-        countScale += Number(item.scale);
-      });
+
+      // 如果三个值都为空，则不用检验
+      if (!lastDate.organId && !lastDate.scale && !lastDate.feeFlag && checked) {
+        form.errorText = ''
+        return;
+      }
       let num = 0;
       if (forms.type === 2) {
         num = 100;
       } else if (forms.type === 1) {
         num = 10;
       }
-      // 如果三个值都为空，则不用检验
-      if (!lastDate.organId && !lastDate.scale && !lastDate.feeFlag) {
-        form.errorText = ''
-        return;
+      let countScale = 0;
+      let selectFeeCount = 0,
+          selectFeeCount2 = 0
+      let isFeeFlag = false,
+          isOrganId = false,
+          isScale = false
+      domains.forEach(item => {
+        countScale += Number(item.scale);
+        if(forms.type == 2) {
+          if(item.feeFlag == 'Y') {
+            selectFeeCount++
+          }
+        } else if(forms.type == 1) {
+          if(item.feeFlag == 'N') {
+            selectFeeCount2++
+          }
+        }
+
+        if(!isFeeFlag) {
+          isFeeFlag = !item.feeFlag ? true : false
+        }
+
+        if(!isOrganId) {
+          isOrganId = !item.organId ? true : false
+        }
+
+        if(!isScale) {
+          isScale = !item.scale ? true: false
+        }
+      });
+      if(selectFeeCount > 1) {
+        form.errorText = `承担手续费只能设置一次“是”`;
+        return
+      } else if(selectFeeCount2 > 0) {
+        form.errorText = `承担手续费只能设置“是”`;
+        return
       }
 
       if (!lastDate.organId) {
@@ -412,13 +451,33 @@ export default {
           key: Date.now()
         });
       } else {
-        if (parseInt(countScale) != num) {
-          form.errorText = "比例总和应为" + num;
+         if (isOrganId) {
+          form.errorText = "选择分部不能为空";
+          return;
+        }
+        if (isScale) {
+          form.errorText = "比例不能为空";
           return;
         }
+        if(isFeeFlag) {
+          form.errorText = "请选择是否承担手续费";
+          return;
+        }
+        if(forms.type == 2) {
+          if(selectFeeCount != 1) {
+            form.errorText = "承担手续费必须设置一次“是”"
+            return;
+          }
+        }
       }
     },
     removeDomain(form, item) {
+      // this.calcBranchList.forEach(organ => {
+      //   if (item.organId == organ.value) {
+      //     console.log(true)
+      //     organ.disabled = false;
+      //   }
+      // });
       var index = form.domains.indexOf(item);
       if (index !== -1) {
         form.domains.splice(index, 1);
@@ -513,6 +572,20 @@ export default {
         type: 2,
         routeScale: []
       };
+      this.result = {
+        domains: [
+          {
+            organId: null,
+            scale: null,
+            feeFlag: null,
+            disabled: false,
+            key: Date.now()
+          }
+        ],
+        errorText: null,
+        yqError: null,
+        hfError: null
+      }
       this.$refs[formName].resetFields();
     }
   }
@@ -548,7 +621,7 @@ export default {
     font-size: 12px;
     line-height: 1;
     position: absolute;
-    left: 120px;
+    left: 100px;
     top: 100%;
     margin-top: -21px;
   }

src/views/chargeManager/two.vue

@@ -246,7 +246,7 @@ export default {
       }
     },
     async getList() {
-      await sysConfigList({ group: "payment_config" }).then(res => {
+      await sysConfigList({ group: "channel_config" }).then(res => {
         if (res.code == 200 && res.data.length > 0) {
           let tempResult = [];
           let paranValue = {};
@@ -254,19 +254,17 @@ export default {
             if (item.paramName === "amount_channel") {
               paranValue = item.paranValue ? JSON.parse(item.paranValue) : [];
               this.selectId = item.id;
-              this.result.domains = []
-              paranValue.forEach((item, index) => {
-                // let disabled = true
-                // if(paranValue.length - 1 === index) {
-                //   disabled = false
-                // }
-                this.result.domains.push({
-                  organId: item.organId,
-                  routeOrganId: item.routeOrganId,
-                  amount: item.amount,
-                  type: item.type
+              if(paranValue.length > 0) {
+                this.result.domains = []
+                paranValue.forEach((item, index) => {
+                  this.result.domains.push({
+                    organId: item.organId,
+                    routeOrganId: item.routeOrganId,
+                    amount: item.amount,
+                    type: item.type
+                  })
                 })
-              })
+              }
             }
             if (item.paramName === "sporadic_channel") {
               this.formSporadic = item.paranValue
@@ -305,13 +303,12 @@ export default {
       this.$refs["ruleFormValid"].validate(valid => {
         if(valid) {
           if (!checked) {
-            lastDate.disabled = true;
+            // lastDate.disabled = true;
             domains.push({
               organId: null,
               routeOrganId: null,
               amount: null,
-              type: null,
-              disabled: false
+              type: null
             });
           }
         } else {