xuhaifeng 8 månader sedan
förälder
incheckning
8d2a1a4a29
4 ändrade filer med 493 tillägg och 586 borttagningar
  1. 5 2
      README.md
  2. 1 0
      package.json
  3. 12 6
      src/views/app/delivery/index.vue
  4. 475 578
      src/views/goods/goodsComment/index.vue

+ 5 - 2
README.md

@@ -13,9 +13,12 @@
 
 一七生活是一套全部开源的快速开发平台,毫无保留给个人及企业免费使用。
 
-1. 修改page  selectionChange多选时候要加
+0 去除laber标签
+1. 修改page  selectionChange 多选时候要加
+
+<Page uri="/mapi/core/clothItem/list" :request-params="queryParams" ref="pagination">
 <Page uri="/mapi/core/clothItem/list" :request-params="queryParams" ref="pagination" :selectionChange="handleSelectionChange">
-2. 去除分页查询相关字段
+2. 去除分页查询相关字段 pageNum
 
 3. 修改查询
       this.$nextTick(() => {

+ 1 - 0
package.json

@@ -80,6 +80,7 @@
     "eslint-plugin-vue": "7.2.0",
     "lint-staged": "10.5.3",
     "merge": "^1.2.1",
+    "prettier": "3.3.2",
     "runjs": "4.4.2",
     "sass": "1.32.13",
     "sass-loader": "10.1.1",

+ 12 - 6
src/views/app/delivery/index.vue

@@ -23,8 +23,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <Page uri="/mapi/app/delivery/page" :request-params="queryParams" ref="pagination">
-            <el-table-column type="selection" width="55" align="center" />
+        <el-table v-loading="loading" :data="deliveryList" @selection-change="handleSelectionChange" fit highlight-current-row border stripe>
             <el-table-column label="姓名" align="center" prop="realName" width="150" />
             <el-table-column label="手机号" align="center" prop="phoneNumber" width="150" />
             <el-table-column label="简介" align="center" prop="description" width="220" show-overflow-tooltip />
@@ -56,7 +55,9 @@
                     <el-button type="text" icon="el-icon-delete" @click="recordDetail(scope.row)" v-hasPermi="['app:delivery:edit']">接单记录</el-button>
                 </template>
             </el-table-column>
-        </Page>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改配送员对话框 -->
         <el-dialog :title="title" :visible.sync="open" size="50%" append-to-body>
@@ -103,7 +104,7 @@
         </el-dialog>
 
         <!--   接单记录 -->
-        <el-dialog v-loading="loading" :title="recordDetailTitle" :visible.sync="openDetail" size="80%" append-to-body :before-close="checkCloseDetail">
+        <el-dialog v-loading="loading" :title="recordDetailTitle" :visible.sync="openDetail" size="80%" append-to-body>
             <div class="head-column1" style="margin-top: 40px">
                 <el-table v-loading="loading" :data="recordDetailList">
                     <el-table-column label="订单编号" align="center" prop="orderNo" width="200" />
@@ -164,6 +165,8 @@ export default {
             openDetail: false,
             // 查询参数
             queryParams: {
+                pageNum: 1,
+                pageSize: 10,
                 appUserName: null,
                 phoneNumber: null
             },
@@ -209,8 +212,11 @@ export default {
         },
         /** 查询配送员列表 */
         getList() {
-            this.$nextTick(() => {
-                this.$refs.pagination.handleSearch(true)
+            this.loading = true
+            listDelivery(this.queryParams).then((response) => {
+                this.deliveryList = response.data
+                this.total = response.data.length
+                this.loading = false
             })
         },
         // 取消按钮

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 475 - 578
src/views/goods/goodsComment/index.vue


Vissa filer visades inte eftersom för många filer har ändrats