From 9bd55a0ab09ea44c67f9c7a6e00fcf84f3fab0f9 Mon Sep 17 00:00:00 2001 From: ks3356143 <314298729@qq.com> Date: Thu, 24 Aug 2023 19:24:00 +0800 Subject: [PATCH] 8.000 --- .../components/ma-crud/components/form.vue | 15 +++++++-- cdTMP/src/components/ma-crud/index.vue | 2 +- cdTMP/src/views/project/case/index.vue | 32 ++++++++++++++++++- .../src/views/project/design-demand/index.vue | 25 ++++++++++++--- cdTMP/src/views/project/dut/index.vue | 17 +++++++++- cdTMP/src/views/project/round/index.vue | 8 +++++ cdTMP/src/views/project/testDemand/index.vue | 30 +++++++++++++++-- .../src/views/testmanage/projmanage/index.vue | 15 +++++++-- 8 files changed, 129 insertions(+), 15 deletions(-) diff --git a/cdTMP/src/components/ma-crud/components/form.vue b/cdTMP/src/components/ma-crud/components/form.vue index 3f7ca00..9420783 100644 --- a/cdTMP/src/components/ma-crud/components/form.vue +++ b/cdTMP/src/components/ma-crud/components/form.vue @@ -148,13 +148,22 @@ const close = () => { form.value = {} } const add = () => { - actionTitle.value = "新增" + if (!actionTitle.value) { + actionTitle.value = "新增" + } else { + actionTitle.value += "新增" + } currentAction.value = "add" form.value = {} open() } const edit = (data) => { - actionTitle.value = "编辑" + if (!actionTitle.value) { + actionTitle.value = "编辑" + } else { + actionTitle.value += "编辑" + } + currentAction.value = "edit" form.value = {} for (let i in data) form.value[i] = data[i] @@ -357,5 +366,5 @@ const getFormColumns = async (type = "add") => { await init() return formColumns.value } -defineExpose({ add, edit, currentAction, form, getFormColumns }) +defineExpose({ add, edit, currentAction, form, getFormColumns, actionTitle }) diff --git a/cdTMP/src/components/ma-crud/index.vue b/cdTMP/src/components/ma-crud/index.vue index e2717c8..ae2e00c 100644 --- a/cdTMP/src/components/ma-crud/index.vue +++ b/cdTMP/src/components/ma-crud/index.vue @@ -31,7 +31,7 @@
- +
- + @@ -24,12 +24,42 @@ const dutNumber = route.query.key.split("-")[1] const designDemandNumber = route.query.key.split("-")[2] const testDemandNumber = route.query.key.split("-")[3] const caseNumber = route.query.key.split("-")[4] +const crudRef = ref() const projectId = ref(route.query.id) const crudOptions = ref({ api: problemApi.getProblemList, add: { show: true, api: problemApi.save }, edit: { show: true, api: problemApi.update }, delete: { show: true, api: problemApi.delete }, + beforeOpenAdd: function () { + let round_key = route.query.key.split("-")[0] + let dut_key = route.query.key.split("-")[1] + let design_key = route.query.key.split("-")[2] + let test_key = route.query.key.split("-")[3] + let case_key = route.query.key.split("-")[4] + let td = treeDataStore.treeData + crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > + ${td[round_key].title} > ${td[round_key].children[dut_key].title} > + ${td[round_key].children[dut_key].children[design_key].title} > + ${td[round_key].children[dut_key].children[design_key].children[test_key].title} > + ${td[round_key].children[dut_key].children[design_key].children[test_key].children[case_key].title} > 用例-` + return true + }, + beforeOpenEdit: function (record) { + let round_key = route.query.key.split("-")[0] + let dut_key = route.query.key.split("-")[1] + let design_key = route.query.key.split("-")[2] + let test_key = route.query.key.split("-")[3] + let case_key = route.query.key.split("-")[4] + let td = treeDataStore.treeData + crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > + ${td[round_key].title} > ${td[round_key].children[dut_key].title} > + ${td[round_key].children[dut_key].children[design_key].title} > + ${td[round_key].children[dut_key].children[design_key].children[test_key].title} > + ${td[round_key].children[dut_key].children[design_key].children[test_key].children[case_key].title} + >用例[${record.name}]-` + return true + }, afterAdd: (res) => { console.log(res) let id = projectId.value diff --git a/cdTMP/src/views/project/design-demand/index.vue b/cdTMP/src/views/project/design-demand/index.vue index 9cc4aaf..78005a6 100644 --- a/cdTMP/src/views/project/design-demand/index.vue +++ b/cdTMP/src/views/project/design-demand/index.vue @@ -2,7 +2,7 @@
- + @@ -22,6 +22,7 @@ import PinYinMatch from "pinyin-match" const treeDataStore = useTreeDataStore() const route = useRoute() const router = useRouter() +const crudRef = ref() // 根据传参获取key，分别为轮次、设计需求的key const roundNumber = route.query.key.split("-")[0] const dutNumber = route.query.key.split("-")[1] @@ -50,6 +51,22 @@ const crudOptions = ref({ add: { show: true, api: testDemandApi.save }, edit: { show: true, api: testDemandApi.update }, delete: { show: true, api: testDemandApi.delete }, + beforeOpenAdd: function () { + let round_key = route.query.key.split("-")[0] + let dut_key = route.query.key.split("-")[1] + let design_key = route.query.key.split("-")[2] + let td = treeDataStore.treeData + crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > ${td[round_key].title} > ${td[round_key].children[dut_key].title} > ${td[round_key].children[dut_key].children[design_key].title} > 测试项-` + return true + }, + beforeOpenEdit: function (record) { + let round_key = route.query.key.split("-")[0] + let dut_key = route.query.key.split("-")[1] + let design_key = route.query.key.split("-")[2] + let td = treeDataStore.treeData + crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > ${td[round_key].title} > ${td[round_key].children[dut_key].title} > ${td[round_key].children[dut_key].children[design_key].title} >测试项[${record.name}]-` + return true + }, afterAdd: (res) => { let id = projectId.value treeDataStore.updateTestDemandTreeData(res.data, id) @@ -131,9 +148,9 @@ const crudColumns = ref([ dict: { name: "testType", translation: true, props: { label: "title", value: "key" } }, extra: "请保证测试类型选择正确", filterOption: function (inputValue, selectedOption) { - if(inputValue){ - let matchRes = PinYinMatch.match(selectedOption.label,inputValue) - if(matchRes){ + if (inputValue) { + let matchRes = PinYinMatch.match(selectedOption.label, inputValue) + if (matchRes) { return true } } diff --git a/cdTMP/src/views/project/dut/index.vue b/cdTMP/src/views/project/dut/index.vue index 1e9a2f7..1b73121 100644 --- a/cdTMP/src/views/project/dut/index.vue +++ b/cdTMP/src/views/project/dut/index.vue @@ -2,7 +2,7 @@
- + @@ -20,6 +20,7 @@ import { useTreeDataStore } from "@/store" const treeDataStore = useTreeDataStore() const route = useRoute() const router = useRouter() +const crudRef = ref() const roundNumber = route.query.key.split("-")[0] const dutNumber = route.query.key.split("-")[1] const projectId = ref(route.query.id) @@ -48,6 +49,20 @@ const crudOptions = ref({ edit: { show: true, api: designDemandApi.editDesignDemand }, delete: { show: true, api: designDemandApi.delete }, // 处理添加后函数 + beforeOpenAdd: function () { + let round_key = route.query.key.split("-")[0] + let dut_key = route.query.key.split("-")[1] + let td = treeDataStore.treeData + crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > ${td[round_key].title} > ${td[round_key].children[dut_key].title} > 设计需求-` + return true + }, + beforeOpenEdit: function (record) { + let round_key = route.query.key.split("-")[0] + let dut_key = route.query.key.split("-")[1] + let td = treeDataStore.treeData + crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > ${td[round_key].title} > ${td[round_key].children[dut_key].title} >设计需求[${record.name}]-` + return true + }, afterAdd: (res) => { let id = projectId.value treeDataStore.updateDesignDemandTreeData(res.data, id) diff --git a/cdTMP/src/views/project/round/index.vue b/cdTMP/src/views/project/round/index.vue index c41ac2f..36e5695 100644 --- a/cdTMP/src/views/project/round/index.vue +++ b/cdTMP/src/views/project/round/index.vue @@ -56,6 +56,14 @@ const crudOptions = ref({ api: dutApi.getDutList, add: { show: true, api: dutApi.save, text: "新增被测件" }, // 处理添加后函数 + beforeOpenAdd: function () { + crudRef.value.crudFormRef.actionTitle = `${route.query.ident}>第${parseInt(route.query.key) + 1}轮>被测件-` + return true + }, + beforeOpenEdit: function (record) { + crudRef.value.crudFormRef.actionTitle = `${route.query.ident}>第${parseInt(route.query.key) + 1}轮>被测件[${record.name}]-` + return true + }, afterAdd: (res) => { let id = projectId.value treeDataStore.updateDutTreeData(res.data, id) diff --git a/cdTMP/src/views/project/testDemand/index.vue b/cdTMP/src/views/project/testDemand/index.vue index 3285331..18b29d9 100644 --- a/cdTMP/src/views/project/testDemand/index.vue +++ b/cdTMP/src/views/project/testDemand/index.vue @@ -2,7 +2,7 @@
- + @@ -23,11 +23,12 @@ const roundNumber = route.query.key.split("-")[0] const dutNumber = route.query.key.split("-")[1] const designDemandNumber = route.query.key.split("-")[2] const testDemandNumber = route.query.key.split("-")[3] +const crudRef = ref() const projectId = ref(route.query.id) // 标识显示字段 const showType = (record) => { let key_string = parseInt(record.key.substring(record.key.lastIndexOf("-") + 1)) + 1 - return "YL-" + record.ident + "-" + key_string.toString().padStart(3,"0") + return "YL-" + record.ident + "-" + key_string.toString().padStart(3, "0") } // crud设置 const crudOptions = ref({ @@ -36,6 +37,31 @@ const crudOptions = ref({ edit: { show: true, api: caseApi.update }, delete: { show: true, api: caseApi.delete }, // 处理新增删除后树状图显示 + beforeOpenAdd: function () { + let round_key = route.query.key.split("-")[0] + let dut_key = route.query.key.split("-")[1] + let design_key = route.query.key.split("-")[2] + let test_key = route.query.key.split("-")[3] + let td = treeDataStore.treeData + crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > + ${td[round_key].title} > ${td[round_key].children[dut_key].title} > + ${td[round_key].children[dut_key].children[design_key].title} > + ${td[round_key].children[dut_key].children[design_key].children[test_key].title} > 用例-` + return true + }, + beforeOpenEdit: function (record) { + let round_key = route.query.key.split("-")[0] + let dut_key = route.query.key.split("-")[1] + let design_key = route.query.key.split("-")[2] + let test_key = route.query.key.split("-")[3] + let td = treeDataStore.treeData + crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > + ${td[round_key].title} > ${td[round_key].children[dut_key].title} > + ${td[round_key].children[dut_key].children[design_key].title} > + ${td[round_key].children[dut_key].children[design_key].children[test_key].title} + >用例[${record.name}]-` + return true + }, afterAdd: (res) => { let id = projectId.value treeDataStore.updateCaseTreeData(res.data, id) diff --git a/cdTMP/src/views/testmanage/projmanage/index.vue b/cdTMP/src/views/testmanage/projmanage/index.vue index 19c10dd..4915e3b 100644 --- a/cdTMP/src/views/testmanage/projmanage/index.vue +++ b/cdTMP/src/views/testmanage/projmanage/index.vue @@ -23,14 +23,23 @@ const crudRef = ref() const crudOptions = ref({ rowSelection: { showCheckedAll: true }, api: projectApi.getPageList, - add: { show: true, api: projectApi.save }, - edit: { show: true, api: projectApi.update }, + add: { show: true, api: projectApi.save, text: "新增项目" }, + edit: { show: true, api: projectApi.update, text: "编辑项目" }, delete: { show: true, api: projectApi.delete }, searchColNumber: 3, tablePagination: false, operationColumn: true, operationWidth: 500, showIndex: false, + // 处理弹窗的title + beforeOpenAdd: function () { + crudRef.value.crudFormRef.actionTitle = "项目" + return true + }, + beforeOpenEdit: function (record) { + crudRef.value.crudFormRef.actionTitle = record.ident + "：" + record.name + return true + }, formOption: { isFull: true, layout: [ @@ -62,7 +71,7 @@ const crudOptions = ref({ { span: 24, formList: [{ dataIndex: "member" }] }, { span: 8, formList: [{ dataIndex: "quality_person" }] }, { span: 8, formList: [{ dataIndex: "vise_person" }] }, - { span: 8, formList: [{ dataIndex: "config_person" }] }, + { span: 8, formList: [{ dataIndex: "config_person" }] } ] }, {