修改省市区不能选中

ruoyi-ui/src/api/agri/region.js

@@ -1,9 +1,15 @@
 import request from '@/utils/request'
+import { normalizeRegionTree } from '@/utils/region'
 
-// 查询省市区三级树（平台端）
+// 查询省市区三级树（平台端，原始数据）
 export function getRegionTree() {
   return request({
     url: '/agri/region/tree',
     method: 'get'
   })
 }
+
+/** 查询供 el-cascader 使用的省市区树（已 normalize，仅区县可选） */
+export function getRegionCascaderTree() {
+  return getRegionTree().then(response => normalizeRegionTree(response.data || []))
+}

ruoyi-ui/src/mixins/regionCascader.js

@@ -0,0 +1,90 @@
+import { getRegionCascaderTree } from '@/api/agri/region'
+import {
+  REGION_CASCADER_PROPS,
+  findRegionPath as findRegionPathInTree,
+  getRegionNamesByCodes as getRegionNamesByCodesInTree,
+  findRegionNodeByCodes as findRegionNodeByCodesInTree,
+  parseRegionSelection
+} from '@/utils/region'
+
+/**
+ * 省市区 el-cascader 混入：loadRegionTree、回显、落库。
+ * 页面需提供 this.form；调用 syncRegionCascaderFromForm 时传入字段映射。
+ */
+export default {
+  data() {
+    return {
+      regionTree: [],
+      regionTreeLoaded: false,
+      regionCascaderProps: REGION_CASCADER_PROPS
+    }
+  },
+  methods: {
+    /** 加载规范化后的省市区树（全局缓存一次） */
+    loadRegionTree() {
+      if (this.regionTreeLoaded) {
+        return Promise.resolve(this.regionTree)
+      }
+      return getRegionCascaderTree().then(tree => {
+        this.regionTree = tree || []
+        this.regionTreeLoaded = true
+        return this.regionTree
+      }).catch(() => {
+        this.regionTree = []
+        return this.regionTree
+      })
+    },
+    findRegionPath(nodes, targetCode, path) {
+      return findRegionPathInTree(nodes || this.regionTree, targetCode, path)
+    },
+    getRegionNamesByCodes(codes) {
+      return getRegionNamesByCodesInTree(this.regionTree, codes)
+    },
+    findRegionNodeByCodes(codes) {
+      return findRegionNodeByCodesInTree(this.regionTree, codes)
+    },
+    /**
+     * 编辑回显：把库里的区县 code 转成 cascader 路径
+     * @param {Array<{ codeKey: string, cascaderKey: string }>} fields
+     */
+    syncRegionCascaderFromForm(fields) {
+      if (!this.form || !this.regionTree.length) {
+        return
+      }
+      const list = fields || []
+      list.forEach(item => {
+        const code = this.form[item.codeKey]
+        if (code) {
+          this.form[item.cascaderKey] = this.findRegionPath(this.regionTree, code) || []
+        }
+      })
+    },
+    /**
+     * 级联变更落库：code=区县 code，name=省/市/区县用 / 连接
+     * @param {Array} codes cascader 选中路径
+     * @param {string} prefix 如 reg / biz → regRegionCode、regRegionName
+     */
+    applyRegionSelection(codes, prefix) {
+      const codeKey = prefix + 'RegionCode'
+      const nameKey = prefix + 'RegionName'
+      const cascaderKey = prefix + 'RegionCascader'
+      const result = parseRegionSelection(this.regionTree, codes)
+      if (!codes || !codes.length) {
+        this.form[codeKey] = undefined
+        this.form[nameKey] = undefined
+        return
+      }
+      if (!result.valid) {
+        this.$modal.msgWarning('请选择完整的省/市/区县')
+        this.$nextTick(() => {
+          this.form[cascaderKey] = []
+          this.form[codeKey] = undefined
+          this.form[nameKey] = undefined
+        })
+        return
+      }
+      this.form[codeKey] = result.code
+      this.form[nameKey] = result.name
+    }
+  }
+}

