1.志愿者任务相关页面修改

2.学校地址页面修改

package-lock.json

@@ -3430,6 +3430,11 @@
       "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
       "dev": true
     },
+    "china-division": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmmirror.com/china-division/-/china-division-2.7.0.tgz",
+      "integrity": "sha512-4uUPAT+1WfqDh5jytq7omdCmHNk3j+k76zEG/2IqaGcYB90c2SwcixttcypdsZ3T/9tN1TTpBDoeZn+Yw/qBEA=="
+    },
     "chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -4910,6 +4915,14 @@
       "integrity": "sha512-0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww==",
       "dev": true
     },
+    "element-china-area-data": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmmirror.com/element-china-area-data/-/element-china-area-data-6.1.0.tgz",
+      "integrity": "sha512-IkpcjwQv2A/2AxFiSoaISZ+oMw1rZCPUSOg5sOCwT5jKc96TaawmKZeY81xfxXsO0QbKxU5LLc6AirhG52hUmg==",
+      "requires": {
+        "china-division": "^2.7.0"
+      }
+    },
     "element-ui": {
       "version": "2.15.6",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz",
@@ -8701,8 +8714,7 @@
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
       "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "pify": {
       "version": "4.0.1",

package.json

@@ -12,6 +12,7 @@
     "axios": "^0.19.0",
     "core-js": "^3.6.5",
     "echarts": "^4.5.0",
+    "element-china-area-data": "^6.1.0",
     "element-ui": "^2.15.6",
     "hls.js": "^0.14.15",
     "js-cookie": "^2.2.1",

src/api/base/addressInfo.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/addressInfo/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/addressInfo/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/addressInfo/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/addressInfo/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/addressInfo/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/addressInfo/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/addressInfo/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function list() {
+    return request.post(constant.serverUrl + "/base/addressInfo/list");
+  }
+
+export default {
+  pageList, create, edit, add, update, remove, batchRemove,list
+}

src/api/base/volunteerSignRecord.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/volunteerSignRecord/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/volunteerSignRecord/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/volunteerSignRecord/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/volunteerSignRecord/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/volunteerSignRecord/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/volunteerSignRecord/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/volunteerSignRecord/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function list() {
+    return request.post(constant.serverUrl + "/base/volunteerSignRecord/list");
+  }
+
+export default {
+  pageList, create, edit, add, update, remove, batchRemove,list
+}

src/api/base/volunteerTasks.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/volunteerTasks/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/volunteerTasks/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/volunteerTasks/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/volunteerTasks/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/volunteerTasks/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/volunteerTasks/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/volunteerTasks/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function list() {
+    return request.post(constant.serverUrl + "/base/volunteerTasks/list");
+  }
+
+export default {
+  pageList, create, edit, add, update, remove, batchRemove,list
+}

src/api/base/wishInfoUserRecord.js

@@ -37,6 +37,10 @@ function changeStatus(formData) {
   return request.post(constant.serverUrl + "/base/wishInfoUserRecord/changeStatus", formData);
 }
 
+function updateDeliveryTime(formData) {
+  return request.post(constant.serverUrl + "/base/wishInfoUserRecord/updateDeliveryTime", formData);
+}
+
 function batchRemove(idList) {
   return request.post(constant.serverUrl + "/base/wishInfoUserRecord/batchDelete", idList, {
     headers: {
@@ -47,5 +51,5 @@ function batchRemove(idList) {
 
 
 export default {
-  pageList, create, edit, add, update, remove, batchRemove,changeStatus
+  pageList, create, edit, add, update, remove, batchRemove,changeStatus,updateDeliveryTime
 }

src/routers/modules/base.js

@@ -95,6 +95,32 @@ var routers = [
                 title: '留言板'
         }
     },
+    {
+        path: '/base/addressInfo/list',
+        name: 'baseAddressInfoList',
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import('@/views/base/addressInfo-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '地址管理'
+        }
+    },
+    {
+        path: '/base/volunteerTasks/list',
+        name: 'baseVolunteerTasksList',
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import('@/views/base/volunteerTasks-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '志愿者任务'
+        }
+    },
+
+    
 ]
 
 export default routers;

src/views/base/addressInfo-detail.vue

@@ -0,0 +1,187 @@
+<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"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="寄件人" prop="recipients">
+          <el-input
+            v-model="formModel.recipients"
+            placeholder="请输入寄件人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="电话号码" prop="phone">
+          <el-input
+            v-model="formModel.phone"
+            placeholder="请输入电话号码"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="地区" prop="region">
+            <el-cascader
+            style="width: 300px"
+            v-model="formModel.regionValueArr"
+            :options="options"
+            @change="handleChange">
+            </el-cascader>
+        </el-form-item>
+        <el-form-item label="详细地址" prop="detailAddress">
+          <el-input
+            v-model="formModel.detailAddress"
+            placeholder="请输入详细地址"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import addressInfoApi from "@/api/base/addressInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import {regionData,codeToText,pcaTextArr} from 'element-china-area-data'
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      showPwd: true,
+      ruleValidate: {
+        recipients: [
+          { required: true, message: "寄件人不能为空", trigger: "blur" },
+        ],
+        phone: [
+          { required: true, message: "电话号码不能为空", trigger: "blur" },
+        ],
+        region: [
+          { required: true, message: "地区不能为空", trigger: "blur" },
+        ],
+        detailAddress: [
+          { required: true, message: "详细地址不能为空", trigger: "blur" },
+        ],
+      },
+      roleList: [],
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      typeList:[],
+      options:regionData,
+      selectedOptions: [],
+      address: '',
+      addressCode: [],
+      pcaTextArr,
+    };
+  },
+  created() {
+    // this.options = provinceData;
+    // alert(provinceData);
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return addressInfoApi.add(self.formModel);
+            } else {
+              self.formModel.password = null;
+              return addressInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+    handleChange (value) {
+        this.addressCode = value     // 示例 ：['110000','110100','110102']
+        let address = ''
+        value.map((item,index) => {
+            address +=codeToText[item] + ','
+        })
+        this.address = address.slice(0, address.length-1)    // 中文省市区用逗号分割拼接成字符串
+        alert(value);
+        this.formModel.region= address;
+    }
+  },
+  async mounted() {
+    var self = this;
+    self.loading = true;
+
+    (function () {
+      if (self.businessKey != null && self.businessKey.length > 0) {
+        return addressInfoApi.edit(self.businessKey);
+      } else {
+        return addressInfoApi.create();
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          self.showModal = true;
+
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+
+        self.loading = false;
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+        self.loading = false;
+      });
+  },
+  components: {
+    // "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/addressInfo-list.vue

@@ -0,0 +1,261 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          回馈方式管理
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-divider></el-divider>
+      <el-table
+        :data="tableData"
+        style="min-height:400px;"
+        v-loading="loading"
+        stripe
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          prop="recipients"
+          label="寄件人"
+        ></el-table-column>
+        <el-table-column
+          prop="phone"
+          label="电话"
+        ></el-table-column>
+        <el-table-column
+          prop="region"
+          label="地区"
+        ></el-table-column>
+        <el-table-column
+          prop="detailAddress"
+          label="详细地址"
+          width="180"
+        ></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="{row}">
+            <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
+            <!-- <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button> -->
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page.sync="pageIndex"
+        :total="totalElements"
+        :page-sizes="pageSizeList"
+        @current-change="changePage"
+        @size-change="pageSizeChange"
+        layout="total, sizes, prev, pager, next, jumper"
+      ></el-pagination>
+      <addressInfo-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></addressInfo-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import addressInfoDetail from "./addressInfo-detail";
+  import addressInfoApi from "@/api/base/addressInfo";
+  
+  export default {
+    name: 'baseAddressInfoList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+            name: "",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+      };
+    },
+    methods: {
+      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("name", self.queryModel.name);
+  
+        if (this.field != null) {
+          formData.append("field", this.field);
+        }
+  
+        if (this.direction != null) {
+          formData.append("direction", this.direction);
+        }
+  
+        self.loading = true;
+  
+        addressInfoApi.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;
+      },
+      handleReset(name) {
+        this.$refs[name].resetFields();
+      },
+      handleAdd() {
+        var self = this;
+        
+        self.modalTitle = "新增";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除" + record.userName + "？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            addressInfoApi.remove(record.id).then(function(response) {
+            var jsonData = response.data;
+  
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+  
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+      },
+      handleBatchDelete() {
+        var self = this;
+  
+        var idList = this.multipleSelection.map(record => {
+          return record.id;
+        });
+  
+        this.$confirm("是否确认删除选中项？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            addressInfoApi.batchRemove(idList).then(function(response) {
+            var jsonData = response.data;
+  
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+  
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+      },
+      onDetailModalClose(refreshed) {
+      this.showModal = false;
+
+      if(refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    },
+    mounted: function() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+      "addressInfo-detail": addressInfoDetail,
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  .el-breadcrumb {
+    margin: 10px;
+    line-height: 20px;
+  }
+  
+  .el-divider {
+    margin: 5px 0;
+  }
+  
+  .demo-form-inline {
+    margin-left: 10px;
+    text-align: left;
+  }
+  
+  .button-group {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/participateProjectInfo-list.vue

@@ -72,7 +72,7 @@
         <el-table-column  prop="feedbackName"  label="回馈方式名称"></el-table-column>
         <el-table-column  prop="cooperativeCompany"  label="项目合作单位"></el-table-column>
         <el-table-column  prop="contacts"  label="联系人"></el-table-column>
-        <el-table-column  prop="contactsCompany"  label="联系单位"></el-table-column>
+        <el-table-column  prop="contactsCompany"  label="联系电话"></el-table-column>
         <el-table-column  prop="completionTime"  label="完成时间"></el-table-column>
         <el-table-column prop="status"  label="状态" >
             <template slot-scope="{row}">

src/views/base/volunteerSignRecord-list.vue

@@ -0,0 +1,169 @@
+<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"
+  >
+    <div class="user-panel" v-loading="loading">
+        <el-table
+        :data="tableData"
+        style="min-height:400px;"
+        v-loading="loading"
+        stripe
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          prop="name"
+          label="任务介绍"
+        ></el-table-column>
+        <el-table-column
+          prop="phone"
+          label="联系电话"
+        ></el-table-column>
+        <el-table-column
+          prop="bak"
+          label="备注"
+          width="200"
+        ></el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="报名时间"
+          width="150"
+        ></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="{row}">
+            <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          </template>
+        </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 volunteerSignRecordApi from "@/api/base/volunteerSignRecord";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+    };
+  },
+  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("volunteerTasksId", self.businessKey);
+
+        self.loading = true;
+  
+        volunteerSignRecordApi.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;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            volunteerSignRecordApi.remove(record.id).then(function(response) {
+            var jsonData = response.data;
+  
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+  
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+      },
+  },
+  async mounted() {
+    this.changePage(1);
+  }
+};
+</script>

src/views/base/volunteerTasks-detail.vue

@@ -0,0 +1,159 @@
+<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"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'130px'"
+      >
+        <el-form-item label="任务简介" prop="introduce">
+          <el-input
+            v-model="formModel.introduce"
+            type="textarea"
+            :rows="5"
+            placeholder="请输入内容"
+            style="width: 300px">
+            </el-input>
+
+        </el-form-item>
+        <el-form-item label="志愿者要求" prop="volunteerRequirements">
+          <el-input
+            v-model="formModel.volunteerRequirements"
+            placeholder="请输入志愿者要求"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="校方联系方式" prop="schoolContact">
+          <el-input
+            v-model="formModel.schoolContact"
+            placeholder="请输入校方联系方式"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import volunteerTasksApi from "@/api/base/volunteerTasks";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      showPwd: true,
+      ruleValidate: {
+        introduce: [
+          { required: true, message: "任务简介不能为空", trigger: "blur" },
+        ],
+        volunteerRequirements: [
+          { required: true, message: "志愿者要求不能为空", trigger: "blur" },
+        ],
+        schoolContact: [
+          { required: true, message: "校方联系方式不能为空", trigger: "blur" },
+        ],
+      },
+      roleList: [],
+      formModel: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      typeList:[]
+    };
+  },
+  created() {
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return volunteerTasksApi.add(self.formModel);
+            } else {
+              self.formModel.password = null;
+              return volunteerTasksApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  async mounted() {
+    var self = this;
+    self.loading = true;
+
+    (function () {
+      if (self.businessKey != null && self.businessKey.length > 0) {
+        return volunteerTasksApi.edit(self.businessKey);
+      } else {
+        return volunteerTasksApi.create();
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          self.showModal = true;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+
+        self.loading = false;
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+        self.loading = false;
+      });
+  },
+  components: {
+    // "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/volunteerTasks-list.vue

@@ -0,0 +1,327 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          志愿者任务
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-divider></el-divider>
+      <!--
+        要resetFields起作用，必须配置:model和prop
+      -->
+      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+        <el-form-item label="任务介绍" prop="introduce">
+          <el-input type="text" size="mini" v-model="queryModel.introduce"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="ios-search"
+            @click="changePage(1)"
+            :loading="loading"
+          >查询</el-button>&nbsp;
+          <el-button
+            type="info"
+            size="mini"
+            style="margin-left: 8px"
+            @click="handleReset('queryForm')"
+          >重置</el-button>&nbsp;
+        </el-form-item>
+      </el-form>
+      <el-divider></el-divider>
+      <el-row class="button-group">
+        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          :disabled="multipleSelection.length==0"
+          @click="handleBatchDelete"
+        >删除选中项</el-button>
+      </el-row>
+      <el-table
+        :data="tableData"
+        style="min-height:400px;"
+        v-loading="loading"
+        stripe
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column
+          prop="introduce"
+          label="任务介绍"
+          width="250"
+        ></el-table-column>
+        <el-table-column
+          prop="volunteerRequirements"
+          label="志愿者要求"
+          width="200"
+        ></el-table-column>
+        <el-table-column
+          prop="schoolContact"
+          label="校方联系方式"
+        ></el-table-column>
+        <el-table-column
+          prop="startTime"
+          label="活动开始时间"
+        ></el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          width="180"
+        ></el-table-column>
+        <el-table-column label="操作" width="250">
+          <template slot-scope="{row}">
+            <el-button size="mini" type="primary" @click="handlePeople(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>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page.sync="pageIndex"
+        :total="totalElements"
+        :page-sizes="pageSizeList"
+        @current-change="changePage"
+        @size-change="pageSizeChange"
+        layout="total, sizes, prev, pager, next, jumper"
+      ></el-pagination>
+      <volunteerTasks-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></volunteerTasks-detail>
+      <volunteerSignRecord-list
+        v-if="showModal2"
+        :businessKey="businessKey"
+        :title="modalTitle2"
+        @close="onDetailModalClose2"
+      ></volunteerSignRecord-list>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import volunteerTasksDetail from "./volunteerTasks-detail";
+  import volunteerSignRecordList from "./volunteerSignRecord-list";
+  import volunteerTasksApi from "@/api/base/volunteerTasks";
+  
+  export default {
+    name: 'baseVolunteerTasksList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+          introduce: "",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",
+        modalTitle2:"",      
+        businessKey: "",
+        showModal: false,
+        showModal2:false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+      };
+    },
+    methods: {
+      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("introduce", self.queryModel.introduce);
+  
+        if (this.field != null) {
+          formData.append("field", this.field);
+        }
+  
+        if (this.direction != null) {
+          formData.append("direction", this.direction);
+        }
+  
+        self.loading = true;
+  
+        volunteerTasksApi.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;
+      },
+      handleReset(name) {
+        this.$refs[name].resetFields();
+      },
+      handleAdd() {
+        var self = this;
+        
+        self.modalTitle = "新增";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handlePeople(record){
+        var self = this;
+        
+        self.modalTitle2 = "参与人员";
+        self.businessKey = record.id;
+        self.showModal2 = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            volunteerTasksApi.remove(record.id).then(function(response) {
+            var jsonData = response.data;
+  
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+  
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+      },
+      handleBatchDelete() {
+        var self = this;
+  
+        var idList = this.multipleSelection.map(record => {
+          return record.id;
+        });
+  
+        this.$confirm("是否确认删除选中项？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            volunteerTasksApi.batchRemove(idList).then(function(response) {
+            var jsonData = response.data;
+  
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+  
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+      },
+      onDetailModalClose(refreshed) {
+      this.showModal = false;
+
+      if(refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    onDetailModalClose2(refreshed) {
+      this.showModal2 = false;
+
+      if(refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    },
+    mounted: function() {
+      this.changePage(1);
+    },
+    components: {
+      "volunteerTasks-detail": volunteerTasksDetail,
+      "volunteerSignRecord-list": volunteerSignRecordList,
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  .el-breadcrumb {
+    margin: 10px;
+    line-height: 20px;
+  }
+  
+  .el-divider {
+    margin: 5px 0;
+  }
+  
+  .demo-form-inline {
+    margin-left: 10px;
+    text-align: left;
+  }
+  
+  .button-group {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/wishInfoUserRecord-detail.vue

@@ -57,6 +57,7 @@
               </el-descriptions-item>
             </el-descriptions>
           </div>
+        
         </el-card>
 
         <el-card class="box-card2">
@@ -73,12 +74,23 @@
               <el-descriptions-item v-if="!formModel.wishInfoUserRecord.isSpot" label="寄件人地址">{{formModel.wishInfoUserRecord.senderAddress}}</el-descriptions-item>
               <el-descriptions-item label="流水号">{{formModel.wishInfoUserRecord.num}}</el-descriptions-item>
               <el-descriptions-item label="互换状态">{{formModel.wishInfoUserRecord.statusN}}</el-descriptions-item>
+              <el-descriptions-item v-if="!formModel.wishInfoUserRecord.isSpot" label="发货时间">
+                <el-date-picker
+                  size="mini"
+                  v-model="formModel.wishInfoUserRecord.deliveryTime"
+                  type="date"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-descriptions-item>
             </el-descriptions>
           </div>
         </el-card>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" v-if="formModel.wishInfoUserRecord.status!='1'&&!formModel.wishInfoUserRecord.isSpot" @click="handleDeliveryTime" >保 存</el-button>
       </span>
     </el-dialog>
   </template>
@@ -186,6 +198,37 @@
           self.fileUrl =
             res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
       },
+      handleDeliveryTime(){
+        var self = this;
+        var formData = new FormData();
+        self.loading = true;
+  
+        formData.append("id", self.businessKey);
+        formData.append("deliveryTime", self.formModel.wishInfoUserRecord.deliveryTime);
+
+        wishInfoUserRecordApi.updateDeliveryTime(formData).then(function(response) {
+          var jsonData = response.data;
+
+          if(jsonData.result){
+            self.loading = false;
+            self.$message({
+                type: "success",
+                message: "修改成功!"
+            });
+           
+            self.$emit("close", true);
+          }
+          else {
+            self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+            });
+            self.$emit("close", false);
+          }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
     },
     async mounted() {
       var self = this;