xuhaifeng 11 місяців тому
батько
коміт
1541b85dea
38 змінених файлів з 392 додано та 619 видалено
  1. 0 5
      src/assets/styles/element-ui.scss
  2. 4 1
      src/assets/styles/ruoyi.scss
  3. 0 1
      src/views/activity/clothInfo/index.vue
  4. 0 1
      src/views/activity/clothItem/index.vue
  5. 0 1
      src/views/activity/couponInfo/index.vue
  6. 0 1
      src/views/activity/couponItem/index.vue
  7. 0 1
      src/views/activity/discountInfo/index.vue
  8. 0 1
      src/views/activity/groupInfo/index.vue
  9. 0 1
      src/views/activity/rechargeInfo/index.vue
  10. 0 1
      src/views/activity/rechargeItem/index.vue
  11. 0 1
      src/views/app/banner/index.vue
  12. 0 1
      src/views/app/delivery/index.vue
  13. 0 1
      src/views/app/feedback/index.vue
  14. 0 1
      src/views/app/notify/index.vue
  15. 0 1
      src/views/cloth/flawTop/index.vue
  16. 10 38
      src/views/coupon/item/index.vue
  17. 0 1
      src/views/coupon/sendCouponCount/index.vue
  18. 11 25
      src/views/coupon/thirdParty/index.vue
  19. 25 50
      src/views/coupon/type/index.vue
  20. 0 1
      src/views/coupon/typeApplyCloth/index.vue
  21. 0 1
      src/views/generator/form/index.vue
  22. 0 1
      src/views/goods/commonGoods/index.vue
  23. 0 1
      src/views/goods/goodsComment/index.vue
  24. 0 1
      src/views/recharge/balanceCount/index.vue
  25. 0 1
      src/views/recharge/batchRecord/cardDetail.vue
  26. 4 5
      src/views/recharge/batchRecord/index.vue
  27. 0 1
      src/views/recharge/batchRecord/useRecord.vue
  28. 10 17
      src/views/recharge/card/index.vue
  29. 8 33
      src/views/recharge/cardVersion/index.vue
  30. 6 13
      src/views/recharge/cashStatement/index.vue
  31. 25 32
      src/views/recharge/order/index.vue
  32. 8 16
      src/views/recharge/refund/index.vue
  33. 12 37
      src/views/recharge/type/index.vue
  34. 0 1
      src/views/refund/refundRechargeOrder/index.vue
  35. 269 322
      src/views/refund/refundRetailOrder/index.vue
  36. 0 1
      src/views/settlement/bill/index.vue
  37. 0 1
      src/views/workbench/workAppointmentOrder/index.vue
  38. 0 1
      src/views/workbench/workNotice/index.vue

+ 0 - 5
src/assets/styles/element-ui.scss

@@ -1,9 +1,4 @@
 // cover some element-ui styles
-
-.el-table--medium .el-table__cell {
-  padding: 5px 0;
-}
-
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
   font-weight: 400 !important;

+ 4 - 1
src/assets/styles/ruoyi.scss

@@ -82,7 +82,7 @@
 		th {
 			word-break: break-word;
 			background-color: #FAFAFA;
-			height: 40px;
+			height: 43px;
 			font-size: 13px;
 			font-weight:bold;
 		}
@@ -97,6 +97,9 @@
 			margin-left: 1px;
 		}
 	}
+  .el-table--medium .el-table__cell {
+    padding: 6px 0;
+  }
 }
 
 /** 表单布局 **/

+ 0 - 1
src/views/activity/clothInfo/index.vue

@@ -210,7 +210,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/activity/clothItem/index.vue

@@ -183,7 +183,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/activity/couponInfo/index.vue

@@ -359,7 +359,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/activity/couponItem/index.vue

@@ -228,7 +228,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/activity/discountInfo/index.vue

@@ -248,7 +248,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/activity/groupInfo/index.vue

@@ -319,7 +319,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/activity/rechargeInfo/index.vue

@@ -205,7 +205,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/activity/rechargeItem/index.vue

@@ -160,7 +160,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/app/banner/index.vue

@@ -276,7 +276,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/app/delivery/index.vue

@@ -228,7 +228,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/app/feedback/index.vue

@@ -144,7 +144,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/app/notify/index.vue

@@ -162,7 +162,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/cloth/flawTop/index.vue

@@ -122,7 +122,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 10 - 38
src/views/coupon/item/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-            <el-form-item label="发放工厂/门店" label-width="120px" prop="orgIndex" v-if="userInfoVO.userType == '00'">
-                <el-select v-model="queryParams.orgIndex" placeholder="请选择" clearable>
+            <el-form-item label-width="120px" prop="orgIndex" v-if="userInfoVO.userType == '00'">
+                <el-select v-model="queryParams.orgIndex" placeholder="请选择门店" clearable>
                     <el-option-group label="工厂">
                         <template>
                             <el-option v-for="factory in factoryList" :key="factory.id + factory.sourceType" :label="factory.name" :value="factory.id + ',' + factory.sourceType"> </el-option>
@@ -15,20 +15,20 @@
                     </el-option-group>
                 </el-select>
             </el-form-item>
-            <el-form-item label="类型" prop="discountWay">
+            <el-form-item prop="discountWay">
                 <el-select v-model="queryParams.discountWay" placeholder="请选择优惠券类型" clearable>
                     <el-option v-for="dict in dict.type.coupon_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="是否核销" prop="isUsed" v-if="isUsed != 'Y'">
+            <el-form-item prop="isUsed" v-if="isUsed != 'Y'">
                 <el-select v-model="queryParams.isUsed" placeholder="请选择是否核销" clearable>
                     <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="有效期">
+            <el-form-item>
                 <el-date-picker v-model="queryParams.duringDate" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="客户手机号" prop="appUserPhoneNumber">
+            <el-form-item prop="appUserPhoneNumber">
                 <el-input v-model="queryParams.appUserPhoneNumber" placeholder="请输入客户手机号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
@@ -41,35 +41,13 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['app:couponItem:add']">手动发送优惠券</el-button>
             </el-col>
