diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index 87b7d94..d05df30 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -410,10 +410,7 @@
               </el-upload>-->
               <el-upload
                 :disabled="isDisabled"
-                v-model="formData.contract.file"
                 :headers="{'Token':userStore.token}"
-                class="upload-demo"
-                action="https://worker-task.lihaink.cn/adminapi/upload/file"
                 multiple
                 :limit="1"
               >
@@ -503,7 +500,6 @@ const formData = reactive({
   master_position: "",
   master_phone: "",
   master_email: "",
-
   other_contacts: [
     {
       name: "",
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index b5b8b71..55dc714 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -175,11 +175,11 @@
                 :style="{ width: '100%' }"
                 clearable
               >
+<<<<<<< HEAD
                 <el-option v-if="formData.root == 1" label="系统管理员" :value="0" />
+=======
                 <el-option
-                  v-for="(item, index) in optionsData.role"
-                  :key="index"
-                  :label="item.name"
+                  label="系统管理员"
                   :value="item.id"
                 />
               </el-select>
@@ -417,7 +417,11 @@
         </el-col>
 
         <el-col :span="24" v-if="!isCheck">
+<<<<<<< HEAD
           <el-form-item label="合同上传" prop="field127">
+=======
+          <el-form-item label="上传" prop="field127">
+>>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
             <el-upload
               :headers="{ Token: userStore.token }"
               v-model="formData.file"
@@ -483,8 +487,11 @@ const formData = reactive({
   street: "",
   address: "",
   account: "",
+<<<<<<< HEAD
   is_contract: 0,
   // 签约方
+=======
+>>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
   party_a_name: "",
   qualification: {
     id_card: "",
@@ -497,6 +504,10 @@ const formData = reactive({
   // 合同类型
   contract_type: "",
   file: "",
+<<<<<<< HEAD
+=======
+  is_contract: 0,
+>>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
   role_id: "",
   avatar: "",
   multipoint_login: 1,
@@ -555,8 +566,12 @@ getcontract_type();
 const isCompany = ref(false);
 function customEvent(data: any) {
   isCompany.value = false;
+<<<<<<< HEAD
   //   formData.contract.party_a = data.id
   console.log(data);
+=======
+  // formData.contract.party_a = data.id
+>>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
   formData.party_a_name = data.company_name;
 }
 // 表单验证
@@ -749,6 +764,7 @@ const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
 
 //获取省份
 function province_change(value: string) {
+<<<<<<< HEAD
   getCityList();
 }
 function city_change(value: string) {
@@ -756,6 +772,18 @@ function city_change(value: string) {
 }
 function area_change(value: string) {
   getStreetList();
+=======
+  formData.province = value;
+  getCityList(value);
+}
+function city_change(value: string) {
+  formData.city = value;
+  getAreaList(value);
+}
+function area_change(value: string) {
+  formData.area = value;
+  getStreetList(value);
+>>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
 }
 function street_change(value: string) {
   formData.street = value;
@@ -764,6 +792,7 @@ const getProvinceList = async () => {
   const data = await apiProvinceList({});
   datas["provinceOptions"] = data;
 };
+<<<<<<< HEAD
 const getCityList = async () => {
   const data = await apiCityList({ city: formData.province });
   datas["cityOptions"] = data;
@@ -778,6 +807,20 @@ const getStreetList = async () => {
 };
 getProvinceList();
 
+=======
+const getCityList = async (id: any) => {
+  const data = await apiCityList({ city: id });
+  datas["cityOptions"] = data;
+};
+const getAreaList = async (id: any) => {
+  const data = await apiAreaList({ area: id });
+  datas["areaOptions"] = data;
+};
+const getStreetList = async (id: any) => {
+  const data = await apiStreetList({ street: id });
+  datas["streetOptions"] = data;
+};
+>>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
 const setFormData = async (row: any) => {
   const data = await adminDetail({
     id: row.id,
@@ -789,12 +832,16 @@ const setFormData = async (row: any) => {
       key == "role_id"
         ? (formData[key] = data[key][0])
         : (formData[key] = data[key]);
+<<<<<<< HEAD
       if (stringArr.includes(key)) {
         formData[key] = formData[key].toString();
         getCityList();
         getAreaList();
         getStreetList();
       }
+=======
+      if (stringArr.includes(key)) formData[key] = formData[key].toString();
+>>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
     }
   }
 };
@@ -802,6 +849,11 @@ const setFormData = async (row: any) => {
 const handleClose = () => {
   emit("close");
 };
+<<<<<<< HEAD
+=======
+getProvinceList();
+
+>>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
 defineExpose({
   open,
   setFormData,