From 949a04de73198d8a13dfc1732f8eefaa7231434c Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 7 Aug 2024 15:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=BB=84=E4=BB=B6=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=EF=BC=8C=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E7=AE=A1=E7=90=86=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/sidebar.scss                |   1 +
 src/components/DialogModel/index.vue          |  55 +++++
 src/components/TableModel/index.vue           | 139 ++++++-----
 src/components/ToolbarModel/index.vue         | 227 ++++++++++++++++++
 src/layout/components/AppMain.vue             |  79 +++---
 src/main.js                                   |   3 +
 src/mixins/common.js                          |  12 +
 src/permission.js                             |  81 ++++---
 src/router/index.js                           |  12 +
 .../components/form-contact-units.vue         | 121 ++++++++++
 src/views/BasicManage/ContactUnits/config.js  |  18 ++
 src/views/BasicManage/ContactUnits/index.vue  |  49 +++-
 .../ProjectManage/components/form-project.vue | 185 ++++++++++++++
 src/views/BasicManage/ProjectManage/config.js |  27 ++-
 src/views/BasicManage/ProjectManage/index.vue |  45 +++-
 15 files changed, 904 insertions(+), 150 deletions(-)
 create mode 100644 src/components/DialogModel/index.vue
 create mode 100644 src/components/ToolbarModel/index.vue
 create mode 100644 src/mixins/common.js
 create mode 100644 src/views/BasicManage/ContactUnits/components/form-contact-units.vue
 create mode 100644 src/views/BasicManage/ContactUnits/config.js
 create mode 100644 src/views/BasicManage/ProjectManage/components/form-project.vue

diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index abe5b63..e85851a 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -5,6 +5,7 @@
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
     position: relative;
+    overflow: hidden;
   }
 
   .sidebarHide {
diff --git a/src/components/DialogModel/index.vue b/src/components/DialogModel/index.vue
new file mode 100644
index 0000000..76c3dcc
--- /dev/null
+++ b/src/components/DialogModel/index.vue
@@ -0,0 +1,55 @@
+<template>
+    <!-- 弹框组件 -->
+    <div>
+        <el-dialog
+            :title="dialogConfig.outerTitle"
+            :width="dialogConfig.outerWidth"
+            :visible.sync="dialogConfig.outerVisible"
+            v-if="dialogConfig.outerVisible"
+            :before-close="handleCloseOuter"
+            append-to-body
+        >
+            <!-- 外层弹框内容 -->
+            <slot name="outerContent"></slot>
+
+            <!-- 内层对话框 -->
+            <el-dialog
+                :title="dialogConfig.innerTitle"
+                :width="dialogConfig.innerWidth"
+                :visible.sync="dialogConfig.innerVisible"
+                v-if="dialogConfig.innerVisible"
+                :before-close="handleCloseInner"
+                append-to-body
+            >
+                <!-- 内层弹框内容 -->
+                <slot name="innerContent"></slot>
+            </el-dialog>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        /* 配置项 */
+        dialogConfig: {
+            type: Object,
+            default: () => {
+                return {}
+            },
+        },
+    },
+    methods: {
+        /* 右上角关闭外层 */
+        handleCloseOuter() {
+            /* 通知父组件更改弹框显示值 */
+            this.$emit('closeDialogOuter', false)
+        },
+        /* 右上角关闭内层 */
+        handleCloseInner() {
+            /* 通知父组件更改弹框显示值 */
+            this.$emit('closeDialogInner', false)
+        },
+    },
+}
+</script>
diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue
index 9111634..d072e38 100644
--- a/src/components/TableModel/index.vue
+++ b/src/components/TableModel/index.vue
@@ -76,70 +76,72 @@
             </el-form-item>
         </el-form>
         <!-- 按钮集群 -->
-        <el-row>
-            <slot name="btn" :pageParams="pageParams"></slot>
-            <RightToolbar
+        <el-row class="btn-container">
+            <div class="btn-handler">
+                <slot name="btn" :pageParams="queryParams"></slot>
+            </div>
+            <ToolbarModel
                 :showSearch.sync="showSearch"
+                :indexNumShow.sync="indexNumShow"
+                :selectionShow.sync="selectionShow"
+                :handleShow.sync="handleShow"
+                :columns="columCheckList"
                 @queryTable="getTableList"
