+
+
+
+ 
{{ $title }}
+
+
+ 点击新增
+
+
+ 提交
+
+
+
+
+
+
+
+
+ 快速新增
+
+
+
+
+
+
+
+ 快速新增缩略语
+
+
+
+
+
+
+
+ 快速新增依据标准
+
+
+
+
@@ -141,6 +218,138 @@ import MaFormItem from "./form-item.vue"
import { get, isUndefined, set, xor, isObject, isBoolean } from "lodash-es"
import { runEvent } from "../js/event.js"
import { handlerCascader, loadDict } from "../js/networkRequest.js"
+import { Message, Notification } from "@arco-design/web-vue"
+
+// 改动2：快速新增联系单位信息[耦合内容] - start
+import { columnsOptions as contactColumnOption } from "@/views/datamanage/projContact/crudColumns"
+import { columnsOptions as abbrColumnOption } from "@/views/datamanage/abbreviation/columnsOptions"
+import useDictItemCrud from "@/views/datamanage/dictmanage/DataList/useCrudRef.ts"
+import tool from "@/utils/tool"
+import contactApi from "@/api/system/contact"
+import abbrApi from "@/api/system/abbreviation"
+import dictApi from "@/api/system/dict"
+//// 1. 处理快速新增单位
+const contactFormOptions = ref(
+ tool.renameKeyInArray(
+ contactColumnOption.filter((it) => it.dataIndex !== "id"),
+ "commonRules",
+ "rules"
+ )
+)
+const contactFormData = ref({})
+const handleContactFormSubmit = async (data, done) => {
+ done(true)
+ try {
+ const res = await contactApi.save(data)
+ // 更新当前select的选项
+ const newInfo = {
+ label: res.data.name,
+ value: res.data.name,
+ disabled: false,
+ indeterminate: false
+ }
+ dictList.value["entrust_unit"].push(newInfo)
+ dictList.value["test_unit"].push(newInfo)
+ dictList.value["dev_unit"].push(newInfo)
+ // 清空当前数据
+ contactFormData.value = {}
+ Notification.success("添加成功，请回到输入框进行选择")
+ } catch (err) {
+ Notification.error("请求错误，请重试或在数据管理页面添加")
+ } finally {
+ done(false)
+ }
+}
+//// 2. 处理快速新增缩略语
+const abbrFormOptions = ref(
+ tool.renameKeyInArray(
+ abbrColumnOption.filter((it) => it.dataIndex !== "id"),
+ "commonRules",
+ "rules"
+ )
+)
+const abbrFormData = ref({})
+const handleAbbrFormSubmit = async (data, done) => {
+ done(true)
+ try {
+ const res = await abbrApi.save(data)
+ // 更新当前select的选项
+ const newInfo = {
+ label: res.data.title,
+ value: res.data.title,
+ disabled: false,
+ indeterminate: false
+ }
+ dictList.value["abbreviation"].push(newInfo)
+ // 清空当前数据
+ abbrFormData.value = {}
+ Notification.success("添加成功，请回到输入框进行选择")
+ } catch (err) {
+ Notification.error("请求错误，请重试或在数据管理页面添加")
+ } finally {
+ done(false)
+ }
+}
+//// 3. 处理快速依据标准
+const { columns: dictColumnOptions } = useDictItemCrud()
+const initStdFormData = {
+ status: "1",
+ code: "standard",
+ sort: 1
+}
+const stdFormData = ref(initStdFormData)
+const stdFormOptions = computed(() => {
+ const options = tool.renameKeyInArray(
+ dictColumnOptions.value.filter(
+ (it) => it.dataIndex !== "id" && it.dataIndex !== "update_datetime" && it.dataIndex !== "key"
+ ),
+ "commonRules",
+ "rules"
+ )
+ return options.map((it) => {
+ if (it.dataIndex === "doc_name") {
+ return {
+ ...it,
+ rules: [{ required: true, message: "文档名称必填" }]
+ }
+ }
+ if (it.dataIndex === "publish_date") {
+ return {
+ ...it,
+ rules: [{ required: true, message: "发布日期必填" }]
+ }
+ }
+ if (it.dataIndex === "source") {
+ return {
+ ...it,
+ rules: [{ required: true, message: "来源机构必填" }]
+ }
+ }
+ return it
+ })
+})
+const handleStdFormSubmit = async (data, done) => {
+ done(true)
+ try {
+ const res = await dictApi.createDictItemStdFast(data)
+ // 更新当前select的选项
+ const newInfo = {
+ label: res.data.doc_name,
+ value: res.data.key,
+ disabled: false,
+ indeterminate: false
+ }
+ dictList.value["standard"].push(newInfo)
+ // 清空当前数据
+ stdFormData.value = initStdFormData
+ Notification.success("添加成功，请回到输入框进行选择")
+ } catch (err) {
+ Notification.error("请求错误，请重试或在数据管理页面添加")
+ } finally {
+ done(false)
+ }
+}
+// 改动2结束 - end
const props = defineProps({
component: Object,
@@ -159,8 +368,9 @@ const dictList = inject("dictList")
const formLoading = inject("formLoading")
const columns = inject("columns")
const getColumnService = inject("getColumnService")
-const rv = async (ev, value = "") =>
+const rv = async (ev, value = "") => {
await runEvent(props.component, ev, { formModel, getColumnService, columns }, value)
+}
const index = props.customField ?? props.component.dataIndex
const dictIndex = index.match(/^(\w+\.)\d+\./)
@@ -172,6 +382,38 @@ const loading = ref(false)
const optionMap = ref({})
const keyword = ref("")
+// 改动1：新增按钮处理
+const createItem = ref("") // 新增string
+const createLoading = ref(false) // 新增loading状态
+const handleCreteSubmit = async (onCreate) => {
+ // 判断是否为空
+ if (!createItem.value.trim()) {
+ Message.error("请填写新增内容")
+ return
+ }
+ createLoading.value = true
+ try {
+ const code = await onCreate(createItem.value)
+ // 处理回显内容-更新当前select的选项
+ const optionList = dictList.value[code]
+ const new_dict_item = {
+ label: createItem.value,
+ value: (optionList.length + 1).toString(),
+ disabled: false,
+ indeterminate: false
+ }
+ optionList.push(new_dict_item)
+ } catch (err) {
+ // 弹出错误
+ Message.error("新增出错")
+ } finally {
+ createItem.value = ""
+ createLoading.value = false
+ Notification.success("新增成功，请重新选择新增内容")
+ }
+}
+// 改动1结束
+
watch(
() => get(formModel.value, index),
(vl) => (value.value = vl)
@@ -271,6 +513,7 @@ const handlePage = async (page) => {
loading.value = false
}
+// 搜索当前字典内容
const handlerFallback = (key) => {
return optionMap.value[key] || key
}
diff --git a/cdTMP/src/components/ma-form/formItem/form-textarea.vue b/cdTMP/src/components/ma-form/formItem/form-textarea.vue
index 88a88f0..eeb1f95 100644
--- a/cdTMP/src/components/ma-form/formItem/form-textarea.vue
+++ b/cdTMP/src/components/ma-form/formItem/form-textarea.vue
@@ -11,7 +11,7 @@
:allow-clear="props.component.allowClear ?? true"
:disabled="props.component.disabled"
:readonly="props.component.readonly"
- :auto-size="props.component.autoSize"
+ :auto-size="props.component.autoSize || true"
:error="props.component.error"
:placeholder="props.component.placeholder ?? `请输入${props.component.title}`"
:max-length="props.component.maxLength"
diff --git a/cdTMP/src/main.ts b/cdTMP/src/main.ts
index 29c4801..6e9404f 100644
--- a/cdTMP/src/main.ts
+++ b/cdTMP/src/main.ts
@@ -24,6 +24,7 @@ app.use(ArcoVueIcon)
app.use(router)
app.use(pinia)
app.use(globalComponents)
+
// 使用服务端请求数据管理库
import { VueQueryPlugin } from "@tanstack/vue-query"
app.use(VueQueryPlugin)
diff --git a/cdTMP/src/style/warp.less b/cdTMP/src/style/warp.less
index 8e49c92..2adc52f 100644
--- a/cdTMP/src/style/warp.less
+++ b/cdTMP/src/style/warp.less
@@ -13,3 +13,22 @@ body {
--border-radius-medium: 0px;
--border-radius-large: 0px;
}
+
+// 覆盖arco表单行间距为3px，原来为20px
+.arco-form-item {
+ display: flex;
+ align-items: flex-start;
+ justify-content: flex-start;
+ width: 100%;
+ margin-bottom: 5px;
+}
+
+// 覆盖card组件actions的margin-top，原来为20px
+.arco-card-actions{
+ margin-top: 0px !important;
+}
+
+// 覆盖card组件，padding原来为16px
+.arco-card-body{
+ padding: 8px !important;
+}
\ No newline at end of file
diff --git a/cdTMP/src/views/dashboard/usercenter/index.vue b/cdTMP/src/views/dashboard/usercenter/index.vue
index 06e25cf..f36e3f0 100644
--- a/cdTMP/src/views/dashboard/usercenter/index.vue
+++ b/cdTMP/src/views/dashboard/usercenter/index.vue
@@ -105,4 +105,7 @@ defineOptions({
.top-box {
font-size: 2rem;
}
+:deep(.arco-form-item) {
+ margin-bottom: 20px; /* 覆盖默认样式 */
+}
diff --git a/cdTMP/src/views/dashboard/usermanage/index.vue b/cdTMP/src/views/dashboard/usermanage/index.vue
index 9aa6705..25d8d01 100644
--- a/cdTMP/src/views/dashboard/usermanage/index.vue
+++ b/cdTMP/src/views/dashboard/usermanage/index.vue
@@ -51,7 +51,6 @@ const crudOptions = reactive({
// 是否显示操作列
operationColumn: true,
operationWidth: 200,
- showTools: false,
// 设置列表数据API
api: userApi.getPageList,
// 设置新增接口-show为true则显示按钮
diff --git a/cdTMP/src/views/datamanage/abbreviation/columnsOptions.ts b/cdTMP/src/views/datamanage/abbreviation/columnsOptions.ts
new file mode 100644
index 0000000..980fd6d
--- /dev/null
+++ b/cdTMP/src/views/datamanage/abbreviation/columnsOptions.ts
@@ -0,0 +1,19 @@
+export const columnsOptions = [
+ { title: "ID", dataIndex: "id", addDisplay: false, editDisplay: false, width: 50, hide: true },
+ {
+ title: "缩略语",
+ align: "center",
+ width: 200,
+ dataIndex: "title",
+ search: true,
+ commonRules: [{ required: true, message: "缩略语必填" }]
+ },
+ {
+ title: "全称",
+ align: "center",
+ dataIndex: "des",
+ search: true,
+ ellipsis: true,
+ commonRules: [{ required: true, message: "全称和描述必填" }]
+ }
+]
diff --git a/cdTMP/src/views/datamanage/abbreviation/index.vue b/cdTMP/src/views/datamanage/abbreviation/index.vue
index cfd8b5a..d9fafff 100644
--- a/cdTMP/src/views/datamanage/abbreviation/index.vue
+++ b/cdTMP/src/views/datamanage/abbreviation/index.vue
@@ -10,6 +10,7 @@
diff --git a/cdTMP/src/views/login.vue b/cdTMP/src/views/login.vue
index a7a7e15..aa3d300 100644
--- a/cdTMP/src/views/login.vue
+++ b/cdTMP/src/views/login.vue
@@ -8,7 +8,10 @@
{{ $title }}
- ---- 为测评服务，打造测评高地
+ ---- 为测评服务，打造测评高地