diff --git a/src/api/company-manage/performance-manage.js b/src/api/company-manage/performance-manage.js
index 79269b3..2ea3ac4 100644
--- a/src/api/company-manage/performance-manage.js
+++ b/src/api/company-manage/performance-manage.js
@@ -10,6 +10,14 @@ export function getCompanyPerformanceListAPI(data) {
         params: data,
     })
 }
+// 公司业绩列表 根据人员id查询
+export function getCompanyPerformanceListByPersonIdAPI(data) {
+    return request({
+        url: '/tbCompanyPerf/getTbCompanyPerfListByPersonId',
+        method: 'get',
+        params: data,
+    })
+}
 
 // 新增公司业绩
 export function addCompanyPerformanceAPI(data) {
diff --git a/src/views/data-create/gw-template/components/addAndEditForm.vue b/src/views/data-create/gw-template/components/addAndEditForm.vue
index 8de5597..b3d8992 100644
--- a/src/views/data-create/gw-template/components/addAndEditForm.vue
+++ b/src/views/data-create/gw-template/components/addAndEditForm.vue
@@ -64,51 +64,63 @@
                             <el-button
                                 type="text"
                                 size="mini"
-                                v-if="scope.row.name === ''"
+                                v-if="scope.row.userName === ''"
                                 @click="selectCompanyKeyPerson(scope.$index)"
                             >
                                 选择
                             </el-button>
 
                             <span v-else>
-                                {{ scope.row.name }}
+                                {{ scope.row.userName }}
                             </span>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="职称" prop="title" show-overflow-tooltip />
-                    <el-table-column align="center" label="职业资格证书/身份证" prop="idCard" show-overflow-tooltip />
-                    <el-table-column align="center" label="在本施工队伍中的职责分工">
+                    <el-table-column align="center" label="职业资格证书/身份证" width="200">
                         <template slot-scope="{ row }">
-                            <el-input placeholder="请输入" v-model="row.duty" />
+                            <span>
+                                {{ row.diploma }}
+                            </span>
+                            <br />
+                            <span>
+                                {{ row.idCard }}
+                            </span>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="计划入场时间">
+                    <el-table-column align="center" label="在本施工队伍中的职责分工" width="160">
                         <template slot-scope="{ row }">
+                            <el-input placeholder="请输入" v-model="row.postName" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="center" label="计划入场时间" width="160">
+                        <template slot-scope="scope">
                             <el-date-picker
                                 type="date"
                                 clearable
-                                v-model="row.planEnterTime"
                                 style="width: 100%"
                                 placeholder="选择日期"
                                 value-format="yyyy-MM-dd"
+                                v-model="scope.row.einDate"
+                                @change="onChangeEinDate(scope.$index, $event)"
                             />
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="计划退场时间" prop="planLeaveTime">
-                        <template slot-scope="{ row }">
+                    <el-table-column align="center" label="计划退场时间" width="160">
+                        <template slot-scope="scope">
                             <el-date-picker
                                 type="date"
                                 clearable
-                                v-model="row.planLeaveTime"
                                 style="width: 100%"
                                 placeholder="选择日期"
                                 value-format="yyyy-MM-dd"
+                                v-model="scope.row.exitDate"
+                                @change="onChangeExitDate(scope.$index, $event)"
                             />
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="近年同类工程业绩">
                         <template slot-scope="{ row }">
-                            {{ row.performance }}
+                            {{ row.proPerf }}
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="操作" show-overflow-tooltip>
@@ -135,7 +147,7 @@
                     <el-table-column label="序号" width="55" type="index" />
                     <el-table-column align="center" label="在本次标书中的职务">
                         <template slot-scope="{ row }">
-                            <el-input placeholder="请输入" v-model="row.title" />
+                            <el-input placeholder="请输入" v-model="row.postName" />
                         </template>
                     </el-table-column>
                     <el-table-column align="center" label="姓名">
@@ -143,22 +155,21 @@
                             <el-button
                                 type="text"
                                 size="mini"
-                                v-if="scope.row.name === ''"
+                                v-if="scope.row.userName === ''"
                                 @click="selectCompanyOtherPerson(scope.$index)"
                             >
                                 选择
                             </el-button>
-
                             <span v-else>
-                                {{ scope.row.name }}
+                                {{ scope.row.userName }}
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="职称" show-overflow-tooltip />
-                    <el-table-column align="center" label="证书名称" show-overflow-tooltip />
-                    <el-table-column align="center" label="级别" show-overflow-tooltip />
-                    <el-table-column align="center" label="证号" show-overflow-tooltip />
-                    <el-table-column align="center" label="专业" show-overflow-tooltip />
+                    <el-table-column align="center" label="职称" show-overflow-tooltip prop="title" />
+                    <el-table-column align="center" label="证书名称" show-overflow-tooltip prop="diploma" />
+                    <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="操作">
                         <template slot-scope="scope">
                             <el-button
@@ -180,10 +191,10 @@
                 </div>
 
                 <div class="subcontractor-box" v-if="subcontractorList.length > 0">
-                    <div v-for="(item, index) in subcontractorList" :key="item.key" class="subcontractor-item-box">
+                    <div v-for="(item, index) in subcontractorList" :key="item.id" class="subcontractor-item-box">
                         <div class="subcontractor-item">
                             <span>
-                                {{ item.label }}
+                                {{ item.subName }}
                             </span>
                             <el-button
                                 type="text"
@@ -208,34 +219,91 @@
                             <el-table-column label="序号" width="55" type="index" />
                             <el-table-column
                                 align="center"
+                                prop="proName"
                                 label="项目名称(按合同)"
-                                prop="label"
                                 show-overflow-tooltip
                             />
                             <el-table-column align="center" label="电压等级" prop="voltage" show-overflow-tooltip />
-                            <el-table-column align="center" label="建设单位" prop="company" show-overflow-tooltip />
+                            <el-table-column align="center" label="建设单位" prop="consUnit" show-overflow-tooltip />
                             <el-table-column
                                 align="center"
-                                label="分包合同额"
-                                prop="contractAmount"
+                                label="分包合同额（万元）"
+                                prop="money"
                                 show-overflow-tooltip
                             />
-                            <el-table-column align="center" label="开竣工日期" prop="startDate" show-overflow-tooltip />
+                            <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="操作">
                                 <template slot-scope="scope">
                                     <el-button
                                         type="text"
                                         icon="el-icon-delete"
                                         style="color: #f56c6c"
-                                        @click="deleteSubcontractorPerformance(index, scope.$index)"
+                                        @click="deleteSubcontractorPerformance(index, scope.$index, scope.row.id)"
                                     />
                                 </template>
                             </el-table-column>
                         </el-table>
                         <div class="title-box-subcontractor">
                             <div> 拟派人员 </div>
-                            <el-button icon="el-icon-circle-plus" type="text">添加</el-button>
+                            <el-button icon="el-icon-circle-plus" type="text" @click="addSubcontractorPerson(index)">
+                                添加
+                            </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="姓名">
+                                <template slot-scope="scope">
+                                    <el-button
+                                        type="text"
+                                        size="mini"
+                                        v-if="scope.row.userName === ''"
+                                        @click="selectSubcontractorPerson(index, scope.$index)"
+                                    >
+                                        选择
+                                    </el-button>
+
+                                    <span v-else>
+                                        {{ scope.row.userName }}
+                                    </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" label="职称" prop="title" show-overflow-tooltip />
+                            <el-table-column align="center" label="执业资格证书/身份证" width="200">
+                                <template slot-scope="{ row }">
+                                    <span>
+                                        {{ row.diploma }}
+                                    </span>
+                                    <br />
+                                    <span>
+                                        {{ row.idCard }}
+                                    </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" label="在本施工队伍中的职责分工" width="160">
+                                <template slot-scope="{ row }">
+                                    <el-input placeholder="请输入" v-model="row.postName" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" label="近年同类工程业绩">
+                                <template slot-scope="{ row }">
+                                    {{ row.proPerf }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" label="操作" show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                    <el-button
+                                        type="text"
+                                        style="color: #f56c6c"
+                                        icon="el-icon-delete"
+                                        @click="deleteSubcontractorPerson(index, scope.$index)"
+                                    />
+                                </template>
+                            </el-table-column>
+                        </el-table>
                     </div>
                 </div>
             </div>
@@ -253,32 +321,38 @@
         <DialogModel :dialogConfig="dialogConfig" @closeDialogOuter="closeDialogOuter">
             <template slot="outerContent">
                 <!-- 关键人员和公司业绩选择 -->
-                <template v-if="dialogConfig.outerTitle === '人员选择' || dialogConfig.outerTitle === '公司业绩选择'">
-                    <div class="title" v-if="dialogConfig.outerTitle === '人员选择'"> 拟派人员 </div>
-                    <el-select
-                        clearable
-                        filterable
-                        v-model="companyPerformanceQueryParams.keyUser"
-                        @change="onChangePerson"
-                        placeholder="请选择人员"
-                        v-if="dialogConfig.outerTitle === '人员选择'"
-                    >
-                        <el-option
-                            :key="item.id"
-                            :value="item.id + ''"
-                            :label="item.userName"
-                            v-for="item in keyPersonList"
-                        />
-                    </el-select>
-                    <div class="title" v-if="dialogConfig.outerTitle === '人员选择'"> 人员业绩选择 </div>
+                <template
+                    v-if="dialogConfig.outerTitle === '关键人员选择' || dialogConfig.outerTitle === '公司业绩选择'"
+                >
+                    <div class="title" v-if="dialogConfig.outerTitle === '关键人员选择'"> 拟派人员 </div>
+                    <el-row :gutter="20">
+                        <el-col :span="5">
+                            <el-select
+                                clearable
+                                filterable
+                                @change="onChangePerson"
+                                placeholder="请选择人员"
+                                v-if="dialogConfig.outerTitle === '关键人员选择'"
+                                v-model="companyPerformanceQueryParams.personId"
+                            >
+                                <el-option
+                                    :key="item.id"
+                                    :value="item.id + ''"
+                                    :label="item.userName"
+                                    v-for="item in keyPersonList"
+                                />
+                            </el-select>
+                        </el-col>
+                    </el-row>
+                    <div class="title" v-if="dialogConfig.outerTitle === '关键人员选择'"> 人员业绩选择 </div>
                     <el-form
                         inline
                         label-width="0"
                         ref="companyPerformanceFormRef"
                         :model="companyPerformanceQueryParams"
                     >
-                        <el-row>
-                            <el-col :span="4">
+                        <el-row :gutter="20">
+                            <el-col :span="5">
                                 <el-form-item prop="proName">
                                     <el-input
                                         clearable
@@ -288,7 +362,7 @@
                                     </el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="4">
+                            <el-col :span="5">
                                 <el-form-item prop="voltage">
                                     <el-input
                                         clearable
@@ -298,7 +372,7 @@
                                     </el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="4">
+                            <el-col :span="5">
                                 <el-form-item prop="age">
                                     <el-select
                                         placeholder="请选择"
@@ -323,7 +397,7 @@
                                     />
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="3.5">
+                            <el-col :span="3">
                                 <el-form-item>
                                     <el-button type="primary" icon="el-icon-search" @click="searchPersonPerformance">
                                         查询
@@ -356,17 +430,20 @@
                 </template>
                 <!-- 其他人员选择 -->
                 <template v-else-if="dialogConfig.outerTitle === '其他人员选择'">
-                    <el-form :model="personPerformanceForm" label-width="0" inline>
-                        <el-row>
+                    <el-form :model="otherPersonQueryParams" label-width="0" inline>
+                        <el-row :gutter="20">
                             <el-col :span="6">
-                                <el-form-item>
-                                    <el-input placeholder="姓名" clearable> </el-input>
-                                </el-form-item>
+                                <el-input
+                                    clearable
+                                    placeholder="姓名"
+                                    style="width: 100%"
+                                    v-model="otherPersonQueryParams.userName"
+                                />
                             </el-col>
 
-                            <el-col :span="3">
+                            <el-col :span="6">
                                 <el-form-item>
-                                    <el-button type="primary" icon="el-icon-search" @click="searchPersonPerformance">
+                                    <el-button type="primary" icon="el-icon-search" @click="searchOtherPerson">
                                         查询
                                     </el-button>
                                 </el-form-item>
@@ -374,18 +451,27 @@
                         </el-row>
                     </el-form>
 
-                    <el-table :data="personList" stripe @selection-change="onSelectionChange" ref="singleTable">
+                    <el-table :data="otherPersonList" stripe @selection-change="onSelectionChange" ref="singleTable">
                         <el-table-column label="序号" width="55" type="index" align="center" />
-                        <el-table-column type="selection" width="55" align="center" />
-                        <el-table-column label="姓名" prop="label" align="center" />
+                        <el-table-column
+                            type="selection"
+                            width="55"
+                            align="center"
+                            :selectable="
+                                (row) => {
+                                    return !row.disabled
+                                }
+                            "
+                        />
+                        <el-table-column label="姓名" prop="userName" align="center" />
                         <el-table-column label="身份证号" prop="idCard" align="center" />
                     </el-table>
 
                     <pagination
-                        :total="total"
-                        :page.sync="queryParams.pageNum"
-                        :limit.sync="queryParams.pageSize"
-                        @pagination="getOtherPersonList"
+                        :total="otherPersonTotal"
+                        @pagination="searchOtherPerson"
+                        :page.sync="otherPersonQueryParams.pageNum"
+                        :limit.sync="otherPersonQueryParams.pageSize"
                     />
                 </template>
 
@@ -397,69 +483,83 @@
                             v-model="selectSubcontractorData"
                             :data="waitSubcontractorSelectData"
                             :titles="['待选列表', '已选列表']"
+                            :props="{
+                                key: 'id',
+                                label: 'subName',
+                            }"
                         />
                     </div>
                 </template>
 
                 <!-- 分包商业绩选择 -->
-
-                <template v-else-if="dialogConfig.outerTitle === '分包商业绩选择'">
-                    <el-form :model="personPerformanceForm" label-width="0" inline>
-                        <el-row>
-                            <el-col :span="4">
-                                <el-form-item>
-                                    <el-input
-                                        v-model="personPerformanceForm.projectName"
-                                        placeholder="项目名称"
-                                        clearable
-                                    >
+                <template
+                    v-else-if="
+                        dialogConfig.outerTitle === '分包商业绩选择' || dialogConfig.outerTitle === '分包人员选择'
+                    "
+                >
+                    <div class="title" v-if="dialogConfig.outerTitle === '分包人员选择'"> 拟派人员 </div>
+                    <el-row :gutter="20">
+                        <el-col :span="5">
+                            <el-select
+                                clearable
+                                filterable
+                                @change="onChangePerson"
+                                placeholder="请选择人员"
+                                v-if="dialogConfig.outerTitle === '分包人员选择'"
+                                v-model="companyPerformanceQueryParams.personId"
+                            >
+                                <el-option
+                                    :key="item.id"
+                                    :value="item.id + ''"
+                                    :label="item.userName"
+                                    v-for="item in keyPersonList"
+                                />
+                            </el-select>
+                        </el-col>
+                    </el-row>
+                    <div class="title" v-if="dialogConfig.outerTitle === '分包人员选择'"> 人员业绩选择 </div>
+                    <el-form inline label-width="0" :model="personPerformanceForm">
+                        <el-row :gutter="20">
+                            <el-col :span="5">
+                                <el-form-item prop="proName">
+                                    <el-input clearable placeholder="工程名称" v-model="personPerformanceForm.proName">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="4">
-                                <el-form-item>
-                                    <el-input v-model="personPerformanceForm.voltage" placeholder="电压等级" clearable>
+                            <el-col :span="5">
+                                <el-form-item prop="voltage">
+                                    <el-input clearable placeholder="电压等级" v-model="personPerformanceForm.voltage">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="4">
-                                <el-form-item>
+                            <el-col :span="5">
+                                <el-form-item prop="age">
                                     <el-select placeholder="请选择" v-model="personPerformanceForm.age" clearable>
                                         <el-option label="近三年" value="3" />
                                         <el-option label="近五年" value="5" />
                                     </el-select>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="4">
-                                <el-form-item>
+                            <el-col :span="6">
+                                <el-form-item prop="timeValue">
                                     <el-date-picker
-                                        type="date"
-                                        v-model="value1"
-                                        placeholder="选择日期"
+                                        type="daterange"
+                                        range-separator="~"
                                         style="width: 100%"
                                         value-format="yyyy-MM-dd"
-                                        clearable
+                                        end-placeholder="结束时间"
+                                        start-placeholder="开始时间"
+                                        v-model="personPerformanceForm.timeValue"
                                     />
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="0.5" style="text-align: center">
-                                <el-form-item> 至 </el-form-item>
-                            </el-col>
-                            <el-col :span="4">
+                            <el-col :span="3">
                                 <el-form-item>
-                                    <el-date-picker
-                                        type="date"
-                                        clearable
-                                        v-model="value1"
-                                        placeholder="选择日期"
-                                        style="width: 100%"
-                                        value-format="yyyy-MM-dd"
-                                    />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="3.5">
-                                <el-form-item>
-                                    <el-button type="primary" icon="el-icon-search" @click="searchPersonPerformance">
+                                    <el-button
+                                        type="primary"
+                                        icon="el-icon-search"
+                                        @click="searchSubcontractorPerformanceData"
+                                    >
                                         查询
                                     </el-button>
                                 </el-form-item>
@@ -468,19 +568,24 @@
                     </el-form>
 
                     <div>
+                        <!-- 分包商业绩选择框 -->
                         <el-transfer
                             :data="waitSubcontractorPerformanceData"
                             v-model="selectSubcontractorPerformanceData"
                             :titles="['待选列表', '已选列表']"
+                            :props="{
+                                key: 'id',
+                                label: 'proName',
+                            }"
                         >
                             <div slot-scope="{ option }" class="transfer-item">
                                 <span>
