Merge branch 'historical_route' into dev

package.json

@@ -45,6 +45,7 @@
     "clipboard": "2.0.8",
     "core-js": "^3.25.3",
     "echarts": "^5.4.0",
+    "el-table-horizontal-scroll": "^1.2.5",
     "el-table-infinite-scroll": "^2.0.0",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",

src/main.js

@@ -65,6 +65,8 @@ import 'umy-ui/lib/theme-chalk/index.css';// 引入样式
 // 引入vxe-table
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'
+//底部横拉条
+import horizontalScroll from 'el-table-horizontal-scroll';
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts;
@@ -104,6 +106,7 @@ Vue.use(VueMeta);
 Vue.use(Print); //注册
 Vue.use(UmyUi);
 Vue.use(VXETable)
+Vue.use(horizontalScroll);//底部横拉条
 DictData.install();
 
 // el-table无限滚动解决页面渲染卡死

src/views/business/spd/bo/plan/add.vue

@@ -131,6 +131,7 @@
           fit
           height="460"
           style="font-size: 12px;"
+          v-horizontal-scroll
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" align="center"/>

src/views/business/spd/bo/plan/index.vue

@@ -169,8 +169,9 @@
         <el-table 
         :data="tableList" 
         fit
-        height="560"
+        max-height="560"
         style="font-size: 12px;"
+        v-horizontal-scroll
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
         @row-dblclick="getEmpDetail"

src/views/business/spd/goal_management/AnnualSaleGoal.vue

@@ -170,7 +170,7 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
       <el-table-column type="selection" width="55" align="center" fixed/>
       <el-table-column label="编码" align="center" prop="code" width="180"/>
       <el-table-column label="目标名称" align="center" prop="goalName" width="180"/>
@@ -317,7 +317,7 @@
         </el-row>
         <el-tabs v-model="activeName">
           <el-tab-pane label="年销售目标填报明细" name="annualSaleGoalDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange">
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180" :render-header="(h, obj) => addRedStar(h, obj, '0')">
                 <template slot-scope="scope">
