diff --git a/src/api/common.js b/src/api/common.js
index 3e22d48..5eedbe9 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -16,10 +16,11 @@ export function getKeyPersonListAPI() {
     })
 }
 // 关键人员下拉数据  （分包商管理人员）
-export function getSubKeyPersonListAPI() {
+export function getSubKeyPersonListAPI(data) {
     return request({
         url: '/tbSubPeople/getTbSubPeopleAll',
         method: 'get',
+        params: data,
     })
 }
 // 分包商下拉数据
diff --git a/src/api/data-create/gw-template.js b/src/api/data-create/gw-template.js
new file mode 100644
index 0000000..945710e
--- /dev/null
+++ b/src/api/data-create/gw-template.js
@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+// 标书材料生成 ---- 国网模板
+
+// 获取国网模板列表
+export function getGwTemplateListAPI(data) {
+    return request({
+        url: '/stateGrid/getStateGridList',
+        method: 'get',
+        params: data,
+    })
+}
+// 根据id获取国网模板详情
+export function getGwTemplateByIdAPI(data) {
+    return request({
+        url: '/stateGrid/getStateGridTempById',
+        method: 'post',
+        data: data,
+    })
+}
+
+// 新增国网模板
+export function addGwTemplateAPI(data) {
+    return request({
+        url: '/stateGrid/addStateGridTemp',
+        method: 'post',
+        data: data,
+    })
+}
+
+// 编辑国网模板
+export function editGwTemplateAPI(data) {
+    return request({
+        url: '/stateGrid/updateStateGridTemp',
+        method: 'post',
+        data: data,
+    })
+}
+
+// 删除国网模板
+export function deleteGwTemplateAPI(data) {
+    return request({
+        url: '/stateGrid/delStateGridTemp',
+        method: 'post',
+        data: data,
+    })
+}
diff --git a/src/api/sub-manage/sub-performance-manage.js b/src/api/sub-manage/sub-performance-manage.js
index 20ab2dd..e9b95b3 100644
--- a/src/api/sub-manage/sub-performance-manage.js
+++ b/src/api/sub-manage/sub-performance-manage.js
@@ -10,6 +10,14 @@ export function getSubPerformanceManageListAPI(data) {
         params: data,
     })
 }