-                :columns="tableColumCheckProps"
             />
         </el-row>
         <!-- 表格 -->
-        <el-table-column
-            v-for="(item, v) in tableColumCheckProps"
-            :key="v"
-            :label="item.t_label"
-            :prop="item.t_props"
-            :width="item.t_width"
-            align="center"
-            show-overflow-tooltip
-        >
-            <template slot-scope="scope">
-                <!-- 判断当前列数据是否需要使用插槽的数据 -->
-                <template v-if="item.t_slot">
-                    <slot :data="scope.row" :name="item.t_slot"></slot>
-                </template>
-                <template v-else>
-                    {{ scope.row[item.t_props] || '-' }}
-                </template>
-            </template>
-        </el-table-column>
-        <el-table-column
-            align="center"
-            label="操作"
-            v-if="config.handleColShow"
-            :width="config.handleWidth"
-        >
-            <template slot-scope="{ row }">
-                <slot :data="row" name="handle"></slot>
-            </template>
 
-            <!-- 增加筛选列显示隐藏操作 -->
-            <template slot="header">
-                <el-popover
-                    placement="bottom"
-                    title="筛选列"
-                    width="200"
-                    trigger="click"
-                >
-                    <span slot="reference" class="handel-text">操作</span>
-                    <div>
-                        <el-checkbox
-                            v-for="(check, index) in columCheckList"
-                            v-show="check.t_label != '序号'"
-                            :key="index"
-                            v-model="check.checked"
-                            >{{ check.t_label }}</el-checkbox
-                        >
-                    </div>
-                </el-popover>
-            </template>
-        </el-table-column>
+        <el-table
+            :data="tableList"
+            border
+            ref="tableRef"
+            select-on-indeterminate
+        >
+            <el-table-column
+                type="selection"
+                width="45"
+                align="center"
+                v-if="selectionShow"
+            />
+            <el-table-column
+                width="55"
+                align="center"
+                label="序号"
+                type="index"
+                v-if="indexNumShow"
+            />
+            <el-table-column
+                v-for="(item, v) in tableColumCheckProps"
+                :key="v"
+                :label="item.t_label"
+                :prop="item.t_props"
+                :width="item.t_width"
+                align="center"
+                show-overflow-tooltip
+            >
+                <template slot-scope="scope">
+                    <!-- 判断当前列数据是否需要使用插槽的数据 -->
+                    <template v-if="item.t_slot">
+                        <slot :data="scope.row" :name="item.t_slot"></slot>
+                    </template>
+                    <template v-else>
+                        {{ scope.row[item.t_props] || '-' }}
+                    </template>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" label="操作" v-show="handleShow">
+                <template slot-scope="{ row }">
+                    <slot :data="row" name="handle"></slot>
+                </template>
+            </el-table-column>
+        </el-table>
     </div>
 </template>
 
 <script>
+import ToolbarModel from '../ToolbarModel'
 export default {
+    components: { ToolbarModel },
     props: {
         /** 表单查询条件 */
         formLabel: {
@@ -153,7 +155,7 @@ export default {
         },
         /* 列表配置项 */
         columnsList: {
-            type: Object,
+            type: Array,
             default: () => [],
         },
     },
@@ -172,6 +174,14 @@ export default {
             queryParams: {},
             // 搜索区域是否隐藏
             showSearch: true,
+            // 是否显示复选框
+            selectionShow: true,
+            // 是否显示序号
+            indexNumShow: true,
+            // 是否显示操作列
+            handleShow: true,
+            columCheckList: [],
+            tableList: [],
         }
     },
 
@@ -200,11 +210,28 @@ export default {
         },
         /** 重置按钮 */
         resetQuery() {
-            this.$refs.queryFormRef.resetFields()
+            // this.$refs.queryFormRef.resetFields()
             this.getTableList()
         },
+        /** 筛选列 */
+        checkboxChange(list) {
+            this.columCheckList = list
+        },
     },
 }
 </script>
 
