修改

config/index.js

@@ -13,7 +13,7 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '192.168.100.137', // can be overwritten by process.env.HOST
     port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     // autoOpenBrowser: true,
     errorOverlay: true,

src/api/exchangeManage.js

@@ -1,26 +1,26 @@
 import request from '@/utils/request'
 
-export function complete(data) {
+export function complete(query) {
   return request({
-    url: '/admin/mall-order/complete',
+    url: '/mall-order/complete',
     method: 'post',
-    data
+    params:query
   })
 }
 
-export function list(data) {
+export function list(query) {
   return request({
-    url: '/admin/mall-order/page',
+    url: '/mall-order/page',
     method: 'post',
-    data
+    params:query
   })
 }
 
 export function detail(query) {
   return request({
-    url: '/admin/mall-order/info',
+    url: '/mall-order/info',
     method: 'post',
-    data:query
+    params:query
   })
 }
 

src/router/index.js

@@ -59,7 +59,7 @@ export const asyncRouterMap = [
     name: 'pointManage',
     meta: {
       title: '积分管理',
-      icon: 'people'
+      icon: 'jifen'
     },
     children: [
       { path: 'pointInstructions', component: _import('pointManage/pointInstructions'), name: 'pointInstructions', meta: { title: '积分规则说明书', noCache: true }},
@@ -74,7 +74,7 @@ export const asyncRouterMap = [
     name: 'goodsManage',
     meta: {
       title: '商品管理',
-      icon: 'people'
+      icon: 'shangpin'
     },
     children: [
       { path: 'goodsExchangeRules', component: _import('goodsManage/goodsExchangeRules'), name: 'goodsExchangeRules', meta: { title: '兑换须知', noCache: true }},
@@ -88,7 +88,7 @@ export const asyncRouterMap = [
     name: 'giftManage',
     meta: {
       title: '礼品管理',
-      icon: 'people'
+      icon: 'lipin'
     },
     children: [
       { path: 'giftExchangeRules', component: _import('giftManage/giftExchangeRules'), name: 'giftExchangeRules', meta: { title: '兑换须知', noCache: true }},
@@ -102,7 +102,7 @@ export const asyncRouterMap = [
     name: 'welfareManage',
     meta: {
       title: '福利管理',
-      icon: 'people'
+      icon: 'fuli'
     },
     children: [
       { path: 'welfareList', component: _import('welfareManage/welfareList'), name: 'welfareList', meta: { title: '福利列表', noCache: true }},
@@ -116,7 +116,7 @@ export const asyncRouterMap = [
     name: 'exchangeManage',
     meta: {
       title: '兑换管理',
-      icon: 'people'
+      icon: 'duihuan'
     },
     children: [
       { path: 'exchangeList', component: _import('exchangeManage/exchangeList'), name: 'exchangeList', meta: { title: '兑换列表', noCache: true }},

src/views/exchangeManage/exchangeList.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container calendar-list-container">
+    <div class="app-container calendar-list-container exchangeView">
 
         <!-- 查询和其他操作 -->
         <div class="filter-container">
@@ -7,12 +7,14 @@
                 v-model="listQuery.purchaser"></el-input>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="订单编号"
                 v-model="listQuery.orderSeq"></el-input>
-            <el-input clearable class="filter-item" style="width: 200px;" placeholder="商品编号"
-                v-model="listQuery.skuSeq"></el-input>
+            <el-select v-model="listQuery.orderType" clearable placeholder="订单状态" style="top: -4px;width: 200px;">
+                <el-option :key="item.orderType" v-for="item in orderTypeList" :label="item.orderTypeName" :value="item.orderType">
+                </el-option>
+            </el-select>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="活动标题"
                 v-model="listQuery.title"></el-input>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
-            <el-button class="filter-item" type="primary" v-waves icon="el-icon-download">导出</el-button>
+            <el-button class="filter-item" type="primary" v-waves icon="el-icon-download" @click="handleDownLoad">导出</el-button>
 
         </div>
 
@@ -21,26 +23,27 @@
             highlight-current-row>
             <el-table-column type="index" label="序号" header-align="center" align="center">
             </el-table-column>
-
-            <el-table-column align="center" min-width="100px" label="员工名称" prop="purchaser">
+            <el-table-column align="center" min-width="150px" label="部门名称" prop="deptName">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="订单编号" prop="orderSeq">
+            <el-table-column align="center" min-width="80px" label="员工名称" prop="purchaser">
             </el-table-column>
-            <el-table-column align="center" min-width="150px" label="商品编号" prop="skuSeq">
+            <el-table-column align="center" min-width="150px" label="订单编号" prop="orderSeq">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="商品类型" prop="skuName">
+            <el-table-column align="center" min-width="120px" label="订单状态" prop="orderTypeName">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="活动标题" prop="title">
+            <el-table-column align="center" min-width="120px" label="商品名称" prop="name">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="数量" prop="skuCount">
+            <el-table-column align="center" min-width="150px" label="商品编号" prop="skuSeq">
+            </el-table-column>
+            <el-table-column align="center" min-width="80px" label="商品类型" prop="skuTypeName">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="兑换时间" prop="createTime">
+            <el-table-column align="center" min-width="80px" label="活动标题" prop="title">
             </el-table-column>
-            <el-table-column align="center" label="操作" width="150px" class-name="small-padding fixed-width">
+            <el-table-column align="center" label="操作" width="80px" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <el-button v-if="scope.row.orderStatus == 0" type="success" size="small"
-                        @click="handleClick(scope.row.id, 'complete')">处理</el-button>
-                    <el-button type="primary" size="small" @click="handleClick(scope.row.id, 'view')">查看</el-button>
+                    <el-button v-if="scope.row.orderType == 0 || scope.row.orderType == 4" type="success" size="small"
+                        @click="handleClick(scope.row.orderId, 'complete')">处理</el-button>
+                    <el-button v-else type="primary" size="small" @click="handleClick(scope.row.orderId, 'view')">查看</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -55,14 +58,16 @@
         <!-- 添加或修改对话框 -->
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogVisible" width="70%">
 
-
+            <h3>订单信息</h3>
+            
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">
                 <div style="display: flex;">
+                    
                     <el-form-item label="订单编号">
                         <el-input readonly v-model="detailData.orderSeq" style="width: 200px;"></el-input>
                     </el-form-item>
                     <el-form-item label="员工姓名">
-                        <el-input readonly v-model="detailData.purchaserId" style="width: 200px;"></el-input>
+                        <el-input readonly v-model="detailData.purchaser" style="width: 200px;"></el-input>
                     </el-form-item>
                     <el-form-item label="部门名称">
                         <el-input readonly v-model="detailData.deptName" style="width: 200px;"></el-input>
@@ -74,7 +79,7 @@
                         <el-input readonly v-model="detailData.createTime" style="width: 200px;"></el-input>
                     </el-form-item>
                     <el-form-item label="订单状态">
-                        <el-input readonly v-model="detailData.orderStatusName" style="width: 200px;"></el-input>
+                        <el-input readonly v-model="detailData.orderTypeName" style="width: 200px;"></el-input>
                     </el-form-item>
                     <el-form-item label="联系人">
                         <el-input readonly v-model="detailData.contact" style="width: 200px;"></el-input>
@@ -85,50 +90,43 @@
                     <el-form-item label="联系电话">
                         <el-input readonly v-model="detailData.contactPhone" style="width: 200px;"></el-input>
                     </el-form-item>
-                    <el-form-item label="地址/邮箱">
-                        <el-input readonly v-model="detailData.contactAddr" style="width: 500px;"></el-input>
+                    <el-form-item v-if="detailData.contactAddr" label="地址">
+                        <el-input readonly v-model="detailData.contactAddr" style="width: 200px;"></el-input>
+                    </el-form-item>
+                    <el-form-item v-if="detailData.contactEmail" label="邮箱">
+                        <el-input readonly v-model="detailData.contactEmail" style="width: 200px;"></el-input>
                     </el-form-item>
                 </div>
             </el-form>
+            <h3>商品信息</h3>
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">
                 <div style="display: flex;">
                     <el-form-item label="商品编号">
                         <el-input readonly v-model="detailData.skuSeq" style="width: 200px;"></el-input>
                     </el-form-item>
                     <el-form-item label="商品名称">
-                        <el-input readonly v-model="detailData.skuName" style="width: 200px;"></el-input>
-                    </el-form-item>
-                    <el-form-item label="所需积分">
-                        <el-input readonly v-model="detailData.price" style="width: 200px;"></el-input>
-                    </el-form-item>
-                </div>
-                <div style="display: flex;">
-                    <el-form-item label="兑换数量">
-                        <el-input readonly v-model="detailData.skuCount" style="width: 200px;"></el-input>
-                    </el-form-item>
-                    <el-form-item label="合计">
-                        <el-input readonly v-model="detailData.total" style="width: 200px;"></el-input>
+                        <el-input readonly v-model="detailData.name" style="width: 200px;"></el-input>
                     </el-form-item>
                     <el-form-item label="商品类型">
-                        <el-input readonly v-model="detailData.skuType" style="width: 200px;"></el-input>
+                        <el-input readonly v-model="detailData.skuTypeName" style="width: 200px;"></el-input>
                     </el-form-item>
                 </div>
                 <div style="display: flex;">
                     <el-form-item label="商品属性">
-                        <el-input readonly v-model="detailData.skuAttr" style="width: 200px;"></el-input>
+                        <el-input readonly v-model="detailData.productAttributeName" style="width: 200px;"></el-input>
                     </el-form-item>
                     <el-form-item label="兑换方式">
-                        <el-input readonly v-model="detailData.deliveryName" style="width: 200px;"></el-input>
+                        <el-input readonly v-model="detailData.deliveryTypeName" style="width: 200px;"></el-input>
                     </el-form-item>
-                    <el-form-item v-if="detailData.deliveryType == 1 && detailData.orderStatus == 0" label="快递单号">
+                    <el-form-item v-if="detailData.deliveryType == 1 && (detailData.orderType == 0 || detailData.orderType == 4)" label="快递单号">
                         <el-input v-model="detailData.trackingNumber" style="width: 200px;"></el-input>
                     </el-form-item>
-                    <el-form-item v-if="detailData.trackingNumber" label="快递单号">
+                    <el-form-item v-else label="快递单号">
                         <el-input readonly v-model="detailData.trackingNumber" style="width: 200px;"></el-input>
                     </el-form-item>
                 </div>
 
-                <el-form-item v-if="detailData.orderStatus == 0" label="备注">
+                <el-form-item v-if="detailData.orderType == 0 || detailData.orderType == 4" label="备注">
                     <el-input type="textarea" v-model="comment" style="width: 100%"></el-input>
                 </el-form-item>
 
@@ -150,8 +148,7 @@
             </el-table>
 
 
-            <div v-if="detailData.orderStatus == 0" slot="footer" class="dialog-footer">
-                <!-- <el-button @click="dialogVisible = false">取消</el-button> -->
+            <div v-if="detailData.orderType == 0 || detailData.orderType == 4" slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="complete(0)">确认</el-button>
                 <el-button type="danger" @click="complete(1)">作废</el-button>
             </div>
@@ -187,87 +184,32 @@ export default {
     directives: { waves },
     data() {
         return {
-            auditor:'吴艳敏',
-            trackingNumber: '',
-            comment: '',
-            tableData: [{
-                orderStatus: '待确认',
-                auditor: '王小虎',
-                createTime: '2023-4-7',
-                comment: '请确认',
-            }, {
-                orderStatus: '已确认',
-                auditor: '王小虎',
-                createTime: '2023-4-7',
-                comment: '已确认确认',
-            }, {
-                orderStatus: '作废',
-                auditor: '王小虎',
-                createTime: '2023-4-7',
-                comment: '作废原因',
-            }, {
-                orderStatus: '邮寄中',
-                auditor: '王小虎',
-                createTime: '2023-4-7',
-                comment: '已邮寄',
-            }],
-            list: [
+            orderTypeList: [
                 {
-                    id: 1,
-                    title: '中秋福利',
-                    purchaser: '张三',
-                    orderSeq: 'd123456',
-                    skuSeq: 's123456',
-                    createTime: '2023-3-24',
-                    skuName: '活动礼品',
-                    skuCount: '1',
-                    orderStatus: 0,
+                    orderType: 0,
+                    orderTypeName: '商务待确认'
                 },
                 {
-                    id: 2,
-                    title: '中秋福利',
-                    purchaser: '张三',
-                    orderSeq: 'd123456',
-                    skuSeq: 's123456',
-                    createTime: '2023-3-24',
-                    skuName: '活动礼品',
-                    skuCount: '1',
-                    orderStatus: 1,
+                    orderType: 1,
+                    orderTypeName: '商务部已确认'
                 },
                 {
-                    id: 3,
-                    title: '中秋福利',
-                    purchaser: '张三',
-                    orderSeq: 'd123456',
-                    skuSeq: 's123456',
-                    createTime: '2023-3-24',
-                    skuName: '活动礼品',
-                    skuCount: '1',
-                    orderStatus: 2,
+                    orderType: 2,
+                    orderTypeName: '商务部作废'
                 },
                 {
-                    id: 4,
-                    title: '中秋福利',
-                    purchaser: '张三',
-                    orderSeq: 'd123456',
-                    skuSeq: 's123456',
-                    createTime: '2023-3-24',
-                    skuName: '活动礼品',
-                    skuCount: '1',
-                    orderStatus: 3,
+                    orderType: 3,
+                    orderTypeName: '员工已确认'
                 },
                 {
-                    id: 5,
-                    title: '中秋福利',
-                    purchaser: '张三',
-                    orderSeq: 'd123456',
-                    skuSeq: 's123456',
-                    createTime: '2023-3-24',
-                    skuName: '活动礼品',
-                    skuCount: '1',
-                    orderStatus: 4,
+                    orderType: 4,
+                    orderTypeName: '员工反馈问题件退回'
                 },
             ],
+            trackingNumber: '',
+            comment: '',
+            tableData: [],
+            list: [],
             total: 0,
             listLoading: false,
             listQuery: {
@@ -275,7 +217,7 @@ export default {
                 limit: 10,
                 purchaser: '',
                 orderSeq: '',
-                skuSeq: '',
+                orderType: '',
                 title: '',
             },
             dialogVisible: false,
@@ -284,35 +226,16 @@ export default {
                 complete: "审批",
                 view: "详情",
             },
-            detailData: {
-                id:'123',
-                orderSeq: 'D123456',
-                purchaserId: '李四',
-                deptName: '软件工程院',
-                createTime: '2023-4-7',
-                orderStatusName: '待确认',
-                orderStatus: 0,
-                contact: '张三',
-                contactPhone: '13613885046',
-                contactAddr: '正大西区CPL',
-                skuSeq: 'S123456',
-                skuName: '榨汁机',
-                price: '100',
-                skuCount: 1,
-                total: '100',
-                skuType: '积分商品',
-                skuAttr: '实物',
-                deliveryName: '邮寄',
-                deliveryType: 1,
-                trackingNumber: '',
-                comment: '',
-            },
+            detailData: { },
         }
     },
     created() {
-        // this.getList();
+        this.getList();
     },
     methods: {
+        handleDownLoad(){
+            window.location.href = process.env.BASE_API + '/mall-order/exportOrderLog?purchaser=' + this.listQuery.purchaser + '&orderSeq=' + this.listQuery.orderSeq + '&orderType=' + this.listQuery.orderType + '&title=' + this.listQuery.title;
+        },
         checked(val){
             if(val.flag == 0 && val.deliveryType==1){
                 if(!val.trackingNumber){
@@ -335,40 +258,38 @@ export default {
         },
         complete(flag) {
             const parms = {
-                orderId:this.detailData.id,
+                orderId:this.detailData.orderId,
+                orderType:this.detailData.orderType,
                 flag:flag,
                 deliveryType:this.detailData.deliveryType,
-                auditor:this.auditor,
                 trackingNumber: this.detailData.trackingNumber,
                 comment: this.comment,
             }
             const isChecked = this.checked(parms);
             if(isChecked){
                 complete(parms).then((response) => {
-                this.getList();
-                    this.dialogFormVisible = false;
                     this.$notify({
                         title: "成功",
-                        message: "创建成功",
+                        message: "操作成功",
                         type: "success",
                         duration: 2000,
                     });
-                    this.reload();
+                    this.getList();
+                    this.dialogVisible = false;
                 })
                 .catch(() => { });
             }
             
         },
         getDetail(id) {
-            detail({ order: id }).then(response => {
-                this.detailData = response.data.data.items
-            }).catch(() => {
-                this.detailData = {}
-            })
+            detail({ orderId: id }).then(response => {
+                this.detailData = response.data.data;
+                this.tableData = response.data.data.logs;
+            }).catch(() => {})
         },
         handleClick(id, tag) {
             this.dialogStatus = tag;
-            // this.getDetail(id);
+            this.getDetail(id);
             this.dialogVisible = true;
         },
         getList() {
@@ -377,11 +298,7 @@ export default {
                 this.list = response.data.data.items
                 this.total = response.data.data.total
                 this.listLoading = false
-            }).catch(() => {
-                this.list = []
-                this.total = 0
-                this.listLoading = false
-            })
+            }).catch(() => {})
         },
         handleFilter() {
             this.listQuery.page = 1
@@ -423,5 +340,8 @@ export default {
 .ad-avatar {
     display: block;
 }
+.exchangeView .el-dialog__body {
+    padding-top: 0px;
+}
 </style>
   

src/views/giftManage/giftList.vue

@@ -419,12 +419,6 @@ export default {
         getWelfareList(){
             welfareList({status:1}).then(response => {
                 this.options = response.data.data;
-                // this.options.push(
-                //     {
-                //         id:'',
-                //         title:'请选择'
-                //     }
-                // )
             }).catch(() => {});
         },
         changeProductAttribute(val) {
@@ -632,12 +626,9 @@ export default {
                         type: 'success',
                         duration: 2000
                     })
-                    this.getList()
+                    this.getList();
                 })
-            }).catch(() => {
-
-            })
-
+            }).catch(() => {})
         },
         getDepTypeList() {
             depTypeList().then(response => {
@@ -650,11 +641,7 @@ export default {
                 this.list = response.data.data.items
                 this.total = response.data.data.total
                 this.listLoading = false
-            }).catch(() => {
-                this.list = []
-                this.total = 0
-                this.listLoading = false
-            })
+            }).catch(() => {})
         },
         getItemList() {
             this.listLoading = true
@@ -662,11 +649,7 @@ export default {
                 this.itemList = response.data.data.items
                 this.itemLotal = response.data.data.total
                 this.listLoading = false
-            }).catch(() => {
-                this.itemList = []
-                this.itemLotal = 0
-                this.listLoading = false
-            })
+            }).catch(() => {})
         },
 
         handleFilter() {

src/views/goodsManage/goodsExchangeRules.vue

@@ -72,7 +72,7 @@
                   type: 'success',
                   duration: 2000
                 })
-                // this.getDetail()
+                this.getDetail();
               }) 
           }
         })

src/views/goodsManage/goodsList.vue

@@ -7,8 +7,8 @@
                 v-model="listQuery.name"></el-input>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="商品编号"
                 v-model="listQuery.seq"></el-input>
-            <el-date-picker class="filter-item" v-model="listQuery.shelfTime" type="datetime" placeholder="商品上架时间">
-            </el-date-picker>
+            <!-- <el-date-picker class="filter-item" v-model="listQuery.shelfTime" type="datetime" placeholder="商品上架时间">
+            </el-date-picker> -->
             <el-select v-model="listQuery.status" clearable placeholder="状态" style="top: -4px;width: 200px;">
                 <el-option :key="item.type" v-for="item in goodsStatusList" :label="item.name" :value="item.type">
                 </el-option>
@@ -252,97 +252,9 @@ export default {
                     name: '下架'
                 },
             ],
-            depTypeList: [
-                {
-                    type: 'highTechnology',
-                    name: '高科技'
-                },
-                {
-                    type: 'fastExtinction',
-                    name: '快销'
-                },
-                {
-                    type: 'manufacturingIndustry',
-                    name: '制造业'
-                },
-                {
-                    type: 'all',
-                    name: '全部'
-                },
-            ],
-            list: [
-                {
-                    id: 1,
-                    name: '类型1',
-                    seq: 'sp123456',
-                    productAttribute: 0,
-                    price: '100',
-                    actualStock: '12',
-                    deliveryType: 0,
-                    location: '北京',
-                    shelfTime: '2023-3-24 12:12:12',
-                    imgUrl: 'https://xiaoyou.dgtis.com/images/image/2023/04/04/knitu6huek0c0f4jbshq.jpg',
-                    status: 1,
-                },
-                {
-                    id: 2,
-                    name: '类型1',
-                    seq: 'sp123456',
-                    productAttribute: 1,
-                    price: '100',
-                    actualStock: '12',
-                    deliveryType: 1,
-                    location: '上海',
-                    shelfTime: '2023-3-24 12:12:12',
-                    imgUrl: 'https://xiaoyou.dgtis.com/images/image/2023/04/04/knitu6huek0c0f4jbshq.jpg',
-                    status: 0,
-                },
-                {
-                    id: 3,
-                    name: '类型1',
-                    seq: 'sp123456',
-                    productAttribute: 1,
-                    price: '100',
-                    actualStock: '12',
-                    deliveryType: 1,
-                    location: '洛阳',
-                    shelfTime: '2023-3-24 12:12:12',
-                    imgUrl: 'https://xiaoyou.dgtis.com/images/image/2023/04/04/knitu6huek0c0f4jbshq.jpg',
-                    status: 0,
-                },
-            ],
-            itemList: [
-                {
-                    id: 1,
-                    deptName: '软件工程院',
-                    userName: '张三',
-                    deliveryName: '邮寄',
-                    contact: '李四',
-                    contactPhone: '13613885046',
-                    contactAddr: '正大西区CPL',
-                    createTime: '2023-4-3',
-                },
-                {
-                    id: 2,
-                    deptName: '软件工程院',
-                    userName: '张三',
-                    deliveryName: '邮寄',
-                    contact: '李四',
-                    contactPhone: '13613885046',
-                    contactAddr: '正大西区CPL',
-                    createTime: '2023-4-3',
-                },
-                {
-                    id: 3,
-                    deptName: '软件工程院',
-                    userName: '张三',
-                    deliveryName: '邮寄',
-                    contact: '李四',
-                    contactPhone: '13613885046',
-                    contactAddr: '正大西区CPL',
-                    createTime: '2023-4-3',
-                },
-            ],
+            depTypeList: [],
+            list: [],
+            itemList: [],
             total: 0,
             itemTotal: 0,
             listLoading: false,
@@ -352,7 +264,6 @@ export default {
                 limit: 10,
                 name: '',
                 seq: '',
-                shelfTime: '',
                 status: '',
             },
             itemListQuery: {
@@ -589,8 +500,7 @@ export default {
                         type: 'success',
                         duration: 2000
                     })
-                    const index = this.list.indexOf(row)
-                    this.list.splice(index, 1)
+                    this.getList();
                 })
             }).catch(() => {
 
@@ -608,11 +518,7 @@ export default {
                 this.list = response.data.data.items
                 this.total = response.data.data.total
                 this.listLoading = false
-            }).catch(() => {
-                this.list = []
-                this.total = 0
-                this.listLoading = false
-            })
+            }).catch(() => {})
         },
         getItemList() {
             this.listLoading = true
@@ -620,11 +526,7 @@ export default {
                 this.itemList = response.data.data.items
                 this.itemLotal = response.data.data.total
                 this.listLoading = false
-            }).catch(() => {
-                this.itemList = []
-                this.itemLotal = 0
-                this.listLoading = false
-            })
+            }).catch(() => {})
         },
 
         handleFilter() {

src/views/pointManage/pointInstructions.vue

@@ -56,10 +56,7 @@
         getPointInstructionsDetail({}).then(response => {
           this.dataForm = response.data.data.items
           this.listLoading = false
-        }).catch(() => {
-          this.dataForm = []
-          this.listLoading = false
-        })
+        }).catch(() => {})
       },
       updateData() {
         this.$refs['dataForm'].validate((valid) => {

src/views/pointManage/pointList.vue

@@ -263,22 +263,18 @@ export default {
         getCompanyTypeList() {
             companyTypeList().then(response => {
                 this.companyTypeList = response.data.data;
-            }).catch(() => {
-                this.companyTypeList = []
-            });
+            }).catch(() => {});
         },
         getDepTypeList() {
             depTypeList().then(response => {
                 this.depTypeList = response.data.data;
-            }).catch(() => {
-                this.depTypeList = []
-            });
+            }).catch(() => {});
         },
         getPointRulesType() {
             pointRulesTypeList().then(response => {
                 this.allTypeList = response.data.data;
             }).catch(() => {
-                this.allTypeList = []
+                
             });
         },
         getList() {
@@ -288,9 +284,7 @@ export default {
                 this.total = response.data.data.total
                 this.listLoading = false
             }).catch(() => {
-                this.list = []
-                this.total = 0
-                this.listLoading = false
+                
             })
         },
         getItemList() {
@@ -299,11 +293,7 @@ export default {
                 this.itemList = response.data.data.items
                 this.itemLotal = response.data.data.total
                 this.listLoading = false
-            }).catch(() => {
-                this.itemList = []
-                this.itemLotal = 0
-                this.listLoading = false
-            })
+            }).catch(() => {})
         },
         handleFilter() {
             this.listQuery.page = 1

src/views/pointManage/pointRulesList.vue

@@ -244,7 +244,7 @@
         pointRulesTypeList().then(response => {
           this.allTypeList = response.data.data;
         }).catch(() => {
-          this.allTypeList = []
+          
         });
       },
        
@@ -255,9 +255,7 @@
           this.total = response.data.data.total
           this.listLoading = false
         }).catch(() => {
-          this.list = []
-          this.total = 0
-          this.listLoading = false
+          
         })
       },