提交

web/src/views/crm/contract/components/InvalidDialog.vue

@@ -46,14 +46,13 @@
 </template>
 
 <script setup lang="ts" name="InvalidDialog">
-import { ref, computed, getCurrentInstance, type ComponentInternalInstance } from 'vue';
+import { ref, computed, getCurrentInstance, toRefs, type ComponentInternalInstance } from 'vue';
 import { invalidContract, getContract } from '@/api/crm/contract';
-import { useDict } from '@/utils/dict';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 // 字典数据
-const { crm_invalid_reason } = useDict('crm_invalid_reason');
+const { crm_invalid_reason } = toRefs<any>(proxy?.useDict('crm_invalid_reason'));
 
 // 定义事件
 const emit = defineEmits(['success']);

web/src/views/crm/contract/detail.vue

@@ -815,7 +815,6 @@ import { useRouter, useRoute } from 'vue-router';
 import { getContract, listContractApproval, type ContractVO } from '@/api/crm/contract/index';
 import { list as listOperLog } from '@/api/monitor/operlog';
 import type { OperLogVO, OperLogQuery } from '@/api/monitor/operlog/types';
-import { useDict } from '@/utils/dict';
 import { parseTime } from '@/utils/ruoyi';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { CircleCheck, CircleClose, View, ChatLineSquare, Clock, InfoFilled, VideoPlay, Document, Paperclip, Download } from '@element-plus/icons-vue';
@@ -846,16 +845,18 @@ const {
   crm_product_unit,
   crm_invalid_reason,
   sys_oper_type
-} = useDict(
-  'crm_contract_type',
-  'crm_contract_status',
-  'crm_approval_status',
-  'crm_contract_nature',
-  'crm_performance_status',
-  'crm_currency',
-  'crm_product_unit',
-  'crm_invalid_reason',
-  'sys_oper_type'
+} = toRefs<any>(
+  proxy?.useDict(
+    'crm_contract_type',
+    'crm_contract_status',
+    'crm_approval_status',
+    'crm_contract_nature',
+    'crm_performance_status',
+    'crm_currency',
+    'crm_product_unit',
+    'crm_invalid_reason',
+    'sys_oper_type'
+  )
 );
 
 // 合同详情

web/src/views/crm/customer/tag/index.vue

@@ -161,7 +161,6 @@ import type { ComponentInternalInstance } from 'vue';
 import type { ElFormInstance } from 'element-plus';
 import { listCustomerTag, getCustomerTag, addCustomerTag, updateCustomerTag, delCustomerTag, exportCustomerTag } from '@/api/crm/customer/tag';
 import type { CustomerTagQuery, CustomerTagForm, CustomerTagVO } from '@/api/crm/customer/tag';
-import { useDict } from '@/utils/dict';
 
 // 查询参数
 const queryParams = ref<CustomerTagQuery>({
@@ -204,7 +203,7 @@ const ids = ref<number[]>([]);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 // 字典数据
-const { sys_normal_disable } = toRefs<any>(useDict('sys_normal_disable'));
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
 
 // 对话框
 const dialog = reactive<DialogOption>({