-<style></style>
+<style scoped lang="scss">
+.btn-container {
+    margin-bottom: 6px;
+    display: flex;
+    align-items: center;
+}
+::v-deep .btn-handler {
+    flex: 1;
+
+    .el-button {
+        padding: 6px 18px;
+    }
+}
+</style>
diff --git a/src/components/ToolbarModel/index.vue b/src/components/ToolbarModel/index.vue
new file mode 100644
index 0000000..626b89f
--- /dev/null
+++ b/src/components/ToolbarModel/index.vue
@@ -0,0 +1,227 @@
+<template>
+    <div class="top-right-btn" :style="style">
+        <el-row>
+            <el-tooltip
+                class="item"
+                effect="dark"
+                :content="showSearch ? '隐藏搜索' : '显示搜索'"
+                placement="top"
+                v-if="search"
+            >
+                <el-button
+                    size="mini"
+                    circle
+                    icon="el-icon-search"
+                    @click="toggleSearch()"
+                />
+            </el-tooltip>
+            <el-tooltip
+                class="item"
+                effect="dark"
+                content="刷新"
+                placement="top"
+            >
+                <el-button
+                    size="mini"
+                    circle
+                    icon="el-icon-refresh"
+                    @click="refresh()"
+                />
+            </el-tooltip>
+            <el-tooltip
+                class="item"
+                effect="dark"
+                content="列表筛选"
+                placement="top"
+            >
+                <el-dropdown
+                    trigger="click"
+                    :hide-on-click="false"
+                    style="padding-left: 12px"
+                >
+                    <el-button size="mini" circle icon="el-icon-menu" />
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item>
+                            <el-checkbox
+                                :checked="selectionShow"
+                                @change="
+                                    () => {
+                                        this.$emit(
+                                            'update:selectionShow',
+                                            !this.selectionShow,
+                                        )
+                                    }
+                                "
+                                >复选框</el-checkbox
+                            >
+                        </el-dropdown-item>
+                        <el-dropdown-item>
+                            <el-checkbox
+                                :checked="indexNumShow"
+                                @change="
+                                    () => {
+                                        this.$emit(
+                                            'update:indexNumShow',
+                                            !this.indexNumShow,
+                                        )
+                                    }
+                                "
+                                >序号</el-checkbox
+                            >
+                        </el-dropdown-item>
+                        <el-dropdown-item>
+                            <el-checkbox
+                                :checked="handleShow"
+                                @change="
+                                    () => {
+                                        this.$emit(
+                                            'update:handleShow',
+                                            !this.handleShow,
+                                        )
+                                    }
+                                "
+                                >操作</el-checkbox
+                            >
+                        </el-dropdown-item>
+
+                        <template v-for="(item, index) in columns">
+                            <el-dropdown-item :key="index">
+                                <el-checkbox
+                                    :checked="item.checked"
+                                    @change="
+                                        checkboxChange($event, item.t_label)
+                                    "
+                                    :label="item.t_label"
+                                    >{{ item.t_label }}</el-checkbox
+                                >
+                            </el-dropdown-item>
+                        </template>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </el-tooltip>
+        </el-row>
+    </div>
+</template>
+<script>
+export default {
+    name: 'RightToolbar',
+    data() {
+        return {
+            // 显隐数据
+            value: [],
+            // 弹出层标题
+            title: '显示/隐藏',
+            // 是否显示弹出层
+            open: false,
+        }
+    },
+    props: {
+        /* 是否显示检索条件 */
+        showSearch: {
+            type: Boolean,
+            default: true,
+        },
+        /* 列表复选框显示 */
+        selectionShow: {
+            type: Boolean,
+            default: true,
+        },
+        /* 列表序号显示 */
+        indexNumShow: {
+            type: Boolean,
+            default: true,
+        },
+        /* 列表操作列显示 */
+        handleShow: {
+            type: Boolean,
+            default: true,
+        },
+        /* 显隐列信息 */
+        columns: {
+            type: Array,
+        },
+        /* 是否显示检索图标 */
+        search: {
+            type: Boolean,
+            default: true,
+        },
+        /* 显隐列类型（transfer穿梭框、checkbox复选框） */
+        showColumnsType: {
+            type: String,
+            default: 'checkbox',
+        },
+        /* 右外边距 */
+        gutter: {
+            type: Number,
+            default: 10,
+        },
+    },
+    computed: {
+        style() {
+            const ret = {}
+            if (this.gutter) {
+                ret.marginRight = `${this.gutter / 2}px`
+            }
+            return ret
+        },
+    },
+    created() {
+        if (this.showColumnsType == 'transfer') {
+            // 显隐列初始默认隐藏列
+            for (let item in this.columns) {
+                if (this.columns[item].visible === false) {
+                    this.value.push(parseInt(item))
+                }
+            }
+        }
+    },
+    methods: {
+        // 搜索
+        toggleSearch() {
+            this.$emit('update:showSearch', !this.showSearch)
+        },
+
+        // // 搜索
+        // toggleSearch() {
+        //     this.$emit('update:showSearch', !this.showSearch)
+        // },
+        // 刷新
+        refresh() {
+            this.$emit('queryTable')
+        },
+        // 右侧列表元素变化
+        dataChange(data) {
+            for (let item in this.columns) {
+                const key = this.columns[item].key
+                this.columns[item].visible = !data.includes(key)
+            }
+        },
+        // 打开显隐列dialog
+        showColumn() {
+            this.open = true
+        },
+        // 勾选
+        checkboxChange(event, label) {
+            let checkList = this.columns
+            checkList.forEach((e) => {
+                if (e.t_label === label) {
+                    e.checked = event
+                }
+            })
+
+            this.$emit('checkboxChange', checkList)
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .el-transfer__button {
+    border-radius: 50%;
+    padding: 12px;
+    display: block;
+    margin-left: 0px;
+}
+::v-deep .el-transfer__button:first-child {
+    margin-bottom: 10px;
+}
+</style>
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index a25c562..2a92571 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,75 +1,76 @@
 <template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
-        <router-view v-if="!$route.meta.link" :key="key" />
-      </keep-alive>
-    </transition>
-    <iframe-toggle />
-  </section>
+    <section class="app-main">
+        <transition name="fade-transform" mode="out-in">
+            <keep-alive :include="cachedViews">
+                <router-view v-if="!$route.meta.link" :key="key" />
+            </keep-alive>
+        </transition>
+        <iframe-toggle />
+    </section>
 </template>
 
 <script>
-import iframeToggle from "./IframeToggle/index"
+import iframeToggle from './IframeToggle/index'
 
 export default {
-  name: 'AppMain',
-  components: { iframeToggle },
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+    name: 'AppMain',
+    components: { iframeToggle },
+    computed: {
+        cachedViews() {
+            return this.$store.state.tagsView.cachedViews
+        },
+        key() {
+            return this.$route.path
+        },
     },
-    key() {
-      return this.$route.path
-    }
-  }
 }
 </script>
 
 <style lang="scss" scoped>
 .app-main {
-  /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
-  width: 100%;
-  position: relative;
-  overflow: hidden;
+    /* 50= navbar  50  */
+    // min-height: calc(100vh - 50px);
+    height: calc(100vh - 50px);
+    width: 100%;
+    position: relative;
+    overflow: auto;
 }
 
 .fixed-header + .app-main {
-  padding-top: 50px;
+    padding-top: 50px;
 }
 
 .hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
-  }
+    .app-main {
+        /* 84 = navbar + tags-view = 50 + 34 */
+        min-height: calc(100vh - 84px);
+    }
 
-  .fixed-header + .app-main {
-    padding-top: 84px;
-  }
+    .fixed-header + .app-main {
+        padding-top: 84px;
+    }
 }
 </style>
 
 <style lang="scss">
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 6px;
-  }
+    .fixed-header {
+        padding-right: 6px;
+    }
 }
 
 ::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
