[update] 修改bug87313和87311

src/components/selection/MarketRegulationsListSelectionModal.vue

@@ -15,28 +15,35 @@
             <!--  清单编号 -->
             <a-col :md="6" :sm="12">
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.listNumber')">
-                <j-input
+                <a-input
                   :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listNumber')"
-                  v-model="queryParam.manifestNo"></j-input>
+                  v-model="queryParam.manifestNo"></a-input>
               </a-form-item>
             </a-col>
 
             <!--   清单名称  -->
             <a-col :md="6" :sm="8">
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.listName')">
-                <j-input
+                <a-input
                   :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listName')"
-                  v-model="queryParam.manifestName"></j-input>
+                  v-model="queryParam.manifestName"></a-input>
               </a-form-item>
             </a-col>
 
             <!--   国家/地区  -->
             <a-col :md="6" :sm="8">
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.countryRegion')">
-                <j-dict-select-tag
+                <a-tree-select
-                  :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.countryRegion')"
+                  tree-node-filter-prop="title"
                   v-model="queryParam.country"
-                  dict-code="market_state"></j-dict-select-tag>
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  :tree-data="countryOptions"
+                  :placeholder="$t('pleaseSelect')+$t('standardRegulationLibrary.marketRegulationsList.countryRegion')"
+                  show-search
+                  allowClear
+                  :filterTreeNode="filterTreeOption"
+                />
               </a-form-item>
             </a-col>
 
@@ -53,9 +60,9 @@
             <!--   作者  -->
             <a-col :md="6" :sm="8">
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.author')">
-                <j-input
+                <a-input
                   :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.author')"
-                  v-model="queryParam.author"></j-input>
+                  v-model="queryParam.author"></a-input>
               </a-form-item>
             </a-col>
 
@@ -73,7 +80,7 @@
         :scroll="{x: 900}"
         :data-source="dataList"
         :pagination="ipagination"
-        :row-selection="{ type: type, selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :row-selection="rowSelection"
         :loading="loading"
         @change="handleTableChange">
         <template slot="text" slot-scope="text">
@@ -106,6 +113,7 @@
 import JDictSelectTag from '../dict/JDictSelectTag'
 import { StandardSource } from '../../enums/commonEnums'
 import { getMarketRegulationsList } from '@/api/api'
+import { getFormDictTreeList } from '../../api/api'
 
 export default {
   name: 'MarketRegulationsListSelectionModal',
@@ -133,6 +141,28 @@ export default {
       default: () => {
         return {}
       }
+    },
+    // 不可选的数据
+    disabledData: {
+      type: Array,
+      required: false,
+      default: () => {
+        return []
+      }
+    }
+  },
+  computed: {
+    rowSelection () {
+      return {
+        type: this.type,
+        selectedRowKeys: this.selectedRowKeys,
+        onChange: this.onSelectChange,
+        getCheckboxProps: record => ({
+          props: {
+            disabled: this.disabledData.includes(record.id)
+          }
+        })
+      }
     }
   },
   data () {
@@ -145,6 +175,7 @@ export default {
       wrapperCol: {
         sm: 14
       },
+      countryOptions: [], // 国家下拉选择
       selectedRowKeys: [],
       selectedRowList: [],
       loading: false,
@@ -222,7 +253,17 @@ export default {
       dataList: []
     }
   },
+  mounted () {
+    this.getCountryOption()
+  },
   methods: {
+    getCountryOption () {
+      getFormDictTreeList({ dictId: '1801130851452059649' }).then(res => {
+        if (res.success) {
+          this.countryOptions = res.result
+        }
+      })
+    },
     open () {
       this.visible = true
       this.queryParam = {}
@@ -354,6 +395,10 @@ export default {
           title: this.$t('view')
         }
       })
+    },
+    filterTreeOption (input, option) {
+      const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label
+      return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     }
   }
 }

src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue

@@ -188,7 +188,7 @@
                               ref="transferModal"
                               @listChange="transferOk"/>
     <!--  复制弹框  -->
-    <market-regulations-list-selection-modal ref="copyModal" type="radio" @change="copyOk"/>
+    <market-regulations-list-selection-modal ref="copyModal" type="radio" :disabledData="[model.id]" @change="copyOk"/>
     <!--  历史版本弹框  -->
     <history-version-modal ref="historyVersionModal"/>
   </internal-detail-page>