From e7622d3fd34ba59ce8f962dc0b9e72074bff8c45 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 03 Feb 2026 09:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/appConfiguration/inventory/index.vue | 56 +++++++++++++++++++++++++++++---------------------------
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue | 1 +
uniapps/work-wx/src/subPackages/deviceRegistration/add.vue | 1 -
applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue | 1 +
4 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/appConfiguration/inventory/index.vue b/applications/task-work-order/src/views/orderView/appConfiguration/inventory/index.vue
index 0ebf579..0eafb91 100644
--- a/applications/task-work-order/src/views/orderView/appConfiguration/inventory/index.vue
+++ b/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>
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
index 61a5900..f400d47 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/index.vue
+++ b/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"
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
index 58066d9..405710e 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/index.vue
+++ b/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>
diff --git a/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue b/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue
index 0b30f36..6541906 100644
--- a/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue
+++ b/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>
--
Gitblit v1.9.3