+    width: 6px;
+    height: 6px;
 }
 
 ::-webkit-scrollbar-track {
-  background-color: #f1f1f1;
+    background-color: #f1f1f1;
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: #c0c0c0;
-  border-radius: 3px;
+    background-color: #c0c0c0;
+    border-radius: 3px;
 }
 </style>
diff --git a/src/main.js b/src/main.js
index ea2b899..86212e0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -40,6 +40,8 @@ import DictData from '@/components/DictData'
 
 // 表格组件
 import TableModel from '@/components/TableModel'
+// 弹框组件
+import DialogModel from '@/components/DialogModel'
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -61,6 +63,7 @@ Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('TableModel', TableModel)
+Vue.component('DialogModel', DialogModel)
 
 Vue.use(directive)
 Vue.use(plugins)
diff --git a/src/mixins/common.js b/src/mixins/common.js
new file mode 100644
index 0000000..dd37b4a
--- /dev/null
+++ b/src/mixins/common.js
@@ -0,0 +1,12 @@
+export const commonMixin = {
+    methods: {
+        /** 关闭外侧弹框 */
+        closeDialogOuter() {
+            this.dialogConfig.outerVisible = false
+        },
+        /** 关闭内侧弹框 */
+        closeDialogInner() {
+            this.dialogConfig.innerVisible = false
+        },
+    }
+} 
\ No newline at end of file
diff --git a/src/permission.js b/src/permission.js
index 5297df9..1d597ec 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -12,46 +12,47 @@ const whiteList = ['/login', '/register']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
-  if (getToken()) {
-    console.log(getToken())
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
-    /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
-    } else if (whiteList.indexOf(to.path) !== -1) {
-      next()
-    } else {
-      if (store.getters.roles.length === 0) {
-        isRelogin.show = true
-        // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-          })
-        }).catch(err => {
-          store.dispatch('LogOut').then(() => {
-            Message.error(err)
-            next({ path: '/' })
-          })
-        })
-      } else {
-        next()
-      }
-    }
-  } else {
-    // 没有token
-    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录白名单，直接进入
-      next()
-    } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
-      NProgress.done()
-    }
-  }
+  next()
+  // if (getToken()) {
+  //   console.log(getToken())
+  //   to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+  //   /* has token*/
+  //   if (to.path === '/login') {
+  //     next({ path: '/' })
+  //     NProgress.done()
+  //   } else if (whiteList.indexOf(to.path) !== -1) {
+  //     next()
+  //   } else {
+  //     if (store.getters.roles.length === 0) {
+  //       isRelogin.show = true
+  //       // 判断当前用户是否已拉取完user_info信息
+  //       store.dispatch('GetInfo').then(() => {
+  //         isRelogin.show = false
+  //         store.dispatch('GenerateRoutes').then(accessRoutes => {
+  //           // 根据roles权限生成可访问的路由表
+  //           router.addRoutes(accessRoutes) // 动态添加可访问路由表
+  //           next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+  //         })
+  //       }).catch(err => {
+  //         store.dispatch('LogOut').then(() => {
+  //           Message.error(err)
+  //           next({ path: '/' })
+  //         })
+  //       })
+  //     } else {
+  //       next()
+  //     }
+  //   }
+  // } else {
+  //   // 没有token
+  //   if (whiteList.indexOf(to.path) !== -1) {
+  //     // 在免登录白名单，直接进入
+  //     next()
+  //   } else {
+  //     next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
+  //     NProgress.done()
+  //   }
+  // }
 })
 
 router.afterEach(() => {
diff --git a/src/router/index.js b/src/router/index.js
index 493b19f..b35dc4f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -71,6 +71,18 @@ export const constantRoutes = [
         component: () => import('@/views/index'),
         name: 'Index',
         meta: { title: '首页', icon: 'dashboard', affix: true }
+      },
+      {
+        path: 'ProjectManage',
+        component: () => import('@/views/BasicManage/ProjectManage'),
+        name: 'ProjectManage',
+        meta: { title: '工程管理', icon: 'dashboard', affix: true }
+      },
+      {
+        path: 'ContactUnits',
+        component: () => import('@/views/BasicManage/ContactUnits'),
+        name: 'ContactUnits',
+        meta: { title: '往来单位', icon: 'dashboard', affix: true }
       }
     ]
   },
