Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js

@@ -130,6 +130,17 @@ export function customerBillThreeDetails(data) {
   })
 }
 
+// 客户账单汇总--导出
+export function exportCustomerBillExcel(data) {
+  return request({
+    url: '/fin/finuncollectedreceivablesdetailed/exportCustomerBillExcel',
+    method: 'post',
+    responseType: 'blob', // 表明返回服务器返回的数据类型
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
 // 客户账单明细
 export function customerBillDetailedListPage(data) {
   return request({

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingSummary.vue

@@ -126,7 +126,7 @@
 </template>
 
 <script>
-import { customerBillListPage, exportExcel, customerBillDetailsList, customerBillThreeDetails } from '@/api/anruifinmanagement/paymentConfirmation.js'
+import { customerBillListPage, exportCustomerBillExcel, customerBillDetailsList, customerBillThreeDetails } from '@/api/anruifinmanagement/paymentConfirmation.js'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -301,30 +301,29 @@ export default {
       this.innerVisible = false
     },
     doExport() {
-      this.$message({ showClose: true, type: 'warning', message: '导出功能完善中' })
+      const loading = this.$loading({
-      // const loading = this.$loading({
+        lock: true,
-      //   lock: true,
+        text: 'Loading',
-      //   text: 'Loading',
+        spinner: 'el-icon-loading',
-      //   spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
-      //   background: 'rgba(0, 0, 0, 0.7)'
+      })
-      // })
+      exportCustomerBillExcel(this.listQuery.params).then((resp) => {
-      // exportExcel(this.listQuery.params).then((resp) => {
+        loading.close()
-      //   loading.close()
+        const blob = new Blob([resp], {
-      //   const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
-      //     type: 'application/vnd.ms-excel'
+        })
-      //   })
+        const fileName = '客户账单汇总' + '.xls'
-      //   const fileName = '客户账单汇总' + '.xls'
+        const elink = document.createElement('a')
-      //   const elink = document.createElement('a')
+        elink.download = fileName
-      //   elink.download = fileName
+        elink.style.display = 'nonde'
-      //   elink.style.display = 'nonde'
+        elink.href = URL.createObjectURL(blob)
-      //   elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
-      //   document.body.appendChild(elink)
+        elink.click()
-      //   elink.click()
+        URL.revokeObjectURL(elink.href)
-      //   URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
-      //   document.body.removeChild(elink)
+      }).catch(() => {
-      // }).catch(() => {
+        loading.close()
-      //   loading.close()
+      })
-      // })
     },
     resetState() {
       this.viewState = 1

yxt-as-ui/src/views/statement/inventory/maintenanceCommissionDetails.vue

@@ -8,7 +8,7 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
               <el-form-item label="姓名">
                 <el-input v-model="listQuery.params.name" placeholder="" clearable/>
               </el-form-item>
@@ -94,12 +94,12 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50"/>
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column prop="name" label="姓名" align="center" min-width="130" />
+            <el-table-column prop="name" label="姓名" align="center" width="100" />
-            <el-table-column prop="postName" label="岗位" align="center" min-width="100" />
+            <el-table-column prop="postName" label="岗位" align="center" width="100" />
             <el-table-column prop="subject" label="科目" align="center" width="100" />
             <el-table-column prop="commissionWay" label="提成方式" align="center" width="100" />
-            <el-table-column prop="resultsType" label="业绩类型" align="center" min-width="100" />
+            <el-table-column prop="resultsType" label="业绩类型" align="center" width="100" />
-            <el-table-column prop="commissionCriteria" label="提成标准" align="center" min-width="100" />
+            <el-table-column prop="commissionCriteria" label="提成标准" align="center" width="100" />
             <el-table-column prop="profitResults" label="利润业绩" align="center" width="100" />
             <el-table-column prop="commission" label="提成" align="center" width="100" />
             <el-table-column prop="goodsType" label="商品类别" align="center" width="100" />
@@ -112,13 +112,13 @@
             <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="customerName" label="客户" align="center" width="100" />
-            <el-table-column prop="billNo" label="维修单号/销售单号" align="center" width="100" />
+            <el-table-column prop="billNo" label="维修单号/销售单号" align="center" min-width="180" />
-            <el-table-column prop="createTime" label="创建时间" align="center" width="100" />
+            <el-table-column prop="createTime" label="创建时间" align="center" width="120" />
-            <el-table-column prop="dispatchTime" label="派工时间" align="center" width="100" />
+            <el-table-column prop="dispatchTime" label="派工时间" align="center" width="120" />
-            <el-table-column prop="finishTime" label="竣工时间" align="center" width="100" />
+            <el-table-column prop="finishTime" label="竣工时间" align="center" width="120" />
-            <el-table-column prop="settleTime" label="结算时间" align="center" width="100" />
+            <el-table-column prop="settleTime" label="结算时间" align="center" width="120" />
             <el-table-column prop="nodeName" label="单据环节" align="center" width="100" />
-            <el-table-column prop="deptName" label="服务站" align="center" width="100" />
+            <el-table-column prop="deptName" label="服务站" align="center" min-width="100" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->

yxt-as-ui/src/views/statement/inventory/performanceSummary.vue

@@ -46,17 +46,17 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50"/>
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column prop="name" label="姓名" align="center" min-width="130" />
+            <el-table-column prop="name" label="姓名" align="center" width="100" />
-            <el-table-column prop="postName" label="岗位" align="center" min-width="100" />
+            <el-table-column prop="postName" label="岗位" align="center" width="100" />
             <el-table-column prop="baseSalary" label="基本工资" align="center" width="100" />
-            <el-table-column prop="sitemResults" label="维修项目业绩" align="center" width="100" />
+            <el-table-column prop="sitemResults" label="维修项目业绩" align="center" width="140" />
-            <el-table-column prop="sitemCommission" label="维修项目提成" align="center" min-width="100" />
+            <el-table-column prop="sitemCommission" label="维修项目提成" align="center" width="140" />
-            <el-table-column prop="goodsSalesResults" label="配件销售业绩" align="center" min-width="100" />
+            <el-table-column prop="goodsSalesResults" label="配件销售业绩" align="center" width="140" />
             <el-table-column prop="goodsCost" label="配件成本" align="center" width="100" />
-            <el-table-column prop="goodsSalesCommission" label="配件销售提成" align="center" width="120" />
+            <el-table-column prop="goodsSalesCommission" label="配件销售提成" align="center" width="140" />
             <el-table-column prop="commissionTotal" label="提成合计" align="center" width="100" />
-            <el-table-column prop="salaryCommissionTotal" label="工资提成合计" align="center" width="120" />
+            <el-table-column prop="salaryCommissionTotal" label="工资提成合计" align="center" width="140" />
-            <el-table-column prop="deptName" label="服务站" align="center" width="100" />
+            <el-table-column prop="deptName" label="服务站" align="center" min-width="100" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->

yxt-as-ui/src/views/statement/inventory/salesCommissionDetails.vue

@@ -88,12 +88,12 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column fixed type="selection" align="center" width="50"/>
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column prop="name" label="姓名" align="center" min-width="130" />
+            <el-table-column prop="name" label="姓名" align="center" width="100" />
-            <el-table-column prop="postName" label="岗位" align="center" min-width="100" />
+            <el-table-column prop="postName" label="岗位" align="center" width="100" />
             <el-table-column prop="subject" label="科目" align="center" width="100" />
             <el-table-column prop="commissionWay" label="提成方式" align="center" width="100" />
-            <el-table-column prop="resultsType" label="业绩类型" align="center" min-width="100" />
+            <el-table-column prop="resultsType" label="业绩类型" align="center" width="100" />
-            <el-table-column prop="commissionCriteria" label="提成标准" align="center" min-width="100" />
+            <el-table-column prop="commissionCriteria" label="提成标准" align="center" width="100" />
             <el-table-column prop="assignmentCriteria" label="分配标准" align="center" width="100" />
             <el-table-column prop="results" label="业绩" align="center" width="100" />
             <el-table-column prop="commission" label="提成" align="center" width="100" />
@@ -103,13 +103,13 @@
             <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="customerName" label="客户" align="center" width="100" />
-            <el-table-column prop="billNo" label="维修单号" align="center" width="100" />
+            <el-table-column prop="billNo" label="维修单号" align="center" min-width="150" />
-            <el-table-column prop="createTime" label="创建时间" align="center" width="100" />
+            <el-table-column prop="createTime" label="创建时间" align="center" width="120" />
-            <el-table-column prop="dispatchTime" label="派工时间" align="center" width="100" />
+            <el-table-column prop="dispatchTime" label="派工时间" align="center" width="120" />
-            <el-table-column prop="finishTime" label="竣工时间" align="center" width="100" />
+            <el-table-column prop="finishTime" label="竣工时间" align="center" width="120" />
-            <el-table-column prop="settleTime" label="结算时间" align="center" width="100" />
+            <el-table-column prop="settleTime" label="结算时间" align="center" width="120" />
             <el-table-column prop="nodeName" label="单据环节" align="center" width="100" />
-            <el-table-column prop="deptName" label="服务站" align="center" width="100" />
+            <el-table-column prop="deptName" label="服务站" align="center" min-width="100" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->