Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!492

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

@@ -223,7 +223,7 @@
       @pagination="getList"
     />
 
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%">
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="6">

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

@@ -238,7 +238,7 @@
     />
 
     <!-- 添加或修改年度销售目标明细对话框 -->
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%">
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="6">

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

@@ -250,7 +250,7 @@
     />
 
     <!-- 添加或修改月销售目标合并抽屉 -->
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%">
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="6">

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

@@ -219,7 +219,7 @@
       @pagination="getList"
     />
 
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%">
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="6">

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

@@ -225,7 +225,7 @@
   />
 
   <!-- 添加或修改月销售目标合并抽屉 -->
-  <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%">
+  <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="6">

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

@@ -222,7 +222,7 @@
       @pagination="getList"
     />
 
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%">
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="6">