diff --git a/src/views/BasicManage/ContactUnits/components/form-contact-units.vue b/src/views/BasicManage/ContactUnits/components/form-contact-units.vue
new file mode 100644
index 0000000..62ac463
--- /dev/null
+++ b/src/views/BasicManage/ContactUnits/components/form-contact-units.vue
@@ -0,0 +1,121 @@
+<template>
+    <div>
+        <el-form
+            label-width="100px"
+            size="medium"
+            ref="contactUnitsParamsRef"
+            :model="contactUnitsParams"
+            :rules="contactUnitsParamsRules"
+        >
+            <el-form-item label="单位名称" prop="pro_name">
+                <el-input v-model="contactUnitsParams.pro_name" />
+            </el-form-item>
+            <el-form-item label="单位类型" prop="pro_type_of">
+                <el-select v-model="contactUnitsParams.pro_type_of"></el-select>
+            </el-form-item>
+            <el-form-item label="所属分公司" prop="pro_unit">
+                <el-select v-model="contactUnitsParams.pro_unit"></el-select>
+            </el-form-item>
+            <el-form-item label="联系人" prop="pro_user">
+                <el-input v-model="contactUnitsParams.pro_user" />
+            </el-form-item>
+            <el-form-item label="联系电话" prop="pro_phone">
+                <el-input v-model="contactUnitsParams.pro_phone" />
+            </el-form-item>
+            <el-form-item label="启用状态" prop="pro_type">
+                <el-switch
+                    active-text="启用"
+                    inactive-text="禁用"
+                    v-model="contactUnitsParams.pro_type"
+                ></el-switch>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSubmit">确定</el-button>
+                <el-button
+                    @click="
+                        () => {
+                            this.$emit('closeDialog')
+                        }
+                    "
+                    >取消</el-button
+                >
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            contactUnitsParams: {
+                pro_name: '',
+                pro_code: '',
+                pro_unit: '',
+                pro_type_of: '',
+                pro_type: '',
+                pro_nature: '',
+                pro_user: '',
+                pro_phone: '',
+            },
+            // 校验规则
+            contactUnitsParamsRules: {
+                pro_name: [
+                    {
+                        required: true,
+                        message: '请输入工程名称',
+                        trigger: 'blur',
+                    },
+                ],
+                pro_unit: [
+                    {
+                        required: true,
+                        message: '请选择施工单位',
+                        trigger: 'blur',
+                    },
+                ],
+                pro_type_of: [
+                    {
+                        required: true,
+                        message: '请选择工程类型',
+                        trigger: 'blur',
+                    },
+                ],
+                pro_type: [
+                    {
+                        required: true,
+                        message: '请选择工程状态',
+                        trigger: 'blur',
+                    },
+                ],
+                pro_nature: [
+                    {
+                        required: true,
+                        message: '请选择工程性质',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+        }
+    },
+    methods: {
+        /** 确认按钮 */
+        onSubmit() {
+            this.$refs.contactUnitsParamsRef.validate((valid) => {
+                if (valid) {
+                    console.log('校验通过')
+                    // 1. 表单校验通过后调后台 Api
+                    // 2. 成功之后通知父组件关闭弹框
+                    this.$emit('closeDialog')
+                }
+            })
+        },
+    },
+}
+</script>
+
+<style scoped>
+::v-deep .el-select {
+    width: 100%;
+}
+</style>
diff --git a/src/views/BasicManage/ContactUnits/config.js b/src/views/BasicManage/ContactUnits/config.js
new file mode 100644
index 0000000..6e65931
--- /dev/null
+++ b/src/views/BasicManage/ContactUnits/config.js
@@ -0,0 +1,18 @@
+
+export const formLabel = [
+    { f_label: '分公司名称', f_model: 'keyWords', f_type: 'ipt' },
+]
+export const columnsList = [
+    { t_props: 'scrapNum', t_label: '单位名称', },
+    { t_props: '', t_label: '单位类型' },
+    { t_props: 'repairNum', t_label: '所属分公司' },
+    { t_props: 'unitName', t_label: '联系人', },
+    { t_props: 'projectName', t_label: '联系电话', },
+    { t_props: 'itemType', t_label: '状态', },
+
+]
+export const dialogConfig = {
+    outerWidth: '40%',
+    outerTitle: '',
+    outerVisible: false,
+}
\ No newline at end of file
diff --git a/src/views/BasicManage/ContactUnits/index.vue b/src/views/BasicManage/ContactUnits/index.vue
index f43a00c..615ecda 100644
--- a/src/views/BasicManage/ContactUnits/index.vue
+++ b/src/views/BasicManage/ContactUnits/index.vue
@@ -1,10 +1,51 @@
 <template>
     <!-- 往来单位 -->
