sunlupeng 1 år sedan
förälder
incheckning
4e650ec03d

+ 5 - 0
src/views/exchangeManage/approvalList.vue

@@ -131,6 +131,11 @@
                         <el-input type="textarea" :rows="2" disabled v-model="addressStr"></el-input>
                     </el-form-item>
                 </div>
+                <div style="display: flex;">
+                    <el-form-item label="支付类型">
+                        <el-input disabled v-model="detailData.payTypeName"></el-input>
+                    </el-form-item>
+                </div>
             </el-form>
             <h3>商品信息</h3>
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">

+ 5 - 0
src/views/exchangeManage/cancelledList.vue

@@ -128,6 +128,11 @@
                         <el-input type="textarea" :rows="2" disabled v-model="addressStr"></el-input>
                     </el-form-item>
                 </div>
+                <div style="display: flex;">
+                    <el-form-item label="支付类型">
+                        <el-input disabled v-model="detailData.payTypeName"></el-input>
+                    </el-form-item>
+                </div>
             </el-form>
             <h3>商品信息</h3>
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">

+ 5 - 0
src/views/exchangeManage/exchangeList.vue

@@ -132,6 +132,11 @@
                         <el-input type="textarea" :rows="2" disabled v-model="addressStr"></el-input>
                     </el-form-item>
                 </div>
+                <div style="display: flex;">
+                    <el-form-item label="支付类型">
+                        <el-input disabled v-model="detailData.payTypeName"></el-input>
+                    </el-form-item>
+                </div>
             </el-form>
             <h3>商品信息</h3>
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">

+ 5 - 0
src/views/exchangeManage/pasList.vue

@@ -129,6 +129,11 @@
                         <el-input type="textarea" :rows="2" disabled v-model="addressStr"></el-input>
                     </el-form-item>
                 </div>
+                <div style="display: flex;">
+                    <el-form-item label="支付类型">
+                        <el-input disabled v-model="detailData.payTypeName"></el-input>
+                    </el-form-item>
+                </div>
             </el-form>
             <h3>商品信息</h3>
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">

+ 5 - 0
src/views/exchangeManage/voidList.vue

@@ -129,6 +129,11 @@
                         <el-input type="textarea" :rows="2" disabled v-model="addressStr"></el-input>
                     </el-form-item>
                 </div>
+                <div style="display: flex;">
+                    <el-form-item label="支付类型">
+                        <el-input disabled v-model="detailData.payTypeName"></el-input>
+                    </el-form-item>
+                </div>
             </el-form>
             <h3>商品信息</h3>
             <el-form status-icon label-position="center" label-width="100px" style="width:100%;">

+ 2 - 2
src/views/raffleManage/raffleDataList.vue

@@ -9,14 +9,14 @@
             </el-select>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
             <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
-            <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button>
+            <!-- <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button> -->
 
         </div>
 
         <!-- 查询结果 -->
         <el-table size="small" :data="list" v-loading="listLoading" @selection-change="handleSelectionChange"
             element-loading-text="正在查询中。。。" border fit highlight-current-row>
-            <el-table-column type="selection" width="55px"> </el-table-column>
+            <!-- <el-table-column type="selection" width="55px"> </el-table-column> -->
             <el-table-column align="center" min-width="100px" label="奖品类型" prop="prizeTypeName">
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="奖品名称" prop="prizeName">

+ 2 - 2
src/views/raffleManage/raffleList.vue

@@ -10,7 +10,7 @@
       </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
-      <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button>
+      <!-- <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button> -->
     </div>
 
     <!-- 查询结果 -->
@@ -24,7 +24,7 @@
       fit
       highlight-current-row
     >
-      <el-table-column type="selection" width="55px"> </el-table-column>
+      <!-- <el-table-column type="selection" width="55px"> </el-table-column> -->
       <el-table-column type="index" label="序号" header-align="center" align="center">
       </el-table-column>
 

+ 5 - 1
src/views/raffleManage/raffleLogsList.vue

@@ -15,7 +15,7 @@
             placeholder="创建日期">
             </el-date-picker>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
-
+            <el-button class="filter-item" type="primary"  :loading="downloadLoading" v-waves icon="el-icon-download" @click="handleDownload">导出</el-button>
         </div>
 
         <!-- 查询结果 -->
@@ -73,6 +73,7 @@ export default {
             list: [],
             total: 0,
             listLoading: false,
+            downloadLoading: false,
             listQuery: {
                 page: 1,
                 limit: 10,
@@ -86,6 +87,9 @@ export default {
         this.getList();
     },
     methods: {
+        handleDownload() {
+            window.location.href = process.env.BASE_API + '/mall-prize/export/log?userName=' + this.listQuery.userName + '&actTitle=' + this.listQuery.actTitle + '&createTime=' + this.listQuery.createTime;
+        },
         getList() {
             this.listLoading = true
             logsList(this.listQuery).then(response => {