diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 1afb213..0f6b7c7 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1,326 +1,495 @@
 <template>
   <div>
-    <table>
-      <td style="width:60%;">
-        <div style="display:flex">
-          <el-form ref="form" :model="form" label-width="80px" :rules="rules" size="medium">
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="单位名称" prop="customerOrgId">
-                  <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll"
-                    :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops }" :show-all-levels="false"
-                    disabled>
-                  </el-cascader>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="条码号" prop="patientRegisterNo">
-                  <el-input v-model="form.patientRegisterNo" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="档案号" prop="patientNo">
-                  <el-input v-model="form.patientNo" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6" />
-            </el-row>
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="姓名" prop="patientName">
-                  <el-input v-model="form.patientName" @blur="query(form.patientName)"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="性别" prop="sexId">
-                  <el-select v-model="form.sexId" placeholder="请选择">
-                    <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="体检次数" prop="medicalTimes">
-                  <el-input v-model="form.medicalTimes" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6" />
-            </el-row>
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="年龄" prop="age">
-                  <el-input v-model="form.age"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="出生日期" prop="birthDate">
-                  <el-date-picker v-model="form.birthDate" type="date" placeholder="出生日期" style="width:135px;" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="婚姻状况" prop="maritalStatusId">
-                  <el-select v-model="form.maritalStatusId" placeholder="请选择">
-                    <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6" />
-            </el-row>
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="体检类别" prop="medicalTypeId">
-                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable>
-                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="人员类别" prop="personnelTypeId">
-                  <el-select v-model="form.personnelTypeId" placeholder="请选择" filterable>
-                    <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="工卡号" prop="jobCardNo">
-                  <el-input v-model="form.jobCardNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="体检卡号" prop="medicalCardNo">
-                  <el-input v-model="form.medicalCardNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="职务" prop="jobPost">
-                  <el-input v-model="form.jobPost"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="职称" prop="jobTitle">
-                  <el-input v-model="form.jobTitle"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮箱" prop="email">
-                  <el-input v-model="form.email"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="身份证号" prop="idNo">
-                  <el-input v-model="form.idNo" @blur="query(form.idNo)"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="地址" prop="address">
-                  <el-input v-model="form.address"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮政编码" prop="postalCode">
-                  <el-input v-model="form.postalCode"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="电话" prop="telephone">
-                  <el-input v-model="form.telephone"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="手机号" prop="mobileTelephone">
-                  <el-input v-model="form.mobileTelephone"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="民族" prop="nationId">              
-                  <el-select v-model="form.nationId" placeholder="请选择" filterable>
-                    <el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="介绍人" prop="salesman">
-                  <el-input v-model="form.salesman"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="性激素期" prop="sexHormoneTermId">
-                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="是否VIP" prop="isVip">
-                  <el-radio v-model="form.isVip" label="Y">是</el-radio>
-                  <el-radio v-model="form.isVip" label="N">否</el-radio>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
+    <div style="width: 60%">
+      <div style="display: flex">
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="80px"
+          :rules="rules"
+          size="medium"
+        >
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="单位名称" prop="customerOrgId">
+                <el-cascader
+                  v-model="form.customerOrgId"
+                  :options="patientRegister.customerOrgTreeAll"
+                  :props="{
+                    checkStrictly: true,
+                    expandTrigger: 'hover',
+                    ...customerOrg.treeprops,
+                  }"
+                  :show-all-levels="false"
+                  disabled
+                >
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="条码号" prop="patientRegisterNo">
+                <el-input v-model="form.patientRegisterNo" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="档案号" prop="patientNo">
+                <el-input v-model="form.patientNo" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" />
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="姓名" prop="patientName">
+                <el-input
+                  v-model="form.patientName"
+                  @blur="query(form.patientName)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="性别" prop="sexId">
+                <el-select v-model="form.sexId" placeholder="请选择">
+                  <el-option
+                    v-for="item in dict.sex"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="体检次数" prop="medicalTimes">
+                <el-input v-model="form.medicalTimes" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" />
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="年龄" prop="age">
+                <el-input v-model="form.age"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出生日期" prop="birthDate">
+                <el-date-picker
+                  v-model="form.birthDate"
+                  type="date"
+                  placeholder="出生日期"
+                  style="width: 135px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="婚姻状况" prop="maritalStatusId">
+                <el-select v-model="form.maritalStatusId" placeholder="请选择">
+                  <el-option
+                    v-for="item in dict.maritalStatus"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" />
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="体检类别" prop="medicalTypeId">
+                <el-select
+                  v-model="form.medicalTypeId"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in dict.medicalType"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="人员类别" prop="personnelTypeId">
+                <el-select
+                  v-model="form.personnelTypeId"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in dict.personnelType"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="工卡号" prop="jobCardNo">
+                <el-input v-model="form.jobCardNo"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="体检卡号" prop="medicalCardNo">
+                <el-input v-model="form.medicalCardNo"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="职务" prop="jobPost">
+                <el-input v-model="form.jobPost"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="职称" prop="jobTitle">
+                <el-input v-model="form.jobTitle"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮箱" prop="email">
+                <el-input v-model="form.email"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="身份证号" prop="idNo">
+                <el-input
+                  v-model="form.idNo"
+                  @blur="query(form.idNo)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="地址" prop="address">
+                <el-input v-model="form.address"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮政编码" prop="postalCode">
+                <el-input v-model="form.postalCode"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电话" prop="telephone">
+                <el-input v-model="form.telephone"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="手机号" prop="mobileTelephone">
+                <el-input v-model="form.mobileTelephone"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="民族" prop="nationId">
+                <el-select
+                  v-model="form.nationId"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in dict.nation"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="介绍人" prop="salesman">
+                <el-input v-model="form.salesman"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="性激素期" prop="sexHormoneTermId">
+                <el-select
+                  v-model="form.sexHormoneTermId"
+                  placeholder="请选择"
+                  filterable
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.sexHormoneTerm"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否VIP" prop="isVip">
+                <el-radio v-model="form.isVip" label="Y">是</el-radio>
+                <el-radio v-model="form.isVip" label="N">否</el-radio>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="电话随访" prop="isPhoneFollow">
+                <el-radio v-model="form.isPhoneFollow" label="Y">是</el-radio>
+                <el-radio v-model="form.isPhoneFollow" label="N">否</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="隐藏姓名" prop="isNameHide">
+                <el-radio v-model="form.isNameHide" label="Y">是</el-radio>
+                <el-radio v-model="form.isNameHide" label="N">否</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否锁住" prop="isLock">
+                <el-radio v-model="form.isLock" label="Y">是</el-radio>
+                <el-radio v-model="form.isLock" label="N">否</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="体检开始" prop="isMedicalStart">
+                <el-radio v-model="form.isMedicalStart" label="Y" disabled
+                  >是</el-radio
+                >
+                <el-radio v-model="form.isMedicalStart" label="N" disabled
+                  >否</el-radio
+                >
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="体检中心" prop="organizationUnitId">
+                <el-select
+                  v-model="form.organizationUnitId"
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in dict.organization"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="分组" prop="customerOrgGroupId">
+                <el-select
+                  v-model="form.customerOrgGroupId"
+                  placeholder="请选择"
+                  filterable
+                  clearable
+                  :disabled="
+                    form.customerOrgId === dict.personOrgId ? true : false
+                  "
+                >
+                  <el-option
+                    v-for="item in patientRegister.customerOrgGroup"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="套餐" prop="medicalPackageId">
+                <el-select
+                  v-model="form.medicalPackageId"
+                  placeholder="请选择"
+                  filterable
+                  clearable
+                  :disabled="
+                    form.customerOrgId === dict.personOrgId ? false : true
+                  "
+                >
+                  <el-option
+                    v-for="item in dict.medicalPackage"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="完成标志" prop="completeFlag">
+                <el-select
+                  v-model="form.completeFlag"
+                  placeholder="请选择"
+                  disabled
+                >
+                  <el-option
+                    v-for="item in dict.completeFlag"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  type="textarea"
+                  :rows="2"
+                  placeholder="请输入内容"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="创建者">
+                <el-input v-model="form.creatorId" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-input
+                  :value="
+                    form.creationTime
+                      ? lmoment(form.creationTime, 'yyyy-MM-DD')
+                      : ''
+                  "
+                  disabled
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="修改者">
+                <el-input v-model="form.lastModifierId" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="修改时间">
+                <el-input
+                  :value="
+                    form.lastModificationTime
+                      ? lmoment(form.lastModificationTime, 'yyyy-MM-DD')
+                      : ''
+                  "
+                  disabled
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-image
+          class="photo"
+          :src="apiurl + '/' + form.photo"
+          style="width: 150; height: 200"
+        >
+          <div slot="placeholder" class="image-slot">
+            加载中<span class="dot">...</span>
+          </div>
+        </el-image>
+      </div>
 
