From be2a65bc992062180276dde29a758005c0b8c57d Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 3 Mar 2026 11:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elderTagOpeLogMain/NuConfigElderTagOpeLogInfo.data.ts     | 4 ++--
 .../elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts     | 4 ++--
 .../elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue     | 2 +-
 .../components/NuConfigElderTagOpeLogInfoCompare.vue          | 4 ++--
 .../components/NuConfigElderTagOpeLogMainForm.vue             | 4 ++--
 .../eldertag/tagSyncLogMain/ElderTagSyncLogInfo.data.ts       | 4 ++--
 .../tagSyncLogMain/components/ElderTagSyncLogInfoForm.vue     | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogInfo.data.ts b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogInfo.data.ts
index ee9800f..1225964 100644
--- a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogInfo.data.ts
+++ b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogInfo.data.ts
@@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '标签类型中文名',
+    title: '标签类型',
     align: "center",
     dataIndex: 'typeName'
   },
@@ -39,7 +39,7 @@ export const columns: BasicColumn[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  typeName: {title: '标签类型中文名',order: 0,view: 'text', type: 'string',},
+  typeName: {title: '标签类型',order: 0,view: 'text', type: 'string',},
   tagName: {title: '标签名称',order: 1,view: 'text', type: 'string',},
   describ: {title: '说明',order: 2,view: 'text', type: 'string',},
   price: {title: '价格',order: 3,view: 'number', type: 'number',},
diff --git a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts
index eacc910..ec366d8 100644
--- a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts
+++ b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts
@@ -17,7 +17,7 @@ export const columns: BasicColumn[] = [
     width: 100
   },
   // {
-  //   title: '标签类型中文名',
+  //   title: '标签类型',
   //   align: "center",
   //   dataIndex: 'typeName'
   // },
@@ -57,7 +57,7 @@ export const columns: BasicColumn[] = [
 export const superQuerySchema = {
   opeType: {title: '操作类型',order: 0,view: 'list', type: 'string',dictCode: 'directive_ope_type',},
   orgCode: {title: '机构名称',order: 1,view: 'list', type: 'string',dictTable: "sys_depart", dictCode: 'org_code', dictText: 'depart_name',},
-  typeName: {title: '标签类型中文名',order: 2,view: 'text', type: 'string',},
+  typeName: {title: '标签类型',order: 2,view: 'text', type: 'string',},
   tagName: {title: '标签名称',order: 3,view: 'text', type: 'string',},
   describ: {title: '说明',order: 4,view: 'text', type: 'string',},
   price: {title: '价格',order: 5,view: 'number', type: 'number',},
diff --git a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue
index d5ad069..a53640d 100644
--- a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue
+++ b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue
@@ -7,7 +7,7 @@
           <a-col :lg="8">
             <a-form-item name="orgCode">
               <template #label><span title="机构名称">机构名称</span></template>
-              <JDictSelectTag placeholder="请选择机构名称" v-model:value="queryParam.orgCode" dictCode="sys_depart,depart_name,org_code" allow-clear />
+              <JDictSelectTag placeholder="请选择机构名称" v-model:value="queryParam.orgCode" dictCode="sys_depart,depart_name,org_code,org_code is not null" allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="8">
diff --git a/src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogInfoCompare.vue b/src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogInfoCompare.vue
index 80d5f7d..d3b2eae 100644
--- a/src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogInfoCompare.vue
+++ b/src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogInfoCompare.vue
@@ -27,10 +27,10 @@
                   <JImageUpload :value="getFieldValue(record, column.dataIndex)" disabled />
                 </template>
                 <template v-else-if="record.fieldKey === 'pic' && record.newValue">
-                    <img :src="getFileAccessHttpUrl(getFullUrl(record.oldValue))" style="width:80px;">
+                    <img :src="getFileAccessHttpUrl(getFullUrl(record.newValue))" style="width:80px;">
                 </template>
                 <template v-else-if="record.fieldKey === 'picFocus' && record.newValue">
-                    <img :src="getFileAccessHttpUrl(getFullUrl(record.oldValue))" style="width:80px;">
+                    <img :src="getFileAccessHttpUrl(getFullUrl(record.newValue))" style="width:80px;">
                 </template>
                 <template v-else>
                   <span>{{ record[column.dataIndex] != null ? record[column.dataIndex] : '-' }}</span>
diff --git a/src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogMainForm.vue b/src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogMainForm.vue
index 4b309f8..2e5b69f 100644
--- a/src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogMainForm.vue
+++ b/src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogMainForm.vue
@@ -15,8 +15,8 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="标签类型中文名" v-bind="validateInfos.typeName" id="NuConfigElderTagOpeLogMainForm-typeName" name="typeName">
-								<a-input v-model:value="formData.typeName" placeholder="请输入标签类型中文名"  allow-clear ></a-input>
+							<a-form-item label="标签类型" v-bind="validateInfos.typeName" id="NuConfigElderTagOpeLogMainForm-typeName" name="typeName">
+								<a-input v-model:value="formData.typeName" placeholder="请输入标签类型"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
diff --git a/src/views/synchronization/eldertag/tagSyncLogMain/ElderTagSyncLogInfo.data.ts b/src/views/synchronization/eldertag/tagSyncLogMain/ElderTagSyncLogInfo.data.ts
index 19de911..8d9f5da 100644
--- a/src/views/synchronization/eldertag/tagSyncLogMain/ElderTagSyncLogInfo.data.ts
+++ b/src/views/synchronization/eldertag/tagSyncLogMain/ElderTagSyncLogInfo.data.ts
@@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'type'
   // },
   {
-    title: '标签类型中文名',
+    title: '标签类型',
     align: "center",
     dataIndex: 'typeName'
   },
@@ -49,7 +49,7 @@ export const columns: BasicColumn[] = [
 export const superQuerySchema = {
   pkId: {title: 'nu_config_elder_tag_sync_log_main.id',order: 0,view: 'text', type: 'string',},
   type: {title: '标签类型',order: 1,view: 'text', type: 'string',},
-  typeName: {title: '标签类型中文名',order: 2,view: 'text', type: 'string',},
+  typeName: {title: '标签类型',order: 2,view: 'text', type: 'string',},
   tagName: {title: '标签名称',order: 3,view: 'text', type: 'string',},
   describ: {title: '说明',order: 4,view: 'text', type: 'string',},
   price: {title: '价格',order: 5,view: 'number', type: 'number',},
diff --git a/src/views/synchronization/eldertag/tagSyncLogMain/components/ElderTagSyncLogInfoForm.vue b/src/views/synchronization/eldertag/tagSyncLogMain/components/ElderTagSyncLogInfoForm.vue
index c8172d8..06d197a 100644
--- a/src/views/synchronization/eldertag/tagSyncLogMain/components/ElderTagSyncLogInfoForm.vue
+++ b/src/views/synchronization/eldertag/tagSyncLogMain/components/ElderTagSyncLogInfoForm.vue
@@ -15,8 +15,8 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
-							<a-form-item label="标签类型中文名" v-bind="validateInfos.typeName" id="ElderTagSyncLogInfoForm-typeName" name="typeName">
-								<a-input v-model:value="formData.typeName" placeholder="请输入标签类型中文名"  allow-clear ></a-input>
+							<a-form-item label="标签类型" v-bind="validateInfos.typeName" id="ElderTagSyncLogInfoForm-typeName" name="typeName">
+								<a-input v-model:value="formData.typeName" placeholder="请输入标签类型"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">