修复bug

src/HDrpManagement/projectChange/components/putPeople.vue

@@ -1,20 +1,8 @@
 <template>
   <div>
-<<<<<<< HEAD
     <el-button v-if="flag === 0 && tool.checkAuth($route.name,'putSubmit')" size="mini" :type="!disabled || rowData.status === '已失败' ?'':'primary'" slot="reference" @click="onSubmit" :disabled="!disabled || rowData.status === '已失败'">提交报备</el-button>
     <el-button v-if="flag === 1 && tool.checkAuth($route.name,'putCheck')" size="mini" type="primary" slot="reference" @click="onCheck" >报备审核</el-button>
     <el-button v-if="flag !== 0 && tool.checkAuth($route.name,'putBack') " size="mini" type="primary" slot="reference"  @click="onUnCheck" >报备驳回(退回)</el-button>
-=======
-    <div v-if="flag === 0 && tool.checkAuth($route.name,'putSubmit')" class="inline-16">
-      <el-button  size="mini" :type="!disabled || rowData.status === '已失败' ?'':'primary'" slot="reference" @click="onSubmit" :disabled="!disabled || rowData.status === '已失败'">提交报备</el-button>
-    </div>
-    <div v-else-if="flag === 1 && tool.checkAuth($route.name,'putCheck')" class="inline-16">
-      <el-button size="mini" type="primary" slot="reference" @click="onCheck" >报备审核</el-button>
-    </div>
-    <div v-if="flag !== 0 && tool.checkAuth($route.name,'putBack') " class="inline-16">
-      <el-button size="mini" type="primary" slot="reference"  @click="onUnCheck" >报备驳回(退回)</el-button>
-    </div>
->>>>>>> 7ded3ac24d3c590bd3cb1ef2d357b71f5c688afb
   </div>
 </template>
 

src/template/salesForecastUseProject/addProduct.vue

@@ -14,7 +14,7 @@
             <el-input size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>&nbsp;
           </div>
           <div style="float: right">
-            <el-button style="float: right" type="primary" size="mini" @click="onSubmit"  :disabled="tableSelectData.length === 0 ">批量添加</el-button>
+            <el-button style="float: right" type="primary" size="mini" @click="batchSelects"  :disabled="tableSelectData.length === 0 ">批量添加</el-button>
           </div>
         </div>
         <div class="produtMag-panel" style="margin-top: 10px">
@@ -110,7 +110,7 @@
                 width="90"
                 fixed="right">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="batchSelect(scope.row)">添加1</el-button>
+                <el-button type="text" size="small" @click="batchSelect(scope.row)">添加</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -229,7 +229,7 @@ export default {
     batchSelect(row){
       this.debounce(() => {
         this.addProduct(row)
-      }, 1000)()
+      }, 300)()
     },
     debounce (fn, wait) {
       let that = this
@@ -238,6 +238,11 @@ export default {
         that.timer = setTimeout(fn, wait)
       }
     },
+    batchSelects(){
+      this.debounce(() => {
+        this.onSubmit()
+      }, 300)()
+    },
     /*选择要添加的数据*/
     selectionChange(val){
       console.log(val)

src/template/salesForecastUseProject/index.vue

@@ -101,7 +101,9 @@ export default {
       this.listData()
     },
     batchSelect(row){
-      this.debounce(this.addProject(row),1000)()
+      this.debounce(() => {
+        this.addProject(row)
+      }, 300)()
     },
     async addProject (row) {
       const res = await this.$api.requested({