-              <el-col :span="6">
-                <el-form-item label="电话随访" prop="isPhoneFollow">
-                  <el-radio v-model="form.isPhoneFollow" label="Y">是</el-radio>
-                  <el-radio v-model="form.isPhoneFollow" label="N">否</el-radio>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="隐藏姓名" prop="isNameHide">
-                  <el-radio v-model="form.isNameHide" label="Y">是</el-radio>
-                  <el-radio v-model="form.isNameHide" label="N">否</el-radio>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="是否锁住" prop="isLock">
-                  <el-radio v-model="form.isLock" label="Y">是</el-radio>
-                  <el-radio v-model="form.isLock" label="N">否</el-radio>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="体检开始" prop="isMedicalStart">
-                  <el-radio v-model="form.isMedicalStart" label="Y" disabled>是</el-radio>
-                  <el-radio v-model="form.isMedicalStart" label="N" disabled>否</el-radio>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="体检中心" prop="organizationUnitId">
-                  <el-select v-model="form.organizationUnitId" placeholder="请选择" filterable>
-                    <el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="分组" prop="customerOrgGroupId">
-                  <el-select v-model="form.customerOrgGroupId" placeholder="请选择" filterable clearable
-                    :disabled="form.customerOrgId === dict.personOrgId ? true : false"
-                    @change="getCustomerOrgGroupAsb">
-                    <el-option v-for="item in patientRegister.customerOrgGroup" :key="item.id" :label="item.displayName"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="套餐" prop="medicalPackageId">
-                  <el-select v-model="form.medicalPackageId" placeholder="请选择" filterable clearable
-                    :disabled="form.customerOrgId === dict.personOrgId ? false : true">
-                    <el-option v-for="item in dict.medicalPackage" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成标志" prop="completeFlag">
-                  <el-select v-model="form.completeFlag" placeholder="请选择" disabled>
-                    <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="备注" prop="remark">
-                  <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入内容"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="创建者">
-                  <el-input v-model="form.creatorId" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="创建时间">
-                  <el-input :value="form.creationTime ? lmoment(form.creationTime, 'yyyy-MM-DD'):''" disabled></el-input>                 
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="修改者">
-                  <el-input v-model="form.lastModifierId" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="修改时间">
-                  <el-input :value="form.lastModificationTime ? lmoment(form.lastModificationTime, 'yyyy-MM-DD'):''" disabled></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <el-image class="photo" :src="apiurl + '/' + form.photo" style="width:150;height:200" >
-            <div slot="placeholder" class="image-slot">
-              加载中<span class="dot">...</span>
-            </div>
-          </el-image>
+      <!-- 按钮区域 -->
+      <div style="margin-left: 10px; display: flex">
+        <div class="btn">
+          <el-button @click="readIdCard">读身份证</el-button>
         </div>
