Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

bms-back/bms-admin/src/main/resources/application.yml

@@ -123,8 +123,8 @@ token:
   header: Authorization
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
-  expireTime: 30
+  # 令牌有效期（24小时，单位：分钟）
+  expireTime: 1440
 
 # MyBatis配置
 mybatis:

bms-front/src/views/ar/bill/components/BillDetail.vue

@@ -59,7 +59,7 @@
           @size-change="handleDetailSizeChange"
         />
 
-        <div class="section-title export-title"><span>导出历史</span><el-button size="small" type="primary" plain icon="Download" :loading="exporting" :disabled="exporting" @click="$emit('export')">{{ exporting ? '生成中' : '导出账单' }}</el-button></div>
+        <div class="section-title export-title"><span>导出历史</span><el-button size="small" type="primary" plain icon="Download" :loading="exporting" :disabled="exporting" @click="$emit('export')">{{ exporting ? '生成中' : '导出账单明细' }}</el-button></div>
         <el-table :data="detail.exports || []" border size="small">
           <el-table-column prop="fileName" label="文件名" min-width="250" show-overflow-tooltip />
           <el-table-column prop="templateVersion" label="模板版本" width="100" />

bms-front/src/views/ar/bill/index.vue

@@ -43,7 +43,7 @@
         <el-button link type="primary" icon="View" @click="viewBill(row)">详情</el-button>
         <el-button v-if="row.status === AR_BILL_STATUS.DRAFT" link type="success" v-hasPermi="['ar:bill:confirm']" @click="confirmBill(row)">确认</el-button>
         <el-button v-if="row.status === AR_BILL_STATUS.DRAFT || row.status === AR_BILL_STATUS.CONFIRMED" link type="warning" v-hasPermi="['ar:bill:void']" @click="voidBill(row)">作废</el-button>
-        <el-button v-if="row.status !== AR_BILL_STATUS.DRAFT && row.status !== AR_BILL_STATUS.VOID" link type="primary" v-hasPermi="['ar:bill:export']" @click="exportBill(row)">导出</el-button>
+        <el-button v-if="row.status !== AR_BILL_STATUS.DRAFT && row.status !== AR_BILL_STATUS.VOID" link type="primary" v-hasPermi="['ar:bill:export']" @click="exportBill(row)">导出明细</el-button>
         <el-button v-if="canGoWriteoff(row)" link type="primary" v-hasPermi="['customer:bill:writeoff']" @click="goWriteoff(row)">去核销</el-button>
       </template>
     </basic-table>