Merge branch 'feature/EK-1281' of guanli/ngds-backend-ele into master

src/views/shop/goods-add.vue

@@ -342,8 +342,8 @@ export default {
       // this.$refs.multipleTable.toggleRowSelection(row,true);
     },
     handleRowClickTemp(row) {
-      console.log(row)
-      console.log('temp 选中')
+      // console.log(row)
+      // console.log('temp 选中')
       // 手动控制行点击时的选中状态
       // this.$refs.multipleTableTemp.toggleRowSelection(row,true);
     },
@@ -401,7 +401,7 @@ export default {
     submitAvailableCountries(){
       this.$refs.availableCountriesTableForm.validate((valid) => {
         if (valid) {
-          this.form.nature = this.multipleSelection
+          this.form.nature = {...this.multipleSelection, ...this.multipleSelectionTemp}
           this.editAvailableCountriesDialog = false
         } else {
 
@@ -411,6 +411,7 @@ export default {
 
     },
     handleSelectionChange(val) {
+      console.log(val)
       this.multipleSelection = val;
       // 更新选中的项
       this.selectedIds = val.map(item => item.ID);