Merge branch 'xiaoqin' into mergeBranch

src/HManagement/marketing2/agent/details/modules/saleclass/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <add-sale-class class="normal-margin" :data="data" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'salerClass') "/>
+    <add-sale-class class="normal-margin" :data="data" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'classAdd') "/>
     <tableLayout  :layout="tablecols" :data="saleClassList" :custom="false" height="calc(100vh - 405px)" fixedName="operation">
       <template v-slot:opreation="scope">
-        <Del v-if="tool.checkAuth($route.name,'salerClass')" :id="scope.data.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
+        <Del v-if="tool.checkAuth($route.name,'classDel')" :id="scope.data.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
       </template>
     </tableLayout>
   </div>

src/template/orderCanUseProduct/index.vue

@@ -151,6 +151,9 @@ export default {
     },
     onConfirm () {
       this.$emit('onConfirm',this.tableSelectData)
+      this.tableSelectData.forEach(v => {
+        this.tableData.splice(this.tableData.findIndex(j => j.itemid == v.itemid),1)
+      })
     },
     clearSelection () {
       this.$refs.multipleTable.clearSelection();

src/template/product/index.vue

@@ -178,6 +178,7 @@ export default {
     },
     addProduct (row) {
       this.$emit('addProduct',row)
+      this.tableData.splice(this.tableData.findIndex(item => item.itemid == row.itemid),1)
     }
   },
   mounted () {