+// 根据人员id查询分包业绩管理列表
+export function getSubPerformanceManageListByPersonIdAPI(data) {
+    return request({
+        url: '/tbSubPerf/getTbSubPerfListByPersonId',
+        method: 'get',
+        params: data,
+    })
+}
 
 // 新增分包业绩管理
 export function addSubPerformanceManageAPI(data) {
diff --git a/src/views/data-create/gw-template/components/addAndEditForm.vue b/src/views/data-create/gw-template/components/addAndEditForm.vue
index b3d8992..e8ac648 100644
--- a/src/views/data-create/gw-template/components/addAndEditForm.vue
+++ b/src/views/data-create/gw-template/components/addAndEditForm.vue
@@ -6,6 +6,7 @@
             ref="addAndEditFormRef"
             label-width="0px"
             label-position="top"
+            :disabled="formType === 2"
         >
             <el-row :gutter="20">
                 <el-col :span="12">
@@ -18,7 +19,13 @@
             <div class="card-box">
                 <div class="title-box">
                     <div> 公司业绩 </div>
-                    <el-button icon="el-icon-circle-plus" type="text" @click="addCompanyPerformance">添加</el-button>
+                    <el-button
+                        type="text"
+                        v-if="formType !== 2"
+                        icon="el-icon-circle-plus"
+                        @click="addCompanyPerformance"
+                        >添加</el-button
+                    >
                 </div>
 
                 <!-- 公司业绩 -->
@@ -37,7 +44,7 @@
                     <el-table-column align="center" label="承包范围" prop="contractRang" show-overflow-tooltip />
                     <el-table-column align="center" label="业主单位" prop="ownerUnit" show-overflow-tooltip />
                     <el-table-column align="center" label="业主单位联系方式" prop="ownerPhone" show-overflow-tooltip />
-                    <el-table-column align="center" label="操作">
+                    <el-table-column align="center" label="操作" v-if="formType !== 2">
                         <template slot-scope="scope">
                             <el-button
                                 type="text"
@@ -53,7 +60,14 @@
             <div class="card-box">
                 <div class="title-box">
                     <div> 公司关键人员 </div>
-                    <el-button icon="el-icon-circle-plus" type="text" @click="addCompanyKeyPerson">添加</el-button>
+                    <el-button
+                        icon="el-icon-circle-plus"
+                        type="text"
+                        @click="addCompanyKeyPerson"
+                        v-if="formType !== 2"
+                    >
+                        添加
+                    </el-button>
                 </div>
 
                 <!-- 公司关键人员 -->
@@ -88,8 +102,16 @@
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="在本施工队伍中的职责分工" width="160">
-                        <template slot-scope="{ row }">
-                            <el-input placeholder="请输入" v-model="row.postName" />
+                        <template slot-scope="scope">
+                            <el-input
+                                placeholder="请输入"
+                                v-if="formType !== 2"
+                                v-model="scope.row.postName"
+                                :ref="`comKeyPostName_${scope.$index}`"
+                            />
+                            <span v-else>
+                                {{ scope.row.postName }}
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="计划入场时间" width="160">
@@ -99,10 +121,15 @@
                                 clearable
                                 style="width: 100%"
                                 placeholder="选择日期"
+                                v-if="formType !== 2"
                                 value-format="yyyy-MM-dd"
                                 v-model="scope.row.einDate"
+                                :ref="`comKeyEinDate_${scope.$index}`"
                                 @change="onChangeEinDate(scope.$index, $event)"
                             />
+                            <span v-else>
+                                {{ scope.row.einDate }}
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="计划退场时间" width="160">
@@ -111,11 +138,16 @@
                                 type="date"
                                 clearable
                                 style="width: 100%"
+                                v-if="formType !== 2"
                                 placeholder="选择日期"
                                 value-format="yyyy-MM-dd"
                                 v-model="scope.row.exitDate"
+                                :ref="`comKeyExitDate_${scope.$index}`"
                                 @change="onChangeExitDate(scope.$index, $event)"
                             />
+                            <span v-else>
+                                {{ scope.row.exitDate }}
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="近年同类工程业绩">
@@ -123,7 +155,7 @@
                             {{ row.proPerf }}
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="操作" show-overflow-tooltip>
+                    <el-table-column align="center" label="操作" show-overflow-tooltip v-if="formType !== 2">
                         <template slot-scope="scope">
                             <el-button
                                 type="text"
@@ -140,14 +172,29 @@
                 <!-- 公司其他人员 -->
                 <div class="title-box">
                     <div> 公司其他人员 </div>
-                    <el-button icon="el-icon-circle-plus" type="text" @click="addCompanyOtherPerson">添加</el-button>
+                    <el-button
+                        type="text"
+                        v-if="formType !== 2"
+                        icon="el-icon-circle-plus"
+                        @click="addCompanyOtherPerson"
+                    >
+                        添加
+                    </el-button>
                 </div>
 
                 <el-table :data="companyOtherPersonList" stripe style="width: 100%">
                     <el-table-column label="序号" width="55" type="index" />
                     <el-table-column align="center" label="在本次标书中的职务">
-                        <template slot-scope="{ row }">
-                            <el-input placeholder="请输入" v-model="row.postName" />
+                        <template slot-scope="scope">
+                            <el-input
+                                :ref="`comOtherPostName_${scope.$index}`"
+                                placeholder="请输入"
+                                v-model="scope.row.postName"
+                                v-if="formType !== 2"
+                            />
+                            <span v-else>
+                                {{ scope.row.postName }}
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="姓名">
@@ -170,7 +217,7 @@
                     <el-table-column align="center" label="级别" show-overflow-tooltip prop="level" />
                     <el-table-column align="center" label="证书编号" show-overflow-tooltip prop="diplomaNum" />
                     <el-table-column align="center" label="专业" show-overflow-tooltip prop="major" />
-                    <el-table-column align="center" label="操作">
+                    <el-table-column align="center" label="操作" v-if="formType !== 2">
                         <template slot-scope="scope">
                             <el-button
                                 type="text"
@@ -187,7 +234,9 @@
                 <!-- 分包商 -->
                 <div class="title-box">
                     <div> 分包商 </div>
-                    <el-button icon="el-icon-circle-plus" type="text" @click="addSubcontractor">添加</el-button>
+                    <el-button icon="el-icon-circle-plus" type="text" @click="addSubcontractor" v-if="formType !== 2">
+                        添加
+                    </el-button>
                 </div>
 
                 <div class="subcontractor-box" v-if="subcontractorList.length > 0">
@@ -199,6 +248,7 @@
                             <el-button
                                 type="text"
                                 style="color: #f56c6c"
+                                v-if="formType !== 2"
                                 icon="el-icon-delete"
                                 @click="deleteSubcontractor(index)"
                             />
@@ -207,9 +257,10 @@
                         <div class="title-box-subcontractor">
                             <div> 公司业绩 </div>
                             <el-button
-                                icon="el-icon-circle-plus"
                                 type="text"
-                                @click="addSubcontractorPerformance(index)"
+                                v-if="formType !== 2"
+                                icon="el-icon-circle-plus"
+                                @click="addSubcontractorPerformance(index, item.id)"
                             >
                                 添加
                             </el-button>
@@ -234,7 +285,7 @@
                             <el-table-column align="center" label="开竣工日期" prop="startDate">
                                 <template slot-scope="{ row }"> {{ row.startTime }} 至{{ row.endTime }} </template>
                             </el-table-column>
-                            <el-table-column align="center" label="操作">
+                            <el-table-column align="center" label="操作" v-if="formType !== 2">
                                 <template slot-scope="scope">
                                     <el-button
                                         type="text"
@@ -247,12 +298,17 @@
                         </el-table>
                         <div class="title-box-subcontractor">
                             <div> 拟派人员 </div>
-                            <el-button icon="el-icon-circle-plus" type="text" @click="addSubcontractorPerson(index)">
+                            <el-button
+                                type="text"
+                                v-if="formType !== 2"
+                                icon="el-icon-circle-plus"
+                                @click="addSubcontractorPerson(index, item.id)"
+                            >
                                 添加
                             </el-button>
                         </div>
 
-                        <!-- 公司关键人员 -->
+                        <!-- 分包人员 -->
                         <el-table :data="item.subcontractorPersonList" stripe style="width: 100%">
                             <el-table-column label="序号" width="55" type="index" />
                             <el-table-column align="center" label="姓名">
@@ -284,8 +340,16 @@
                                 </template>
                             </el-table-column>
                             <el-table-column align="center" label="在本施工队伍中的职责分工" width="160">
-                                <template slot-scope="{ row }">
-                                    <el-input placeholder="请输入" v-model="row.postName" />
+                                <template slot-scope="scope">
+                                    <el-input
+                                        placeholder="请输入"
+                                        v-if="formType !== 2"
+                                        v-model="scope.row.postName"
+                                        :ref="`comSubcontractorPostName_${index}_${scope.$index}`"
+                                    />
+                                    <span v-else>
+                                        {{ scope.row.postName }}
+                                    </span>
                                 </template>
                             </el-table-column>
                             <el-table-column align="center" label="近年同类工程业绩">
@@ -293,7 +357,7 @@
                                     {{ row.proPerf }}
                                 </template>
                             </el-table-column>
-                            <el-table-column align="center" label="操作" show-overflow-tooltip>
+                            <el-table-column align="center" label="操作" show-overflow-tooltip v-if="formType !== 2">
                                 <template slot-scope="scope">
                                     <el-button
                                         type="text"
@@ -312,7 +376,7 @@
             <el-form-item>
                 <el-row style="text-align: right; border-top: 1px solid #e5e5e5; padding-top: 10px">
                     <el-button size="mini" @click="onCancel">取消</el-button>
-                    <el-button type="primary" size="mini" @click="onConfirm">确定</el-button>
+                    <el-button type="primary" size="mini" @click="onConfirm" v-if="formType !== 2">确定</el-button>
                 </el-row>
             </el-form-item>
         </el-form>
@@ -412,7 +476,7 @@
                             :data="waitSelectData"
                             :titles="['待选列表', '已选列表']"
                             :props="{
-                                key: 'id',
+                                key: 'perfId',
                                 label: 'proName',
                             }"
                         >
@@ -503,16 +567,16 @@
                             <el-select
                                 clearable
                                 filterable
-                                @change="onChangePerson"
                                 placeholder="请选择人员"
+                                @change="onChangeSubcontractorPerson"
                                 v-if="dialogConfig.outerTitle === '分包人员选择'"
-                                v-model="companyPerformanceQueryParams.personId"
+                                v-model="personPerformanceForm.personId"
                             >
                                 <el-option
                                     :key="item.id"
                                     :value="item.id + ''"
                                     :label="item.userName"
-                                    v-for="item in keyPersonList"
+                                    v-for="item in subcontractorPersonSelectList"
                                 />
                             </el-select>
                         </el-col>
@@ -574,7 +638,7 @@
                             v-model="selectSubcontractorPerformanceData"
                             :titles="['待选列表', '已选列表']"
                             :props="{
-                                key: 'id',
+                                key: 'perfId',
                                 label: 'proName',
                             }"
                         >
@@ -601,17 +665,24 @@
 </template>
 
 <script>
+import moment from 'moment'
 import UploadImg from '@/components/UploadImg'
 import DialogModel from '@/components/DialogModel/index'
-import moment from 'moment'
-import { getKeyPersonListAPI } from '@/api/common'
+import { getKeyPersonListAPI, getSubKeyPersonListAPI } from '@/api/common'
+import { getSubManageListAPI } from '@/api/sub-manage/sub-manage'
 import { getOtherPersonListAPI } from '@/api/company-manage/other-person'
+import { getSubPersonManageListAPI } from '@/api/sub-manage/sub-person-manage'
+import {
+    getSubPerformanceManageListAPI,
+    getSubPerformanceManageListByPersonIdAPI,
+} from '@/api/sub-manage/sub-performance-manage'
 import {
     getCompanyPerformanceListAPI,
     getCompanyPerformanceListByPersonIdAPI,
 } from '@/api/company-manage/performance-manage'
