Merge remote-tracking branch 'origin/master'

罗广辉

2026-02-03 e7622d3fd34ba59ce8f962dc0b9e72074bff8c45

Merge remote-tracking branch 'origin/master'

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

@@ -1,33 +1,6 @@
<template>
    <basic-container>
        <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
            <el-form-item label="事项名称" prop="matterName">
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.matterName"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>
            <el-form-item label="实施清单名称" prop="implementName">
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.implementName"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>
                        <el-form-item label="目录编码" prop="catalogCode">
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.catalogCode"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>
            <el-form-item label="所属区划" prop="areaCode">
                <el-tree-select
                    class="gd-select gray"
@@ -45,6 +18,35 @@
                    :render-after-expand="false"
                />
            </el-form-item>
             <el-form-item label="实施清单名称" prop="implementName">
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.implementName"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>
            <el-form-item label="事项名称" prop="matterName">
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.matterName"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>
           
                        <el-form-item label="目录编码" prop="catalogCode">
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.catalogCode"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>
			

            <el-form-item class="gd-search-actions">
                <el-button :icon="RefreshRight" @click="resetForm"></el-button>

 applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue

@@ -19,6 +19,7 @@
                    placeholder="请选择"
                    clearable
                    @change="handleSearch"
                    :disabled="permission.yycx_shtg"
                >
                    <el-option
                        v-for="item in dictObj.appInnovationStatus"

 applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue

@@ -19,6 +19,7 @@
                    placeholder="请选择"
                    clearable
                    @change="handleSearch"
                    :disabled="permission.sjyy_shtg"
                >
                    <el-option v-for="item in isResolvedOptions" :key="item.value" :label="item.label" :value="item.value" />
                </el-select>

 uniapps/work-wx/src/subPackages/deviceRegistration/add.vue

@@ -303,7 +303,6 @@
            value-key="code"
            label-key="name"
            children-key="children"
            :auto-close="true"
            @confirm="onRegionConfirm"
            @close="isShowRegion = false"
        ></u-cascader>