-                                    {{ option.label }}
+                                    {{ option.proName }}
                                 </span>
                                 <span style="margin-left: 18px">
                                     {{ option.voltage }}
                                 </span>
-                                <span style="margin-left: 6px"> {{ option.startDate }} 至{{ option.endDate }} </span>
+                                <span style="margin-left: 6px"> {{ option.startTime }} 至{{ option.endTime }} </span>
                             </div>
                         </el-transfer>
                     </div>
@@ -500,7 +605,13 @@ import UploadImg from '@/components/UploadImg'
 import DialogModel from '@/components/DialogModel/index'
 import moment from 'moment'
 import { getKeyPersonListAPI } from '@/api/common'
-import { getCompanyPerformanceListAPI } from '@/api/company-manage/performance-manage'
+import { getOtherPersonListAPI } from '@/api/company-manage/other-person'
+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'
 export default {
     components: {
         UploadImg,
@@ -549,8 +660,6 @@ export default {
             waitSelectData: [], // 待选列表
             selectData: [], // 已选列表
 
-            companyOtherPersonList: [], // 公司其他人员列表
-            subcontractorList: [], // 分包商列表
             companyPerformanceInnerList: [
                 {
                     key: 10,
@@ -620,79 +729,9 @@ export default {
 
             keyTableCurrentIndex: 0,
             otherTableCurrentIndex: 0,
-            selectedPerson: null,
-            selectSubcontractorData: [], // 分包商已选列表
-            waitSubcontractorSelectData: [
-                {
-                    key: 1,
-                    label: '川东电力集团有限公司',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                    companyPerformanceList: [],
-                },
-                {
-                    key: 2,
-                    label: '川西电力集团有限公司',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                    companyPerformanceList: [],
-                },
-                {
-                    key: 3,
-                    label: '川南电力集团有限公司',
-                    disabled: false,
-                    voltage: '110kv',
-                    startDate: '2020-01-01',
-                    endDate: '2020-01-01',
-                    companyPerformanceList: [],
-                },
-            ], // 分包商待选列表
 
             // subcontractorList: [], // 分包商外层显示列表
-            selectSubcontractorPerformanceData: [], // 分包商业绩已选列表 ---- 内层穿梭框选择后只有ID数据源
-            waitSubcontractorPerformanceData: [
-                {
-                    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: '校花工程取得完美收官',
-                },
-            ], // ---- 内层穿梭框显示的
             subcontractorPerformanceInnerList: [], // 分包商业绩列表
             subcontractorPersonInnerList: [], // 分包商人员列表
             subcontractorPerformanceCurrentIndex: 0, // 分包商业绩当前操作的index
@@ -710,6 +749,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10000,
                 timeValue: [],
+                personId: '',
             },
 
             /**
@@ -718,15 +758,43 @@ export default {
             companyKeyPersonList: [], // 公司关键人员列表
             keyTableCurrentIndex: 0, // 公司关键人员当前操作行的索引
             keyPersonList: [], // 关键人员列表
-            // 人员业绩待选列表查询条件
-            keyPersonQueryParams: {
-                age: '3',
-                proName: '',
-                voltage: '',
+
+            /**
+             * 公司其他人员需要的数据源
+             */
+            companyOtherPersonList: [], // 公司其他人员列表
+            otherTableCurrentIndex: 0, // 公司其他人员当前操作行的索引
+            // 其他人员列表查询条件
+            otherPersonQueryParams: {
+                userName: '',
+                pageNum: 1,
+                pageSize: 10,
+            },
+            otherPersonList: [], // 其他人员列表
+            otherPersonTotal: 0, // 其他人员列表总条数
+            selectedOtherPerson: null, // 其他人员列表选中项
+
+            /**
+             * 分包商模块需要的数据源
+             */
+            subcontractorList: [], // 分包商列表
+            selectSubcontractorData: [], // 穿梭框内分包商已选列表
+            waitSubcontractorSelectData: [], // 穿梭框内分包商待选列表
+            subcontractorPerformanceCurrentIndex: 0, // 分包商业绩当前操作的index
+            // 分包商业绩查询条件
+            personPerformanceForm: {
+                proName: '', //项目名称
+                startTime: '',
+                endTime: '',
                 pageNum: 1,
                 pageSize: 10000,
                 timeValue: [],
+                personId: '',
+                age: '3',
             },
+            selectSubcontractorPerformanceData: [], // 分包商业绩已选列表 ---- 内层穿梭框选择后只有ID数据源
+            waitSubcontractorPerformanceData: [], // 分包商业绩待选列表 ---- 内层穿梭框显示的
+            subcontractorPersonCurrentIndex: 0, // 分包商人员当前操作的index
         }
     },
     methods: {
@@ -741,26 +809,17 @@ export default {
             })
         },
 
-        // 添加公司其他人员
-        addCompanyOtherPerson() {
-            console.log('添加公司其他人员')
-            this.companyOtherPersonList.push({
-                name: '',
-                title: '',
-                idCard: '',
-            })
-        },
-        // 添加分包商
-        addSubcontractor() {
-            console.log('添加分包商')
-            this.dialogConfig.outerTitle = '分包商选择'
-            this.dialogConfig.outerVisible = true
-        },
         // 查询
         searchPersonPerformance() {
             // console.log('查询')
             if (this.dialogConfig.outerTitle === '公司业绩选择') {
                 this.getCompanyPerformanceData()
+            } else {
+                if (this.companyPerformanceQueryParams.personId) {
+                    this.getCompanyPerformanceListByPersonIdData()
+                } else {
+                    this.$modal.msgError('请选择人员')
+                }
             }
         },
         // 关闭弹窗
@@ -777,109 +836,66 @@ export default {
             if (this.dialogConfig.outerTitle === '公司业绩选择') {
                 this.companyPerformanceList = this.waitSelectData.filter((item) => this.selectData.includes(item.id))
             }
-            // if (this.dialogConfig.outerTitle === '其他人员选择') {
-            //     if (!this.selectedPerson) {
-            //         this.$modal.msgError('请选择人员')
-            //         return false
-            //     } else {
-            //         this.companyOtherPersonList[this.otherTableCurrentIndex].name = this.selectedPerson.label
-            //         this.companyOtherPersonList[this.otherTableCurrentIndex].idCard = this.selectedPerson.idCard
-            //     }
-            // } else if (this.dialogConfig.outerTitle === '分包商选择') {
-            //     if (this.selectSubcontractorData.length < 1) {
-            //         this.$modal.msgError('右侧已选列表为空，请操作后再确认')
-            //         return false
-            //     } else {
-            //         this.subcontractorList = this.waitSubcontractorSelectData.filter((item) =>
-            //             this.selectSubcontractorData.includes(item.key),
-            //         )
-            //     }
-            // } else if (this.dialogConfig.outerTitle === '分包商业绩选择') {
-            //     if (this.selectSubcontractorPerformanceData.length < 1) {
-            //         this.$modal.msgError('右侧已选列表为空，请操作后再确认')
-            //         return false
-            //     } else {
-            //         this.subcontractorPerformanceList = this.waitSubcontractorPerformanceData.filter((item) =>
-            //             this.selectSubcontractorPerformanceData.includes(item.key),
-            //         )
 
-            //         this.subcontractorList[this.subcontractorPerformanceCurrentIndex].companyPerformanceList =
-            //             this.subcontractorPerformanceList
-            //     }
-            // } else {
-            //     if (this.selectData.length < 1) {
-            //         this.$modal.msgError('右侧已选列表为空，请操作后再确认')
-            //         return false
-            //     }
-            //     if (this.dialogConfig.outerTitle === '公司业绩选择') {
-            //         this.companyPerformanceList = this.waitSelectData.filter((item) =>
-            //             this.selectData.includes(item.key),
-            //         )
-            //     } else if (this.dialogConfig.outerTitle === '拟派人员选择') {
-            //         this.keyPersonPerformanceInnerSelectList = this.waitSelectData.filter((item) =>
-            //             this.selectData.includes(item.key),
-            //         )
+            if (this.dialogConfig.outerTitle === '关键人员选择') {
+                if (this.companyPerformanceQueryParams.personId) {
+                    const keyPersonPerformanceInnerSelectList = this.waitSelectData.filter((item) =>
+                        this.selectData.includes(item.id),
+                    )
+                    this.companyKeyPersonList[this.keyTableCurrentIndex].proPerf = keyPersonPerformanceInnerSelectList
+                        .map((item) => item.proName)
+                        .join(',')
+                } else {
+                    this.$modal.msgError('请选择人员')
+                    return false
+                }
+            }
 
-            //         this.companyKeyPersonList[this.keyTableCurrentIndex].performance =
-            //             this.keyPersonPerformanceInnerSelectList.map((item) => item.performance).join(',')
-            //     }
-            // }
+            if (this.dialogConfig.outerTitle === '其他人员选择') {
+                if (!this.selectedOtherPerson) {
+                    this.$modal.msgError('请选择其他人员')
+                    return false
+                } else {
+                    // 选取需要的数据
+                    const { id, userName, title, diploma, diplomaNum, major, level } = this.selectedOtherPerson
+                    Object.assign(this.companyOtherPersonList[this.otherTableCurrentIndex], {
+                        id,
+                        userName,
+                        title,
+                        diploma,
+                        diplomaNum,
+                        major,
+                        level,
+                    })
+                }
+            }
+
+            if (this.dialogConfig.outerTitle === '分包商选择') {
+                this.subcontractorList = this.waitSubcontractorSelectData.filter((item) =>
+                    this.selectSubcontractorData.includes(item.id),
+                )
+            }
+
+            if (this.dialogConfig.outerTitle === '分包商业绩选择') {
+                const subcontractorPerformanceInnerList = this.waitSubcontractorPerformanceData.filter((item) =>
+                    this.selectSubcontractorPerformanceData.includes(item.id),
+                )
+
+                this.$set(
+                    this.subcontractorList[this.subcontractorPerformanceCurrentIndex],
+                    'companyPerformanceList',
+                    subcontractorPerformanceInnerList,
+                )
+                this.subcontractorList[this.subcontractorPerformanceCurrentIndex].companyPerformanceList =
+                    subcontractorPerformanceInnerList
+            }
 
-            this.personSelectValue = ''
             this.dialogConfig.outerVisible = false
         },
-        // 删除公司业绩
-        deleteCompanyPerformance(index) {
-            this.companyPerformanceList.splice(index, 1)
-        },
-        // 删除公司关键人员
-        deleteCompanyKeyPerson(index) {
-            this.companyKeyPersonList.splice(index, 1)
-        },
 
-        onChangePerson(value) {
-            const rowInfo = this.personList.find((item) => item.value === value)
-            const { label, idCard, title } = rowInfo
-            this.companyKeyPersonList[this.keyTableCurrentIndex].name = label
-            this.companyKeyPersonList[this.keyTableCurrentIndex].idCard = idCard
-            this.companyKeyPersonList[this.keyTableCurrentIndex].title = title
-        },
-
-        // 选择公司其他人员
-        selectCompanyOtherPerson(index) {
-            this.otherTableCurrentIndex = index
-            this.dialogConfig.outerTitle = '其他人员选择'
-            this.dialogConfig.outerVisible = true
-        },
-        // 选择其他人员
-        onSelectionChange(selection) {
-            console.log(selection)
-
-            if (selection.length > 1) {
-                const lastSelected = selection[selection.length - 1]
-                this.$refs.singleTable.clearSelection() // 清空所有选中
-                this.$refs.singleTable.toggleRowSelection(lastSelected, true) // 重新选中最后一个
-            }
-            this.selectedPerson = selection[0] || null // 存储当前选中项
-        },
         getOtherPersonList() {
             console.log('查询')
         },
-        deleteCompanyOtherPerson(index) {
-            this.companyOtherPersonList.splice(index, 1)
-        },
-        deleteSubcontractor(index) {
-            this.subcontractorList.splice(index, 1)
-        },
-        addSubcontractorPerformance(index) {
-            this.subcontractorPerformanceCurrentIndex = index
-            this.dialogConfig.outerTitle = '分包商业绩选择'
-            this.dialogConfig.outerVisible = true
-            console.log('添加分包商业绩')
-        },
-        deleteSubcontractorPerformance(index, performanceIndex) {
-            this.subcontractorList[index].companyPerformanceList.splice(performanceIndex, 1)
-        },
 
         /**
          * 公司业绩模块
@@ -888,17 +904,11 @@ export default {
         // 添加公司业绩
         async addCompanyPerformance() {
             this.dialogConfig.outerTitle = '公司业绩选择'
-
+            this.initQueryForm()
             this.getCompanyPerformanceData()
             // 获取已选择过的数据 赋值给穿梭框 作回显
-            if (this.companyPerformanceList.length > 0) {
-                this.selectData = this.companyPerformanceList.map((item) => item.id)
-            } else {
-                this.selectData = []
-            }
-            this.dialogConfig.outerVisible = true
         },
-        // 获取公司业绩数据
+        // 获取公司业绩
         async getCompanyPerformanceData() {
             const { age, proName, voltage, pageNum, pageSize, timeValue } = this.companyPerformanceQueryParams
 
@@ -930,6 +940,17 @@ export default {
                 ...item,
                 disabled: false,
             }))
+
+            if (this.companyPerformanceList.length > 0) {
+                this.selectData = this.companyPerformanceList.map((item) => item.id)
+            } else {
+                this.selectData = []
+            }
+            this.dialogConfig.outerVisible = true
+        },
+        // 删除公司业绩
+        deleteCompanyPerformance(index) {
+            this.companyPerformanceList.splice(index, 1)
         },
         /**
          * 添加公司关键人员
@@ -938,37 +959,213 @@ export default {
         // 添加公司关键人员
         addCompanyKeyPerson() {
             this.companyKeyPersonList.push({
-                name: '',
-                title: '',
-                idCard: '',
-                performance: '',
-                duty: '',
-                planEnterTime: '',
-                planLeaveTime: '',
+                id: '', // 人员id
+                userName: '', // 人员名称
+                title: '', // 人员职称
+                diploma: '', // 执业资格证书
+                idCard: '', // 身份证号
+                postName: '', // 本施工队伍中的职责分工
+                proPerf: '', // 人员业绩
+                einDate: '', // 计划入场事件
+                exitDate: '', // 计划退场事件
             })
         },
         // 选择公司关键人员
         selectCompanyKeyPerson(index) {
+            this.getKeyPersonList()
+            this.initQueryForm()
             this.keyTableCurrentIndex = index
             this.dialogConfig.outerTitle = '关键人员选择'
-            // this.waitSelectData = this.keyPersonPerformanceInnerList
-            // if (this.keyPersonPerformanceInnerSelectList.length > 0) {
-            //     this.selectData = this.keyPersonPerformanceInnerSelectList.map((item) => item.key)
-            // }
-            // this.keyPersonPerformanceInnerSelectList = []
-            // this.selectData = []
+            this.waitSelectData = []
+            this.selectData = []
             this.dialogConfig.outerVisible = true
         },
+
+        // 删除公司关键人员
+        deleteCompanyKeyPerson(index) {
+            this.companyKeyPersonList.splice(index, 1)
+        },
         // 获取关键人员列表
         async getKeyPersonList() {
             const { rows: res } = await getKeyPersonListAPI()
             this.keyPersonList = res
         },
 
-        // 根据人员信息获取公司业绩数据
-        async getCompanyPerformanceData() {
-            const { age, proName, voltage, pageNum, pageSize, timeValue } = this.companyPerformanceQueryParams
+        // 获取人员业绩数据
+        async getCompanyPerformanceListByPersonIdData() {
+            const { age, proName, voltage, pageNum, pageSize, timeValue, personId } = this.companyPerformanceQueryParams
 
+            const queryParams = {
+                proName,
+                voltage,
+                pageNum,
+                pageSize,
+                startTime: '',
+                endTime: '',
+                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 getCompanyPerformanceListByPersonIdAPI(queryParams)
+            if (res && res.length > 0) {
+                this.waitSelectData = res.map((item) => ({
+                    ...item,
+                    disabled: false,
+                }))
+            } else {
+                this.waitSelectData = []
+            }
+        },
+
+        // 人员下拉选的change事件
+        onChangePerson(value) {
+            if (this.companyKeyPersonList.length > 0 && this.companyKeyPersonList.some((item) => item.id == value)) {
+                this.$modal.msgError('当前人员已选择，不可重复添加')
+                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].title = rowInfo.title
+                this.companyKeyPersonList[index].userName = rowInfo.userName
+                this.companyKeyPersonList[index].diploma = rowInfo.diploma
+                this.companyKeyPersonList[index].idCard = rowInfo.idCard
+            }
+        },
+
+        // 计划入场时间change事件
+        onChangeEinDate(index, value) {
+            // 使用moment.js 判断入场时间不能大于退场时间 否则提示错误
+            if (moment(value).isAfter(moment(this.companyKeyPersonList[index].exitDate))) {
+                this.$modal.msgError('计划入场时间不能大于计划退场时间')
+                this.companyKeyPersonList[index].einDate = ''
+                return false
+            }
+        },
+        // 计划退场时间change事件
+        onChangeExitDate(index, value) {
+            // 使用moment.js 判断退场时间不能小于入场时间 否则提示错误
+            if (moment(value).isBefore(moment(this.companyKeyPersonList[index].einDate))) {
+                this.$modal.msgError('计划退场时间不能小于计划入场时间')
+                this.companyKeyPersonList[index].exitDate = ''
+                return false
+            }
+        },
+        // 初始化查询表单
+        initQueryForm() {
+            this.companyPerformanceQueryParams = {
+                age: '3',
+                proName: '',
+                voltage: '',
+                pageNum: 1,
+                pageSize: 10000,
+                timeValue: [],
+                personId: '',
+            }
+        },
+
+        /**
+         * 添加公司其他人员
+         */
+
+        // 添加公司其他人员
+        addCompanyOtherPerson() {
+            this.companyOtherPersonList.push({
+                id: '', // 人员id
+                userName: '', // 人员名称
+                postName: '', // 本次标书中的职务职责分工
+                title: '', // 职称
+                diploma: '', // 证书名称
+                diplomaNum: '', // 证书编号
+                major: '', // 专业
+                level: '', // 级别
+            })
+        },
+        // 选择公司其他人员
+        selectCompanyOtherPerson(index) {
+            this.otherTableCurrentIndex = index
+            this.dialogConfig.outerTitle = '其他人员选择'
+            this.otherPersonQueryParams.pageNum = 1
+            this.otherPersonQueryParams.pageSize = 10
+            this.otherPersonQueryParams.userName = ''
+            this.searchOtherPerson()
+            this.dialogConfig.outerVisible = true
+        },
+        // 查询其他人员
+        async searchOtherPerson() {
+            const res = await getOtherPersonListAPI(this.otherPersonQueryParams)
+            this.otherPersonList = res.rows
+            this.otherPersonTotal = res.total
+
+            // 根据已选的人员 将已选人员的数据增加一个标识 让表格复选框禁用
+            if (this.companyOtherPersonList.length > 0) {
+                this.otherPersonList.forEach((item) => {
+                    if (this.companyOtherPersonList.some((otherItem) => otherItem.id == item.id)) {
+                        item.disabled = true
+                    } else {
+                        item.disabled = false
+                    }
+                })
+            }
+        },
+        // 其他人员列表复选框
+        onSelectionChange(selection) {
+            if (selection.length > 1) {
+                const lastSelected = selection[selection.length - 1]
+                this.$refs.singleTable.clearSelection() // 清空所有选中
+                this.$refs.singleTable.toggleRowSelection(lastSelected, true) // 重新选中最后一个
+            }
+            this.selectedOtherPerson = selection[0] || null // 存储当前选中项
+        },
+        // 删除公司其他人员
+        deleteCompanyOtherPerson(index) {
+            this.companyOtherPersonList.splice(index, 1)
+        },
+
+        /**
+         * 添加分包商模块
+         */
+
+        // 添加分包商
+        addSubcontractor() {
+            console.log('添加分包商')
+            this.dialogConfig.outerTitle = '分包商选择'
+            this.getSubcontractorList()
+            this.dialogConfig.outerVisible = true
+        },
+
+        // 获取分包商列表
+        async getSubcontractorList() {
+            const res = await getSubManageListAPI({ pageNum: 1, pageSize: 10000 })
+            this.waitSubcontractorSelectData = res.rows
+        },
+
+        // 添加分包商业绩
+        addSubcontractorPerformance(index) {
+            this.subcontractorPerformanceCurrentIndex = index
+            this.dialogConfig.outerTitle = '分包商业绩选择'
+            this.getSubcontractorPerformanceData()
+            this.dialogConfig.outerVisible = true
+        },
+        // 删除分包商
+        deleteSubcontractor(index) {
+            this.subcontractorList.splice(index, 1)
+        },
+        // 获取分包商业绩数据
+        async getSubcontractorPerformanceData() {
+            const { age, proName, voltage, pageNum, pageSize, timeValue } = this.personPerformanceForm
             const queryParams = {
                 proName,
                 voltage,
@@ -991,12 +1188,67 @@ export default {
                 queryParams.startTime = timeValue[0]
                 queryParams.endTime = timeValue[1]
             }
-            const res = await getCompanyPerformanceListAPI(queryParams)
+            const res = await getSubPerformanceManageListAPI(queryParams)
 
-            this.waitSelectData = res.rows.map((item) => ({
-                ...item,
-                disabled: false,
-            }))
+            if (res.rows.length > 0) {
+                this.waitSubcontractorPerformanceData = res.rows.map((item) => ({
+                    ...item,
+                    disabled: false,
+                }))
+            } else {
+                this.waitSubcontractorPerformanceData = []
+            }
+        },
+        // 初始化分包商业绩查询条件
+        initSubcontractorPerformanceQueryParams() {
+            this.personPerformanceForm = {
+                age: '3',
+            }
+        },
+        // 查询分包商业绩
+        async searchSubcontractorPerformanceData() {
+            if (this.dialogConfig.outerTitle === '分包商业绩选择') {
+                this.getSubcontractorPerformanceData()
+            }
+        },
+
+        // 删除分包商业绩
+        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', [])
+            }
+
+            this.subcontractorList[index].subcontractorPersonList.push({
+                id: '',
+                userName: '',
+                title: '',
+                diploma: '',
+                idCard: '',
+                postName: '',
+                proPerf: '',
+            })
+        },
+
+        // 选择分包商人员
+        selectSubcontractorPerson(index, personIndex) {
+            this.dialogConfig.outerTitle = '分包人员选择'
+            this.dialogConfig.outerVisible = true
+            this.subcontractorPersonCurrentIndex = index
+        },
+        // 删除分包商人员
+        deleteSubcontractorPerson(index, personIndex) {
+            this.subcontractorList[index].subcontractorPersonList.splice(personIndex, 1)
         },
     },
 }