-    <div> 往来单位 </div>
+    <div class="app-container">
+        <TableModel :formLabel="formLabel" :columnsList="columnsList">
+            <template slot="btn">
+                <el-button type="primary" @click="addContactUnits()"
+                    >新建</el-button
+                >
+                <el-button>导入</el-button>
+                <el-button>导出</el-button>
+            </template>
+        </TableModel>
+
+        <DialogModel
+            :dialogConfig="dialogConfig"
+            @closeDialogOuter="closeDialogOuter"
+        >
+            <template slot="outerContent">
+                <FormContactUnits @closeDialog="closeDialog" />
+            </template>
+        </DialogModel>
+    </div>
 </template>
 
 <script>
-export default {}
+import { formLabel, columnsList, dialogConfig } from './config'
+import { commonMixin } from '@/mixins/common.js'
+import FormContactUnits from './components/form-contact-units.vue'
+export default {
+    mixins: [commonMixin], // 混入公共方法和数据
+    components: { FormContactUnits },
+    data() {
+        return {
+            formLabel,
+            columnsList,
+            dialogConfig,
+        }
+    },
+    methods: {
+        /** 新建往来单位 */
+        addContactUnits() {
+            this.dialogConfig.outerTitle = '新建往来单位'
+            this.dialogConfig.outerVisible = true
+        },
+        /** 关闭弹框 */
+        closeDialog() {
+            this.dialogConfig.outerVisible = false
+        },
+    },
+}
 </script>
