From 4ce12642fa041aaa799b3db23bdf925d2939b90b Mon Sep 17 00:00:00 2001
From: ks3356143 <314298729@qq.com>
Date: Thu, 17 Aug 2023 20:15:03 +0800
Subject: [PATCH] 3211

---
 cdTMP/src/api/system/contact.js               | 48 ++++++++++++++++
 cdTMP/src/router/routes/modules/datamanage.js | 11 ++++
 .../src/views/datamanage/dictmanage/index.vue |  2 +-
 .../views/datamanage/projContact/index.vue    | 52 +++++++++++++++++
 cdTMP/src/views/project/round/index.vue       |  9 ++-
 .../src/views/testmanage/projmanage/index.vue | 57 +++++++------------
 6 files changed, 139 insertions(+), 40 deletions(-)
 create mode 100644 cdTMP/src/api/system/contact.js
 create mode 100644 cdTMP/src/views/datamanage/projContact/index.vue

diff --git a/cdTMP/src/api/system/contact.js b/cdTMP/src/api/system/contact.js
new file mode 100644
index 0000000..6a15135
--- /dev/null
+++ b/cdTMP/src/api/system/contact.js
@@ -0,0 +1,48 @@
+import { request } from "@/api/request"
+
+export default {
+    /**
+     * 请求委托方、研制方、测试方全部数据
+     * @returns 请求委托方、研制方、测试方全部数据
+     */
+    getlist(params = {}) {
+        return request({
+            url: `system/contact/getlist`,
+            method: "get",
+            params
+        })
+    },
+    /**
+     * 添加委托方、研制方、测试方数据
+     * @returns 返回已添加的contact数据
+     */
+    save(data = {}) {
+        return request({
+            url: "system/contact/save",
+            method: "post",
+            data
+        })
+    },
+    /**
+     * 更新委托方、研制方、测试方数据
+     * @returns
+     */
+    update(id, data = {}) {
+        return request({
+            url: "system/contact/update/" + id,
+            method: "put",
+            data
+        })
+    },
+    /**
+     * 删除委托方、研制方、测试方数据
+     * @returns
+     */
+    delete(data) {
+        return request({
+            url: "system/contact/delete",
+            method: "delete",
+            data
+        })
+    }
+}
diff --git a/cdTMP/src/router/routes/modules/datamanage.js b/cdTMP/src/router/routes/modules/datamanage.js
index d22cc20..4afd8d6 100644
--- a/cdTMP/src/router/routes/modules/datamanage.js
+++ b/cdTMP/src/router/routes/modules/datamanage.js
@@ -21,6 +21,17 @@ const DATAMANAGE = {
                 locale: "字典管理",
                 icon: "icon-book"
             }
+        },
+        {
+            path: "projContact",
+            name: "ProjContact",
+            component: () => import("@/views/datamanage/projContact/index.vue"),
+            meta: {
+                requiresAuth: true,
+                roles: ["*"],
+                locale: "项目联系信息",
+                icon: "icon-phone"
+            }
         }
     ]
 }
diff --git a/cdTMP/src/views/datamanage/dictmanage/index.vue b/cdTMP/src/views/datamanage/dictmanage/index.vue
index 7c33143..ac03c75 100644
--- a/cdTMP/src/views/datamanage/dictmanage/index.vue
+++ b/cdTMP/src/views/datamanage/dictmanage/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="ma-content-block lg:flex justify-between p-4">
+    <div class="ma-content-block lg:flex justify-between p-4" ref="crudRef">
         <div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0">
             <!-- CRUD组件 -->
             <ma-crud :options="crudOptions" :columns="crudColumns">
diff --git a/cdTMP/src/views/datamanage/projContact/index.vue b/cdTMP/src/views/datamanage/projContact/index.vue
new file mode 100644
index 0000000..cd5c4c0
--- /dev/null
+++ b/cdTMP/src/views/datamanage/projContact/index.vue
@@ -0,0 +1,52 @@
+<template>
+    <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">
+            <!-- crud组件 -->
+            <ma-crud :options="crudOptions" :columns="crudColumns" ref="crudRef"></ma-crud>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref } from "vue"
+import { Message } from "@arco-design/web-vue"
+import contactApi from "@/api/system/contact"
+
+const crudRef = ref()
+const crudOptions = ref({
+    autoRequest: true,
+    api: contactApi.getlist,
+    add: { show: true, api: contactApi.save },
+    edit: { show: true, api: contactApi.update },
+    delete: { show: true, api: contactApi.delete },
+    operationWidth: 160,
+    operationColumn: true,
+    operationColumnAlign: "center",
+    showIndex: false,
+    searchColNumber: 3,
+    tablePagination: false,
+    rowSelection: { showCheckedAll: true }
+})
+const crudColumns = ref([
+    { title: "ID", dataIndex: "id", addDisplay: false, editDisplay: false, width: 50, hide: true },
+    { title: "公司编号", align: "center", dataIndex: "key", search: true, width: 220 },
+    {
+        title: "名称",
+        align: "center",
+        dataIndex: "name",
+        search: true,
+        width: 220,
+        commonRules: [{ required: true, message: "名称必填" }]
+    },
+    {
+        title: "法人",
+        align: "center",
+        dataIndex: "entrust_person",
+        search: true,
+        width: 220,
+        commonRules: [{ required: true, message: "法人必填" }]
+    }
+])
+</script>
+
+<style lang="less" scoped></style>
diff --git a/cdTMP/src/views/project/round/index.vue b/cdTMP/src/views/project/round/index.vue
index 58ab1a2..e453963 100644
--- a/cdTMP/src/views/project/round/index.vue
+++ b/cdTMP/src/views/project/round/index.vue
@@ -2,7 +2,7 @@
     <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">
             <!-- CRUD组件 -->