@@ -918,7 +918,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除年度销售目标编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除年销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
         return delAnnualSaleGoal(ids);
       }).then(() => {
         this.getList();
@@ -932,7 +932,7 @@ export default {
         this.computeTotal()
       } else {
         if (row.id !== null) {
-          this.$modal.confirm('是否确认删除年度销售目标明细编号为"' + row.id + '"的数据项？').then(function () {
+          this.$modal.confirm('是否确认删除年度销售目标明细序号为"' + (index + 1) + '"的数据项？').then(function () {
             return delAnnualSaleGoalDetails(row.id)
           }).then(() => {
             this.getListDetails()

src/views/business/spd/goal_management/AnnualSaleGoalMerge.vue

@@ -183,7 +183,7 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="annualSaleGoalMergeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="annualSaleGoalMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编码" align="center" prop="code" width="180"/>
       <el-table-column label="目标名称" align="center" prop="goalName" width="180"/>
@@ -344,7 +344,7 @@
         </el-row>
         <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
           <el-tab-pane label="年销售目标合并明细" name="annualSaleGoalMergeDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="annualSaleGoalMergeDetailsList">
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="annualSaleGoalMergeDetailsList" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180">
                 <template slot-scope="scope">
@@ -468,7 +468,7 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="区域目标汇总(年)" name="zoneGoalSum(year)">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="areaDetailList">
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="areaDetailList" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180">
                 <template slot-scope="scope">
@@ -565,7 +565,7 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="客户目标汇总(年)" name="customerGoalSum(year)">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="customerDetailList">
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="customerDetailList" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180">
                 <template slot-scope="scope">
@@ -1111,7 +1111,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除年度销售目标明细编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除年度销售目标单据编号为"' + row.code + '"的数据项？').then(function () {
         return delAnnualSaleGoalMerge(ids);
       }).then(() => {
         this.getList();
@@ -1125,7 +1125,7 @@ export default {
         this.computeTotal()
       } else { // 修改
         if (row.id !== null) {
-          this.$modal.confirm('是否确认删除年度销售目标明细编号为"' + row.id + '"的数据项？').then(function () {
+          this.$modal.confirm('是否确认删除年度销售目标明细序号为"' + (index + 1) + '"的数据项？').then(function () {
             return delAnnualSaleMergeDetails(row.id);
           }).then(() => {
             this.getListDetails();

src/views/business/spd/goal_management/MonthGoalMerge.vue

@@ -196,7 +196,7 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="monthGoalMergeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="monthGoalMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编码" align="center" prop="code"/>
       <el-table-column label="目标名称" align="center" prop="goalName"/>
@@ -377,7 +377,7 @@
         </el-row>
         <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
           <el-tab-pane label="月销售目标合并明细" name="monthGoalMergeDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange">
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
                 <template slot-scope="scope">
@@ -470,7 +470,7 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="区域目标汇总(月)" name="zoneGoalSum" v-if="this.form.goalCategory == '销售区域'">
-            <el-table max-height="300" :data="zoneGoalSumList">
+            <el-table max-height="300" :data="zoneGoalSumList" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="55" align="center" fixed />
               <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
                 <template slot-scope="scope">
@@ -504,7 +504,7 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="客户目标汇总(月)" name="customGoalSum" v-if="this.form.goalCategory == '销售区域'">
-            <el-table max-height="300" :data="customGoalSumList">
+            <el-table max-height="300" :data="customGoalSumList" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="55" align="center" fixed />
               <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
                 <template slot-scope="scope">
@@ -977,7 +977,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除月销售目标合并编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除月销售目标合并单据编号为"' + row.code + '"的数据项？').then(function () {
         return delMonthGoalMerge(ids);
       }).then(() => {
         this.getList();
@@ -991,7 +991,7 @@ export default {
         this.computeTotal()
       } else {
         if (row.id !== null) {
-          this.$modal.confirm('是否确认删除月销售目标合并明细编号为"' + row.id + '"的数据项？').then(function () {
+          this.$modal.confirm('是否确认删除月销售目标合并明细序号为"' + (index + 1) + '"的数据项？').then(function () {
             return delMonthGoalMergeDetails(row.id);
           }).then(() => {
             this.getListDetails();

src/views/business/spd/goal_management/MonthReturnGoal.vue

@@ -167,7 +167,7 @@
         </el-dropdown>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="monthReturnGoalList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="monthReturnGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编码" align="center" prop="code"/>
       <el-table-column label="目标名称" align="center" prop="goalName"/>
@@ -322,7 +322,7 @@
         </el-row>
         <el-tabs v-model="activeName">
           <el-tab-pane label="月回款目标明细" name="monthReturnGoalDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthReturnGoalDetailsList" @selection-change="handleSelectionChange">
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthReturnGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180" :render-header="addRedStar">
                 <template slot-scope="scope">
@@ -827,7 +827,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除月销售目标填报编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除月销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
         return delMonthReturnGoal(ids);
       }).then(() => {
         this.getList();
@@ -841,7 +841,7 @@ export default {
         this.computeTotal()
       } else {
         if (row.id !== null) {
-          this.$modal.confirm('是否确认删除月销售目标填报明细编号为"' + row.id + '"的数据项？').then(function () {
+          this.$modal.confirm('是否确认删除月销售目标填报明细序号为"' + (index + 1) + '"的数据项？').then(function () {
             return delMonthReturnGoalDetails(row.id);
           }).then(() => {
             this.getListDetails();

src/views/business/spd/goal_management/MonthReturnMerge.vue

@@ -171,7 +171,7 @@
       </el-dropdown>
     </el-col>
   </el-row>
-  <el-table v-loading="loading" :data="monthReturnMergeList" @selection-change="handleSelectionChange">
+  <el-table v-loading="loading" :data="monthReturnMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
     <el-table-column type="selection" width="55" align="center"/>
     <el-table-column label="编码" align="center" prop="code" width="180"/>
     <el-table-column label="目标名称" align="center" prop="goalName" width="180"/>
@@ -334,7 +334,7 @@
       </el-row>
       <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
         <el-tab-pane label="月回款目标合并明细" name="monthReturnMergeDetails">
-          <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthReturnMergeDetailsList">
+          <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthReturnMergeDetailsList" v-horizontal-scroll>
             <el-table-column label="序号" type="index" width="55" align="center" fixed />
             <el-table-column label="销售组织" align="center" width="180">
               <template slot-scope="scope">
@@ -395,7 +395,7 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="区域目标汇总(月回款)" name="zoneGoalSum(monthReturn)">
-          <el-table max-height="300" show-summary :summary-method="getSummaries" :data="zoneGoalSumList">
+          <el-table max-height="300" show-summary :summary-method="getSummaries" :data="zoneGoalSumList" v-horizontal-scroll>
             <el-table-column label="序号" type="index" width="55" align="center" fixed />
             <el-table-column label="销售组织" align="center" width="180">
               <template slot-scope="scope">
@@ -826,7 +826,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除月销售目标合并编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除月销售目标合并单据编号为"' + row.code + '"的数据项？').then(function () {
         return delMonthReturnMerge(ids);
       }).then(() => {
         this.getList();
@@ -840,7 +840,7 @@ export default {
         this.computeTotal()
       } else {
         if (row.id !== null) {
-          this.$modal.confirm('是否确认删除月销售目标合并明细编号为"' + row.id + '"的数据项？').then(function () {
+          this.$modal.confirm('是否确认删除月销售目标合并明细序号为"' + (index + 1) + '"的数据项？').then(function () {
             return delMonthReturnMergeDetails(row.id);
           }).then(() => {
             this.getListDetails();

src/views/business/spd/goal_management/MonthSaleGoal.vue

@@ -169,7 +169,7 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="monthSaleGoalList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="monthSaleGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编码" align="center" prop="code"/>
       <el-table-column label="目标名称" align="center" prop="goalName"/>
@@ -324,7 +324,7 @@
         </el-row>
         <el-tabs v-model="activeName">
           <el-tab-pane label="月销售目标明细" name="monthSaleGoalDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthSaleGoalDetailsList" @selection-change="handleSelectionChange">
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180" :render-header="addRedStar">
                 <template slot-scope="scope">
@@ -875,7 +875,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除月销售目标填报编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除月销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
         return delMonthSaleGoal(ids);
       }).then(() => {
         this.getList();
@@ -889,7 +889,7 @@ export default {
         this.computeTotal()
       } else {
         if (row.id !== null) {
-          this.$modal.confirm('是否确认删除月销售目标填报明细编号为"' + row.id + '"的数据项？').then(function () {
+          this.$modal.confirm('是否确认删除月销售目标填报明细序号为"' + (index + 1) + '"的数据项？').then(function () {
             return delMonthSaleGoalDetails(row.id);
           }).then(() => {
             this.getListDetails();