修改

src/router/index.js

@@ -123,7 +123,7 @@ export const asyncRouterMap = [
       { path: 'exchangeList', component: _import('exchangeManage/exchangeList'), name: 'exchangeList', meta: { title: '兑换列表', noCache: true }},
       { path: 'approvalList', component: _import('exchangeManage/approvalList'), name: 'approvalList', meta: { title: '待审批列表', noCache: true }},
       { path: 'pasList', component: _import('exchangeManage/pasList'), name: 'pasList', meta: { title: '待发货列表', noCache: true }},
-      { path: 'voidList', component: _import('exchangeManage/voidList'), name: 'voidList', meta: { title: '作废列表', noCache: true }},
+      { path: 'voidList', component: _import('exchangeManage/voidList'), name: 'voidList', meta: { title: '订单已完成列表', noCache: true }},
     ]
   },
   {

src/views/exchangeManage/approvalList.vue

@@ -36,6 +36,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="手机号" prop="userPhone">
             </el-table-column>
+            <el-table-column align="center" min-width="150px" label="工作地点" prop="workPlace">
+            </el-table-column>
             <el-table-column align="center" min-width="150px" label="订单编号" prop="orderSeq">
             </el-table-column>
             <el-table-column align="center" min-width="120px" label="订单状态" prop="orderTypeName">
@@ -143,7 +145,7 @@
                     <el-form-item label="商品属性">
                         <el-input readonly v-model="detailData.productAttributeName"></el-input>
                     </el-form-item>
-                    <el-form-item label="当前价格">
+                    <el-form-item label="参考价格">
                         <el-input readonly v-model="detailData.hisPrice"></el-input>
                     </el-form-item>
                     <el-form-item label="兑换方式">
@@ -151,7 +153,7 @@
                     </el-form-item>
                 </div>
                 <div style="display: flex;">
-                    <el-form-item label="价格调整">
+                    <el-form-item label="采购单价">
                         <el-input v-model="detailData.nowPrice"></el-input>
                     </el-form-item>
                     

src/views/exchangeManage/exchangeList.vue

@@ -40,6 +40,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="手机号" prop="userPhone">
             </el-table-column>
+            <el-table-column align="center" min-width="150px" label="工作地点" prop="workPlace">
+            </el-table-column>
             <el-table-column align="center" min-width="150px" label="订单编号" prop="orderSeq">
             </el-table-column>
             <el-table-column align="center" min-width="120px" label="订单状态" prop="orderTypeName">
@@ -146,7 +148,7 @@
                     <el-form-item label="商品属性">
                         <el-input readonly v-model="detailData.productAttributeName"></el-input>
                     </el-form-item>
-                    <el-form-item label="当前价格">
+                    <el-form-item label="参考价格">
                         <el-input readonly v-model="detailData.hisPrice"></el-input>
                     </el-form-item>
                     <el-form-item label="兑换方式">

src/views/exchangeManage/pasList.vue

@@ -36,6 +36,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="手机号" prop="userPhone">
             </el-table-column>
+            <el-table-column align="center" min-width="150px" label="工作地点" prop="workPlace">
+            </el-table-column>
             <el-table-column align="center" min-width="150px" label="订单编号" prop="orderSeq">
             </el-table-column>
             <el-table-column align="center" min-width="120px" label="订单状态" prop="orderTypeName">
@@ -143,7 +145,7 @@
                     <el-form-item label="商品属性">
                         <el-input readonly v-model="detailData.productAttributeName"></el-input>
                     </el-form-item>
-                    <el-form-item label="当前价格">
+                    <el-form-item label="参考价格">
                         <el-input readonly v-model="detailData.hisPrice"></el-input>
                     </el-form-item>
                     <el-form-item label="兑换方式">

src/views/exchangeManage/voidList.vue

@@ -36,6 +36,8 @@
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="手机号" prop="userPhone">
             </el-table-column>
+            <el-table-column align="center" min-width="150px" label="工作地点" prop="workPlace">
+            </el-table-column>
             <el-table-column align="center" min-width="150px" label="订单编号" prop="orderSeq">
             </el-table-column>
             <el-table-column align="center" min-width="120px" label="订单状态" prop="orderTypeName">
@@ -143,7 +145,7 @@
                     <el-form-item label="商品属性">
                         <el-input readonly v-model="detailData.productAttributeName"></el-input>
                     </el-form-item>
-                    <el-form-item label="当前价格">
+                    <el-form-item label="参考价格">
                         <el-input readonly v-model="detailData.hisPrice"></el-input>
                     </el-form-item>
                     <el-form-item label="兑换方式">

src/views/festivalManage/festivalList.vue

@@ -24,7 +24,7 @@
   
         <el-table-column align="center" min-width="100px" label="节日" prop="title">
         </el-table-column>
-        <el-table-column align="center" min-width="200px" label="日期" prop="startTime">
+        <el-table-column align="center" min-width="200px" label="发放日期" prop="startTime">
         </el-table-column>
         <el-table-column align="center" min-width="100px" label="积分" prop="integral">
         </el-table-column>
@@ -59,18 +59,18 @@
       :close-on-click-modal="false"
         :title="textMap[dialogStatus]"
         :visible.sync="dialogFormVisible"
-        width="40%"
+        width="35%"
       >
-        <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="50px" style='width: 700px; margin-left:50px;'>
+        <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="80px">
          <el-form-item  label="节日" prop="title">
               <el-input style="width: 350px" v-model="dataForm.title"></el-input>
             </el-form-item>
-            <el-form-item label="日期" prop="startTime">
+            <el-form-item label="发放日期" prop="startTime">
                 <el-date-picker
                   v-model="dataForm.startTime"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  placeholder="选择日期"
+                  placeholder="选择发放日期"
                   style="width: 350px"
                 ></el-date-picker>
               </el-form-item>
@@ -116,24 +116,7 @@
     directives: { waves },
     data() {
       return {
-        list: [
-          {
-            title:'端午节',
-            startTime:'2023-6-22',
-            integral:'50'
-          },
-          {
-            title:'中秋节',
-            startTime:'2023-9-29',
-            integral:'100'
-          },
-          {
-            title:'国庆节',
-            startTime:'2023-10-1',
-            integral:'100'
-          },
-
-        ],
+        list: [],
         total: 0,
         listLoading: false,
         listQuery: {
@@ -154,7 +137,7 @@
         },
         rules: {
           title: [{ required: true, message: "节日不能为空", trigger: "blur" }],
-          startTime: [{ required: true, message: "请选择日期", trigger: "blur" }],
+          startTime: [{ required: true, message: "请选择发放日期", trigger: "blur" }],
           integral: [{ required: true, message: "积分不能为空", trigger: "blur" }],
         },
       }

src/views/pointManage/pointsDetailList.vue

@@ -101,7 +101,7 @@ export default {
     },
     methods: {
         handleDownload() {
-            window.location.href = process.env.BASE_API + '/mall-integral/export/details/page?type=' + this.listQuery.type + '&deptId=' + this.listQuery.deptId + '&userName=' + this.listQuery.userName + '&createTime=' + this.listQuery.createTime;
+            window.location.href = process.env.BASE_API + '/mall-integral/export/details/page?integralType=' + this.listQuery.integralType + '&deptId=' + this.listQuery.deptId + '&userName=' + this.listQuery.userName + '&createTime=' + this.listQuery.createTime;
         },
         getDepTypeList() {
             depTypeList().then(response => {