-
-<style></style>
diff --git a/src/views/BasicManage/ProjectManage/components/form-project.vue b/src/views/BasicManage/ProjectManage/components/form-project.vue
new file mode 100644
index 0000000..9b8f885
--- /dev/null
+++ b/src/views/BasicManage/ProjectManage/components/form-project.vue
@@ -0,0 +1,185 @@
+<template>
+    <div>
+        <el-form
+            label-width="100px"
+            size="medium"
+            ref="projectParamsRef"
+            :model="projectParams"
+            :rules="projectParamsRules"
+        >
+            <el-row type="flex" justify="space-between" :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="工程名称" prop="pro_name">
+                        <el-input v-model="projectParams.pro_name" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="工程编号" prop="pro_code">
+                        <el-input v-model="projectParams.pro_code" />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="实施单位" prop="pro_unit">
+                        <el-select v-model="projectParams.pro_unit"></el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="工程类型" prop="pro_type_of">
+                        <el-select
+                            v-model="projectParams.pro_type_of"
+                        ></el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="工程状态" prop="pro_type">
+                        <el-select v-model="projectParams.pro_type"></el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="工程性质" prop="pro_nature">
+                        <el-select
+                            v-model="projectParams.pro_nature"
+                        ></el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="项目经理" prop="pro_user">
+                        <el-input v-model="projectParams.pro_user" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="联系电话" prop="pro_phone">
+                        <el-input v-model="projectParams.pro_phone" />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="合同主体单位">
+                        <el-input />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="所属项目中心">
+                        <el-input />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="i8工程ID">
+                        <el-input />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="关联i8工程">
+                        <el-input />
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="备注">
+                        <el-input type="textarea" :rows="6" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12"> </el-col>
+            </el-row>
+
+            <el-form-item>
+                <el-button type="success" @click="onSubmit">确认</el-button>
+                <el-button
+                    @click="
+                        () => {
+                            this.$emit('closeDialog')
+                        }
+                    "
+                    >取消</el-button
+                >
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            projectParams: {
+                pro_name: '',
+                pro_code: '',
+                pro_unit: '',
+                pro_type_of: '',
+                pro_type: '',
+                pro_nature: '',
+                pro_user: '',
+                pro_phone: '',
+            },
+            // 校验规则
+            projectParamsRules: {
+                pro_name: [
+                    {
+                        required: true,
+                        message: '请输入工程名称',
+                        trigger: 'blur',
+                    },
+                ],
+                pro_unit: [
+                    {
+                        required: true,
+                        message: '请选择施工单位',
+                        trigger: 'blur',
+                    },
+                ],
+                pro_type_of: [
+                    {
+                        required: true,
+                        message: '请选择工程类型',
+                        trigger: 'blur',
+                    },
+                ],
+                pro_type: [
+                    {
+                        required: true,
+                        message: '请选择工程状态',
+                        trigger: 'blur',
+                    },
+                ],
+                pro_nature: [
+                    {
+                        required: true,
+                        message: '请选择工程性质',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+        }
+    },
+    methods: {
+        /** 确认按钮 */
+        onSubmit() {
+            this.$refs.projectParamsRef.validate((valid) => {
+                if (valid) {
+                    console.log('校验通过')
+                    // 1. 表单校验通过后调后台 Api
+                    // 2. 成功之后通知父组件关闭弹框
+                    this.$emit('closeDialog')
+                }
+            })
+        },
+    },
+}
+</script>
+
+<style scoped>
+::v-deep .el-select {
+    width: 100%;
+}
+</style>
diff --git a/src/views/BasicManage/ProjectManage/config.js b/src/views/BasicManage/ProjectManage/config.js
index 5963bfc..98d35ea 100644
--- a/src/views/BasicManage/ProjectManage/config.js
+++ b/src/views/BasicManage/ProjectManage/config.js
@@ -3,11 +3,22 @@ export const formLabel = [
     { f_label: '分公司名称', f_model: 'keywords', f_type: 'ipt' },
 ]
 export const columnsList = [
-    // { t_width: '55px', t_props: '', t_label: '序号' },
-    { t_width: '', t_props: 'scrapNum', t_label: '单位名称', },
-    { t_width: '', t_props: '', t_label: '单位类型' },
-    { t_width: '', t_props: 'repairNum', t_label: '所属分公司' },
-    { t_width: '', t_props: 'unitName', t_label: '联系人', },
-    { t_width: '', t_props: 'projectName', t_label: '联系电话', },
-    { t_width: '', t_props: 'itemType', t_label: '状态', },
-]
\ No newline at end of file
+    { t_props: 'scrapNum', t_label: '工程项目名称', },
+    { t_props: '', t_label: '实施单位' },
+    { t_props: 'repairNum', t_label: '工程类型' },
+    { t_props: 'unitName', t_label: 'i8工程编码', },
+    { t_props: 'projectName', t_label: '是否匹配i8工程', },
+    { t_props: 'itemType', t_label: '合同主体', },
+    { t_props: 'itemType', t_label: '项目经理', },
+    { t_props: 'itemType', t_label: '联系电话', },
+    { t_props: 'itemType', t_label: '工程状态', },
+]
+
+export const dialogConfig = {
+    outerWidth: '70%',
+    outerTitle: '',
+    outerVisible: false,
+    innerWidth: '50%',
+    innerTitle: '',
+    innerVisible: false,
+}
diff --git a/src/views/BasicManage/ProjectManage/index.vue b/src/views/BasicManage/ProjectManage/index.vue
index 7d7ce82..513593b 100644
--- a/src/views/BasicManage/ProjectManage/index.vue
+++ b/src/views/BasicManage/ProjectManage/index.vue
@@ -1,18 +1,57 @@
 <template>
     <!-- 工程管理 -->
