页面功能更新

src/views/base/swappedRecords-list.vue

@@ -0,0 +1,164 @@
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="1200px"
+  >
+    <div class="user-panel" v-loading="loading">
+        <el-table
+        :data="tableData"
+        style="min-height:400px;"
+        v-loading="loading"
+        stripe
+      >
+            <el-table-column
+            prop="num"
+            label="流水号"
+            ></el-table-column>
+            <el-table-column
+            prop="regUserName"
+            label="爱心人士"
+            ></el-table-column>
+            <el-table-column
+            prop="aspirationsName"
+            label="交换礼物"
+            ></el-table-column>
+            <el-table-column
+            prop="studentName"
+            label="学生姓名"
+            ></el-table-column>
+            <el-table-column  prop="isSpot"  label="是否现场互换心愿">
+                <template slot-scope="{row}">
+                    <span v-if="row.isSpot">是</span>
+                    <span v-else>否</span>
+            </template>
+            </el-table-column>
+            <el-table-column  prop="status"  label="互换状态">
+                <template slot-scope="{row}">
+                    <span v-if="row.status=='0'">互换中</span>
+                    <span v-else-if="row.status=='1'" style="color:#67C23A">已完成</span>
+            </template>
+            </el-table-column>
+            <el-table-column
+            prop="deliveryTime"
+            label="发货时间"
+            ></el-table-column>
+            <el-table-column
+            prop="completionTime"
+            label="完成时间"
+            ></el-table-column>
+        </el-table>
+        <el-pagination
+            style="text-align:center"
+            :current-page.sync="pageIndex"
+            :total="totalElements"
+            :page-sizes="pageSizeList"
+            @current-change="changePage"
+            @size-change="pageSizeChange"
+            layout="total, sizes, prev, pager, next, jumper"
+        ></el-pagination>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import wishInfoUserRecordApi from "@/api/base/wishInfoUserRecord";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+        showDialog: true,
+        loading: false,
+        submitting: false,
+        typeList:[],
+        tableData:[],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+    };
+  },
+  created() {
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    changePage(pageIndex) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        formData.append("pageSize", self.pageSize);
+
+        formData.append("wishInfoId", self.businessKey);
+        formData.append("status", "1");
+  
+        self.loading = true;
+  
+        wishInfoUserRecordApi.pageList(formData).then(function(response) {
+          self.loading = false;
+  
+          var jsonData = response.data;
+  
+          if(jsonData.result){
+            var pageInfo = jsonData.data;
+  
+            self.tableData = pageInfo.data;
+            self.totalPages = pageInfo.totalPages;
+            self.totalElements = pageInfo.recordsTotal;
+          }
+          else {
+            self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+          }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      pageSizeChange(pageSize) {
+        this.pageSize = pageSize;
+      },
+      sortChange(data) {
+        this.field = data.column.field;
+        this.direction = data.order == "ascending" ? "asc" : "desc";
+  
+        this.changePage(this.pageIndex);
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+  },
+  async mounted() {
+    var self = this;
+    self.changePage(1);
+  },
+  components: {
+    // "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/wishInfo-detail.vue

@@ -35,17 +35,17 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="标题" prop="title">
+                <el-form-item label="作品名" prop="title">
                   <el-input
                     v-model="formModel.title"
-                    placeholder="请输入标题"
+                    placeholder="请输入作品名"
                     style="width: 90%"
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="数量" prop="amount">
+                <el-form-item label="上架总量" prop="amount">
                   <el-input-number
                     v-model="formModel.amount"
-                    placeholder="请输入数量"
+                    placeholder="请输入上架总量"
                     style="width: 90%"
                     :min="1"
                   ></el-input-number>

src/views/base/wishInfo-list.vue

@@ -14,7 +14,17 @@
         要resetFields起作用，必须配置:model和prop
       -->
       <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-        <el-form-item label="标题" prop="title">
+        <el-form-item label="类别" prop="category">
+          <el-select v-model="queryModel.category" size="mini" placeholder="请选择" style="width: 90%">
+                <el-option
+                v-for="item in categoryList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="作品名" prop="title">
           <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
         </el-form-item>
         <el-form-item>
@@ -60,7 +70,7 @@
         ></el-table-column>
         <el-table-column
           prop="title"
-          label="标题"
+          label="作品名"
           width="180"
         ></el-table-column>
         <el-table-column  prop="image"  label="图片">
@@ -77,19 +87,26 @@
         </el-table-column>
         <el-table-column
           prop="amount"
-          label="数量"
+          label="上架总量"
         ></el-table-column>
         <el-table-column
-          prop="status"
-          label="显示状态"
+          prop="wishInfoUserRecordNum"
+          label="互换数量"
         ></el-table-column>
+        <el-table-column  prop="status"  label="是否上架">
+          <template slot-scope="{row}">
+            <span v-if="row.status=='0'">否</span>
+            <span v-else-if="row.status=='1'">是</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="createTime"
           label="创建时间"
           width="180"
         ></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="250">
           <template slot-scope="{row}">
+            <el-button size="mini" type="primary" @click="handleSwapped(row)">互换记录</el-button>
             <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
             <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
           </template>
@@ -110,12 +127,20 @@
         :title="modalTitle"
         @close="onDetailModalClose"
       ></wishInfo-detail>
+      <swappedRecords-list
+        v-if="showModal2"
+        :businessKey="businessKey"
+        :title="modalTitle2"
+        @close="onDetailModalClose2"
+      ></swappedRecords-list>
     </div>
   </template>
   <script>
   import Constant from "@/constant";
   import wishInfoDetail from "./wishInfo-detail";
+  import swappedRecordsList from "./swappedRecords-list";
   import wishInfoApi from "@/api/base/wishInfo";
+  import dataDictionaryApi from "@/api/sys/dataDictionary";
   
   export default {
     name: 'regUserList',
@@ -124,6 +149,7 @@
   
       return {
         queryModel: {
+          category:"",
           title: "",
         },
         loading: false,
@@ -136,12 +162,13 @@
         direction: "",
         pageSizeList: [10, 20, 30],
         multipleSelection: [],
-        modalTitle: "",      
+        modalTitle: "",
+        modalTitle2: "",           
         businessKey: "",
         showModal: false,
+        showModal2:false,
         dialogFormVisible:false,
-        newPassword:"",
-        roleResult:[],
+        categoryList:[],
         props: {
           // 配置项（必选）
           value: "id",
@@ -150,6 +177,13 @@
         },
       };
     },
+    created() {
+      dataDictionaryApi.findByCatalogName({catalogName: "心愿类型",})
+        .then((response) => {
+            var jsonData = response.data;
+            this.categoryList = jsonData.data;
+      });
+    },
     methods: {
       changePage(pageIndex) {
         var self = this;
@@ -161,6 +195,7 @@
   
         formData.append("pageIndex", self.pageIndex);
         formData.append("pageSize", self.pageSize);
+        formData.append("category", self.queryModel.category);
         formData.append("title", self.queryModel.title);
   
         self.loading = true;
@@ -216,10 +251,16 @@
         self.businessKey = record.id;
         self.showModal = true;
       },
+      handleSwapped(record){
+        var self = this;
+        self.modalTitle2 = "互换记录";
+        self.businessKey = record.id;
+        self.showModal2 = true;
+      },
       handleDelete(record) {
         var self = this;
   
-        this.$confirm("是否确认删除" + record.userName + "？", "提示", {
+        this.$confirm("是否确认删除？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -267,12 +308,19 @@
         });
       },
       onDetailModalClose(refreshed) {
-      this.showModal = false;
+        this.showModal = false;
 
-      if(refreshed) {
-        this.changePage(this.pageIndex);
-      }
-    },
+        if(refreshed) {
+          this.changePage(this.pageIndex);
+        }
+      },
+      onDetailModalClose2(refreshed) {
+        this.showModal2 = false;
+
+        if(refreshed) {
+          this.changePage(this.pageIndex);
+        }
+      },
     },
     mounted: function() {
       var self = this;
@@ -280,6 +328,7 @@
     },
     components: {
       "wishInfo-detail": wishInfoDetail,
+      "swappedRecords-list":swappedRecordsList,
     }
   };
   </script>