-            <ma-crud :options="crudOptions" :columns="crudColumns">
+            <ma-crud :options="crudOptions" :columns="crudColumns" ref="crudRef">
                 <template #total_code_line="{ record }">
                     <template v-if="record.total_code_line">
                         <a-statistic
@@ -50,7 +50,7 @@ const treeDataStore = useTreeDataStore()
 const route = useRoute()
 const roundNumber = route.query.key.split("-")[0]
 const projectId = ref(route.query.id)
-
+const crudRef = ref()
 // crud组件
 const crudOptions = ref({
     api: dutApi.getDutList,
@@ -108,7 +108,10 @@ const crudColumns = ref([
         align: "center",
         dataIndex: "ident",
         search: true,
-        commonRules: [{ required: true, message: "标识是必填" }],
+        // 这里做的标识预填
+        addDefaultValue: route.query.ident + "-R" + (parseInt(route.query.key) + 1) + "-UT",
+        addDisabled: true,
+        editDisabled: true,
         validateTrigger: "blur"
     },
     {
diff --git a/cdTMP/src/views/testmanage/projmanage/index.vue b/cdTMP/src/views/testmanage/projmanage/index.vue
index dee5009..bc66210 100644
--- a/cdTMP/src/views/testmanage/projmanage/index.vue
+++ b/cdTMP/src/views/testmanage/projmanage/index.vue
@@ -23,9 +23,9 @@ const crudRef = ref()
 const crudOptions = ref({
     rowSelection: { showCheckedAll: true },
     api: projectApi.getPageList,
-    add: { show: true,api: projectApi.save},
-    edit: { show: true,api: projectApi.update},
-    delete: { show: true ,api:projectApi.delete},
+    add: { show: true, api: projectApi.save },
+    edit: { show: true, api: projectApi.update },
+    delete: { show: true, api: projectApi.delete },
     searchColNumber: 3,
     tablePagination: false,
     operationColumn: true,
@@ -97,8 +97,7 @@ const crudOptions = ref({
                                 title: "委托方信息",
                                 customClass: ["mt-3", "mb-5", "mx-1"],
                                 formList: [
-                                    { dataIndex: "entrust_ident" },
-                                    { dataIndex: "entrust_legal" },
+                                    { dataIndex: "entrust_unit" },
                                     { dataIndex: "entrust_contact" },
                                     { dataIndex: "entrust_contact_phone" },
                                     { dataIndex: "entrust_email" }
@@ -113,8 +112,7 @@ const crudOptions = ref({
                                 title: "研制方信息",
                                 customClass: ["mt-3", "mb-5", "mx-1"],
                                 formList: [
-                                    { dataIndex: "dev_ident" },
-                                    { dataIndex: "dev_legal" },
+                                    { dataIndex: "dev_unit" },
                                     { dataIndex: "dev_contact" },
                                     { dataIndex: "dev_contact_phone" },
                                     { dataIndex: "dev_email" }
@@ -129,8 +127,7 @@ const crudOptions = ref({
                                 title: "测评中心信息",
                                 customClass: ["mt-3", "mb-5", "mx-1"],
                                 formList: [
-                                    { dataIndex: "test_ident" },
-                                    { dataIndex: "test_legal" },
+                                    { dataIndex: "test_unit" },
                                     { dataIndex: "test_contact" },
                                     { dataIndex: "test_contact_phone" },
                                     { dataIndex: "test_email" }
@@ -262,16 +259,12 @@ const crudColumns = ref([
         dict: { name: "standard", props: { label: "title", value: "key" } }
     },
     {
-        title: "标识",
-        dataIndex: "entrust_ident",
+        title: "单位",
+        dataIndex: "entrust_unit",
         hide: true,
-        rules: [{ required: true, message: "标识必填" }]
-    },
-    {
-        title: "法人",
-        dataIndex: "entrust_legal",
-        hide: true,
-        rules: [{ required: true, message: "法人必填" }]
+        commonRules: [{ required: true, message: "单位必选" }],
+        formType: "select",
+        dict: { url: "system/contact/index", props: { label: "name", value: "name" }, translation: true }
     },
     {
         formType: "input",
@@ -295,16 +288,12 @@ const crudColumns = ref([
         rules: [{ required: true, message: "电子邮箱必填" }]
     },
     {
-        title: "标识",
-        dataIndex: "dev_ident",
+        title: "单位",
+        dataIndex: "dev_unit",
         hide: true,
-        rules: [{ required: true, message: "标识必填" }]
-    },
-    {
-        title: "法人",
-        dataIndex: "dev_legal",
-        hide: true,
-        rules: [{ required: true, message: "法人必填" }]
+        commonRules: [{ required: true, message: "单位必选" }],
+        formType: "select",
+        dict: { url: "system/contact/index", props: { label: "name", value: "name" }, translation: true }
     },
     {
         formType: "input",
@@ -328,16 +317,12 @@ const crudColumns = ref([
         rules: [{ required: true, message: "电子邮箱必填" }]
     },
     {
-        title: "标识",
-        dataIndex: "test_ident",
+        title: "单位",
+        dataIndex: "test_unit",
         hide: true,
-        rules: [{ required: true, message: "标识必填" }]
-    },
-    {
-        title: "法人",
-        dataIndex: "test_legal",
-        hide: true,
-        rules: [{ required: true, message: "法人必填" }]
+        commonRules: [{ required: true, message: "单位必选" }],
+        formType: "select",
+        dict: { url: "system/contact/index", props: { label: "name", value: "name" }, translation: true }
     },
     {
         formType: "input",