-
-        <!-- 按钮区域 -->
-        <div style="margin-left: 10px;display:flex;">
-          <div class="btn">
-            <el-button @click="readIdCard">读身份证</el-button>
-          </div>
-          <div class="btn">
-            <el-button type="success" @click="Onsubmit('form')">保存</el-button>
-          </div>
-          <div class="btn">
-            <el-button type="primary" @click="openCamera" icon="el-icon-camera">拍照</el-button>
-          </div>
-          <div class="btn">
-            <el-button type="primary" @click="">申请单</el-button>
-          </div>
-          <div class="btn">
-            <el-button type="primary" @click="">打条码</el-button>
-          </div>
-          <div class="btn">
-            <el-button type="primary" @click="">打指引单</el-button>
-          </div>
-          <div class="btn">
-            <el-button type="primary" @click="">复制新增</el-button>
-          </div>
+        <div class="btn">
+          <el-button type="success" @click="Onsubmit('form')">保存</el-button>
+        </div>
+        <div class="btn">
+          <el-button type="primary" @click="openCamera" icon="el-icon-camera"
+            >拍照</el-button
+          >
+        </div>
+        <div class="btn">
+          <el-button type="primary">申请单</el-button>
+        </div>
+        <div class="btn">
+          <el-button type="primary">打条码</el-button>
         </div>
-        
-      </td>
-      <td style="width:40%">
-        <PatientRegisterItem :patientRegisterForm="form" />
-      </td>
-    </table>
+        <div class="btn">
+          <el-button type="primary">打指引单</el-button>
+        </div>
+        <div class="btn">
+          <el-button type="primary">复制新增</el-button>
+        </div>
+      </div>
+    </div>
+    <div style="width: 40%">
+      <PatientRegisterItem />
+    </div>
     <!-- 人员档案列表 -->
-    <el-dialog title="人员档案列表" :visible.sync="dialogVisible" width="800" :append-to-body="true">
-      <el-table :data="patientList" border width="800" height="480" row-key="id" size="small"
-        class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="patientList">
-        <el-table-column type="index" width="30"/>
+    <el-dialog
+      title="人员档案列表"
+      :visible.sync="dialogVisible"
+      width="800"
+      :append-to-body="true"
+    >
+      <el-table
+        :data="patientList"
+        border
+        width="800"
+        height="480"
+        row-key="id"
+        size="small"
+        class="el-table__body-wrapper tbody"
+        highlight-current-row
+        @row-click="rowick"
+        ref="patientList"
+      >
+        <el-table-column type="index" width="30" />
         <el-table-column prop="patientNo" label="档案号" />
         <el-table-column prop="lastTime" label="末次体检" width="100">
           <template slot-scope="scope">