-            <!--      <el-col :span="1.5">-->
-            <!--        <el-button-->
-            <!--          type="success"-->
-            <!--          plain-->
-            <!--          icon="el-icon-edit"-->
-            <!--           -->
-            <!--          :disabled="single"-->
-            <!--          @click="handleUpdate"-->
-            <!--          v-hasPermi="['app:couponItem:edit']"-->
-            <!--        >修改</el-button>-->
-            <!--      </el-col>-->
-            <!--      <el-col :span="1.5">-->
-            <!--        <el-button-->
-            <!--          type="danger"-->
-            <!--          plain-->
-            <!--          icon="el-icon-delete"-->
-            <!--           -->
-            <!--          :disabled="multiple"-->
-            <!--          @click="handleDelete"-->
-            <!--          v-hasPermi="['app:couponItem:remove']"-->
-            <!--        >删除</el-button>-->
-            <!--      </el-col>-->
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['app:couponItem:export']">导出</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="couponItemList">
+        <Page uri="/mapi/app/couponItem/list" :request-params="queryParams" ref="pagination">
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <el-table-column label="编号" align="center" prop="id" fixed="left" />
             <!--      <el-table-column label="订单编码" align="center" prop="orderNo" />-->
@@ -117,7 +95,7 @@
                     <!--          >删除</el-button>-->
                 </template>
             </el-table-column>
-        </el-table>
+        </Page>
 
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
@@ -210,8 +188,6 @@ export default {
             sendCouponOpen: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 orgIndex: null,
                 dateRange: []
             },
