From bf88d13b24bb4d1c65aad29553d56b4fdb3ba8d5 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 13 Jun 2022 16:37:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E7=9B=8A=E7=BF=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wjnft/incomestatement/index.vue | 275 +++-------------------
 1 file changed, 29 insertions(+), 246 deletions(-)

diff --git a/src/views/wjnft/incomestatement/index.vue b/src/views/wjnft/incomestatement/index.vue
index acd5466..6959b99 100644
--- a/src/views/wjnft/incomestatement/index.vue
+++ b/src/views/wjnft/incomestatement/index.vue
@@ -1,104 +1,25 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="订单号" prop="orderId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.orderId"-->
-<!--          placeholder="请输入订单号"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="订单号" prop="orderId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.orderId"-->
+      <!--          placeholder="请输入订单号"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="名称" prop="artistId" v-hasRole="['admin','tester']">
         <el-input
-          v-model="queryParams.artistId"
-          placeholder="请输入创作者名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.artistId"
+            placeholder="请输入创作者名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="创建时间">-->
-<!--        <el-date-picker-->
-<!--            v-model="dateRange"-->
-<!--            size="small"-->
-<!--            style="width: 240px"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            type="daterange"-->
-<!--            range-separator="-"-->
-<!--            start-placeholder="开始日期"-->
-<!--            end-placeholder="结束日期"-->
-<!--        ></el-date-picker>-->
-<!--        <el-date-picker clearable size="small"-->
-<!--                        v-model="queryParams.createdTime"-->
-<!--                        type="date"-->
-<!--                        value-format="yyyy-MM-dd"-->
-<!--                        placeholder="选择入库时间">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="收益金额" prop="earningsAmount">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.earningsAmount"-->
-<!--          placeholder="请输入收益金额"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="商户总收益金额" prop="merchantsEarnings">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.merchantsEarnings"-->
-<!--          placeholder="请输入商户总收益金额"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="平台收益" prop="earnings">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.earnings"-->
-<!--          placeholder="请输入平台收益"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="创建人" prop="createdBy">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.createdBy"-->
-<!--          placeholder="请输入创建人"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
 
