From 3dd1c81c84d78a30fff6468ccb05f979f2d50966 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 17:48:45 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430
---
src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
index f4cdf85..991fb92 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -42,7 +42,7 @@
@search="onDepartList()"
:read-only="true"
v-decorator="['useDepartName', validatorRules.useDepartName]"
- /> -->
+ />
<a-tree-select
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -50,6 +50,15 @@
placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
tree-default-expand-all
v-decorator="['useId', validatorRules.useId ]"
+ />-->
+
+ <j-dict-select-tag
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ v-decorator="['useId', {}]"
/>
</a-form-item>
</a-col>
@@ -201,6 +210,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<template
v-for="col in columns"
--
Gitblit v1.9.3