Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-02-02 8002547d1afde510f1c2c0921fa185c4638c66d9

Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

 applications/task-work-order/src/views/orderView/appConfiguration/inventory/FormDiaLog.vue

@@ -21,6 +21,10 @@
                <div class="val">{{ formData.matterName }}</div>
            </el-col>
            <el-col :span="12">
                <div class="label">目录编码</div>
                <div class="val">{{ formData.catalogCode }}</div>
            </el-col>
            <el-col :span="12">
                <div class="label">所属机构</div>
                <div class="val">{{ formData.orgName }}</div>
            </el-col>
@@ -52,6 +56,7 @@
                            lazy
                            :load="loadRegionNode"
                            :render-after-expand="false"
                            @change="handleAreaChange"
                        />
                    </el-form-item>
                </el-col>
@@ -63,6 +68,11 @@
                <el-col :span="12">
                    <el-form-item label="事项名称" prop="matterName">
                        <el-input class="gd-input" v-model="formData.matterName" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="目录编码" prop="catalogCode">
                        <el-input class="gd-input" v-model="formData.catalogCode" placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
@@ -109,6 +119,7 @@
    orgCode: '',
    orgName: '',
    id: null,
    catalogCode:'',
})

// 注入字典和部门树
@@ -145,6 +156,7 @@
    implementName: fieldRules(true),
    matterName: fieldRules(true),
    orgCode: fieldRules(true),
    catalogCode: fieldRules(true),
}

// 处理机构变更，同步机构名称
@@ -170,6 +182,19 @@
    formData.value.orgName = node?.title || ''
}

// 处理区域变更，同步区域名称
function handleAreaChange(value) {
    if (!value) {
        formData.value.areaName = ''
        return
    }
    // 从缓存中获取区域名称
    const node = regionNodeCache.value.get(value)
    if (node) {
        formData.value.areaName = node.name || ''
    }
}

// 提交新增/编辑
async function handleSubmit() {
    const isValid = await formRef.value?.validate().catch(() => false)

 applications/task-work-order/src/views/orderView/appConfiguration/inventory/index.vue

@@ -50,6 +50,7 @@
                    <el-table-column prop="areaName" show-overflow-tooltip label="所属区划" />
                    <el-table-column prop="implementName" show-overflow-tooltip label="实施清单名称" />
                    <el-table-column prop="matterName" show-overflow-tooltip label="事项名称" />
                    <el-table-column prop="catalogCode" show-overflow-tooltip label="目录编码" />
                    <el-table-column prop="orgName" show-overflow-tooltip label="所属机构" />
                    <el-table-column label="操作" class-name="operation-btns" width="250">
                        <template v-slot="{ row }">