浏览代码

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei 1 年之前
父节点
当前提交
faf5786884
共有 2 个文件被更改,包括 7 次插入9 次删除
  1. 6 5
      src/views/common/chooseBrandModal.vue
  2. 1 4
      src/views/common/chooseTypeModal.vue

+ 6 - 5
src/views/common/chooseBrandModal.vue

@@ -10,10 +10,10 @@
     :width="800">
     <div class="chooseBrand-con">
       <div>
-        <a-checkbox :checked="checkAll" @change="onCheckAllChange">全选</a-checkbox>
+        <a-checkbox :checked="checkAll" :disabled="disabledList.length>0" @change="onCheckAllChange">全选</a-checkbox>
         <span v-if="pageType==='1'">
-          <a-checkbox :checked="checkOwn" @change="onCheckOwnChange">自主品牌</a-checkbox>
-          <a-checkbox :checked="checkAgent" @change="onCheckAgentChange">代理品牌</a-checkbox>
+          <a-checkbox :checked="checkOwn" :disabled="disabledList.length>0" @change="onCheckOwnChange">自主品牌</a-checkbox>
+          <a-checkbox :checked="checkAgent" :disabled="disabledList.length>0" @change="onCheckAgentChange">代理品牌</a-checkbox>
         </span>
       </div>
       <a-divider />
@@ -48,7 +48,6 @@
 
 <script>
 import { productBrandQuery } from '@/api/productBrand'
-import { forEach } from 'core-js/library/fn/dict'
 export default {
   name: 'ChooseBrandModal',
   props: {
@@ -77,7 +76,8 @@ export default {
       checkedRowList: [], //  选中项
       brandList: [], //  品牌数据
       brandOwnList: [],
-      brandAgentList: []
+      brandAgentList: [],
+      disabledList: []
     }
   },
   methods: {
@@ -208,6 +208,7 @@ export default {
     },
     // 禁用
     handleDisabled (list) {
+      this.disabledList = list
       this.brandList.map(item => {
         if (list.includes(item.brandSn)) {
           item.isDisabled = true

+ 1 - 4
src/views/common/chooseTypeModal.vue

@@ -10,7 +10,7 @@
     width="50%">
     <div class="chooseType-con">
       <div>
-        <a-checkbox :checked="checkAll" @change="onCheckAllChange">全选</a-checkbox>
+        <a-checkbox :checked="checkAll" :disabled="!linkageStatus&&chooseData.length>0 " @change="onCheckAllChange">全选</a-checkbox>
       </div>
       <a-divider />
       <a-tree
@@ -160,9 +160,6 @@ export default {
       }
     },
     onCheck (checkedKeys, info) {
-      console.log('onCheck', checkedKeys, info)
-      // this.checkedData = [...checkedKeys, ...info.halfCheckedKeys]
-      // this.checkedKeys = checkedKeys
       this.checkedRows = []
       info.checkedNodes.map((item, index) => {
         this.checkedRows.push(item.data.props)