@@ -1082,4 +1334,12 @@ export default {
 ::v-deep .el-button + .el-button {
     margin: 0;
 }
+
+::v-deep .el-table .el-table__header-wrapper th .el-checkbox {
+    display: none;
+}
+
+::v-deep .el-table .el-table__header-wrapper th .el-checkbox {
+    display: none;
+}
 </style>
diff --git a/src/views/sub-manage/sub-performance-manage/index.vue b/src/views/sub-manage/sub-performance-manage/index.vue
index f95d51b..cb89354 100644
--- a/src/views/sub-manage/sub-performance-manage/index.vue
+++ b/src/views/sub-manage/sub-performance-manage/index.vue
@@ -142,6 +142,7 @@ export default {
             tableList: [],
             tableColumn: [
                 { label: '项目名称(按合同)', prop: 'proName' },
+                { label: '电压等级', prop: 'voltage' },
                 { label: '建设单位', prop: 'consUnit' },
                 { label: '分包合同额(万元)', prop: 'money' },
                 { label: '开竣工日期', isSlot: true },
diff --git a/vue.config.js b/vue.config.js
index f7ba35c..1ff047d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,8 @@ module.exports = {
         proxy: {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
-                target: `http://192.168.0.60:58080`, // 赵福海
+                // target: `http://192.168.0.60:58080`, // 赵福海
+                target: `http://192.168.0.137:58080`, // 方亮
                 // target: `http://192.168.0.38:58080`,
                 changeOrigin: true,
                 pathRewrite: {