-    <div>
-        <TableModel :formLabel="formLabel" :columnsList="columnsList" />
+    <div class="app-container">
+        <!-- 表格 -->
+        <TableModel :formLabel="formLabel" :columnsList="columnsList">
+            <template slot="btn">
+                <el-button type="primary" @click="addProject()">新建</el-button>
+                <el-button>导入</el-button>
+                <el-button>导出</el-button>
+            </template>
+        </TableModel>
+
+        <!-- 新增弹框 -->
+        <DialogModel
+            :dialogConfig="dialogConfig"
+            @closeDialogOuter="closeDialogOuter"
+        >
+            <template slot="outerContent">
+                <FormProject @closeDialog="closeDialog" />
+            </template>
+        </DialogModel>
     </div>
 </template>
 
 <script>
-import { formLabel, columnsList } from './config'
+import { formLabel, columnsList, dialogConfig } from './config'
+import { commonMixin } from '@/mixins/common.js'
+import FormProject from './components/form-project'
 export default {
+    mixins: [commonMixin], // 混入公共方法和数据
+    components: {
+        FormProject,
+    },
     data() {
         return {
+            // 搜索区表单配置项
             formLabel,
+            // 列表区表单配置项
             columnsList,
+            // 弹框区表单配置项
+            dialogConfig,
         }
     },
+    methods: {
+        /** 新建工程 */
+        addProject() {
+            this.dialogConfig.outerTitle = '新建工程'
+            this.dialogConfig.outerVisible = true
+        },
+
+        /** 关闭弹框 */
+        closeDialog() {
+            this.dialogConfig.outerVisible = false
+        },
+    },
 }
 </script>