feat: EK-856: 管理员增加“Country”属性.

src/utils/usersInfo.js

@@ -183,6 +183,9 @@ const usersInfo = {
   daysDiff() {
     return this.get('daysDiff')
   },
+  isSuperAdmin() {
+    return this.get('isSuperAdmin')
+  },
   get(...arg) {
     let baseInfo = null
     try {

src/views/admin/edit.vue

@@ -13,7 +13,7 @@
             <el-option v-for="item in roles" :key="item.ID" :label="item.ROLE_NAME" :value="item.ID" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('transportationConfig.countryName')"><!-- 国家 -->
+        <el-form-item :label="$t('transportationConfig.countryName')" v-if="form.roleId !== baseInfo.superAdminRoleId()"><!-- 国家 -->
           <el-select v-model="form.countryId" multiple :placeholder="$t('Administrator.pleaseSelectCountry')">
             <el-option v-for="item in countries" :key="item.ID" :label="item.NAME" :value="item.ID" />
           </el-select>
@@ -53,6 +53,8 @@
 import { adminAddAndEditAndChangePassword, adminAdd, adminEdit } from '@/api/filter'
 import {getCountries} from "@/api/site";
 import {isArray} from "@/utils/validate";
+import usersInfo from "@/utils/usersInfo";
+import baseInfo from "@/utils/baseInfo";
 export default {
   name: 'RoleAdd',
   data() {
@@ -67,7 +69,7 @@ export default {
         roleId: null,
         password: null,
         surePassword: null,
-        countryId: []
+        countryId: [1]
       },
       loading: true,
       submitButtonStat: false,
@@ -77,6 +79,12 @@ export default {
     }
   },
   computed: {
+    baseInfo() {
+      return baseInfo
+    },
+    usersInfo() {
+      return usersInfo
+    },
     isAddOrEdit() {
       if (this.$route.name === 'admin_add' || this.$route.name === 'admin_edit') {
         return true
@@ -99,7 +107,6 @@ export default {
         this.loading = false
         this.isEdit = true
       }).catch(err => {
-        console.log('err=============' + err)
         this.loading = false
         this.$message({
           message: err,
@@ -111,7 +118,6 @@ export default {
         this.roles = response.data.adminRoles
         this.loading = false
       }).catch(err => {
-        console.log('err=============' + err)
         this.loading = false
         this.$message({
           message: err,
@@ -133,7 +139,7 @@ export default {
         path = 'admin/change-password'
       }
 
-      if (!(isArray(this.form.countryId) && this.form.countryId.length > 0)){
+      if ((this.form.roleId !== baseInfo.superAdminRoleId()) && !(isArray(this.form.countryId) && this.form.countryId.length > 0)){
         this.$message({
           message: this.$t('Administrator.pleaseSelectCountry'),
           type: 'error'
@@ -150,7 +156,6 @@ export default {
         })
         this.$router.go(-1)
       }).catch(err => {
-        console.log('err=============' + err)
         this.submitButtonStat = false
         this.$message({
           message: err,

src/views/admin/index.vue

@@ -20,17 +20,17 @@
             {{ scope.row.REAL_NAME }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('Administrator.remark')" prop="REMARK" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.REMARK }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Administrator.role')" prop="ROLE_NAME" width="150">
+<!--        <el-table-column :label="$t('Administrator.remark')" prop="REMARK" width="150">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.REMARK }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column :label="$t('Administrator.role')" prop="ROLE_NAME" width="170">
           <template slot-scope="scope">
             <el-tag type="warning" size="small" class="no-border">{{ scope.row.ROLE_NAME }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('Administrator.isEnable')" prop="IS_ENABLE">
+        <el-table-column :label="$t('Administrator.isEnable')" prop="IS_ENABLE" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.IS_ENABLE==1?'success':'danger')">
               <template v-if="scope.row.IS_ENABLE==1">
@@ -42,48 +42,56 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('Administrator.loginTimes')" prop="LOGIN_NUMS">
-          <template slot-scope="scope">
-            {{ scope.row.LOGIN_NUMS }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Administrator.lastLoginIp')" prop="LAST_LOGIN_IP" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.LAST_LOGIN_IP }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Administrator.lastLoginAt')" width="180">
-          <template slot-scope="scope">
-            {{ tool.formatDate(scope.row.LAST_LOGIN_AT) }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Administrator.bindIp')" width="250">
-          <template slot-scope="scope">
-            {{ scope.row.BIND_IP }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Administrator.creatUser')" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.CREATE_ADMIN_NAME }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Administrator.creatAt')" width="180">
-          <template slot-scope="scope">
-            {{ tool.formatDate(scope.row.CREATED_AT) }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Administrator.updateUser')" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.UPDATE_ADMIN_NAME }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Administrator.updateAt')" width="180">
-          <template slot-scope="scope">
-            {{ tool.formatDate(scope.row.UPDATED_AT) }}
+        <el-table-column :label="$t('transportationConfig.countryName')" prop="country">
+          <template slot-scope="scope" v-if="!scope.row.isSuper">
+            <el-tag type="info" size="mini" v-for="country in scope.row.country">
+              {{ country }}
+            </el-tag>
           </template>
+          <template v-else>-</template>
         </el-table-column>
+<!--        <el-table-column :label="$t('Administrator.loginTimes')" prop="LOGIN_NUMS">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.LOGIN_NUMS }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('Administrator.lastLoginIp')" prop="LAST_LOGIN_IP" width="150">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.LAST_LOGIN_IP }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('Administrator.lastLoginAt')" width="180">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ tool.formatDate(scope.row.LAST_LOGIN_AT) }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('Administrator.bindIp')" width="250">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.BIND_IP }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('Administrator.creatUser')" width="150">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.CREATE_ADMIN_NAME }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('Administrator.creatAt')" width="180">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ tool.formatDate(scope.row.CREATED_AT) }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('Administrator.updateUser')" width="150">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.UPDATE_ADMIN_NAME }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('Administrator.updateAt')" width="180">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ tool.formatDate(scope.row.UPDATED_AT) }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
 
-        <el-table-column :fixed="fixedColumn" :label="$t('table.actions')" width="180">
+        <el-table-column :fixed="fixedColumn" :label="$t('table.actions')" width="180" v-if="usersInfo.isSuperAdmin()">
           <template slot-scope="scope">
             <el-dropdown v-if="scope.row.DONT_DEL!=='1'&&(permission.hasPermission(`admin/edit`)||permission.hasPermission(`admin/admin-delete`))" size="small" trigger="click" @command="handleRow" @click.stop="">
               <el-button type="primary" size="small">
@@ -97,7 +105,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="white-box-footer">
+      <div class="white-box-footer" v-if="usersInfo.isSuperAdmin()">
         <el-dropdown v-if="permission.hasPermission(`admin/admin-delete`)" size="small" trigger="click" @command="handleMuliDel">
           <el-button type="primary" size="small">
             {{ $t('Administrator.selectData') }}
@@ -122,9 +130,15 @@ import permission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 import filterHelper from '@/utils/filterHelper'
 import {getOperatingSystem, getScreenWidth} from "@/utils"
+import usersInfo from "@/utils/usersInfo";
 
 export default {
   name: 'DecLevel',
+  computed: {
+    usersInfo() {
+      return usersInfo
+    }
+  },
   components: { FilterUser, Pagination },
   data() {
     return {

src/views/admin/role-add.vue

@@ -61,7 +61,6 @@ export default {
           message: err,
           type: 'error'
         })
-        console.log('err---------' + err)
       })
     }
   }

src/views/shop/goods-add.vue

@@ -11,41 +11,15 @@
                 <el-form-item :label="$t('shop.productType')"><!-- 商品类型 -->
                     <el-checkbox  v-for="(value,key) in GiftTypeArr" v-model="form.giftType[key-1]" :key="key" >{{value.name}}</el-checkbox>
                 </el-form-item>
-                <el-form-item :label="$t('shop.bvSplit')">
-                  <el-select v-model="form.pvSplit" placeholder="">
-                    <el-option
-                      v-for="item in pvSplitOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item :label="$t('shop.productCategory')"><!-- 商品分类 -->
-                    <el-select v-model="form.categoryType" placeholder="">
-                        <el-option v-for="item in categoryType" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
                 <el-form-item :label="$t('shop.productCode')"><!-- 商品编号 -->
                     <el-input v-model="form.goodsNo"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('shop.unit')"><!-- 单位 -->
                     <el-input v-model="form.unit"></el-input>
                 </el-form-item>
-<!--                <el-form-item :label="$t('shop.taxRate')">&lt;!&ndash; 税率 &ndash;&gt;-->
-<!--                  <el-input v-model="form.taxRate">-->
-<!--                    <template slot="append">%</template>-->
-<!--                  </el-input>-->
-<!--                </el-form-item>-->
                 <el-form-item :label="$t('shop.standardPrice')">
                     <el-input-number v-model="form.sellPriceStandard" @input="handleInput" class="left-aligned-input" :precision="2" :step="0.1" :min="0" :controls="false" style="text-align: left"></el-input-number>
                 </el-form-item>
-<!--                <el-form-item :label="$t('shop.salesPrice')">-->
-<!--                    <el-input v-model="form.sellPrice"></el-input>-->
-<!--                </el-form-item>-->
-<!--                <el-form-item :label="$t('shop.marketPrice')">-->
-<!--                  <el-input v-model="form.marketPrice"></el-input>-->
-<!--                </el-form-item>-->
                 <el-form-item :label="$t('shop.priceBV')" v-show="pvDisabled"><!-- 价格BV -->
                     <el-input v-model="form.pricePv"></el-input>
                 </el-form-item>
@@ -68,10 +42,6 @@
                 </el-form-item>
                 <el-form-item :label="$t('shop.uploadImages')"><!-- 上传图片 -->
                     <div class='up_load'>
-                        <!-- <leo-uploader
-                            @on-success='upLoadSuccess'
-                            :request-route="'shop/upload'"
-                        ></leo-uploader> -->
                         <Upload
                             :request-route="'v1/shop/upload'"
                             width="400px"
@@ -230,7 +200,7 @@ export default {
         cover: '',
         textarea: '',
         sellDiscount: '',
-        categoryType: '',
+        categoryType: 1,
         sellPriceStandard: undefined,
         taxRate: 0,
         nature: []
@@ -240,6 +210,7 @@ export default {
       GiftTypeArr: [],
       categoryType: [],
       sellType: null,
+      countries: [],
       width: '100px',
       height: '100px',
       pvDisabled: true,
@@ -276,7 +247,6 @@ export default {
     'form.sellPriceStandard': {
         deep: true,
         handler(modern, origin) {
-            // this.form.sellPrice = modern * this.exchangeRate
           if(modern){
             this.form.nature = []
             this.availableCountriesTableForm.availableCountriesList = []
@@ -345,14 +315,8 @@ export default {
 
     },
     setSelection() {
-      console.log(this.selectedIds)
-      console.log(this.availableCountriesTableForm.tempData)
       this.availableCountriesTableForm.tempData.forEach(row => {
-        console.log('----1111')
-        console.log(this.selectedIds.includes(row.ID))
         if (this.selectedIds.includes(row.ID)) {
-          console.log('----1111----------aaa')
-          console.log(row)
           this.$nextTick(() => {
             this.$refs.multipleTableTemp.toggleRowSelection(row, true);
           });
@@ -364,11 +328,8 @@ export default {
       let selectedIds = JSON.parse(JSON.stringify(this.selectedIds))
       let selectedIdsTemp = JSON.parse(JSON.stringify(this.selectedIdsTemp))
 
-      console.log('----2222')
       let list = selectedIds.concat(selectedIdsTemp)
-      console.log("list=====+" + list)
       this.availableCountriesTableForm.availableCountriesList.forEach(row => {
-        console.log('----3333')
         if (list.includes(row.ID)) {
           this.$refs.multipleTable.toggleRowSelection(row, true);
         }
@@ -488,14 +449,18 @@ export default {
       row.marketPrice = (row.sellPrice * 1.2).toFixed(2)
     },
     editAvailableCountries(){
-      getCountries({'filter': 1}).then(response => {
-        this.availableCountriesTableForm.availableCountriesList = response
-        this.editAvailableCountriesDialog = true
-        // this.multipleSelection = this.form.nature
-        this.toggleSelection(this.form.nature)
-      }).catch(err => {
-
-      })
+      this.availableCountriesTableForm.availableCountriesList = this.countries
+      this.editAvailableCountriesDialog = true
+      this.toggleSelection(this.form.nature)
+
+      // getCountries({'filter': 1}).then(response => {
+      //   this.availableCountriesTableForm.availableCountriesList = response
+      //   this.editAvailableCountriesDialog = true
+      //   // this.multipleSelection = this.form.nature
+      //   this.toggleSelection(this.form.nature)
+      // }).catch(err => {
+      //
+      // })
     },
     toggleSelection(rows) {
       if (rows) {
@@ -547,6 +512,7 @@ export default {
         this.goodsType = response.data.goodsType
         this.GiftTypeArr = response.data.giftType
         this.sellType = response.data.sellType
+        this.countries = response.data.countries
       }).catch(err => {
         this.$message({
           message: err,

src/views/shop/index.vue

@@ -33,97 +33,39 @@
               </el-dropdown>
             </template>
           </el-table-column>
-          <!--   <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-button type="success" size="small" @click="handleGroupManage(scope.row)" >
-                状态管理
-              </el-button>
-            </template></el-table-column>-->
         </el-table>
         <div class="white-box-footer">
-
-         <!-- <el-dropdown size="small" trigger="click">
-              <el-button type="primary" size="small">
-                  所选数据<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="delete" @click.native="handleMuliDel()">上架</el-dropdown-item>
-              </el-dropdown-menu>
-          </el-dropdown>-->
           <el-button type="primary" size="small" @click="handlestate" icon="el-icon-plus" v-if="permission.hasPermission(`shop/goods-add`)">
-            <!-- 商品添加 -->{{ $t('shop.addProduct') }}
+            {{ $t('shop.addProduct') }}
           </el-button>
-
           <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/goods-list-export`)">{{ $t('common.exportExcel') }}</el-button>
-          <!-- <el-button-group>
-            <el-button type="success" size="mini" @click.native="handleup(scope.row.ID)">上架</el-button>
-            <el-button type="danger" size="mini">下架</el-button>
-          </el-button-group> -->
           <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
         </div>
       </div>
+
       <el-dialog :title="$t('shop.editProducts')" :visible.sync="dialogEditFormVisible"><!-- 修改商品 -->
         <el-form :model="form"  v-loading="dialogEditLoading" label-width="130px" :label-position="labelPosition">
           <el-form-item :label="$t('shop.productName')"><!-- 商品名称 -->
             <el-input v-model="form.goodsName"></el-input>
           </el-form-item>
-            <!-- <el-form-item label="商品来源">
-              <el-select v-model="form.type">
-                  <el-option v-for="(item,index) in goodsType" :key="index" :label="item.name"
-                             :value="index"></el-option>
-              </el-select>
-            </el-form-item> -->
             <el-form-item :label="$t('shop.memberDiscount')"><!-- 会员折扣 -->
               <el-input v-model="form.sellDiscount"></el-input>
             </el-form-item>
             <el-form-item :label="$t('shop.productType')"><!-- 商品类型 -->
               <el-checkbox  v-for="(value,index) in GiftTypeArr" v-model="value.checked" :key="index" >{{value.name}}</el-checkbox>
             </el-form-item>
-            <!-- <el-form-item label="复消购买方式">
-               <el-checkbox  v-for="(value,index) in sell_type" v-model="value.checked" :key="index" >{{value.name}}</el-checkbox>
-            </el-form-item> -->
-            <el-form-item :label="$t('shop.bvSplit')">
-  <!--                      <el-checkbox v-model="form.pvSplit" :checked="form.pvSplit">Yes</el-checkbox>-->
-              <el-select v-model="form.pvSplit" placeholder="">
-                <el-option
-                  v-for="item in pvSplitOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="$t('shop.productCategory')"> <!-- 商品分类 -->
-              <el-select v-model="form.categoryType">
-                <el-option v-for="item in categoryType" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item :label="$t('shop.productCode')"><!-- 商品编号 -->
               <el-input v-model="form.goodsNo"></el-input>
             </el-form-item>
             <el-form-item :label="$t('shop.unit')"><!-- 单位 -->
               <el-input v-model="form.unit"></el-input>
             </el-form-item>
-<!--            <el-form-item :label="$t('shop.taxRate')">&lt;!&ndash; 税率 &ndash;&gt;-->
-<!--              <el-input v-model="form.taxRate">-->
-<!--                <template slot="append">%</template>-->
-<!--              </el-input>-->
-<!--            </el-form-item>-->
-            <el-form-item :label="$t('shop.standardPrice')" p>
+            <el-form-item :label="$t('shop.standardPrice')">
               <el-input v-model="form.sellPriceStandard" @input="sellPriceStandardInput"></el-input>
             </el-form-item>
-<!--            <el-form-item :label="$t('shop.salesPrice')" p>-->
-<!--              <el-input v-model="form.sellPrice"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item :label="$t('shop.marketPrice')">-->
-<!--              <el-input v-model="form.marketPrice"></el-input>-->
-<!--            </el-form-item>-->
             <el-form-item :label="$t('shop.priceBV')" v-show="pvDisabled"> <!-- 价格BV -->
               <el-input v-model="form.pricePv"></el-input>
             </el-form-item>
-  <!--                    <el-form-item label="Exchange points" v-show="false"> &lt;!&ndash; 兑换积分 &ndash;&gt;-->
-  <!--                        <el-input v-model="form.point"></el-input>-->
-  <!--                    </el-form-item>-->
           <el-form-item :label="$t('shop.availableCountries')"><!-- 可购买国家 -->
             <el-button type="primary" size="small" @click="editAvailableCountries">{{ $t('shop.modifyAvailableCountries') }}</el-button>
           </el-form-item>
@@ -272,13 +214,6 @@
     components: {FilterUser, Pagination, Upload},
     mounted () {
       this.getData()
-      // this.$refs.up_load.successImageUrl='';
-      // let system =  getOperatingSystem()
-      // if (system == "Android" || system == 'ios') {
-      //   this.fixedColumn = false
-      // } else {
-      //   this.fixedColumn = 'right'
-      // }
 			this.fixedColumn = getScreenWidth() < 500 ? false : 'right'
     },
 
@@ -315,7 +250,6 @@
             label: this.$t('common.yes')
           }],
         form: {
-          // sellType: [],
           goodsName: '',
           type: '',
           giftType: [],
@@ -334,7 +268,7 @@
           textarea: '',
           sellDiscount: '',
           pvSplit: '',
-          categoryType: '',
+          categoryType: 1,
           sellType: 1,
           taxRate: 0
         },
@@ -367,17 +301,10 @@
     methods: {
         updateTableData() {
             let that = this;
-            // if (!this.searchQuery) {
-            //   return this.availableCountriesTableForm.availableCountriesList;
-            // }
             // 临时存储原始数据，保持搜索时不改变其他列的值
             const query = that.searchQuery.toLowerCase();
-            // this.$refs.multipleTable.toggleRowSelection(JSON.parse(JSON.stringify(this.multipleSelection)),true)
 
             if (that.availableCountriesTableForm.tempData.length === 0) {
-                // this.tempData = JSON.parse(JSON.stringify(this.availableCountriesTableForm.availableCountriesList));
-                // this.selectionTempData = JSON.parse(JSON.stringify(this.multipleSelection));
-
             }
             // const query = this.searchQuery.toLowerCase();
             that.$nextTick(() => {
@@ -397,27 +324,10 @@
 
                 }
             });
-            // this.availableCountriesTableForm.availableCountriesList.forEach(row => {
-            //   if (row.NAME.toLowerCase().includes(query)) {
-            //   } else {
-            //     const originalRow = this.filteredData.find(item => item.NAME === row.NAME);
-            //     if (originalRow) {
-            //       if(originalRow.selected === true){
-            //         console.log('originalRow true')
-            //       }
-            //       row = originalRow;
-            //
-            //     }
-            //   }
-            // });
-            // this.$refs.multipleTable.toggleRowSelection(this.selectionTempData)
-
         },
         setSelection() {
             // this.$refs.multipleTable.clearSelection();
-            console.log('----00000')
             this.availableCountriesTableForm.tempData.forEach(row => {
-                console.log('----1111')
                 if (this.selectedIdsCountry.includes(row.ID)) {
                   this.$nextTick(() => {
                     this.$refs.multipleTableTemp.toggleRowSelection(row, true);
@@ -426,15 +336,11 @@
             });
         },
         setSelectionTemp() {
-            // this.$refs.multipleTable.clearSelection();
             let selectedIds = JSON.parse(JSON.stringify(this.selectedIdsCountry))
             let selectedIdsTemp = JSON.parse(JSON.stringify(this.selectedIdsTemp))
 
-            console.log('----2222')
             let list = selectedIds.concat(selectedIdsTemp)
-            console.log("list=====+" + list)
             this.availableCountriesTableForm.availableCountriesList.forEach(row => {
-                console.log('----3333')
                 if (list.includes(row.ID)) {
                     this.$refs.multipleTableCountries.toggleRowSelection(row, true);
                 }
@@ -499,9 +405,6 @@
       },
         selectOneTemp(selection,row){
             console.log(row.CURRENCY_PRODUCT_RATE)
-            // if(!row.CURRENCY_PRODUCT_RATE){
-            //   return false
-            // }
             row.sellPrice = (row.CURRENCY_PRODUCT_RATE * this.form.sellPriceStandard).toFixed(2)
             row.marketPrice = (row.sellPrice * 1.2).toFixed(2)
         },
@@ -661,13 +564,6 @@
           message: this.$t('common.modifyData'), // 正在修改数据
           type: 'info'
         })
-        // let sen_sell=[];
-        // this.sell_type.map((item,index)=>{
-        //     if(item.checked){
-        //         sen_sell.push(item.key);
-        //     }
-        // })
-        // this.form.sellType=sen_sell;
 
         let sen_gift = []
         this.GiftTypeArr.map((item, index) => {