ruoyi-ui/src/utils/region.js

@@ -0,0 +1,108 @@
+/** el-cascader 省市区配置（须配合 normalizeRegionTree 使用） */
+export const REGION_CASCADER_PROPS = {
+  value: 'code',
+  label: 'name',
+  children: 'children',
+  emitPath: true,
+  leaf: 'leaf',
+  disabled: 'disabled'
+}
+
+/**
+ * 规范化地区树供 el-cascader 使用。
+ * Element UI 默认把 children: [] 当作叶子并可点击选中；
+ * 后端 RegionTreeVO 对无下级节点也返回空数组，导致省/市被误选。
+ * 仅 type=3（区县）标记为 leaf；无下级的非区县节点 disabled。
+ */
+export function normalizeRegionTree(nodes) {
+  if (!nodes || !nodes.length) {
+    return []
+  }
+  return nodes.map(node => {
+    const hasChildren = node.children && node.children.length > 0
+    const children = hasChildren ? normalizeRegionTree(node.children) : undefined
+    const isDistrict = node.type === 3
+    const item = {
+      code: node.code,
+      name: node.name,
+      type: node.type,
+      leaf: isDistrict,
+      disabled: !isDistrict && !hasChildren
+    }
+    if (children && children.length) {
+      item.children = children
+    }
+    return item
+  })
+}
+
+/** 根据区县 code 回显级联选中路径 */
+export function findRegionPath(nodes, targetCode, path) {
+  if (!nodes || !nodes.length) {
+    return null
+  }
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i]
+    const nextPath = (path || []).concat(node.code)
+    if (String(node.code) === String(targetCode)) {
+      return nextPath
+    }
+    if (node.children && node.children.length) {
+      const found = findRegionPath(node.children, targetCode, nextPath)
+      if (found) {
+        return found
+      }
+    }
+  }
+  return null
+}
+
+/** 根据级联 code 路径拼地区名称 */
+export function getRegionNamesByCodes(regionTree, codes) {
+  const names = []
+  let nodes = regionTree
+  for (let i = 0; i < codes.length; i++) {
+    const code = codes[i]
+    const node = (nodes || []).find(item => String(item.code) === String(code))
+    if (!node) {
+      break
+    }
+    names.push(node.name)
+    nodes = node.children || []
+  }
+  return names
+}
+
+/** 根据级联路径找到末级节点 */
+export function findRegionNodeByCodes(regionTree, codes) {
+  let nodes = regionTree
+  let node = null
+  for (let i = 0; i < codes.length; i++) {
+    node = (nodes || []).find(item => String(item.code) === String(codes[i]))
+    if (!node) {
+      return null
+    }
+    nodes = node.children || []
+  }
+  return node
+}
+
+/**
+ * 解析级联选择结果。
+ * @returns {{ valid: boolean, code?: string, name?: string }}
+ */
+export function parseRegionSelection(regionTree, codes) {
+  if (!codes || !codes.length) {
+    return { valid: true, code: undefined, name: undefined }
+  }
+  const lastNode = findRegionNodeByCodes(regionTree, codes)
+  if (!lastNode || lastNode.type !== 3) {
+    return { valid: false }
+  }
+  const names = getRegionNamesByCodes(regionTree, codes)
+  return {
+    valid: true,
+    code: String(codes[codes.length - 1]),
+    name: names.join('/')
+  }
+}

ruoyi-ui/src/views/agri/org/merchant/index.vue

@@ -336,12 +336,18 @@
 
 <script>
 import { listMerchant, getMerchant, addMerchant, updateMerchant, delMerchant, deleteMerchantCheck, adminUserOptions, memberOptions } from "@/api/agri/merchant"
-import { getRegionTree } from "@/api/agri/region"
+import regionCascaderMixin from "@/mixins/regionCascader"
 import MerchantDetail from "./detail"
 
