This commit is contained in:
2023-08-24 19:24:00 +08:00
parent 5c39fb35f2
commit 9bd55a0ab0
8 changed files with 129 additions and 15 deletions

View File

@@ -148,13 +148,22 @@ const close = () => {
form.value = {} form.value = {}
} }
const add = () => { const add = () => {
if (!actionTitle.value) {
actionTitle.value = "新增" actionTitle.value = "新增"
} else {
actionTitle.value += "新增"
}
currentAction.value = "add" currentAction.value = "add"
form.value = {} form.value = {}
open() open()
} }
const edit = (data) => { const edit = (data) => {
if (!actionTitle.value) {
actionTitle.value = "编辑" actionTitle.value = "编辑"
} else {
actionTitle.value += "编辑"
}
currentAction.value = "edit" currentAction.value = "edit"
form.value = {} form.value = {}
for (let i in data) form.value[i] = data[i] for (let i in data) form.value[i] = data[i]
@@ -357,5 +366,5 @@ const getFormColumns = async (type = "add") => {
await init() await init()
return formColumns.value return formColumns.value
} }
defineExpose({ add, edit, currentAction, form, getFormColumns }) defineExpose({ add, edit, currentAction, form, getFormColumns, actionTitle })
</script> </script>

View File

@@ -31,7 +31,7 @@
</div> </div>
<div class="_crud-content"> <div class="_crud-content">
<div class="operation-tools lg:flex justify-between mb-3" ref="crudOperationRef"> <div class="operation-tools lg:flex justify-between mb-3" ref="crudOperationRef">
<a-space class="lg:flex block lg:inline-block"> <a-space class="lg:flex block">
<slot name="tableBeforeButtons"></slot> <slot name="tableBeforeButtons"></slot>
<slot name="tableButtons"> <slot name="tableButtons">
<a-button <a-button

View File

@@ -2,7 +2,7 @@
<div class="ma-content-block lg:flex justify-between p-4"> <div class="ma-content-block lg:flex justify-between p-4">
<div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0"> <div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0">
<!-- CRUD组件 --> <!-- CRUD组件 -->
<ma-crud :options="crudOptions" :columns="crudColumns"> <ma-crud :options="crudOptions" :columns="crudColumns" ref="crudRef">
<template #ident="{ record }"> <template #ident="{ record }">
{{ "PT_" + route.query.ident + "_" + record.ident.padStart(3,"0") }} {{ "PT_" + route.query.ident + "_" + record.ident.padStart(3,"0") }}
</template> </template>
@@ -24,12 +24,42 @@ const dutNumber = route.query.key.split("-")[1]
const designDemandNumber = route.query.key.split("-")[2] const designDemandNumber = route.query.key.split("-")[2]
const testDemandNumber = route.query.key.split("-")[3] const testDemandNumber = route.query.key.split("-")[3]
const caseNumber = route.query.key.split("-")[4] const caseNumber = route.query.key.split("-")[4]
const crudRef = ref()
const projectId = ref(route.query.id) const projectId = ref(route.query.id)
const crudOptions = ref({ const crudOptions = ref({
api: problemApi.getProblemList, api: problemApi.getProblemList,
add: { show: true, api: problemApi.save }, add: { show: true, api: problemApi.save },
edit: { show: true, api: problemApi.update }, edit: { show: true, api: problemApi.update },
delete: { show: true, api: problemApi.delete }, 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) => { afterAdd: (res) => {
console.log(res) console.log(res)
let id = projectId.value let id = projectId.value

View File

@@ -2,7 +2,7 @@
<div class="ma-content-block lg:flex justify-between p-4"> <div class="ma-content-block lg:flex justify-between p-4">
<div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0"> <div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0">
<!-- CRUD组件 --> <!-- CRUD组件 -->
<ma-crud :options="crudOptions" :columns="crudColumns"> <ma-crud :options="crudOptions" :columns="crudColumns" ref="crudRef">
<template #ident="{ record }"> <template #ident="{ record }">
{{ showType(record) }} {{ showType(record) }}
</template> </template>
@@ -22,6 +22,7 @@ import PinYinMatch from "pinyin-match"
const treeDataStore = useTreeDataStore() const treeDataStore = useTreeDataStore()
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
const crudRef = ref()
// 根据传参获取key分别为轮次、设计需求的key // 根据传参获取key分别为轮次、设计需求的key
const roundNumber = route.query.key.split("-")[0] const roundNumber = route.query.key.split("-")[0]
const dutNumber = route.query.key.split("-")[1] const dutNumber = route.query.key.split("-")[1]
@@ -50,6 +51,22 @@ const crudOptions = ref({
add: { show: true, api: testDemandApi.save }, add: { show: true, api: testDemandApi.save },
edit: { show: true, api: testDemandApi.update }, edit: { show: true, api: testDemandApi.update },
delete: { show: true, api: testDemandApi.delete }, 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) => { afterAdd: (res) => {
let id = projectId.value let id = projectId.value
treeDataStore.updateTestDemandTreeData(res.data, id) treeDataStore.updateTestDemandTreeData(res.data, id)
@@ -131,9 +148,9 @@ const crudColumns = ref([
dict: { name: "testType", translation: true, props: { label: "title", value: "key" } }, dict: { name: "testType", translation: true, props: { label: "title", value: "key" } },
extra: "请保证测试类型选择正确", extra: "请保证测试类型选择正确",
filterOption: function (inputValue, selectedOption) { filterOption: function (inputValue, selectedOption) {
if(inputValue){ if (inputValue) {
let matchRes = PinYinMatch.match(selectedOption.label,inputValue) let matchRes = PinYinMatch.match(selectedOption.label, inputValue)
if(matchRes){ if (matchRes) {
return true return true
} }
} }

View File

@@ -2,7 +2,7 @@
<div class="ma-content-block lg:flex justify-between p-4"> <div class="ma-content-block lg:flex justify-between p-4">
<div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0"> <div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0">
<!-- CRUD组件 --> <!-- CRUD组件 -->
<ma-crud :options="crudOptions" :columns="crudColumns"> <ma-crud :options="crudOptions" :columns="crudColumns" ref="crudRef">
<template #ident="{ record }"> <template #ident="{ record }">
{{ showType(record) }} {{ showType(record) }}
</template> </template>
@@ -20,6 +20,7 @@ import { useTreeDataStore } from "@/store"
const treeDataStore = useTreeDataStore() const treeDataStore = useTreeDataStore()
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
const crudRef = ref()
const roundNumber = route.query.key.split("-")[0] const roundNumber = route.query.key.split("-")[0]
const dutNumber = route.query.key.split("-")[1] const dutNumber = route.query.key.split("-")[1]
const projectId = ref(route.query.id) const projectId = ref(route.query.id)
@@ -48,6 +49,20 @@ const crudOptions = ref({
edit: { show: true, api: designDemandApi.editDesignDemand }, edit: { show: true, api: designDemandApi.editDesignDemand },
delete: { show: true, api: designDemandApi.delete }, 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) => { afterAdd: (res) => {
let id = projectId.value let id = projectId.value
treeDataStore.updateDesignDemandTreeData(res.data, id) treeDataStore.updateDesignDemandTreeData(res.data, id)

View File

@@ -56,6 +56,14 @@ const crudOptions = ref({
api: dutApi.getDutList, api: dutApi.getDutList,
add: { show: true, api: dutApi.save, text: "新增被测件" }, 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) => { afterAdd: (res) => {
let id = projectId.value let id = projectId.value
treeDataStore.updateDutTreeData(res.data, id) treeDataStore.updateDutTreeData(res.data, id)

View File

@@ -2,7 +2,7 @@
<div class="ma-content-block lg:flex justify-between p-4"> <div class="ma-content-block lg:flex justify-between p-4">
<div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0"> <div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0">
<!-- CRUD组件 --> <!-- CRUD组件 -->
<ma-crud :options="crudOptions" :columns="crudColumns"> <ma-crud :options="crudOptions" :columns="crudColumns" ref="crudRef">
<template #ident="{ record }"> <template #ident="{ record }">
{{ showType(record) }} {{ showType(record) }}
</template> </template>
@@ -23,11 +23,12 @@ const roundNumber = route.query.key.split("-")[0]
const dutNumber = route.query.key.split("-")[1] const dutNumber = route.query.key.split("-")[1]
const designDemandNumber = route.query.key.split("-")[2] const designDemandNumber = route.query.key.split("-")[2]
const testDemandNumber = route.query.key.split("-")[3] const testDemandNumber = route.query.key.split("-")[3]
const crudRef = ref()
const projectId = ref(route.query.id) const projectId = ref(route.query.id)
// 标识显示字段 // 标识显示字段
const showType = (record) => { const showType = (record) => {
let key_string = parseInt(record.key.substring(record.key.lastIndexOf("-") + 1)) + 1 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设置 // crud设置
const crudOptions = ref({ const crudOptions = ref({
@@ -36,6 +37,31 @@ const crudOptions = ref({
edit: { show: true, api: caseApi.update }, edit: { show: true, api: caseApi.update },
delete: { show: true, api: caseApi.delete }, 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) => { afterAdd: (res) => {
let id = projectId.value let id = projectId.value
treeDataStore.updateCaseTreeData(res.data, id) treeDataStore.updateCaseTreeData(res.data, id)

View File

@@ -23,14 +23,23 @@ const crudRef = ref()
const crudOptions = ref({ const crudOptions = ref({
rowSelection: { showCheckedAll: true }, rowSelection: { showCheckedAll: true },
api: projectApi.getPageList, api: projectApi.getPageList,
add: { show: true, api: projectApi.save }, add: { show: true, api: projectApi.save, text: "新增项目" },
edit: { show: true, api: projectApi.update }, edit: { show: true, api: projectApi.update, text: "编辑项目" },
delete: { show: true, api: projectApi.delete }, delete: { show: true, api: projectApi.delete },
searchColNumber: 3, searchColNumber: 3,
tablePagination: false, tablePagination: false,
operationColumn: true, operationColumn: true,
operationWidth: 500, operationWidth: 500,
showIndex: false, 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: { formOption: {
isFull: true, isFull: true,
layout: [ layout: [
@@ -62,7 +71,7 @@ const crudOptions = ref({
{ span: 24, formList: [{ dataIndex: "member" }] }, { span: 24, formList: [{ dataIndex: "member" }] },
{ span: 8, formList: [{ dataIndex: "quality_person" }] }, { span: 8, formList: [{ dataIndex: "quality_person" }] },
{ span: 8, formList: [{ dataIndex: "vise_person" }] }, { span: 8, formList: [{ dataIndex: "vise_person" }] },
{ span: 8, formList: [{ dataIndex: "config_person" }] }, { span: 8, formList: [{ dataIndex: "config_person" }] }
] ]
}, },
{ {