Changes

src/views/cloth/flawTop/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="flawId">
+            <el-form-item prop="flawId">
                 <el-select v-model="queryParams.flawId" placeholder="瑕疵" clearable>
                     <el-option v-for="item in flawList" :label="item.name" :value="item.id" :key="item.name"> </el-option>
                 </el-select>
@@ -17,7 +17,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="flawTopList">
+        <Page uri="/mapi/core/flawTop/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="衣服瑕疵置顶" align="center" prop="id" v-if="false" />
             <el-table-column label="瑕疵id" align="center" prop="flawId" v-if="false" />
             <el-table-column label="瑕疵名称" align="center" prop="flawName" />
@@ -29,9 +29,7 @@
                     <el-switch v-model="scope.row.isCheck" :active-value="1" :inactive-value="0" @change="handleUpdate(scope.row)" v-hasPermi="['cloth:flawTop:edit']">置顶</el-switch>
                 </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>
 
@@ -63,8 +61,6 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 flawId: null,
                 targetId: null,
                 type: null,
@@ -91,11 +87,8 @@ export default {
         },
         /** 查询衣服瑕疵置顶列表 */
         getList() {
-            this.loading = true
-            listFlawTop(this.queryParams).then((response) => {
-                this.flawTopList = response.rows
-                this.total = response.total
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮

src/views/recharge/cardVersion/index.vue

@@ -85,14 +85,17 @@
                         <el-form-item label="批次名称" prop="batchName" label-width="140px" required>
                             <el-input v-model="multiInsertForm.batchName" placeholder="请输入批次名称" style="width: 300px" />
                         </el-form-item>
+                        <el-form-item label="备注" prop="remark" label-width="140px" required>
+                            <el-input type="textarea" v-model="multiInsertForm.remark" placeholder="请输入备注" style="width: 300px" />
+                        </el-form-item>
                         <el-form-item label="过期时间" label-width="140px" required>
                             <el-date-picker v-model="multiInsertForm.expireTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker>
                         </el-form-item>
-                        <el-form-item label="客户星级" prop="starLevel" label-width="140px">
-                            <div style="margin-top: 8px">
-                                <el-rate v-model="multiInsertForm.starLevel"></el-rate>
-                            </div>
-                        </el-form-item>
+                        <!--                        <el-form-item label="客户星级" prop="starLevel" label-width="140px">-->
+                        <!--                            <div style="margin-top: 8px">-->
+                        <!--                                <el-rate v-model="multiInsertForm.starLevel"></el-rate>-->
+                        <!--                            </div>-->
+                        <!--                        </el-form-item>-->
                         <el-form-item label="优先扣款" prop="level" label-width="140px">
                             <el-radio-group v-model.number="multiInsertForm.level">
                                 <el-radio-button label="0">默认</el-radio-button>

src/views/recharge/type/index.vue

@@ -24,7 +24,7 @@
             <el-table-column label="充值金额（元）" align="center" prop="rechargeAmount" />
             <el-table-column label="赠送金额（元）" align="center" prop="giveAmount" />
             <el-table-column label="赠送积分" align="center" prop="givePointAmount" />
-            <el-table-column label="有效期（月）" align="center" prop="expireMonth" />
+            <el-table-column label="赠送有效期（月）" align="center" prop="expireMonth" />
             <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>
@@ -57,6 +57,9 @@
                         <el-form-item label="标题" prop="title">
                             <el-input v-model="form.title" placeholder="请输入标题" />
                         </el-form-item>
+                        <el-form-item label="备注" prop="remark">
+                            <el-input type="textarea" :rows="2" v-model="form.remark" placeholder="请输入标题" />
+                        </el-form-item>
                         <el-form-item label="充值金额（元）" prop="rechargeAmount">
                             <el-input-number v-model="form.rechargeAmount" placeholder="请输入充值金额" :precision="0" :min="0.01" :max="999999" />
                         </el-form-item>
@@ -66,7 +69,7 @@
                         <el-form-item label="赠送积分" prop="givePointAmount">
                             <el-input-number v-model="form.givePointAmount" placeholder="请输入赠送积分" :precision="0" :min="0" :max="999999" />
                         </el-form-item>
-                        <el-form-item label="有效期（月）" prop="expireMonth">
+                        <el-form-item label="赠送有效期（月）" prop="expireMonth">
                             <el-input-number v-model="form.expireMonth" placeholder="请输入有效期" :precision="0" :min="0" :max="999999" />
                         </el-form-item>
                         <el-form-item label="状态" prop="status">
@@ -252,7 +255,7 @@ export default {
         },
         handleStatusChange(row) {
             let text = row.status === '0' ? '启用' : '停用'
-            this.$confirm('确认要' + text + ' ' + row.name + ' 吗？')
+            this.$confirm('确认要' + text + '编号为 ' + row.id + ' 的数据吗？')
                 .then(function () {
                     return updateTypeStatus(row.id, row.status)
                 })

src/views/statistics/overtimeOrders.vue

@@ -1,17 +1,17 @@
 <template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="衣服条码" prop="washCode">
+            <el-form-item prop="washCode">
                 <el-input v-model="queryParams.washCode" placeholder="请输入衣服条码" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="取衣时间">
-                <el-date-picker v-model="takeClothTimeRange" 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="takeClothTimeRange" 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="clothItemName">
+            <el-form-item prop="clothItemName">
                 <el-input v-model="queryParams.clothItemName" placeholder="请输入衣服名称" clearable @keyup.enter.native="handleQuery" />
             </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>
 

src/views/system/user/index.vue

@@ -205,16 +205,16 @@
                             <el-date-picker clearable v-model="form.leaveDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择离职日期"> </el-date-picker>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8" v-if="sourceType == '01'">
+                    <el-col :span="8" v-if="sourceType == '00'">
                         <el-form-item label="所属工厂">
-                            <el-select v-model="form.factoryId"  placeholder="请选择工厂" clearable filterable >
+                            <el-select v-model="form.factoryId" placeholder="请选择工厂" clearable filterable>
                                 <el-option v-for="item in factoryList" :key="item.id" :label="item.factoryName" :value="item.id"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8" v-if="sourceType == '02'">
+                    <el-col :span="8" v-if="sourceType == '00'">
                         <el-form-item label="所属门店">
-                            <el-select v-model="form.storeId"  placeholder="请选择" clearable filterable> 
+                            <el-select v-model="form.storeId" placeholder="请选择" clearable filterable>
                                 <el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                             </el-select>
                         </el-form-item>

src/views/systemSet/purchaseGoods/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="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="orderStatus">
+            <el-form-item prop="orderStatus">
                 <el-select v-model="queryParams.orderStatus" placeholder="请选择支付状态" clearable>
                     <el-option v-for="dict in dict.type.purchase_order_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
@@ -22,7 +22,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="orderLoading" :data="purchaseGoodsList" @selection-change="handleSelectionChange">
+        <Page uri="/mapi/order/purchaseGoods/list" :request-params="queryParams" ref="pagination">
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <el-table-column label="订单编号" align="center" prop="orderNo" width="250px" />
             <el-table-column label="进货总价（元）" align="center" prop="costTotalPrice" width="200px" />
@@ -46,9 +46,7 @@
                     <el-button type="text" icon="el-icon-check" @click="confirmReceive(scope.row)" v-hasPermi="['order:purchaseGoods:edit']" v-if="scope.row.orderStatus == '3' || scope.row.orderStatus == '4'">确认收货</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="70%" append-to-body>
@@ -229,10 +227,7 @@ export default {
             open: false,
             openDetail: false,
             // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10
-            },
+            queryParams: {},
             // 表单参数
             form: {},
             // 表单校验
@@ -410,11 +405,9 @@ export default {
             this.getGoodsList()
         },
         getList() {
-            this.orderLoading = true
-            listPurchaseGoods({ ...this.queryParams, ...{ goodsType: this.goodsType } }).then((response) => {
-                this.purchaseGoodsList = response.rows
-                this.total = response.total
-                this.orderLoading = false
+            this.queryParams.goodsType = this.goodsType
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         getGoodsList() {