+const REGION_CASCADER_FIELDS = [
+  { codeKey: "regRegionCode", cascaderKey: "regRegionCascader" },
+  { codeKey: "bizRegionCode", cascaderKey: "bizRegionCascader" }
+]
+
 export default {
   name: "AgriMerchant",
   components: { MerchantDetail },
+  mixins: [regionCascaderMixin],
   data() {
     return {
       loading: true,
@@ -356,14 +362,6 @@ export default {
       bindSearchLoading: false,
       adminUserList: [],
       memberList: [],
-      regionTree: [],
-      regionTreeLoaded: false,
-      regionCascaderProps: {
-        value: "code",
-        label: "name",
-        children: "children",
-        emitPath: true
-      },
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -509,7 +507,7 @@ export default {
         if (data.licenseValidType === "1" && data.licenseValidStart && data.licenseValidEnd) {
           this.form.licenseValidRange = [data.licenseValidStart, data.licenseValidEnd]
         }
-        this.syncRegionCascaderFromForm()
+        this.syncRegionCascaderFromForm(REGION_CASCADER_FIELDS)
         this.activeTab = "subject"
         this.open = true
         this.title = "编辑商户"
@@ -528,62 +526,6 @@ export default {
       this.adminUserList = []
       this.memberList = []
     },
-    /** 加载省市区树 */
-    loadRegionTree() {
-      if (this.regionTreeLoaded) {
-        return Promise.resolve()
-      }
-      return getRegionTree().then(response => {
-        this.regionTree = response.data || []
-        this.regionTreeLoaded = true
-      }).catch(() => {
-        this.regionTree = []
-      })
-    },
-    /** 根据区县 code 回显级联选中路径 */
-    findRegionPath(nodes, targetCode, path) {
-      if (!nodes || !nodes.length) {
-        return null
-      }
-      for (let i = 0; i < nodes.length; i++) {
-        const node = nodes[i]
-        const nextPath = (path || []).concat(node.code)
-        if (String(node.code) === String(targetCode)) {
-          return nextPath
-        }
-        if (node.children && node.children.length) {
-          const found = this.findRegionPath(node.children, targetCode, nextPath)
-          if (found) {
-            return found
-          }
-        }
-      }
-      return null
-    },
-    /** 根据级联 code 路径拼地区名称 */
-    getRegionNamesByCodes(codes) {
-      const names = []
-      let nodes = this.regionTree
-      for (let i = 0; i < codes.length; i++) {
-        const code = codes[i]
-        const node = (nodes || []).find(item => String(item.code) === String(code))
-        if (!node) {
-          break
-        }
-        names.push(node.name)
-        nodes = node.children || []
-      }
-      return names
-    },
-    /** 编辑回显：把库里的 code 转成 cascader 路径 */
-    syncRegionCascaderFromForm() {
-      if (this.form.regRegionCode && this.regionTree.length) {
-        this.form.regRegionCascader = this.findRegionPath(this.regionTree, this.form.regRegionCode) || []
-      }
-      if (this.form.bizRegionCode && this.regionTree.length) {
-        this.form.bizRegionCascader = this.findRegionPath(this.regionTree, this.form.bizRegionCode) || []
-      }
-    },
     /** 企业注册地区变更：写入 regRegionCode / regRegionName */
     handleRegRegionChange(codes) {
       this.applyRegionSelection(codes, "reg")
@@ -592,19 +534,6 @@ export default {
     handleBizRegionChange(codes) {
       this.applyRegionSelection(codes, "biz")
     },
-    /** 级联选择落库：code=区县 code，name=省/市/区县用 / 连接 */
-    applyRegionSelection(codes, prefix) {
-      const codeKey = prefix + "RegionCode"
-      const nameKey = prefix + "RegionName"
-      if (!codes || !codes.length) {
-        this.form[codeKey] = undefined
-        this.form[nameKey] = undefined
-        return
-      }
-      const names = this.getRegionNamesByCodes(codes)
-      this.form[codeKey] = String(codes[codes.length - 1])
-      this.form[nameKey] = names.join("/")
-    },
     formatAdminOption(item) {
       const parts = [item.nickName || item.userName, item.userName]
       if (item.phonenumber) {