@@ -259,7 +235,6 @@ export default {
         },
         /** 查询优惠券列表 */
         getList() {
-            this.loading = true
             if (this.queryParams.orgIndex != null) {
                 this.queryParams.orgId = this.queryParams.orgIndex.split(',')[0]
                 this.queryParams.sourceType = this.queryParams.orgIndex.split(',')[1]
@@ -274,10 +249,8 @@ export default {
                 delete this.queryParams.startDate
                 delete this.queryParams.endDate
             }
-            listCouponItem(this.queryParams).then((response) => {
-                this.couponItemList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         getAllValidList(id) {
@@ -336,7 +309,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/coupon/sendCouponCount/index.vue

@@ -174,7 +174,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 11 - 25
src/views/coupon/thirdParty/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="第三方名称" prop="name" label-width="90px">
-                <el-input v-model="queryParams.name" placeholder="请输入三方名称" clearable @keyup.enter.native="handleQuery" />
+            <el-form-item prop="name" label-width="90px">
+                <el-input v-model="queryParams.name" placeholder="请输入三方品牌名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -14,17 +14,10 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['coupon:thirdParty:add']">新增</el-button>
             </el-col>
-            <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['coupon:thirdParty:edit']">修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['coupon:thirdParty:remove']">删除</el-button>
-            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="thirdPartyList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
+        <Page uri="/mapi/coupon/thirdParty/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="编号" align="center" prop="id" />
             <el-table-column label="第三方名称" align="center" prop="name" />
             <el-table-column label="状态" align="center" prop="status">
@@ -32,23 +25,22 @@
                     <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
                 </template>
             </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
                 <template slot-scope="scope">
                     <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['coupon:thirdParty:edit']">修改</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['coupon:thirdParty: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" />
+        </Page>
 
         <!-- 添加或修改APP第三方管理对话框 -->
         <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body>
             <el-row :gutter="15">
                 <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                     <el-col :span="24">
-                        <el-form-item label="第三方名称" prop="name">
-                            <el-input v-model="form.name" placeholder="请输入三方名称" maxlength="20" show-word-limit />
+                        <el-form-item label="三方品牌" prop="name">
+                            <el-input v-model="form.name" placeholder="请输入三方品牌名称" maxlength="20" show-word-limit />
                         </el-form-item>
                     </el-col>
                 </el-form>
@@ -90,8 +82,6 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 name: null,
                 status: null
             },
@@ -110,11 +100,8 @@ export default {
     methods: {
         /** 查询APP第三方管理列表 */
         getList() {
-            this.loading = true
-            listThirdParty(this.queryParams).then((response) => {
-                this.thirdPartyList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮
@@ -145,7 +132,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */
@@ -163,7 +149,7 @@ export default {
         handleAdd() {
             this.reset()
             this.open = true
-            this.title = '添加APP第三方管理'
+            this.title = '添加三方品牌'
         },
         /** 修改按钮操作 */
         handleUpdate(row) {
@@ -172,7 +158,7 @@ export default {
             getThirdParty(id).then((response) => {
                 this.form = response.data
                 this.open = true
-                this.title = '修改APP第三方管理'
+                this.title = '修改三方品牌'
             })
         },
 

+ 25 - 50
src/views/coupon/type/index.vue

@@ -1,21 +1,21 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="名称" prop="title">
+            <el-form-item prop="title">
                 <el-input v-model="queryParams.title" placeholder="请输入优惠券类型名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="类型" prop="discountWay">
+            <el-form-item prop="discountWay">
                 <el-select v-model="queryParams.discountWay" placeholder="请选择优惠券类型" clearable>
                     <el-option v-for="dict in dict.type.coupon_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="第三方类型" prop="couponTypeThirdPartyId" label-width="90px">
-                <el-select v-model="queryParams.couponTypeThirdPartyId" placeholder="请选择第三方类型" clearable>
+            <el-form-item prop="couponTypeThirdPartyId" label-width="90px">
+                <el-select v-model="queryParams.couponTypeThirdPartyId" placeholder="请选择三方品牌" clearable>
                     <el-option v-for="third in thirdPartyList" :key="third.id" :label="third.name" :value="third.id" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="有效期">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-form-item>
+                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="有效期开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -27,43 +27,33 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['coupon:type:add']">新增</el-button>
             </el-col>
-            <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['coupon:type:edit']">修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['coupon:type:remove']">删除</el-button>
-            </el-col>
-            <!--      <el-col :span="1.5">-->
-            <!--        <el-button-->
-            <!--          type="warning"-->
-            <!--          plain-->
-            <!--          icon="el-icon-download"-->
-            <!--           -->
-            <!--          @click="handleExport"-->
-            <!--          v-hasPermi="['coupon:type:export']"-->
-            <!--        >导出</el-button>-->
-            <!--      </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="typeList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" fixed="left" />
+        <Page uri="/mapi/coupon/type/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="编号" align="center" prop="id" width="80" />
             <el-table-column label="名称" align="center" prop="title" width="120" />
+            <el-table-column label="图片" align="center" prop="imgUrl" width="100">
+                <template slot-scope="scope">
+                    <image-preview :src="scope.row.imgUrl" :width="60" :height="60" />
+                </template>
+            </el-table-column>
             <el-table-column label="优惠券类型" align="center" prop="discountWay" width="120">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.coupon_type" :value="scope.row.discountWay" />
                 </template>
             </el-table-column>
-            <el-table-column label="描述" align="center" prop="description" width="180" :show-overflow-tooltip="true" />
-            <el-table-column label="图片" align="center" prop="imgUrl" width="120">
+            <el-table-column label="面额(元)" align="center" prop="deductAmount" width="150" />
+            <el-table-column label="有效期" align="center" prop="startDate" width="210">
+                <template slot-scope="scope"> {{ scope.row.startDate }} ~ {{ scope.row.endDate }} </template>
+            </el-table-column>
+            <el-table-column label="三方品牌" align="center" prop="couponTypeThirdPartyId" width="140">
                 <template slot-scope="scope">
-                    <image-preview :src="scope.row.imgUrl" :width="50" :height="50" />
+                    <div v-for="third in thirdPartyList" :key="third.id">
+                        <span v-if="scope.row.couponTypeThirdPartyId == third.id">{{ third.name }}</span>
+                    </div>
                 </template>
             </el-table-column>
-            <el-table-column label="有效期开始日期" align="center" prop="startDate" width="180"> </el-table-column>
-            <el-table-column label="有效期结束日期" align="center" prop="endDate" width="180"> </el-table-column>
-
             <el-table-column label="是否单件抵扣券" align="center" prop="isUnique" width="150">
                 <template slot-scope="scope">
                     <div v-if="scope.row.discountWay != '2'">
@@ -77,14 +67,6 @@
                     <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.canManual" />
                 </template>
             </el-table-column>
-            <el-table-column label="第三方类型" align="center" prop="couponTypeThirdPartyId" width="140">
-                <template slot-scope="scope">
-                    <div v-for="third in thirdPartyList" :key="third.id">
-                        <span v-if="scope.row.couponTypeThirdPartyId == third.id">{{ third.name }}</span>
-                    </div>
-                </template>
-            </el-table-column>
-            <el-table-column label="抵用金额(元)" align="center" prop="deductAmount" width="150" />
             <el-table-column label="状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -97,9 +79,7 @@
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['coupon:type: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" />
+        </Page>
 
         <!-- 添加或修改优惠券类型对话框 -->
         <el-dialog :title="title" :visible.sync="open" size="50%" append-to-body>
@@ -188,8 +168,8 @@
                         </el-col>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="第三方类型" prop="couponTypeThirdPartyId" label-width="100px">
-                            <el-select v-model="form.couponTypeThirdPartyId" placeholder="请选择第三方类型" clearable style="width: 300px">
+                        <el-form-item label="三方品牌" prop="couponTypeThirdPartyId" label-width="100px">
+                            <el-select v-model="form.couponTypeThirdPartyId" placeholder="请选择三方品牌" clearable style="width: 300px">
                                 <el-option v-for="third in thirdPartyList" :key="third.id" :label="third.name" :value="third.id" />
                             </el-select>
                         </el-form-item>
@@ -256,8 +236,6 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 title: null,
                 startDate: null,
                 endDate: null
@@ -307,10 +285,8 @@ export default {
                 delete this.queryParams.startDate
                 delete this.queryParams.endDate
             }
-            listType(this.queryParams).then((response) => {
-                this.typeList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮
@@ -355,7 +331,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/coupon/typeApplyCloth/index.vue

@@ -204,7 +204,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/generator/form/index.vue

@@ -141,7 +141,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/goods/commonGoods/index.vue

@@ -329,7 +329,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/goods/goodsComment/index.vue

@@ -337,7 +337,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/recharge/balanceCount/index.vue

@@ -151,7 +151,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/recharge/batchRecord/cardDetail.vue

@@ -286,7 +286,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 4 - 5
src/views/recharge/batchRecord/index.vue

@@ -1,16 +1,16 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88x">
-            <el-form-item label="批次号" prop="batchNo">
+            <el-form-item prop="batchNo">
                 <el-input v-model="queryParams.batchNo" placeholder="请输入批次号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="批次名称" prop="batchName">
+            <el-form-item prop="batchName">
                 <el-input v-model="queryParams.batchName" placeholder="请输入批次名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="到期时间" prop="lastExpireTime">
+            <el-form-item prop="lastExpireTime">
                 <el-date-picker v-model="queryParams.lastExpireTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="使用优先级" prop="lastUseLevel">
+            <el-form-item prop="lastUseLevel">
                 <el-radio-group v-model="queryParams.lastUseLevel">
                     <el-radio-button :key="0" :label="0">正常</el-radio-button>
                     <el-radio-button :key="1" :label="1">优先扣款</el-radio-button>
@@ -258,7 +258,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/recharge/batchRecord/useRecord.vue

@@ -200,7 +200,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 10 - 17
src/views/recharge/card/index.vue

@@ -1,24 +1,24 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="卡号" prop="cardNo">
+            <el-form-item prop="cardNo">
                 <el-input v-model="queryParams.cardNo" placeholder="请输入卡号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="使用状态" prop="rechargeStatus">
+            <el-form-item prop="rechargeStatus">
                 <el-select v-model="queryParams.rechargeStatus" placeholder="请选择使用状态" clearable>
                     <el-option v-for="dict in dict.type.recharge_use_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="充值时间">
+            <el-form-item>
                 <el-date-picker v-model="daterangeRechargeTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="赠送金额激活时间" label-width="130px">
+            <el-form-item label-width="130px">
                 <el-date-picker v-model="daterangeGiveActiveTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="到期时间">
+            <el-form-item>
                 <el-date-picker v-model="daterangeExpireTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="创建时间">
+            <el-form-item>
                 <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
             <el-form-item>
@@ -40,7 +40,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="cardList">
+        <Page uri="/mapi/recharge/card/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="卡号" align="center" prop="cardNo" width="180" fixed="left" />
             <el-table-column label="密码卡版本" align="center" prop="cardVersionTitle" width="150">
                 <template slot-scope="scope">
@@ -94,9 +94,7 @@
                     <el-button type="text" @click="handleDetail(scope.row)" v-if="scope.row.rechargeStatus == 1">消费明细</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" />
+        </Page>
 
         <!-- 充值卡导入对话框 -->
         <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
@@ -217,8 +215,6 @@ export default {
             daterangeGiveActiveTime: [],
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 cardNo: null,
                 rechargeStatus: null,
                 rechargeTime: null,
@@ -306,10 +302,8 @@ export default {
                 delete this.queryParams.beginCreateTime
                 delete this.queryParams.endCreateTime
             }
-            listCard(this.queryParams).then((response) => {
-                this.cardList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮
@@ -348,7 +342,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 8 - 33
src/views/recharge/cardVersion/index.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="名称" prop="title">
+            <el-form-item prop="title">
                 <el-input v-model="queryParams.title" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="编号" prop="code">
+            <el-form-item prop="code">
                 <el-input v-model="queryParams.code" placeholder="请输入编号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
@@ -17,27 +17,11 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['recharge:cardVersion:add']">新增</el-button>
             </el-col>
-            <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['recharge:cardVersion:edit']">修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['recharge:cardVersion:remove']">删除</el-button>
-            </el-col>
-            <!--      <el-col :span="1.5">-->
-            <!--        <el-button-->
-            <!--          type="warning"-->
-            <!--          plain-->
-            <!--          icon="el-icon-download"-->
-            <!--           -->
-            <!--          @click="handleExport"-->
-            <!--          v-hasPermi="['recharge:cardVersion:export']"-->
-            <!--        >导出</el-button>-->
-            <!--      </el-col>-->
+
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="cardVersionList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
+        <Page uri="/mapi/recharge/cardVersion/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="编号" align="center" prop="id" />
             <el-table-column label="名称" align="center" prop="title" />
             <el-table-column label="编号" align="center" prop="code" />
@@ -54,14 +38,11 @@
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['recharge:cardVersion:edit']">修改</el-button>
-                    <el-button type="text" icon="el-icon-document-copy" @click="handleMultiInsert(scope.row)" v-hasPermi="['recharge:card:add']">一键生成充值卡</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['recharge:cardVersion:remove']">删除</el-button>
+                    <el-button type="text" icon="el-icon-document-copy" @click="handleMultiInsert(scope.row)" v-hasPermi="['recharge:card:add']">一键生成充值卡</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" />
-
+        </Page>
         <!-- 添加或修改充值卡版本对话框 -->
         <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body>
             <el-row :gutter="15">
@@ -196,8 +177,6 @@ export default {
             multiInsertOpen: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 title: null,
                 code: null
             },
@@ -231,11 +210,8 @@ export default {
     methods: {
         /** 查询充值卡版本列表 */
         getList() {
-            this.loading = true
-            listCardVersion(this.queryParams).then((response) => {
-                this.cardVersionList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮
@@ -280,7 +256,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 6 - 13
src/views/recharge/cashStatement/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="创建时间">
+            <el-form-item>
                 <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
             <el-form-item>
@@ -13,7 +13,8 @@
         <el-row :gutter="10" class="mb8">
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="clothOrderList" style="margin-top: 10px">
+
+        <Page uri="/mapi/recharge/card/getBillMstrInfoList" :request-params="queryParams" ref="pagination">
             <el-table-column label="订单编号" align="center" prop="orderNo" width="200" fixed="left" />
             <el-table-column label="订单类型" align="center" prop="orderType" width="100">
                 <template slot-scope="scope">
@@ -59,9 +60,7 @@
                     {{ scope.row.isRefund == 'Y' && scope.row.welfarePayAmount.toString() != '0' ? '退款:' + scope.row.welfarePayAmount.toString().replace('-', '') : scope.row.welfarePayAmount.toString().replace('-', '') }}
                 </template>
             </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </Page>
     </div>
 </template>
 
@@ -93,8 +92,6 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 phoneNumber: null,
                 userId: null,
                 beginCreateTime: '',
@@ -116,7 +113,6 @@ export default {
     },
     methods: {
         getList() {
-            this.loading = true
             if (null != this.createTimeRange && '' != this.createTimeRange) {
                 this.queryParams['beginCreateTime'] = this.createTimeRange[0]
                 this.queryParams['endCreateTime'] = this.createTimeRange[1]
@@ -124,10 +120,8 @@ export default {
                 delete this.queryParams.beginCreateTime
                 delete this.queryParams.endCreateTime
             }
-            getBillMstrInfoList(this.queryParams).then((response) => {
-                this.clothOrderList = response.data.records
-                this.total = response.data.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮
@@ -141,7 +135,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 25 - 32
src/views/recharge/order/index.vue

@@ -1,21 +1,21 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-            <el-form-item label="订单编号" prop="orderNo" v-if="userInfoVO.userType == '00'">
+            <el-form-item prop="orderNo" v-if="userInfoVO.userType == '00'">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="客户姓名" prop="realName">
+            <el-form-item prop="realName">
                 <el-input v-model="queryParams.realName" placeholder="请输入客户姓名" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="手机号" prop="phoneNumber">
+            <el-form-item prop="phoneNumber">
                 <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="订单状态" prop="orderStatus">
+            <el-form-item prop="orderStatus">
                 <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
                     <el-option v-for="dict in dict.type.recharge_order_status" :key="dict.code" :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="门店名称" prop="orgId" v-if="userInfoVO.userType == '00'">
+            <el-form-item prop="orgId" v-if="userInfoVO.userType == '00'">
                 <el-select v-model="queryParams.orgId" placeholder="请选择" filterable clearable>
                     <el-option-group label="门店">
                         <template>
@@ -24,11 +24,12 @@
                     </el-option-group>
                 </el-select>
             </el-form-item>
-            <el-form-item label="支付时间">
-                <el-date-picker clearable v-model="queryPayTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="getPayTime"> </el-date-picker>
+            <div></div>
+            <el-form-item>
+                <el-date-picker clearable v-model="queryPayTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="付款时间" end-placeholder="结束日期" @change="getPayTime"> </el-date-picker>
             </el-form-item>
-            <el-form-item label="下单时间">
-                <el-date-picker clearable v-model="queryCreateTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="getCreateTime"> </el-date-picker>
+            <el-form-item>
+                <el-date-picker clearable v-model="queryCreateTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="下单时间" end-placeholder="结束日期" @change="getCreateTime"> </el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -43,10 +44,21 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="orderList" @selection-change="handleSelectionChange">
+        <Page uri="/mapi/recharge/order/list" :request-params="queryParams" ref="pagination">
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <!--      <el-table-column label="主键ID" align="center" prop="id" />-->
             <el-table-column label="订单编号" align="center" width="190" prop="orderNo" />
+            <el-table-column label="下单门店" align="center" v-if="userInfoVO.userType == '00'">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.sourceType === '01'">
+                        {{ scope.row.factoryName }}
+                    </span>
+                    <span v-if="scope.row.sourceType === '02'">
+                        {{ scope.row.storeName }}
+                    </span>
+                    <span v-if="scope.row.sourceType === '00'"> </span>
+                </template>
+            </el-table-column>
             <el-table-column label="客户姓名" align="center" prop="realName" />
             <el-table-column label="客户手机号" align="center" prop="phoneNumber" width="110" />
             <el-table-column label="总金额(元)" align="center" width="100">
@@ -75,26 +87,13 @@
             </el-table-column>
             <el-table-column label="支付时间" align="center" prop="payTime" width="180" />
             <el-table-column label="下单时间" align="center" prop="createTime" width="180" />
-            <el-table-column label="门店名称" align="center" v-if="userInfoVO.userType == '00'">
-                <template slot-scope="scope">
-                    <span v-if="scope.row.sourceType === '01'">
-                        {{ scope.row.factoryName }}
-                    </span>
-                    <span v-if="scope.row.sourceType === '02'">
-                        {{ scope.row.storeName }}
-                    </span>
-                    <span v-if="scope.row.sourceType === '00'"> </span>
-                </template>
-            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
                 <template slot-scope="scope">
                     <el-button type="text" @click="handleDetail(scope.row)">支付明细</el-button>
                     <el-button type="text" @click="refundOrder(scope.row)" v-if="userInfoVO.userType == '00' && scope.row.refundStatus != '1' && scope.row.refundStatus != '2' && scope.row.orderStatus != '0' && scope.row.orderStatus != '100'">撤单</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" />
+        </Page>
 
         <!-- 添加或修改活动订单对话框 -->
         <el-dialog :title="title" :visible.sync="open" size="40%">
@@ -165,8 +164,6 @@ export default {
             openRefundPage: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 orderNo: null,
                 sourceType: null,
                 orgId: null,
@@ -219,11 +216,8 @@ export default {
         },
         /** 查询充值订单列表 */
         getList() {
-            this.loading = true
-            listOrder(this.queryParams).then((response) => {
-                this.orderList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮
@@ -238,7 +232,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 8 - 16
src/views/recharge/refund/index.vue

@@ -1,16 +1,16 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="订单编号" prop="orderNo">
+            <el-form-item prop="orderNo">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="手机号" prop="phoneNumber">
+            <el-form-item prop="phoneNumber">
                 <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="客户姓名" prop="realName">
+            <el-form-item prop="realName">
                 <el-input v-model="queryParams.realName" placeholder="请输入客户姓名" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="门店名称" prop="storeName">
+            <el-form-item prop="storeName">
                 <el-input v-model="queryParams.storeName" placeholder="请输入组门店名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
@@ -64,7 +64,7 @@
             <!--      </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="refundList" @selection-change="handleSelectionChange">
+        <Page uri="/mapi/recharge/refund/list" :request-params="queryParams" ref="pagination">
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <!--      <el-table-column label="主键ID" align="center" prop="id" />-->
             <el-table-column label="订单编号" align="center" prop="orderNo" />
@@ -107,9 +107,7 @@
                     <el-button type="text" icon="el-icon-check" @click="handleApprovalYes(scope.row)" v-hasPermi="['recharge:order:edit']">同意退卡</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" />
+        </Page>
 
         <!-- 添加或修改充值订单对话框 -->
         <el-dialog :title="title" :visible.sync="open" size="30%" append-to-body>
@@ -212,8 +210,6 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 orderNo: null,
                 orgId: null,
                 storeName: null,
@@ -232,11 +228,8 @@ export default {
     methods: {
         /** 查询充值订单列表 */
         getList() {
-            this.loading = true
-            listRefund(this.queryParams).then((response) => {
-                this.refundList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮
@@ -281,7 +274,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 12 - 37
src/views/recharge/type/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="标题" prop="title">
+            <el-form-item prop="title">
                 <el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
@@ -14,27 +14,11 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['recharge:type:add']">新增</el-button>
             </el-col>
-            <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['recharge:type:edit']">修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['recharge:type:remove']">删除</el-button>
-            </el-col>
-            <!--      <el-col :span="1.5">-->
-            <!--        <el-button-->
-            <!--          type="warning"-->
-            <!--          plain-->
-            <!--          icon="el-icon-download"-->
-            <!--           -->
-            <!--          @click="handleExport"-->
-            <!--          v-hasPermi="['recharge:type:export']"-->
-            <!--        >导出</el-button>-->
-            <!--      </el-col>-->
+
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="typeList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
+        <Page uri="/mapi/recharge/type/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="编号" align="center" prop="id" />
             <el-table-column label="标题" align="center" prop="title" />
             <el-table-column label="充值金额(元)" align="center" prop="rechargeAmount" />
@@ -52,22 +36,19 @@
                     <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="修改人" align="center" prop="updateBy" />
-            <el-table-column label="修改时间" align="center" prop="updateTime" width="180">
-                <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-                </template>
-            </el-table-column>
+            <!--            <el-table-column label="修改人" align="center" prop="updateBy" />-->
+            <!--            <el-table-column label="修改时间" align="center" prop="updateTime" width="180">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    <span>{{ parseTime(scope.row.updateTime, '{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 type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['recharge:type:edit']">修改</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['recharge:type: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" />
-
+        </Page>
         <!-- 添加或修改充值规则管理对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
             <el-row :gutter="15">
@@ -133,8 +114,6 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 title: null
             },
             // 表单参数
@@ -158,11 +137,8 @@ export default {
     methods: {
         /** 查询充值规则管理列表 */
         getList() {
-            this.loading = true
-            listType(this.queryParams).then((response) => {
-                this.typeList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮
@@ -193,7 +169,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/refund/refundRechargeOrder/index.vue

@@ -225,7 +225,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 269 - 322
src/views/refund/refundRetailOrder/index.vue

@@ -1,344 +1,291 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单编号" prop="orderNo">
-        <el-input
-          v-model="queryParams.orderNo"
-          placeholder="请输入订单编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户姓名" prop="realName">
-        <el-input
-          v-model="queryParams.realName"
-          placeholder="请输入客户姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phoneNumber">
-        <el-input
-          v-model="queryParams.phoneNumber"
-          placeholder="请输入手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款状态" prop="refundStatus">
-        <el-select v-model="queryParams.refundStatus" placeholder="请选择支付状态" clearable>
-          <el-option v-for="dict in dict.type.goods_order_refund_status"
-                     :key="dict.value"
-                     :label="dict.label"
-                     :value="dict.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search"   @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh"   @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-           
-          @click="handleExport"
-          v-hasPermi="['order:goods:export']"
-          v-if="userInfoVO.userType == '00'"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="orderLoading" :data="GoodsList" >
-      <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
-      <el-table-column label="订单编号" align="center" prop="orderNo" width="190"/>
-      <el-table-column label="客户姓名" align="center" prop="realName" width="80px"/>
-      <el-table-column label="手机号" align="center" prop="phoneNumber" width="110px"/>
-      <el-table-column label="订单总价(元)" align="center" prop="totalPrice" width="120px"/>
-      <el-table-column label="抵扣金额(元)" align="center" prop="deductAmount" width="120px">
-        <template slot-scope="scope">
-          {{scope.row.deductAmount?scope.row.deductAmount:'0'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="120px"/>
-      <el-table-column label="订单状态" align="center" prop="orderStatus" width="90px">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="退款状态" align="center" prop="refundStatus" width="90px">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.goods_order_refund_status" :value="scope.row.refundStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="退款金额(元)" align="center" prop="refundAmount" width="120px"/>
-      <el-table-column label="退款描述" align="center" prop="refundReason"  show-overflow-tooltip/>
-      <el-table-column label="退款时间" align="center" prop="refundTime" width="180"/>
-      <el-table-column label="支付方式" align="center" prop="payType" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="下单时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="支付时间" align="center" prop="payTime" width="180"/>
-      <!--      <el-table-column label="发货时间" align="center" prop="sendTime" width="200px"/>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="250">
-        <template slot-scope="scope">
-          <el-button
-             
-            type="text"
-            icon="el-icon-check"
-            @click="approvalYes(scope.row)"
-            v-if="scope.row.refundStatus == '1' && userInfoVO.userType == '00'"
-          >退款审核同意</el-button>
-          <el-button
-             
-            type="text"
-            icon="el-icon-close"
-            @click="approvalNo(scope.row)"
-            v-if="scope.row.refundStatus == '1' && userInfoVO.userType == '00'"
-          >退款审核驳回</el-button>
-          <el-button
-             
-            type="text"
-            icon="el-icon-chat-dot-square"
-            @click="orderDetail(scope.row)"
-          >订单详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="订单编号" prop="orderNo">
+                <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="客户姓名" prop="realName">
+                <el-input v-model="queryParams.realName" placeholder="请输入客户姓名" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="手机号" prop="phoneNumber">
+                <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="退款状态" prop="refundStatus">
+                <el-select v-model="queryParams.refundStatus" placeholder="请选择支付状态" clearable>
+                    <el-option v-for="dict in dict.type.goods_order_refund_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:goods:export']" v-if="userInfoVO.userType == '00'">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
+        <el-table v-loading="orderLoading" :data="GoodsList">
+            <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
+            <el-table-column label="订单编号" align="center" prop="orderNo" width="190" />
+            <el-table-column label="客户姓名" align="center" prop="realName" width="80px" />
+            <el-table-column label="手机号" align="center" prop="phoneNumber" width="110px" />
+            <el-table-column label="订单总价(元)" align="center" prop="totalPrice" width="120px" />
+            <el-table-column label="抵扣金额(元)" align="center" prop="deductAmount" width="120px">
+                <template slot-scope="scope">
+                    {{ scope.row.deductAmount ? scope.row.deductAmount : '0' }}
+                </template>
+            </el-table-column>
+            <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="120px" />
+            <el-table-column label="订单状态" align="center" prop="orderStatus" width="90px">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
+                </template>
+            </el-table-column>
+            <el-table-column label="退款状态" align="center" prop="refundStatus" width="90px">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.goods_order_refund_status" :value="scope.row.refundStatus" />
+                </template>
+            </el-table-column>
+            <el-table-column label="退款金额(元)" align="center" prop="refundAmount" width="120px" />
+            <el-table-column label="退款描述" align="center" prop="refundReason" show-overflow-tooltip />
+            <el-table-column label="退款时间" align="center" prop="refundTime" width="180" />
+            <el-table-column label="支付方式" align="center" prop="payType">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
+                </template>
+            </el-table-column>
+            <el-table-column label="下单时间" align="center" prop="createTime" width="180" />
+            <el-table-column label="支付时间" align="center" prop="payTime" width="180" />
+            <!--      <el-table-column label="发货时间" align="center" prop="sendTime" width="200px"/>-->
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="250">
+                <template slot-scope="scope">
+                    <el-button type="text" icon="el-icon-check" @click="approvalYes(scope.row)" v-if="scope.row.refundStatus == '1' && userInfoVO.userType == '00'">退款审核同意</el-button>
+                    <el-button type="text" icon="el-icon-close" @click="approvalNo(scope.row)" v-if="scope.row.refundStatus == '1' && userInfoVO.userType == '00'">退款审核驳回</el-button>
+                    <el-button type="text" icon="el-icon-chat-dot-square" @click="orderDetail(scope.row)">订单详情</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <!--    详情-->
-    <el-dialog :title="detailTitle" :visible.sync="openDetail" width="80%" >
-      <el-card >
-        <el-descriptions title="客户信息"   v-show="detailView" :column="3" border
-                         :label-style="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">
-          <el-descriptions-item label="客户姓名">{{detailView.realName}}</el-descriptions-item>
-          <el-descriptions-item label="客户手机号">{{detailView.phoneNumber }}</el-descriptions-item>
-          <el-descriptions-item label="订单状态">
-            <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus"/>
-          </el-descriptions-item>
-          <el-descriptions-item label="收货联系人">{{detailView.contactName?detailView.contactName:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="收货人手机号">{{detailView.contactPhone?detailView.contactPhone:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="下单时间">{{detailView.createTime?detailView.createTime:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="支付时间">{{detailView.payTime?detailView.payTime:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="发货时间">{{detailView.sendTime?detailView.sendTime:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="确认收货时间">{{detailView.finishTime?detailView.finishTime:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="订单总价">{{detailView.totalPrice?detailView.totalPrice:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="物流公司">{{detailView.deliveryCompany?detailView.deliveryCompany:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="物流单号">{{detailView.totalPrice?detailView.totalPrice:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="收货地址" span="3">{{detailView.province }}{{ detailView.city }}{{ detailView.area }}{{detailView.address }}{{ detailView.addressDetail }}</el-descriptions-item>
-          <el-descriptions-item label="备注信息" span="3">{{detailView.deliveryNo?detailView.deliveryNo:'暂无信息'}}</el-descriptions-item>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
-        </el-descriptions>
-      </el-card>
-      <div class="head-column2">
-        <el-table v-loading="detailLoading" :data="detailView.orderGoodsSkuList">
-          <el-table-column label="分类" align="center" prop="goodsCategoryName" />
-          <el-table-column :label="goodsType==0?'商品名称':'材料名称'" align="center" prop="goodsName" width="250px"/>
-          <el-table-column :label="goodsType==0?'商品规格':'材料规格'" align="center" width="250px">
-            <template slot-scope="scope">
-              <div style="text-align: center">{{scope.row.skuName.replace(' ','/')}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="数量" align="center" prop="buyNum"/>
-          <el-table-column label="价格(元)" align="center" prop="marketPrice" />
-          <el-table-column label="总和(元)" align="center" >
-            <template slot-scope="scope">
-              <span>{{ scope.row.buyNum * scope.row.marketPrice }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <el-row :gutter="10" class="box-shadow" style="margin-top: 10px">
-        <el-col :span="21">
-          <el-form label-width="130px" style="height: 80px;padding-top: 20px;text-align: right" :inline="true" size="small">
-            <el-form-item label="总金额(元):" >
-              {{ costTotalPrice }}
-            </el-form-item>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
+        <!--    详情-->
+        <el-dialog :title="detailTitle" :visible.sync="openDetail" width="80%">
+            <el-card>
+                <el-descriptions title="客户信息" v-show="detailView" :column="3" border :label-style="{ 'text-align': 'center' }" :contentStyle="{ 'text-align': 'center' }">
+                    <el-descriptions-item label="客户姓名">{{ detailView.realName }}</el-descriptions-item>
+                    <el-descriptions-item label="客户手机号">{{ detailView.phoneNumber }}</el-descriptions-item>
+                    <el-descriptions-item label="订单状态">
+                        <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus" />
+                    </el-descriptions-item>
+                    <el-descriptions-item label="收货联系人">{{ detailView.contactName ? detailView.contactName : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="收货人手机号">{{ detailView.contactPhone ? detailView.contactPhone : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="下单时间">{{ detailView.createTime ? detailView.createTime : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="支付时间">{{ detailView.payTime ? detailView.payTime : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="发货时间">{{ detailView.sendTime ? detailView.sendTime : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="确认收货时间">{{ detailView.finishTime ? detailView.finishTime : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="订单总价">{{ detailView.totalPrice ? detailView.totalPrice : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="物流公司">{{ detailView.deliveryCompany ? detailView.deliveryCompany : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="物流单号">{{ detailView.totalPrice ? detailView.totalPrice : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="收货地址" span="3">{{ detailView.province }}{{ detailView.city }}{{ detailView.area }}{{ detailView.address }}{{ detailView.addressDetail }}</el-descriptions-item>
+                    <el-descriptions-item label="备注信息" span="3">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }}</el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div class="head-column2">
+                <el-table v-loading="detailLoading" :data="detailView.orderGoodsSkuList">
+                    <el-table-column label="分类" align="center" prop="goodsCategoryName" />
+                    <el-table-column :label="goodsType == 0 ? '商品名称' : '材料名称'" align="center" prop="goodsName" width="250px" />
+                    <el-table-column :label="goodsType == 0 ? '商品规格' : '材料规格'" align="center" width="250px">
+                        <template slot-scope="scope">
+                            <div style="text-align: center">{{ scope.row.skuName.replace(' ', '/') }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="数量" align="center" prop="buyNum" />
+                    <el-table-column label="价格(元)" align="center" prop="marketPrice" />
+                    <el-table-column label="总和(元)" align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.buyNum * scope.row.marketPrice }}</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <el-row :gutter="10" class="box-shadow" style="margin-top: 10px">
+                <el-col :span="21">
+                    <el-form label-width="130px" style="height: 80px; padding-top: 20px; text-align: right" :inline="true" size="small">
+                        <el-form-item label="总金额(元):">
+                            {{ costTotalPrice }}
+                        </el-form-item>
+                    </el-form>
+                </el-col>
+            </el-row>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import {
-  cancelOrder,
-  getGoods,
-  listGoods,
-  outOrderGoods,
-  refundApprovalPass, refundApprovalReject,
-  refundOrderGoodsList,
-  rePayOrder
-} from '@/api/order/goods'
+import { cancelOrder, getGoods, listGoods, outOrderGoods, refundApprovalPass, refundApprovalReject, refundOrderGoodsList, rePayOrder } from '@/api/order/goods'
 import { findUserByPhoneNumber, getUser } from '@/api/app/user'
 
-
-
 export default {
-  name: "refundRetailOrder",
-  dicts:['order_goods_status','delivery_company','recharge_pay_type','goods_order_refund_status'],
-  data() {
-    return {
-      userInfoVO:null,
-      orderLoading: true,
-      // 遮罩层
-      loading: false,
-      detailLoading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 弹出层标题
-      title: "",
-      detailTitle:"",
-      // 是否显示弹出层
-      openDetail:false,
-      openApprovalPage:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        realName:null,
-        phoneNumber:null,
-        orderNo:null,
-        refundStatus:null,
-      },
-      // 表单参数
-      payFrom: {
-      },
-      // 表单校验
-      rules: {
-      },
-      goodsType:null,
-      // 商品订单表格数据
-      GoodsList: [],
-      // 可选商品集合
-      goodsList: null,
-      // 总金额
-      totalPrice:0,
-      // 总件数
-      totalCount:0,
-      // 详情数据
-      detailView: {},
-      // detailList:[],
-      // 详情总金额
-      costTotalPrice: null,
-    };
-  },
-  created() {
-    this.handleUser();
-    this.goodsType = this.getUrlParam('goodsType');
-    this.getList();
-  },
-  methods: {
-    handleUser(){
-      this.userInfoVO = this.getUserInfo();
-    },
-    getList() {
-      this.orderLoading = true;
-      refundOrderGoodsList({...this.queryParams,...{goodsType:this.goodsType}}).then(response => {
-        this.GoodsList = response.rows;
-        this.total = response.total;
-        this.orderLoading = false;
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+    name: 'refundRetailOrder',
+    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type', 'goods_order_refund_status'],
+    data() {
+        return {
+            userInfoVO: null,
+            orderLoading: true,
+            // 遮罩层
+            loading: false,
+            detailLoading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 弹出层标题
+            title: '',
+            detailTitle: '',
+            // 是否显示弹出层
+            openDetail: false,
+            openApprovalPage: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                realName: null,
+                phoneNumber: null,
+                orderNo: null,
+                refundStatus: null
+            },
+            // 表单参数
+            payFrom: {},
+            // 表单校验
+            rules: {},
+            goodsType: null,
+            // 商品订单表格数据
+            GoodsList: [],
+            // 可选商品集合
+            goodsList: null,
+            // 总金额
+            totalPrice: 0,
+            // 总件数
+            totalCount: 0,
+            // 详情数据
+            detailView: {},
+            // detailList:[],
+            // 详情总金额
+            costTotalPrice: null
+        }
     },
-    // 订单详情
-    orderDetail(row){
-      this.openDetail = true;
-      this.detailTitle = '订单商品详情';
-      this.detailLoading = true;
-      this.detailView = {};
-      const id = row.id
-      getGoods(id).then(response => {
-        this.detailView = response.data;
-        this.costTotalPrice = this.detailView.totalPrice;
-        this.detailLoading = false;
-      });
+    created() {
+        this.handleUser()
+        this.goodsType = this.getUrlParam('goodsType')
+        this.getList()
     },
-    approvalYes(row){
-      this.$confirm('是否确认同意退款申请?').then(() => {
-        refundApprovalPass({"orderId":row.id}).then(response2 => {
-          this.$message.success("操作成功");
-          this.getList();
-        });
-      }).catch(() => {});
-    },
-    approvalNo(row){
-      this.$confirm('是否确认驳回退款申请?').then(() => {
-        refundApprovalReject({"orderId":row.id}).then(response2 => {
-          this.$message.success("操作成功");
-          this.getList();
-        });
-      }).catch(() => {});
-    },
-    checkClose(done) {
-      this.$confirm('是否关闭支付页面,放弃支付?').then(function() {
-        done()
-      }).then(() => {}).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('mapi/order/goods/exportByRefund', {
-        ...this.queryParams, ...{ goodsType: this.goodsType }
-      }, `goods_orderRefund_${new Date().getTime()}.xlsx`)
-    },
-  }
-};
+    methods: {
+        handleUser() {
+            this.userInfoVO = this.getUserInfo()
+        },
+        getList() {
+            this.orderLoading = true
+            refundOrderGoodsList({ ...this.queryParams, ...{ goodsType: this.goodsType } }).then((response) => {
+                this.GoodsList = response.rows
+                this.total = response.total
+                this.orderLoading = false
+            })
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        // 订单详情
+        orderDetail(row) {
+            this.openDetail = true
+            this.detailTitle = '订单商品详情'
+            this.detailLoading = true
+            this.detailView = {}
+            const id = row.id
+            getGoods(id).then((response) => {
+                this.detailView = response.data
+                this.costTotalPrice = this.detailView.totalPrice
+                this.detailLoading = false
+            })
+        },
+        approvalYes(row) {
+            this.$confirm('是否确认同意退款申请?')
+                .then(() => {
+                    refundApprovalPass({ orderId: row.id }).then((response2) => {
+                        this.$message.success('操作成功')
+                        this.getList()
+                    })
+                })
+                .catch(() => {})
+        },
+        approvalNo(row) {
+            this.$confirm('是否确认驳回退款申请?')
+                .then(() => {
+                    refundApprovalReject({ orderId: row.id }).then((response2) => {
+                        this.$message.success('操作成功')
+                        this.getList()
+                    })
+                })
+                .catch(() => {})
+        },
+        checkClose(done) {
+            this.$confirm('是否关闭支付页面,放弃支付?')
+                .then(function () {
+                    done()
+                })
+                .then(() => {})
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'mapi/order/goods/exportByRefund',
+                {
+                    ...this.queryParams,
+                    ...{ goodsType: this.goodsType }
+                },
+                `goods_orderRefund_${new Date().getTime()}.xlsx`
+            )
+        }
+    }
+}
 </script>
 <style>
 .list_title {
-  text-align: center;
-  line-height: 40px;
+    text-align: center;
+    line-height: 40px;
 }
-.head-container-two{
-  height: 500px;
-  display: block;
-  overflow-y: scroll;
+.head-container-two {
+    height: 500px;
+    display: block;
+    overflow-y: scroll;
 }
-.head-column1{
-  height: 300px;
-  display: block;
-  overflow-y: scroll;
+.head-column1 {
+    height: 300px;
+    display: block;
+    overflow-y: scroll;
 }
-.head-column2{
-  height: 600px;
-  display: block;
-  overflow-y: scroll;
+.head-column2 {
+    height: 600px;
+    display: block;
+    overflow-y: scroll;
 }
-.box-shadow .el-button--medium{
-  font-size: 18px;
+.box-shadow .el-button--medium {
+    font-size: 18px;
 }
 </style>

+ 0 - 1
src/views/settlement/bill/index.vue

@@ -151,7 +151,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/workbench/workAppointmentOrder/index.vue

@@ -852,7 +852,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */

+ 0 - 1
src/views/workbench/workNotice/index.vue

@@ -131,7 +131,6 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 重置按钮操作 */