-            <div v-if="scope.row.lastTime">{{ lmoment(scope.row.lastTime, 'yyyy-MM-DD') }}</div>
+            <div v-if="scope.row.lastTime">
+              {{ lmoment(scope.row.lastTime, "yyyy-MM-DD") }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="medicalTimes" label="体检次数" />
         <el-table-column prop="displayName" label="姓名" />
         <el-table-column prop="sexId" label="性别">
           <template slot-scope="scope">
-            <div>{{ ldddw(dict.sex, 'id', scope.row.sexId, 'displayName') }}</div>
+            <div>
+              {{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="maritalStatusId" label="婚姻">
           <template slot-scope="scope">
-            <div>{{ ldddw(dict.maritalStatus, 'id', scope.row.maritalStatusId, 'displayName') }}</div>
+            <div>
+              {{
+                ldddw(
+                  dict.maritalStatus,
+                  "id",
+                  scope.row.maritalStatusId,
+                  "displayName"
+                )
+              }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="birthDate" label="出生日期" width="100">
           <template slot-scope="scope">
-            <div v-if="scope.row.birthDate">{{ lmoment(scope.row.birthDate, 'yyyy-MM-DD') }}</div>
+            <div v-if="scope.row.birthDate">
+              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="nationId" label="民族">
           <template slot-scope="scope">
-            <div>{{ ldddw(dict.nation, 'id', scope.row.nationId, 'displayName') }}</div>
+            <div>
+              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="idNo" label="身份证号" />
@@ -333,20 +502,27 @@
       </span>
     </el-dialog>
     <!-- 拍照 -->
-    <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="800" :show-close="false" :append-to-body="true">
-      <Camera :id="form.id"/>
+    <el-dialog
+      title="拍照"
+      :visible.sync="patientRegister.cameraVisble"
+      width="400"
+      height="800"
+      :show-close="false"
+      :append-to-body="true"
+    >
+      <Camera :id="form.id" />
     </el-dialog>
   </div>
 </template>
-<script>
-
-import moment from 'moment';
-import { mapState } from 'vuex'
+<script >
+import moment from "moment";
+import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import mm from '../../utlis/mm'
-import { objCopy,setNull,dddw } from '../../utlis/proFunc'
-import Camera from './Camera.vue'
-import PatientRegisterItem from './PatientRegisterItem.vue'
+import * as apiurl from "../../utlis/mm";
+
+import { objCopy, setNull, dddw } from "../../utlis/proFunc";
+import Camera from "./Camera.vue";
+import PatientRegisterItem from "./PatientRegisterItem.vue";
 export default {
   components: {
     Camera,
@@ -354,61 +530,62 @@ export default {
   },
   data() {
     return {
-      apiurl:mm.apiurl,
+      apiurl,
       form: {
-        id: '', //id
-        patientId: '00000000-0000-0000-0000-000000000000', //档案号ID 选择了档案就传档案号，未选就传00000-0000...
-        patientNo:'',//档案号
+        id: "", //id
+        patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
+        patientNo: "", //档案号
         customerOrgId: null, //单位编号
         customerOrgGroupId: null, //分组
-        medicalPackageId: null,//套餐
-        patientName: '', //姓名
-        birthDate: '',  //字符串 如：2012-01-29
-        sexId: 'U',     //性别 默认未知U
-        age: null,      //年龄
-        jobCardNo: '',   //工卡号
-        medicalCardNo: '', //体检卡号
-        maritalStatusId: 'U', //婚姻状况 默认未知
-        medicalTypeId: null,   //体检类别
-        personnelTypeId: null,  //人员类别
-        jobPost: '', //职务
-        jobTitle: '', //职称
-        photo: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg', //照片
-        salesman: '', //介绍人
+        medicalPackageId: null, //套餐
+        patientName: "", //姓名
+        birthDate: "", //字符串 如：2012-01-29
+        sexId: "U", //性别 默认未知U
+        age: null, //年龄
+        jobCardNo: "", //工卡号
+        medicalCardNo: "", //体检卡号
+        maritalStatusId: "U", //婚姻状况 默认未知
+        medicalTypeId: null, //体检类别
+        personnelTypeId: null, //人员类别
+        jobPost: "", //职务
+        jobTitle: "", //职称
+        photo:
+          "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //照片
+        salesman: "", //介绍人
         sexHormoneTermId: null, //性激素期限
-        isNameHide: 'N', //隐藏姓名
-        isPhoneFollow: 'N', //电话随访
-        isVip: 'N',  //vip客户
-        remark: '',  //
-        isLock: 'N', //是否锁住
-        completeFlag: '1', //完成标志 0:预登记，1：未检，2：部份已检，3：已总检  【创建编辑时不操作】
-        isMedicalStart: 'N', //体检开始标志 【创建编辑时不操作】
-        patientRegisterNo: '', //条码号 【创建编辑时不操作】
+        isNameHide: "N", //隐藏姓名
+        isPhoneFollow: "N", //电话随访
+        isVip: "N", //vip客户
+        remark: "", //
+        isLock: "N", //是否锁住
+        completeFlag: "1", //完成标志 0:预登记，1：未检，2：部份已检，3：已总检  【创建编辑时不操作】
+        isMedicalStart: "N", //体检开始标志 【创建编辑时不操作】
+        patientRegisterNo: "", //条码号 【创建编辑时不操作】
         medicalTimes: 1, //条码号 【创建编辑时不操作】
         organizationUnitId: null, //体检中心
-        address:'', //地址
-        email:'', //email
-        idNo:'', //身份证号
-        telephone:'', //电话
-        mobileTelephone:'', //手机号
-        nationId:null, //民族编号
-        postalCode:'', //邮编
-        creatorId:null,
-        creationTime:'',
-        lastModificationTime:'',
-        lastModifierId:null,
-      },     //单位 记录 目前新增与更新是一致 
+        address: "", //地址
+        email: "", //email
+        idNo: "", //身份证号
+        telephone: "", //电话
+        mobileTelephone: "", //手机号
+        nationId: null, //民族编号
+        postalCode: "", //邮编
+        creatorId: null,
+        creationTime: "",
+        lastModificationTime: "",
+        lastModifierId: null,
+      }, //单位 记录 目前新增与更新是一致
 
-      defaultNull:[
-        'customerOrgId',
-        'customerOrgGroupId',
-        'medicalPackageId',
-        'age',
-        'medicalTypeId',
-        'personnelTypeId',
-        'sexHormoneTermId',
-        'organizationUnitId',
-        'nationId',
+      defaultNull: [
+        "customerOrgId",
+        "customerOrgGroupId",
+        "medicalPackageId",
+        "age",
+        "medicalTypeId",
+        "personnelTypeId",
+        "sexHormoneTermId",
+        "organizationUnitId",
+        "nationId",
       ], //一般uuid字段为空时，需设置为null值
 
       rules: {
@@ -420,88 +597,82 @@ export default {
         ],
       },
 
-      dialogVisible:false,
-      patientList:[],//人员列表（用于判断人员多次体检）
-      patientChoosed:{}, //查重选中的人员
+      dialogVisible: false,
+      patientList: [], //人员列表（用于判断人员多次体检）
+      patientChoosed: {}, //查重选中的人员
 
-      dialogCamera:false, //拍照组件
+      dialogCamera: false, //拍照组件
     };
   },
 
-  created() {
-
-  },
+  created() {},
 
   //挂载完成
   mounted() {
     //表单赋值
     //console.log('mounted this.patientRegister.patientRegisterRd',this.patientRegister.patientRegisterRd)
-    objCopy(this.patientRegister.patientRegisterRd, this.form)
-    console.log('mounted this.form',this.form)
+    objCopy(this.patientRegister.patientRegisterRd, this.form);
+    console.log("mounted this.form", this.form);
   },
 
   computed: {
-    ...mapState(['dict', 'patientRegister', 'customerOrg']),
+    ...mapState(["dict", "patientRegister", "customerOrg"]),
   },
   methods: {
-
     readIdCard() {
-      console.log('this.form1', this.form)
+      console.log("this.form1", this.form);
     },
 
     //根据姓名，身份证号 查询档案信息，用于判断人员多次体检
-    query(param){
+    query(param) {
       //编辑的时候不查重
-      if(this.form.id || !param) return
-      
+      if (this.form.id || !param) return;
+
       //console.log(param)
-      getapi(`/api/app/patient/in-filter?Filter=${param}`)
-        .then(
-          (res) => {                
-            if(res.code == 1){
-              console.log('查重 ',res)  //有数据才显示
-              if(res.data.items && res.data.items.length > 0){
-                this.patientList = res.data.items
-                this.dialogVisible = true
-              }                        
-            }
+      getapi(`/api/app/patient/in-filter?Filter=${param}`).then((res) => {
+        if (res.code == 1) {
+          console.log("查重 ", res); //有数据才显示
+          if (res.data.items && res.data.items.length > 0) {
+            this.patientList = res.data.items;
+            this.dialogVisible = true;
           }
-        )
+        }
+      });
     },
-    
+
     //列表选中
-    rowick(row){
-      this.patientChoosed = row
+    rowick(row) {
+      this.patientChoosed = row;
     },
 
     //确定选择人员
-    choosePatient(){
-      if(!this.patientChoosed){
-        alert("请选中人员档案信息")
-        return
+    choosePatient() {
+      if (!this.patientChoosed) {
+        alert("请选中人员档案信息");
+        return;
       }
-      
-      this.dialogVisible = false
 
-      this.form.patientId = this.patientChoosed.id
-      this.form.patientName = this.patientChoosed.displayName
-      this.form.sexId = this.patientChoosed.sexId
-      this.form.maritalStatusId = this.patientChoosed.maritalStatusId
-      this.form.birthDate = this.patientChoosed.birthDate
-      this.form.nationId = this.patientChoosed.nationId
-      this.form.idNo = this.patientChoosed.idNo
-      this.form.telephone = this.patientChoosed.telephone
-      this.form.mobileTelephone = this.patientChoosed.mobileTelephone
-      this.form.patientNo = this.patientChoosed.patientNo
-      this.form.medicalTimes = this.patientChoosed.medicalTimes + 1
+      this.dialogVisible = false;
+
+      this.form.patientId = this.patientChoosed.id;
+      this.form.patientName = this.patientChoosed.displayName;
+      this.form.sexId = this.patientChoosed.sexId;
+      this.form.maritalStatusId = this.patientChoosed.maritalStatusId;
+      this.form.birthDate = this.patientChoosed.birthDate;
+      this.form.nationId = this.patientChoosed.nationId;
+      this.form.idNo = this.patientChoosed.idNo;
+      this.form.telephone = this.patientChoosed.telephone;
+      this.form.mobileTelephone = this.patientChoosed.mobileTelephone;
+      this.form.patientNo = this.patientChoosed.patientNo;
+      this.form.medicalTimes = this.patientChoosed.medicalTimes + 1;
     },
 
     ldddw(arrayData, key, value, display) {
-      return dddw(arrayData, key, value, display)
+      return dddw(arrayData, key, value, display);
     },
 
     lmoment(date, forMat) {
-      return moment(new Date(date)).format(forMat)
+      return moment(new Date(date)).format(forMat);
     },
 
     //提交
@@ -509,63 +680,63 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           //赋值
-          let body = {...this.form}
+          let body = { ...this.form };
 
-          delete body.id
-          delete body.patientRegisterNo
-          delete body.medicalTimes
-          delete body.completeFlag
-          delete body.isMedicalStart
-          delete body.patientNo
-          delete body.creatorId
-          delete body.creationTime
-          delete body.lastModificationTime
-          delete body.lastModifierId
+          delete body.id;
+          delete body.patientRegisterNo;
+          delete body.medicalTimes;
+          delete body.completeFlag;
+          delete body.isMedicalStart;
+          delete body.patientNo;
+          delete body.creatorId;
+          delete body.creationTime;
+          delete body.lastModificationTime;
+          delete body.lastModifierId;
+
+          setNull(body, this.defaultNull);
 
-          setNull(body,this.defaultNull)
-          
           //日期转换
-          console.log('body.birthDate',body.birthDate)
-          if(body.birthDate){
-            body.birthDate = moment(new Date(body.birthDate)).format('yyyy-MM-DD')
+          console.log("body.birthDate", body.birthDate);
+          if (body.birthDate) {
+            body.birthDate = moment(new Date(body.birthDate)).format(
+              "yyyy-MM-DD"
+            );
           }
-          
-          console.log('this.form.id',this.form.id)
-          console.log('body',body)
+
+          console.log("this.form.id", this.form.id);
+          console.log("body", body);
           if (this.form.id.length < 1) {
             //id为空则新增
-            postapi(`/api/app/patient-register/return-info`, body)
-            .then(
-              (res) => {                
-                if(res.code == 1){
+            postapi(`/api/app/patient-register/return-info`, body).then(
+              (res) => {
+                if (res.code == 1) {
                   //console.log('res',res)
                   this.$message.success("创健 操作成功");
-                  objCopy(res.data,this.form)              
-                  this.patientRegister.patientRegisterId = res.data.id                  
-                  this.patientRegister.patientRegisterId = res.data.id
-                  this.patientRegister.patientRegisterRd = res.data
-                  this.patientRegister.query.times++
+                  objCopy(res.data, this.form);
+                  this.patientRegister.patientRegisterId = res.data.id;
+                  this.patientRegister.patientRegisterId = res.data.id;
+                  this.patientRegister.patientRegisterRd = res.data;
+                  this.patientRegister.query.times++;
                 }
               }
-            )            
-
+            );
           } else {
-            //id不为空则编辑 
-            putapi(`/api/app/patient-register?PatientRegisterId=${this.form.id}`, body).then(
-              (res) => {
-                if(res.code == 1){
-                  this.$message.success("更新 操作成功");
-                  this.patientRegister.query.times++
-                }
+            //id不为空则编辑
+            putapi(
+              `/api/app/patient-register?PatientRegisterId=${this.form.id}`,
+              body
+            ).then((res) => {
+              if (res.code == 1) {
+                this.$message.success("更新 操作成功");
+                this.patientRegister.query.times++;
               }
-            );
+            });
           }
         } else {
-          alert('未通过数据校验');
+          alert("未通过数据校验");
           return false;
         }
-      })
-
+      });
     },
 
     //新增弹框
@@ -575,78 +746,53 @@ export default {
 
     //删除
     del() {
-      deletapi(`/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`).then(
-        (res) => {
-          this.$message.success("删除 操作成功");
-          this.setData({ key: 'customerOrg.customerOrgRd', value: { id: '' } })
-          this.getCustomerOrgTree()
-        }
-      );
+      deletapi(
+        `/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`
+      ).then((res) => {
+        this.$message.success("删除 操作成功");
+        this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } });
+        this.getCustomerOrgTree();
+      });
     },
 
     //拍照
-    openCamera(){
-      if(!this.form.id){
-        alert("请先保存人员信息")
-        return
+    openCamera() {
+      if (!this.form.id) {
+        alert("请先保存人员信息");
+        return;
       }
-      this.patientRegister.cameraVisble = true      
-    },
-
-    //获取分组所包含的组合项目
-    getCustomerOrgGroupAsb(v){
-      console.log('getCustomerOrgGroupAsb',v);
-      getapi(`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${v}`)
-        .then((res) => {
-          console.log('getCustomerOrgGroupAsb',res);
-          if(res.code == 1){
-            this.patientRegister.customerOrgGroupAsb = res.data
-          }
-        })
-    },
-
-    //获取套餐所包含的组合项目
-    getMedicalPackageAsb(v){
-      console.log('getMedicalPackageAsb')
-      getapi(`/api/app/medical-package-detail/medical-package-in-asbitem?MedicalPackageId=${v}`)
-        .then((res) => {
-          console.log('medicalPackageAsb',res);
-          if(res.code == 1){
-            this.patientRegister.medicalPackageAsb = res.data
-          }
-        })
+      this.patientRegister.cameraVisble = true;
     },
 
   },
 
- 
   //监听事件
   watch: {
     //新增触发
-    'patientRegister.addTimes'(newVal, oldVal) {
+    "patientRegister.addTimes"(newVal, oldVal) {
       //console.log('patientRegister.addTimes newVal：',newVal,' oldVal：',oldVal)
       if (newVal != oldVal) {
         //console.log('this.patientRegister.patientRegisterRdInit',this.patientRegister.patientRegisterRdInit)
-        objCopy(this.patientRegister.patientRegisterRdInit, this.form)
+        objCopy(this.patientRegister.patientRegisterRdInit, this.form);
         //console.log('this.form',this.form)
       }
     },
-    
+
     //编辑触发
-    'patientRegister.patientRegisterRd.id'(newVal, oldVal) {
+    "patientRegister.patientRegisterRd.id"(newVal, oldVal) {
       //console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)
-      if (newVal != oldVal) { 
-        //console.log('newVal：',this.patientRegister.patientRegisterRd)       
-        objCopy(this.patientRegister.patientRegisterRd, this.form)
+      if (newVal != oldVal) {
+        //console.log('newVal：',this.patientRegister.patientRegisterRd)
+        objCopy(this.patientRegister.patientRegisterRd, this.form);
       }
     },
 
     //拍照触发
-    'patientRegister.photo'(newVal, oldVal) {
+    "patientRegister.photo"(newVal, oldVal) {
       //console.log('patientRegister.patientRegisterRd.id newVal：',newVal,' oldVal：',oldVal)
-      if (newVal != oldVal) { 
-        //console.log('newVal：',newVal)       
-        this.form.photo = newVal
+      if (newVal != oldVal) {
+        //console.log('newVal：',newVal)
+        this.form.photo = newVal;
       }
     },
   },
@@ -663,4 +809,5 @@ export default {
   right: 41%;
   width: 150px;
   height: 180px;
-}</style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index b3de302..2227f6c 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -144,16 +144,16 @@
           <el-button type="primary" @click="openCamera" icon="el-icon-camera">拍照</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="">健康档案</el-button>
+          <el-button type="primary" >健康档案</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="">调整分组</el-button>
+          <el-button type="primary" >调整分组</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="">调整项目</el-button>
+          <el-button type="primary" >调整项目</el-button>
         </div>
         <div class="listBtn">
-          <el-button type="primary" @click="">打指引单</el-button>
+          <el-button type="primary" >打指引单</el-button>
         </div>
       </div>
     </div>
diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue
index c9891af..1b4e6b5 100644
--- a/src/components/unitGrouping/unitGroupCategory.vue
+++ b/src/components/unitGrouping/unitGroupCategory.vue
@@ -72,10 +72,10 @@
 
           <el-table-column label="价格" prop="price">
             <template slot-scope="scope">
-              <input
+              <el-input
                 type="text"
                 v-model="scope.row.price"
-                @blur="inputchang(scope.row)"
+                @change="inputchang(scope.row, $event.target.value)"
               />
             </template>
           </el-table-column>
@@ -174,9 +174,11 @@ export default {
     this.getportfolioitems();
   },
   methods: {
-    inputchang(v) {
-      this.price = v.price;
-      console.log(this.price);
+    inputchang(row, newVal) {
+      console.log(row);
+      console.log(newVal);
+      // this.price = v.price;
+      // console.log(this.price);
     },
     //保存按钮
     Onsubmit() {
@@ -218,20 +220,22 @@ export default {
           let count = this.rightselctedata.length - 1;
           for (var i = count; i >= 0; i--) {
             // this.personnelUnit.nogroupselected.splice(i, 1);
-            if (
-              // !this.rightselctedata.includes(this.rightselctedata[i].displayName)
-              [...new Set(this.rightselctedata)]
-            ) {
-              this.tabledata.push(this.rightselctedata[i]);
-              this.personnelUnit.nogroupselected.splice(i, 1);
-            }
+
+            // !this.rightselctedata.includes(this.rightselctedata[i].displayName)
+            [...new Set(this.rightselctedata)];
+
+            this.tabledata.push(this.rightselctedata[i]);
+            this.personnelUnit.nogroupselected.splice(i, 1);
+
             // this.tabledata.push(this.rightselctedata[i]);
           }
           // this.
           this.rightselctedata.forEach((item) => {
+            console.log(this.personnelUnit.customerOrgGroupId);
             this.addrulst.push({
               asbitemId: item.id,
               price: item.price,
+              // price: this.price,
               customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
             });
           });
@@ -254,21 +258,21 @@ export default {
         } else {
           this.saveornot = false;
           let count = this.unselecteddata.length - 1;
+          let uniqueSet = [...new Set(this.unselecteddata, ...this.tabledata)];
+          const filteredArray = [];
           for (var i = count; i >= 0; i--) {
             // this.tabledata.splice(i, 1);
+            this.unselecteddata.push(this.unselecteddata[i]);
+            this.tabledata.splice(i, 1);
             // this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
-            if ([...new Set(this.unselecteddata)]) {
-              this.tabledata.splice(i, 1);
-              this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
-            }
           }
-          console.log(this.price);
+          console.log(this.personnelUnit.customerOrgGroupId);
           this.unselecteddata.forEach((item) => {
-           this.price=item.price
+            this.price = item.price;
             this.addrulst.push({
               asbitemId: item.id,
               price: item.price,
-              // price: this.price,
+              // price: this.psrice,
               customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
             });
           });
@@ -348,7 +352,7 @@ export default {
       getapi(
         `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem?CustomerOrgGroupId=${this.personnelUnit.form.id}`
       ).then((res) => {
-        console.log(res);
+        console.log(res, "res");
         this.personnelUnit.nogroupselected = res.data;
       });
     },
diff --git a/src/components/unitGrouping/unitGroupingTable.vue b/src/components/unitGrouping/unitGroupingTable.vue
index e619369..cecd09f 100644
--- a/src/components/unitGrouping/unitGroupingTable.vue
+++ b/src/components/unitGrouping/unitGroupingTable.vue
@@ -271,7 +271,7 @@ export default {
     },
     //点击当前列
     clickoncolumn(row) {
-      this.personnelUnit.customerOrgGroupId = row.id;
+      this.personnelUnit.customerOrgGroupId = row.id;  
       getapi(`/api/app/customer-org-group/${row.id}`).then((res) => {
         this.form = res.data;
         this.personnelUnit.form = res.data;
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index 5b31036..610a922 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -292,6 +292,7 @@
         </el-select>
         <span style="margin-left: 10%; padding: 5px">搜索选择</span>
         <el-select
+          @change="selectitem"
           filterable
           v-model="flitvalues"
           placeholder="请选择"
@@ -596,6 +597,7 @@ export default {
       rightdata: [],
       rightobj: {},
       nums: 0,
+      itemid: "", //项目id
     };
   },
   created() {
@@ -604,24 +606,36 @@ export default {
   },
   mounted() {
     this.rowDrop();
+    this.gitfleslist();
   },
   methods: {
+    gitfleslist() {
+      getapi("/api/app/item").then((res) => {
+        this.filetelists = res.data.items;
+        console.log(res, "我是项目");
+      });
+    },
+    //搜索选择
+    selectitem(v) {
+      this.itemid = v;
+    },
     Onsubmit() {
       let sampleGroupId = this.form.id;
-      console.log(sampleGroupId);   
+      console.log(sampleGroupId);
       let sdate = [];
-      console.log(this.rightdata,'2222');
-      this.rightdata.forEach((element) => {
-        console.log('项目元素id',element.id);
-        console.log('组合项目id',sampleGroupId);    
-        let sss = { itemId: element.id, asbitemId: sampleGroupId };
-        sdate.push(sss);
-      });
+      console.log(this.rightdata, "2222");
+      let sss = { itemId: this.itemid, asbitemId: sampleGroupId };
+      sdate.push(sss)
+      // this.rightdata.forEach((element) => {
+      //   console.log('项目元素id',element.id);
+      //   console.log('组合项目id',sampleGroupId);
+      //   sdate.push(sss);
+      // });
       // this.leftdata.forEach((element) => {
       //   let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
       //   sdate.push(sss);
       // });
-      console.log(sdate);
+      // console.log(sdate);
       if (sampleGroupId == undefined) {
         this.$message.warning("请选择列表");
       } else {
@@ -650,6 +664,7 @@ export default {
       if (this.leftdata.length > 0) {
         this.leftdata.splice(this.num, 1);
         this.rightdata.push(this.rightobj);
+        this.isdislob = false;
       }
     },
     //右移动
@@ -820,7 +835,6 @@ export default {
         //项目类别
         projectlist().then((res) => {
           this.itemTypeId = res.data.items;
-         
         });
         //仪器类别
         instrumentlist().then((res) => {
@@ -898,18 +912,16 @@ export default {
     addll() {
       this.dialogVisible = true;
       this.title = 1;
-    
+
       //性别
       examinationgender().then((res) => {
-           console.log(res);
+        console.log(res);
         this.forSexId = res.data;
-         console.log(this.forSexId);
+        console.log(this.forSexId);
       });
       //项目类别
       projectlist().then((res) => {
-     
         this.itemTypeId = res.data;
-        
       });
       //仪器类别
       instrumentlist().then((res) => {
@@ -923,12 +935,12 @@ export default {
     rowick(row) {
       asbitemgetid(row.id).then((res) => {
         this.form = res.data;
-       
       });
       getapi(
         `/api/app/asbitem-detail/asbitem-detail-in-item?AsbitemId=${row.id}`
       ).then((res) => {
-        console.log(res,'右侧');
+        this.rightdata = res.data;
+        console.log(res, "右侧");
         let dq = res.data;
         if (dq.length > 0) {
           this.rightdata = [];
diff --git a/src/views/fee-settings/MedicalPackage.vue b/src/views/fee-settings/MedicalPackage.vue
index 37e5f7b..dcf7f38 100644
--- a/src/views/fee-settings/MedicalPackage.vue
+++ b/src/views/fee-settings/MedicalPackage.vue
@@ -379,7 +379,7 @@ export default {
       console.log(this.rightdata);
       let sdate = [];
       this.rightdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
+        let sss = { medicalPackageId: sampleGroupId, asbitemId: element.id };
         sdate.push(sss);
       });
       this.leftdata.forEach((element) => {
@@ -427,6 +427,7 @@ export default {
     //左侧添加按钮
     addobj() {
       if (this.leftdata.length > 0) {
+        this.isdislob = false;
         this.leftdata.splice(this.num, 1);
         this.rightdata.push(this.rightobj);
       }
@@ -632,7 +633,9 @@ export default {
         `/api/app/medical-package-detail/medical-package-in-asbitem?MedicalPackageId=${val.id}`
       ).then((res) => {
         console.log(res);
+        this.rightdata = res.data;
         let dq = res.data;
+
         if (dq.length > 0) {
           this.rightdata = [];
           dq.forEach((element) => {