-import { getSubManageListAPI } from '@/api/sub-manage/sub-manage'
-import { getSubPerformanceManageListAPI } from '@/api/sub-manage/sub-performance-manage'
+
+import { addGwTemplateAPI, getGwTemplateByIdAPI, editGwTemplateAPI } from '@/api/data-create/gw-template'
+
 export default {
     components: {
         UploadImg,
@@ -623,15 +694,14 @@ export default {
             type: Number,
             default: 1,
         },
+        // 详情或编辑的id
+        queryId: {
+            type: [String, Number],
+            default: '',
+        },
     },
     data() {
         return {
-            total: 0,
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-            },
-            personSelectValue: '',
             dialogConfig: {
                 outerTitle: '新增',
                 innerTitle: false,
@@ -651,93 +721,12 @@ export default {
                     },
                 ],
             },
-            personList: [
-                { label: '张三1', value: 1, idCard: '9996', title: '监理' },
-                { label: '张三2', value: 2, idCard: '9996', title: '总监' },
-                { label: '张三3', value: 3, idCard: '9996', title: '元帅' },
-            ],
 
-            waitSelectData: [], // 待选列表
-            selectData: [], // 已选列表
-
-            companyPerformanceInnerList: [
-                {
-                    key: 10,
-                    label: '安徽送变电工程1',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                },
-                {
-                    key: 11,
-                    label: '湖南送变电工程2',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                },
-                {
-                    key: 12,
-                    label: '南网送变电工程3',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                },
-            ], // 公司业绩列表  ---- 内层穿梭框显示的
-            companyPerformanceInnerSelectList: [], // 公司业绩列表  ---- 内层穿梭框选择后只有ID数据源
-            keyPersonPerformanceInnerList: [
-                {
-                    key: 10,
-                    label: '安徽送变电工程',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                    performance: '新疆工程取得完美收官',
-                },
-                {
-                    key: 11,
-                    label: '湖南送变电工程',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                    performance: '湖南（xx工程）工程取得完美收官',
-                },
-                {
-                    key: 12,
-                    label: '南网送变电工程',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                    performance: '日本（xx工程）工程取得完美收官',
-                },
-                {
-                    key: 13,
-                    label: '宁夏送变电工程',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                    performance: '校花工程取得完美收官',
-                },
-            ], // 关键人员业绩列表  ---- 内层穿梭框显示的
-            keyPersonPerformanceInnerSelectList: [], // 关键人员业绩列表  ---- 内层穿梭框选择后只有ID数据源
-
-            keyTableCurrentIndex: 0,
-            otherTableCurrentIndex: 0,
-
-            // subcontractorList: [], // 分包商外层显示列表
-
-            subcontractorPerformanceInnerList: [], // 分包商业绩列表
-            subcontractorPersonInnerList: [], // 分包商人员列表
-            subcontractorPerformanceCurrentIndex: 0, // 分包商业绩当前操作的index
+            waitSelectData: [], // 待选列表 公共  ---- 公司业绩选择 和 关键人员选择 的待选列表
+            selectData: [], // 已选列表 公共  ---- 公司业绩选择 和 关键人员选择 的已选列表
 
             /**
-             * 公司业绩需要的数据源
+             * 公司业绩需要的数据源----------------------------------------------------------------------------------------------------------------------------------------------------------------
              */
 
             companyPerformanceList: [], // 公司业绩列表 ---- 外层表格
@@ -753,14 +742,14 @@ export default {
             },
 
             /**
-             * 公司关键人员需要的数据源
+             * 公司关键人员需要的数据源-------------------------------------------------------------------------------------------------------------------------------------------------------------
              */
             companyKeyPersonList: [], // 公司关键人员列表
             keyTableCurrentIndex: 0, // 公司关键人员当前操作行的索引
             keyPersonList: [], // 关键人员列表
 
             /**
-             * 公司其他人员需要的数据源
+             * 公司其他人员需要的数据源-------------------------------------------------------------------------------------------------------------------------------------------------------------
              */
             companyOtherPersonList: [], // 公司其他人员列表
             otherTableCurrentIndex: 0, // 公司其他人员当前操作行的索引
@@ -775,7 +764,7 @@ export default {
             selectedOtherPerson: null, // 其他人员列表选中项
 
             /**
-             * 分包商模块需要的数据源
+             * 分包商模块需要的数据源---------------------------------------------------------------------------------------------------------------------------------------------------------------
              */
             subcontractorList: [], // 分包商列表
             selectSubcontractorData: [], // 穿梭框内分包商已选列表
@@ -791,27 +780,253 @@ export default {
                 timeValue: [],
                 personId: '',
                 age: '3',
+                subId: '',
             },
             selectSubcontractorPerformanceData: [], // 分包商业绩已选列表 ---- 内层穿梭框选择后只有ID数据源
             waitSubcontractorPerformanceData: [], // 分包商业绩待选列表 ---- 内层穿梭框显示的
-            subcontractorPersonCurrentIndex: 0, // 分包商人员当前操作的index
+            subcontractorPersonCurrentIndex: 0, // 分包商索引
+            subcontractorPersonSelectIndex: 0, // 分包商人员当前操作的index
+            subcontractorPersonSelectList: [], // 分包商人员下拉数据
         }
     },
     methods: {
-        onCancel() {
+        // 关闭弹框
+        async onCancel() {
             this.$emit('closeDialogOuter')
         },
-        onConfirm() {
-            this.$refs.addAndEditFormRef.validate((valid) => {
+        // 最终确定按钮
+        async onConfirm() {
+            this.$refs.addAndEditFormRef.validate(async (valid) => {
                 if (valid) {
                     console.log(this.addAndEditForm)
+
+                    // 组装参数
+                    const params = {
+                        ...this.addAndEditForm,
+                        comPerfList: [], // 公司业绩列表
+                        comCoreList: [], // 关键人员列表
+                        comOtherList: [], // 其他人员列表
+                        subList: [], // 分包商列表
+                    }
+
+                    let isError = false
+
+                    // 添加校验  ---- 公司关键人员
+                    if (this.companyKeyPersonList.length > 0) {
+                        this.companyKeyPersonList.forEach((item, index) => {
+                            if (!item.userId) {
+                                this.$modal.msgError(`公司关键人员第${index + 1}行未选择人员`)
+                                // 并使其获得焦点
+                                isError = true
+                                return false
+                            }
+
+                            if (!item.postName) {
+                                // this.$modal.msgError(`公司关键人员第${index + 1}行未填写在本施工队伍中的职责分工`)
+                                // this.$refs[`comKeyPostName_${index}`].focus()
+                                this.$modal.msgError(`公司关键人员第${index + 1}行未填写在本施工队伍中的职责分工`)
+                                const inputRef = this.$refs[`comKeyPostName_${index}`]
+                                inputRef.focus()
+                                // 添加红框样式
+                                inputRef.$el.querySelector('.el-input__inner').style.border = '1px solid red'
+                                // 可选：监听 blur 事件移除红框
+                                inputRef.$el.querySelector('.el-input__inner').addEventListener('blur', function () {
+                                    this.style.border = ''
+                                })
+                                isError = true
+                                return false
+                            }
+
+                            if (!item.einDate && item.exitDate) {
+                                // this.$modal.msgError(`公司关键人员第${index + 1}行未填写计划入场时间`)
+                                // this.$refs[`comKeyEinDate_${index}`].focus()
+                                this.$modal.msgError(`公司关键人员第${index + 1}行未填写计划入场时间`)
+                                const inputRef = this.$refs[`comKeyEinDate_${index}`]
+                                inputRef.focus()
+                                // 添加红框样式
+                                inputRef.$el.querySelector('.el-input__inner').style.border = '1px solid red'
+                                // 可选：监听 blur 事件移除红框
+                                inputRef.$el.querySelector('.el-input__inner').addEventListener('blur', function () {
+                                    this.style.border = ''
+                                })
+                                isError = true
+                                return false
+                            }
+
+                            if (!item.exitDate && item.einDate) {
+                                // this.$modal.msgError(`公司关键人员第${index + 1}行未填写计划退场时间`)
+                                // this.$refs[`comKeyExitDate_${index}`].focus()
+                                this.$modal.msgError(`公司关键人员第${index + 1}行未填写计划退场时间`)
+                                const inputRef = this.$refs[`comKeyExitDate_${index}`]
+                                inputRef.focus()
+                                // 添加红框样式
+                                inputRef.$el.querySelector('.el-input__inner').style.border = '1px solid red'
+                                // 可选：监听 blur 事件移除红框
+                                inputRef.$el.querySelector('.el-input__inner').addEventListener('blur', function () {
+                                    this.style.border = ''
+                                })
+                                isError = true
+                                return false
+                            }
+                        })
+                    }
+
+                    // 添加校验  ---- 公司其他人员
+                    if (this.companyOtherPersonList.length > 0) {
+                        this.companyOtherPersonList.forEach((item, index) => {
+                            if (!item.userId) {
+                                this.$modal.msgError(`公司其他人员第${index + 1}行未选择人员`)
+                                isError = true
+                                return false
+                            }
+
+                            if (!item.postName) {
+                                this.$modal.msgError(`公司其他人员第${index + 1}行未填写在本次标书中的职务`)
+                                const inputRef = this.$refs[`comOtherPostName_${index}`]
+                                inputRef.focus()
+                                // 添加红框样式
+                                inputRef.$el.querySelector('.el-input__inner').style.border = '1px solid red'
+                                // 可选：监听 blur 事件移除红框
+                                inputRef.$el.querySelector('.el-input__inner').addEventListener('blur', function () {
+                                    this.style.border = ''
+                                })
+                                isError = true
+                                return false
+                            }
+                        })
+                    }
+
+                    // 添加校验  ---- 分包商
+                    if (this.subcontractorList.length > 0) {
+                        try {
+                            this.subcontractorList.forEach((item, index) => {
+                                if (item.subcontractorPersonList.length > 0) {
+                                    item.subcontractorPersonList.forEach((subcontractorPersonItem, subIndex) => {
+                                        if (!subcontractorPersonItem.userId) {
+                                            this.$modal.msgError(
+                                                `" ${item.subName} "中拟派人员第${subIndex + 1}行未选择人员`,
+                                            )
+                                            isError = true
+                                            throw new Error()
+                                        }
+
+                                        if (!subcontractorPersonItem.postName) {
+                                            this.$modal.msgError(
+                                                `" ${item.subName} "中拟派人员第${
+                                                    subIndex + 1
+                                                }行未填写在本次施工队伍中的职责分工`,
+                                            )
+
+                                            this.$nextTick(() => {
+                                                const inputRef =
+                                                    this.$refs[`comSubcontractorPostName_${index}_${subIndex}`][0]
+                                                inputRef.focus()
+                                                // 添加红框样式
+                                                inputRef.$el.querySelector('.el-input__inner').style.border =
+                                                    '1px solid red'
+                                                // 可选：监听 blur 事件移除红框
+                                                inputRef.$el
+                                                    .querySelector('.el-input__inner')
+                                                    .addEventListener('blur', function () {
+                                                        this.style.border = ''
+                                                    })
+                                            })
+
+                                            isError = true
+                                            throw new Error()
+                                        }
+                                    })
+                                }
+                            })
+                        } catch (error) {
+                            isError = true
+                        }
+                    }
+
+                    if (isError) return false
+
+                    // 1. 组装公司业绩列表
+                    if (this.companyPerformanceList.length > 0) {
+                        this.companyPerformanceList.forEach((item) => {
+                            params.comPerfList.push({
+                                id: item.perfId,
+                            })
+                        })
+                    }
+
+                    // 2. 组装关键人员列表
+                    if (this.companyKeyPersonList.length > 0) {
+                        this.companyKeyPersonList.forEach((item) => {
+                            params.comCoreList.push({
+                                id: item.userId,
+                                postName: item.postName,
+                                proPerf: item.proPerf,
+                                einDate: item.einDate,
+                                exitDate: item.exitDate,
+                            })
+                        })
+                    }
+
+                    // 3. 组装其他人员列表
+                    if (this.companyOtherPersonList.length > 0) {
+                        this.companyOtherPersonList.forEach((item) => {
+                            params.comOtherList.push({
+                                id: item.userId,
+                                postName: item.postName,
+                            })
+                        })
+                    }
+
+                    // 4. 组装分包商列表
+                    if (this.subcontractorList.length > 0) {
+                        this.subcontractorList.forEach((item, index) => {
+                            params.subList.push({
+                                id: item.id,
+                                subPerfList: [], // 分包商业绩列表
+                                subPersonList: [], // 分包商人员列表
+                            })
+
+                            if (item.companyPerformanceList && item.companyPerformanceList.length > 0) {
+                                item.companyPerformanceList.forEach((companyPerformanceItem) => {
+                                    params.subList[index].subPerfList.push({
+                                        id: companyPerformanceItem.perfId,
+                                        subId: companyPerformanceItem.subId,
+                                    })
+                                })
+                            }
+                            if (item.subcontractorPersonList && item.subcontractorPersonList.length > 0) {
+                                item.subcontractorPersonList.forEach((subcontractorPersonItem) => {
+                                    params.subList[index].subPersonList.push({
+                                        id: subcontractorPersonItem.userId,
+                                        postName: subcontractorPersonItem.postName,
+                                        proPerf: subcontractorPersonItem.proPerf,
+                                    })
+                                })
+                            }
+                        })
+                    }
+
+                    // console.log(params)
+
+                    const API = this.formType === 1 ? addGwTemplateAPI : editGwTemplateAPI
+                    if (this.formType === 3) {
+                        params.id = this.queryId
+                    }
+
+                    const res = await API(params)
+
+                    if (res.code === 200) {
+                        this.$modal.msgSuccess(this.formType === 1 ? '新增成功' : '修改成功')
+                        this.$emit('closeDialogOuter', true)
+                    } else {
+                        this.$modal.msgError(res.message)
+                    }
                 }
             })
         },
 
-        // 查询
-        searchPersonPerformance() {
-            // console.log('查询')
+        // 公共查询  ---- 公司业绩选择 和 关键人员选择 的查询
+        async searchPersonPerformance() {
             if (this.dialogConfig.outerTitle === '公司业绩选择') {
                 this.getCompanyPerformanceData()
             } else {
@@ -823,24 +1038,26 @@ export default {
             }
         },
         // 关闭弹窗
-        closeDialogOuter() {
+        async closeDialogOuter() {
             this.dialogConfig.outerVisible = false
         },
-        // 取消
-        onCancelInner() {
+        // 关闭弹框
+        async onCancelInner() {
             this.dialogConfig.outerVisible = false
         },
         // 穿梭框内的确定按钮
-        onConfirmInner() {
+        async onConfirmInner() {
             // 公司业绩选择确定时
             if (this.dialogConfig.outerTitle === '公司业绩选择') {
-                this.companyPerformanceList = this.waitSelectData.filter((item) => this.selectData.includes(item.id))
+                this.companyPerformanceList = this.waitSelectData.filter((item) =>
+                    this.selectData.includes(item.perfId),
+                )
             }
 
             if (this.dialogConfig.outerTitle === '关键人员选择') {
                 if (this.companyPerformanceQueryParams.personId) {
                     const keyPersonPerformanceInnerSelectList = this.waitSelectData.filter((item) =>
-                        this.selectData.includes(item.id),
+                        this.selectData.includes(item.perfId),
                     )
                     this.companyKeyPersonList[this.keyTableCurrentIndex].proPerf = keyPersonPerformanceInnerSelectList
                         .map((item) => item.proName)
@@ -859,7 +1076,7 @@ export default {
                     // 选取需要的数据
                     const { id, userName, title, diploma, diplomaNum, major, level } = this.selectedOtherPerson
                     Object.assign(this.companyOtherPersonList[this.otherTableCurrentIndex], {
-                        id,
+                        userId: id,
                         userName,
                         title,
                         diploma,
@@ -871,34 +1088,66 @@ export default {
             }
 
             if (this.dialogConfig.outerTitle === '分包商选择') {
-                this.subcontractorList = this.waitSubcontractorSelectData.filter((item) =>
-                    this.selectSubcontractorData.includes(item.id),
-                )
+                if (this.subcontractorList.length < 1) {
+                    this.subcontractorList = this.waitSubcontractorSelectData.filter((item) =>
+                        this.selectSubcontractorData.includes(item.id),
+                    )
+                } else {
+                    const newSubcontractorList = this.waitSubcontractorSelectData.filter(
+                        (item) =>
+                            this.selectSubcontractorData.includes(item.id) &&
+                            !this.subcontractorList.some((subItem) => subItem.id == item.id),
+                    )
+
+                    this.subcontractorList.push(...newSubcontractorList)
+                }
+
+                this.subcontractorList.forEach((item) => {
+                    if (!item.companyPerformanceList) {
+                        this.$set(item, 'companyPerformanceList', [])
+                    }
+
+                    if (!item.subcontractorPersonList) {
+                        this.$set(item, 'subcontractorPersonList', [])
+                    }
+                    // if (!item.companyPerformanceList) {
+                    //     // this.$set(item, 'companyPerformanceList', [])
+                    //     item.companyPerformanceList = []
+                    // }
+
+                    // if (!item.subcontractorPersonList) {
+                    //     // this.$set(item, 'subcontractorPersonList', [])
+                    //     item.subcontractorPersonList = []
+                    // }
+                })
             }
 
             if (this.dialogConfig.outerTitle === '分包商业绩选择') {
                 const subcontractorPerformanceInnerList = this.waitSubcontractorPerformanceData.filter((item) =>
-                    this.selectSubcontractorPerformanceData.includes(item.id),
+                    this.selectSubcontractorPerformanceData.includes(item.perfId),
                 )
 
-                this.$set(
-                    this.subcontractorList[this.subcontractorPerformanceCurrentIndex],
-                    'companyPerformanceList',
-                    subcontractorPerformanceInnerList,
+                this.subcontractorList[this.subcontractorPerformanceCurrentIndex].companyPerformanceList = JSON.parse(
+                    JSON.stringify(subcontractorPerformanceInnerList),
                 )
-                this.subcontractorList[this.subcontractorPerformanceCurrentIndex].companyPerformanceList =
-                    subcontractorPerformanceInnerList
+            }
+
+            //   添加近年同类工程业绩
+            if (this.dialogConfig.outerTitle === '分包人员选择') {
+                const subcontractorPerformanceInnerList = this.waitSubcontractorPerformanceData.filter((item) =>
+                    this.selectSubcontractorPerformanceData.includes(item.perfId),
+                )
+
+                this.subcontractorList[this.subcontractorPerformanceCurrentIndex].subcontractorPersonList[
+                    this.subcontractorPersonSelectIndex
+                ].proPerf = subcontractorPerformanceInnerList.map((item) => item.proName).join(',')
             }
 
             this.dialogConfig.outerVisible = false
         },
 
-        getOtherPersonList() {
-            console.log('查询')
-        },
-
         /**
-         * 公司业绩模块
+         * 公司业绩模块方法逻辑----------------------------------------------------------------------------------------------------------------------------------------------------------------
          */
 
         // 添加公司业绩
@@ -939,27 +1188,28 @@ export default {
             this.waitSelectData = res.rows.map((item) => ({
                 ...item,
                 disabled: false,
+                perfId: item.id,
             }))
 
             if (this.companyPerformanceList.length > 0) {
-                this.selectData = this.companyPerformanceList.map((item) => item.id)
+                this.selectData = this.companyPerformanceList.map((item) => item.perfId)
             } else {
                 this.selectData = []
             }
             this.dialogConfig.outerVisible = true
         },
         // 删除公司业绩
-        deleteCompanyPerformance(index) {
+        async deleteCompanyPerformance(index) {
             this.companyPerformanceList.splice(index, 1)
         },
         /**
-         * 添加公司关键人员
+         * 添加公司关键人员模块方法逻辑----------------------------------------------------------------------------------------------------------------------------------------------------------------
          */
 
         // 添加公司关键人员
-        addCompanyKeyPerson() {
+        async addCompanyKeyPerson() {
             this.companyKeyPersonList.push({
-                id: '', // 人员id
+                userId: '', // 人员id
                 userName: '', // 人员名称
                 title: '', // 人员职称
                 diploma: '', // 执业资格证书
@@ -971,7 +1221,7 @@ export default {
             })
         },
         // 选择公司关键人员
-        selectCompanyKeyPerson(index) {
+        async selectCompanyKeyPerson(index) {
             this.getKeyPersonList()
             this.initQueryForm()
             this.keyTableCurrentIndex = index
@@ -982,7 +1232,7 @@ export default {
         },
 
         // 删除公司关键人员
-        deleteCompanyKeyPerson(index) {
+        async deleteCompanyKeyPerson(index) {
             this.companyKeyPersonList.splice(index, 1)
         },
         // 获取关键人员列表
@@ -1023,6 +1273,7 @@ export default {
                 this.waitSelectData = res.map((item) => ({
                     ...item,
                     disabled: false,
+                    perfId: item.id,
                 }))
             } else {
                 this.waitSelectData = []
@@ -1030,14 +1281,20 @@ export default {
         },
 
         // 人员下拉选的change事件
-        onChangePerson(value) {
-            if (this.companyKeyPersonList.length > 0 && this.companyKeyPersonList.some((item) => item.id == value)) {
+        async onChangePerson(value) {
+            console.log(value, 'value')
+            console.log(this.companyKeyPersonList, 'this.companyKeyPersonList')
+            if (
+                this.companyKeyPersonList.length > 0 &&
+                this.companyKeyPersonList.some((item) => item.userId == value)
+            ) {
                 this.$modal.msgError('当前人员已选择，不可重复添加')
+                this.companyPerformanceQueryParams.personId = ''
                 return false
             } else {
                 const rowInfo = this.keyPersonList.find((item) => item.id == value)
                 const index = this.keyTableCurrentIndex
-                this.companyKeyPersonList[index].id = rowInfo.id
+                this.companyKeyPersonList[index].userId = rowInfo.id
                 this.companyKeyPersonList[index].title = rowInfo.title
                 this.companyKeyPersonList[index].userName = rowInfo.userName
                 this.companyKeyPersonList[index].diploma = rowInfo.diploma
@@ -1046,7 +1303,7 @@ export default {
         },
 
         // 计划入场时间change事件
-        onChangeEinDate(index, value) {
+        async onChangeEinDate(index, value) {
             // 使用moment.js 判断入场时间不能大于退场时间 否则提示错误
             if (moment(value).isAfter(moment(this.companyKeyPersonList[index].exitDate))) {
                 this.$modal.msgError('计划入场时间不能大于计划退场时间')
@@ -1055,7 +1312,7 @@ export default {
             }
         },
         // 计划退场时间change事件
-        onChangeExitDate(index, value) {
+        async onChangeExitDate(index, value) {
             // 使用moment.js 判断退场时间不能小于入场时间 否则提示错误
             if (moment(value).isBefore(moment(this.companyKeyPersonList[index].einDate))) {
                 this.$modal.msgError('计划退场时间不能小于计划入场时间')
@@ -1064,7 +1321,7 @@ export default {
             }
         },
         // 初始化查询表单
-        initQueryForm() {
+        async initQueryForm() {
             this.companyPerformanceQueryParams = {
                 age: '3',
                 proName: '',
@@ -1077,13 +1334,13 @@ export default {
         },
 
         /**
-         * 添加公司其他人员
+         * 添加公司其他人员模块方法逻辑----------------------------------------------------------------------------------------------------------------------------------------------------------------
          */
 
         // 添加公司其他人员
-        addCompanyOtherPerson() {
+        async addCompanyOtherPerson() {
             this.companyOtherPersonList.push({
-                id: '', // 人员id
+                userId: '', // 人员id
                 userName: '', // 人员名称
                 postName: '', // 本次标书中的职务职责分工
                 title: '', // 职称
@@ -1094,7 +1351,7 @@ export default {
             })
         },
         // 选择公司其他人员
-        selectCompanyOtherPerson(index) {
+        async selectCompanyOtherPerson(index) {
             this.otherTableCurrentIndex = index
             this.dialogConfig.outerTitle = '其他人员选择'
             this.otherPersonQueryParams.pageNum = 1
@@ -1108,11 +1365,12 @@ export default {
             const res = await getOtherPersonListAPI(this.otherPersonQueryParams)
             this.otherPersonList = res.rows
             this.otherPersonTotal = res.total
+            this.selectedOtherPerson = null
 
             // 根据已选的人员 将已选人员的数据增加一个标识 让表格复选框禁用
             if (this.companyOtherPersonList.length > 0) {
                 this.otherPersonList.forEach((item) => {
-                    if (this.companyOtherPersonList.some((otherItem) => otherItem.id == item.id)) {
+                    if (this.companyOtherPersonList.some((otherItem) => otherItem.userId == item.id)) {
                         item.disabled = true
                     } else {
                         item.disabled = false
@@ -1121,7 +1379,7 @@ export default {
             }
         },
         // 其他人员列表复选框
-        onSelectionChange(selection) {
+        async onSelectionChange(selection) {
             if (selection.length > 1) {
                 const lastSelected = selection[selection.length - 1]
                 this.$refs.singleTable.clearSelection() // 清空所有选中
@@ -1130,17 +1388,16 @@ export default {
             this.selectedOtherPerson = selection[0] || null // 存储当前选中项
         },
         // 删除公司其他人员
-        deleteCompanyOtherPerson(index) {
+        async deleteCompanyOtherPerson(index) {
             this.companyOtherPersonList.splice(index, 1)
         },
 
         /**
-         * 添加分包商模块
+         * 添加分包商模块方法逻辑----------------------------------------------------------------------------------------------------------------------------------------------------------------
          */
 
         // 添加分包商
-        addSubcontractor() {
-            console.log('添加分包商')
+        async addSubcontractor() {
             this.dialogConfig.outerTitle = '分包商选择'
             this.getSubcontractorList()
             this.dialogConfig.outerVisible = true
@@ -1150,22 +1407,31 @@ export default {
         async getSubcontractorList() {
             const res = await getSubManageListAPI({ pageNum: 1, pageSize: 10000 })
             this.waitSubcontractorSelectData = res.rows
+
+            if (this.subcontractorList.length > 0) {
+                this.selectSubcontractorData = this.subcontractorList.map((item) => item.id)
+            } else {
+                this.selectSubcontractorData = []
+            }
         },
 
         // 添加分包商业绩
-        addSubcontractorPerformance(index) {
+        async addSubcontractorPerformance(index, subId) {
+            this.initSubcontractorPerformanceQueryParams()
             this.subcontractorPerformanceCurrentIndex = index
+            this.subcontractorPersonCurrentIndex = index
+            this.personPerformanceForm.subId = subId
             this.dialogConfig.outerTitle = '分包商业绩选择'
             this.getSubcontractorPerformanceData()
             this.dialogConfig.outerVisible = true
         },
         // 删除分包商
-        deleteSubcontractor(index) {
+        async deleteSubcontractor(index) {
             this.subcontractorList.splice(index, 1)
         },
         // 获取分包商业绩数据
         async getSubcontractorPerformanceData() {
-            const { age, proName, voltage, pageNum, pageSize, timeValue } = this.personPerformanceForm
+            const { age, proName, voltage, pageNum, pageSize, timeValue, subId } = this.personPerformanceForm
             const queryParams = {
                 proName,
                 voltage,
@@ -1173,6 +1439,7 @@ export default {
                 pageSize,
                 startTime: '',
                 endTime: '',
+                subId,
             }
 
             if (age == 3) {
@@ -1194,43 +1461,63 @@ export default {
                 this.waitSubcontractorPerformanceData = res.rows.map((item) => ({
                     ...item,
                     disabled: false,
+                    perfId: item.id,
                 }))
+
+                const index = this.subcontractorPerformanceCurrentIndex
+                const companyPerformanceList = this.subcontractorList[index].companyPerformanceList
+
+                if (companyPerformanceList.length > 0) {
+                    this.selectSubcontractorPerformanceData = companyPerformanceList.map((item) => item.perfId)
+                }
             } else {
                 this.waitSubcontractorPerformanceData = []
             }
         },
         // 初始化分包商业绩查询条件
-        initSubcontractorPerformanceQueryParams() {
+        async initSubcontractorPerformanceQueryParams() {
             this.personPerformanceForm = {
                 age: '3',
+                proName: '',
+                voltage: '',
+                pageNum: 1,
+                pageSize: 10000,
+                timeValue: [],
+                personId: '',
+                subId: '',
             }
         },
         // 查询分包商业绩
         async searchSubcontractorPerformanceData() {
             if (this.dialogConfig.outerTitle === '分包商业绩选择') {
                 this.getSubcontractorPerformanceData()
+            } else {
+                if (this.personPerformanceForm.personId) {
+                    this.getSubcontractorPerformanceDataByPersonId()
+                } else {
+                    this.$modal.msgError('请选择人员')
+                    return false
+                }
             }
         },
 
         // 删除分包商业绩
-        deleteSubcontractorPerformance(index, performanceIndex, id) {
+        async deleteSubcontractorPerformance(index, performanceIndex, id) {
             this.subcontractorList[index].companyPerformanceList.splice(performanceIndex, 1)
 
             this.selectSubcontractorPerformanceData = this.selectSubcontractorPerformanceData.filter(
                 (item) => item != id,
             )
-
-            console.log(this.selectSubcontractorPerformanceData, id)
         },
 
         // 添加分包商人员
-        addSubcontractorPerson(index) {
-            if (!this.subcontractorList[index].subcontractorPersonList) {
-                this.$set(this.subcontractorList[index], 'subcontractorPersonList', [])
-            }
-
+        async addSubcontractorPerson(index, subId) {
+            this.initSubcontractorPerformanceQueryParams()
+            this.personPerformanceForm.subId = subId
+            this.subcontractorPerformanceCurrentIndex = index
+            this.subcontractorPersonCurrentIndex = index
             this.subcontractorList[index].subcontractorPersonList.push({
-                id: '',
+                userId: '',
                 userName: '',
                 title: '',
                 diploma: '',
@@ -1241,15 +1528,132 @@ export default {
         },
 
         // 选择分包商人员
-        selectSubcontractorPerson(index, personIndex) {
+        async selectSubcontractorPerson(index, personIndex) {
             this.dialogConfig.outerTitle = '分包人员选择'
+            this.personPerformanceForm.personId = ''
             this.dialogConfig.outerVisible = true
+            this.getSubcontractorPersonSelectList()
+            this.waitSubcontractorPerformanceData = []
+            this.selectSubcontractorPerformanceData = []
             this.subcontractorPersonCurrentIndex = index
+            this.subcontractorPersonSelectIndex = personIndex
+        },
+        // 获取分包商人员下拉列表
+        async getSubcontractorPersonSelectList() {
+            const res = await getSubKeyPersonListAPI({ subId: this.personPerformanceForm.subId })
+            this.subcontractorPersonSelectList = res.rows
         },
         // 删除分包商人员
-        deleteSubcontractorPerson(index, personIndex) {
+        async deleteSubcontractorPerson(index, personIndex) {
             this.subcontractorList[index].subcontractorPersonList.splice(personIndex, 1)
         },
+        // 分包人员下拉选的change事件
+        async onChangeSubcontractorPerson(value) {
+            if (
+                this.subcontractorList[this.subcontractorPersonCurrentIndex].subcontractorPersonList.length > 0 &&
+                this.subcontractorList[this.subcontractorPersonCurrentIndex].subcontractorPersonList.some(
+                    (item) => item.userId == value,
+                )
+            ) {
+                this.$modal.msgError('当前人员已选择，不可重复添加')
+                this.personPerformanceForm.personId = ''
+                return false
+            } else {
+                const rowInfo = this.subcontractorPersonSelectList.find((item) => item.id == value)
+                const index = this.subcontractorPersonCurrentIndex
+                const personIndex = this.subcontractorPersonSelectIndex
+                this.subcontractorList[index].subcontractorPersonList[personIndex].userId = rowInfo.id
+                this.subcontractorList[index].subcontractorPersonList[personIndex].userName = rowInfo.userName
+                this.subcontractorList[index].subcontractorPersonList[personIndex].title = rowInfo.title
+                this.subcontractorList[index].subcontractorPersonList[personIndex].diploma = rowInfo.diploma
+                this.subcontractorList[index].subcontractorPersonList[personIndex].idCard = rowInfo.idCard
+            }
+        },
+
+        // 根据人员id获取分包商业绩数据
+        async getSubcontractorPerformanceDataByPersonId() {
+            const { age, proName, voltage, pageNum, pageSize, timeValue, subId, personId } = this.personPerformanceForm
+            const queryParams = {
+                proName,
+                voltage,
+                pageNum,
+                pageSize,
+                startTime: '',
+                endTime: '',
+                subId,
+                personId,
+            }
+
+            if (age == 3) {
+                queryParams.startTime = moment().subtract(3, 'years').format('YYYY-MM-DD')
+                queryParams.endTime = moment().format('YYYY-MM-DD')
+            }
+            if (age == 5) {
+                queryParams.startTime = moment().subtract(5, 'years').format('YYYY-MM-DD')
+                queryParams.endTime = moment().format('YYYY-MM-DD')
+            }
+
+            if (timeValue && timeValue.length > 0) {
+                queryParams.startTime = timeValue[0]
+                queryParams.endTime = timeValue[1]
+            }
+            const res = await getSubPerformanceManageListByPersonIdAPI(queryParams)
+
+            if (res.length > 0) {
+                this.waitSubcontractorPerformanceData = res.map((item) => ({
+                    ...item,
+                    disabled: false,
+                    perfId: item.id,
+                }))
+            } else {
+                this.waitSubcontractorPerformanceData = []
+            }
+        },
+
+        // 根据id获取国网模板详情
+        async getGwTemplateById(id) {
+            const res = await getGwTemplateByIdAPI({ id })
+            if (res.code === 200) {
+                const { name, comCoreList, comOtherList, comPerfList, subList } = res.data
+                this.addAndEditForm.name = name
+                // 根据详情回显数据
+                // 1. 回显公司业绩数据
+                this.companyPerformanceList = comPerfList
+                // 2.  回显公司关键人员数据
+                this.companyKeyPersonList = comCoreList
+                // 3. 回显公司其他人员数据
+                this.companyOtherPersonList = comOtherList
+                // 4. 回显分包商数据
+                if (subList.length > 0) {
+                    subList.forEach((item) => {
+                        this.subcontractorList.push(
+                            JSON.parse(
+                                JSON.stringify({
+                                    ...item,
+                                    subcontractorPersonList: item.subPersonList,
+                                    companyPerformanceList: item.subPerfList,
+                                }),
+                            ),
+                        )
+                    })
+                }
+            } else {
+                this.$modal.msgError('详情获取失败' + res.message)
+                this.$modal.closeDialogOuter()
+            }
+        },
+    },
+
+    watch: {
+        queryId: {
+            handler(newVal) {
+                if (newVal && newVal != '') {
+                    this.getGwTemplateById(newVal)
+                }
+            },
+            immediate: true,
+            deep: true,
+        },
     },
 }
 </script>
@@ -1284,8 +1688,10 @@ export default {
     display: flex;
     align-items: center;
     div {
+        padding: 6px 0;
         margin-right: 10px;
         font-size: 14px;
+        font-weight: 600;
     }
 }
 
diff --git a/src/views/data-create/gw-template/index.vue b/src/views/data-create/gw-template/index.vue
index 2ec412f..b28c250 100644
--- a/src/views/data-create/gw-template/index.vue
+++ b/src/views/data-create/gw-template/index.vue
@@ -1,23 +1,32 @@
 <template>
     <!-- 公司业绩管理 -->
     <div class="app-container">
-        <el-form :model="queryParam" ref="login" label-width="0px" class="ms-content">
+        <el-form :model="queryParams" ref="login" label-width="0px" class="ms-content">
             <el-row :gutter="20">
                 <el-col :span="6">
                     <el-form-item>
-                        <el-input v-model="queryParam.projectName" placeholder="请输入标书名称" clearable> </el-input>
+                        <el-input v-model="queryParams.name" placeholder="请输入标书名称" clearable> </el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
                     <el-form-item>
-                        <el-input v-model="queryParam.projectName" placeholder="请输入职称" clearable> </el-input>
+                        <el-date-picker
+                            clearable
+                            type="daterange"
+                            style="width: 100%"
+                            v-model="timeValue"
+                            range-separator="至"
+                            value-format="yyyy-MM-dd"
+                            end-placeholder="结束日期"
+                            start-placeholder="开始日期"
+                        />
                     </el-form-item>
                 </el-col>
 
                 <el-col :span="12">
                     <el-form-item>
-                        <el-button type="primary">查询</el-button>
-                        <el-button>重置</el-button>
+                        <el-button type="primary" @click="getGwTemplateList">查询</el-button>
+                        <el-button @click="resetQueryParams">重置</el-button>
                         <el-button type="primary" @click="onHandleAddOrEdit(null, 1)">新增</el-button>
                     </el-form-item>
                 </el-col>
@@ -76,9 +85,16 @@
                 </template>
             </el-table-column>
         </el-table>
+
+        <pagination
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getGwTemplateList"
+        />
         <DialogModel :dialogConfig="dialogConfig" @closeDialogOuter="closeDialogOuter">
             <template slot="outerContent">
-                <AddAndEditForm :formType="formType" @closeDialogOuter="closeDialogOuter" />
+                <AddAndEditForm :formType="formType" :queryId="queryId" @closeDialogOuter="closeDialogOuter" />
             </template>
         </DialogModel>
     </div>
@@ -87,6 +103,7 @@
 <script>
 import DialogModel from '@/components/DialogModel/index'
 import AddAndEditForm from './components/addAndEditForm.vue'
+import { getGwTemplateListAPI, deleteGwTemplateAPI } from '@/api/data-create/gw-template'
 export default {
     components: {
         DialogModel,
@@ -95,49 +112,50 @@ export default {
     data() {
         return {
             formType: 1, // 1新增 2详情 3编辑
+            total: 0,
+            queryId: '', // 详情或编辑的id
             dialogConfig: {
-                outerTitle: '新增',
+                outerTitle: '新增国网模板',
                 innerTitle: false,
                 outerWidth: '80%',
                 outerVisible: false,
                 innerVisible: false,
             },
-            queryParam: {
-                projectName: '',
-                startTime: '',
-                endTime: '',
+            queryParams: {
+                name: '',
+                startDate: '',
+                endDate: '',
+                pageNum: 1,
+                pageSize: 10,
             },
             timeValue: [],
-            tableList: [
-                {
-                    projectName: '测试工程1',
-                },
-                {
-                    projectName: '测试工程2',
-                },
-                {
-                    projectName: '测试工程3',
-                },
-            ],
+            tableList: [],
             tableColumn: [
-                { label: '标书名称', prop: 'projectName' },
-                { label: '创建人', prop: '' },
-                { label: '创建时间', prop: '' },
+                { label: '标书名称', prop: 'name' },
+                { label: '创建人', prop: 'createUser' },
+                { label: '创建时间', prop: 'createTime' },
             ],
         }
     },
     methods: {
         // 关闭
-        closeDialogOuter() {
+        closeDialogOuter(isRefresh = false) {
             this.dialogConfig.outerVisible = false
+            if (isRefresh) {
+                this.getGwTemplateList()
+            }
         },
         // 删除
         onHandleDelete(row) {
             console.log(row)
             this.$modal
                 .confirm('确定删除该业绩吗？')
-                .then(() => {
-                    console.log('确定')
+                .then(async () => {
+                    const res = await deleteGwTemplateAPI({ id: row.id })
+                    if (res.code == 200) {
+                        this.$message.success('删除成功')
+                        this.getGwTemplateList()
+                    }
                 })
                 .catch(() => {
                     console.log('取消')
@@ -145,16 +163,16 @@ export default {
         },
         // 新增或编辑
         onHandleAddOrEdit(row, type) {
-            console.log(row, type)
+            this.formType = type
             if (type === 1) {
-                this.dialogConfig.outerTitle = '新增人员'
-                this.formType = 1
+                this.dialogConfig.outerTitle = '新增国网模板'
+                this.queryId = ''
             } else if (type === 3) {
-                this.dialogConfig.outerTitle = '编辑人员'
-                this.formType = 3
+                this.dialogConfig.outerTitle = '编辑国网模板'
+                this.queryId = row.id
             } else if (type === 2) {
-                this.dialogConfig.outerTitle = '人员详情'
-                this.formType = 2
+                this.dialogConfig.outerTitle = '国网模板详情'
+                this.queryId = row.id
             }
 
             this.dialogConfig.outerVisible = true
@@ -163,6 +181,32 @@ export default {
         onHandleDownload(row) {
             console.log(row)
         },
+
+        // 获取国网模板列表列表
+        async getGwTemplateList() {
+            if (this.timeValue && this.timeValue.length > 0) {
+                this.queryParams.startDate = this.timeValue[0]
+                this.queryParams.endDate = this.timeValue[1]
+            } else {
+                this.queryParams.startDate = ''
+                this.queryParams.endDate = ''
+            }
+            const res = await getGwTemplateListAPI(this.queryParams)
+            this.tableList = res.rows
+            this.total = res.total
+            console.log(res, 'res')
+        },
+        // 重置
+        resetQueryParams() {
+            this.timeValue = []
+            this.queryParams.name = ''
+            this.queryParams.pageNum = 1
+            this.queryParams.pageSize = 10
+            this.getGwTemplateList()
+        },
+    },
+    created() {
+        this.getGwTemplateList()
     },
 }
 </script>
diff --git a/src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue b/src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue
index e3d69b5..a9bb4b9 100644
--- a/src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue
+++ b/src/views/sub-manage/sub-performance-manage/components/addAndEditForm.vue
@@ -70,7 +70,7 @@
             <el-row :gutter="20">
                 <el-col :span="24">
                     <div style="display: flex; align-items: center; padding: 8px 0">
-                        <div> 项目关键人员 </div>
+                        <div>分包人员 </div>
                         <el-button icon="el-icon-circle-plus" type="text" @click="onHandleAdd" v-if="formType !== 2">
                             添加
                         </el-button>