-<!--      </el-form-item>-->
-<!--      <el-form-item label="创建时间" prop="createdTime">-->
-<!--        <el-date-picker clearable size="small"-->
-<!--          v-model="queryParams.createdTime"-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          placeholder="选择创建时间">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="更新人" prop="updatedBy">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.updatedBy"-->
-<!--          placeholder="请输入更新人"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="更新时间" prop="uodatedTime">-->
-<!--        <el-date-picker clearable size="small"-->
-<!--          v-model="queryParams.uodatedTime"-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          placeholder="选择更新时间">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -106,173 +27,42 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['wjnft:incomestatement:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['wjnft:incomestatement:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['wjnft:incomestatement:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
     <el-table v-loading="loading" :data="incomestatementList"  @selection-change="handleSelectionChange">
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-<!--      <el-table-column label="id" align="center" prop="id" />-->
-
       <el-table-column label="序号" type="index" width="50" />
       <el-table-column label="创作者名称" align="center" prop="artistId"  />
-<!--      <el-table-column label="订单号" align="center" prop="orderId"/>-->
-<!--      <el-table-column label="收益金额" align="center" prop="earningsAmount" />-->
       <el-table-column label="商户总收益(元)" align="center" prop="merchantsEarnings" />
       <el-table-column label="平台总收益(元)" align="center" prop="earnings" v-if = "testColumn"/>
-
-<!--      <el-table-column-->
-<!--          prop="artistId"-->
-<!--          label="创作者名称"-->
-<!--          width="180">-->
-<!--      </el-table-column>-->
-
-<!--      <el-table-column-->
-<!--          prop="orderId"-->
-<!--          label="订单号"-->
-<!--          width="180">-->
-<!--      </el-table-column>-->
-
-<!--      <el-table-column-->
-<!--          prop="earningsAmount"-->
-<!--          label="收益金额">-->
-<!--      </el-table-column>-->
-
-<!--      <el-table-column-->
-<!--          prop="merchantsEarnings"-->
-<!--          label="商户总收益金额">-->
-<!--      </el-table-column>-->
-
-<!--      <el-table-column-->
-<!--          prop="earnings"-->
-<!--          label="平台收益">-->
-<!--      </el-table-column>-->
-
-<!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
-<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
-<!--      <el-table-column label="更新时间" align="center" prop="uodatedTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.uodatedTime, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasRole="['admin','tester']"-->
-<!--          >修改</el-button>-->
+
           <el-button
               size="mini"
               type="text"
               @click="handleQueryXX(scope.row)"
           >详细</el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['wjnft:incomestatement:remove']"-->
-<!--          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 添加或修改收益 对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-<!--        <el-form-item label="订单id" prop="orderId">-->
-<!--          <el-input v-model="form.orderId" placeholder="请输入订单id" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="创作者表ID" prop="artistId">-->
-<!--          <el-input v-model="form.artistId" placeholder="请输入创作者表ID" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="收益金额" prop="earningsAmount">-->
-<!--          <el-input v-model="form.earningsAmount" placeholder="请输入收益金额" />-->
-<!--        </el-form-item>-->
         <el-form-item label="商户总收益(元)" prop="merchantsEarnings">
           <el-input v-model="form.merchantsEarnings" placeholder="请输入商户总收益金额" />
         </el-form-item>
         <el-form-item label="平台收益(元)" prop="earnings">
           <el-input v-model="form.earnings" placeholder="请输入平台收益"/>
         </el-form-item>
-<!--        <el-form-item label="创建人" prop="createdBy">-->
-<!--          <el-input v-model="form.createdBy" placeholder="请输入创建人" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="创建时间" prop="createdTime">-->
-<!--          <el-date-picker clearable size="small"-->
-<!--            v-model="form.createdTime"-->
-<!--            type="date"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            placeholder="选择创建时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="更新人" prop="updatedBy">-->
-<!--          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="更新时间" prop="uodatedTime">-->
-<!--          <el-date-picker clearable size="small"-->
-<!--            v-model="form.uodatedTime"-->
-<!--            type="date"-->
-<!--            value-format="yyyy-MM-dd"-->
-<!--            placeholder="选择更新时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -314,33 +104,24 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" :data="incomestatementList2">
-      <el-table-column label="序号" type="index" width="50" />
-      <el-table-column label="创作者名称" align="center" prop="artistId"/>
-      <el-table-column label="订单流水号" align="center" prop="orderId"/>
-      <el-table-column label="收益金额(元)" align="center" prop="earningsAmount" />
-<!--      <el-table-column label="商户总收益金额" align="center" prop="merchantsEarnings" />-->
-      <el-table-column label="平台收益(元)" align="center" prop="earnings" v-if = "testColumn"/>
+        <el-table-column label="序号" type="index" width="50" />
+        <el-table-column label="创作者名称" align="center" prop="artistId"/>
+        <el-table-column label="订单流水号" align="center" prop="orderId"/>
+        <el-table-column label="收益金额(元)" align="center" prop="earningsAmount" />
+        <el-table-column label="平台收益(元)" align="center" prop="earnings" v-if = "testColumn"/>
         <el-table-column label="产生收益时间" align="center" prop="createdTime" width="180">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
       </el-table>
-
       <pagination
           v-show="total2>0"
           :total="total2"
           :page.sync="queryParams1.pageNum"
           :limit.sync="queryParams1.pageSize"
-          @pagination1="getList1"
+          @pagination="getList1"
       />
-<!--      <pagination-->
-<!--          v-show="total>0"-->
-<!--          :total="total"-->
-<!--          :page.sync="queryParams.pageNum"-->
-<!--          :limit.sync="queryParams.pageSize"-->
-<!--          @pagination="getList"-->
-<!--      />-->
     </el-dialog>
   </div>
 </template>
@@ -534,7 +315,9 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams1.pageNum = 1;
       this.getList();
+      this.getList1();
     },
     /** 弹出框搜索按钮操作 */
     handleQuery1() {
@@ -585,7 +368,7 @@ export default {
         this.form = response.data;
         this.form.merchantsEarnings = merchantsEarnings
         this.open = true;
-        this.title = "修改收益 ";
+        this.title = "修改收益";
       });
     },
     /** 详细按钮操作 */