diff --git a/.env.development b/.env.development
index 2a54d74..ceb0618 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@ NODE_ENV = 'development'
 
 VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/'
 # VITE_APP_BASE_URL = 'http://www.eng.local/'
-# VITE_APP_BASE_URL = 'http://192.168.1.5:9090/'
\ No newline at end of file
+#VITE_APP_BASE_URL = 'http://192.168.1.8:8526/'
\ No newline at end of file
diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue
index e8c6952..ad74d7f 100644
--- a/src/views/cost_projects/edit.vue
+++ b/src/views/cost_projects/edit.vue
@@ -1,235 +1,233 @@
 <template>
-    <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
-            @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <el-row>
-                    <el-col :span="8">
-                        <el-form-item label="项目编号" prop="project_num">
-                            <el-input v-model="formData.project_num" clearable placeholder="系统自动生成" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目名称" prop="project_name">
-                            <el-input v-model="formData.project_name" clearable placeholder="请输入项目名称" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="关联合同" prop="contract_id">
-                            <el-input v-model="formData.contract_name" clearable placeholder="点击选择项目" readonly
-                                @click="showDialog = true" />
-                        </el-form-item>
-                    </el-col>
-                    <!-- <el-col :span="8">
-                        <el-form-item label="合同类型">
-                            <el-input v-model="formData.contract_type_text" clearable placeholder="系统自动获取" disabled />
-                        </el-form-item>
-                    </el-col> -->
+  <div class="edit-popup">
+    <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
+           @close="handleClose">
+      <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="项目编号" prop="project_num">
+              <el-input v-model="formData.project_num" clearable placeholder="系统自动生成" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目名称" prop="project_name">
+              <el-input v-model="formData.project_name" clearable placeholder="请输入项目名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联合同" prop="contract_id">
+              <el-input v-model="formData.contract_name" clearable placeholder="点击选择项目" readonly
+                        @click="showDialog = true"/>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="8">
+              <el-form-item label="合同类型">
+                  <el-input v-model="formData.contract_type_text" clearable placeholder="系统自动获取" disabled />
+              </el-form-item>
+          </el-col> -->
 
 
-                    <el-col :span="8">
-                        <el-form-item label="咨询类型" prop="types">
-                            <el-select v-model="formData.types" clearable placeholder="请选择业务性质" class="flex-1">
-                                <el-option v-for="(item, index) in dictData.consultation_type" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="行业" prop="industry">
-                            <!-- <el-select v-model="formData.industry" clearable placeholder="请选择行业" class="flex-1" disabled> -->
-                            <el-select v-model="formData.industry" clearable placeholder="请选择行业" class="flex-1">
-                                <el-option v-for="( item, index ) in dictData.cost_consultation_industry_nature"
-                                    :key="index" :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="所在省份" prop="province">
-                            <el-select v-model="formData.province" clearable placeholder="请选择省"
-                                @change="province_change" class="flex-1">
-                                <el-option v-for="(item, index) in datas.provinceOptions" :key="index"
-                                    :label="item.province_name" :value="(item.province_code)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="咨询类型" prop="types">
+              <el-select v-model="formData.types" clearable placeholder="请选择业务性质" class="flex-1">
+                <el-option v-for="(item, index) in dictData.consultation_type" :key="index"
+                           :label="item.name" :value="parseInt(item.value)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="行业" prop="industry">
+              <!-- <el-select v-model="formData.industry" clearable placeholder="请选择行业" class="flex-1" disabled> -->
+              <el-select v-model="formData.industry" clearable placeholder="请选择行业" class="flex-1">
+                <el-option v-for="( item, index ) in dictData.cost_consultation_industry_nature"
+                           :key="index" :label="item.name" :value="parseInt(item.value)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所在省份" prop="province">
+              <el-select v-model="formData.province" clearable placeholder="请选择省"
+                         @change="province_change" class="flex-1">
+                <el-option v-for="(item, index) in datas.provinceOptions" :key="index"
+                           :label="item.province_name" :value="(item.province_code)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="所在市区" prop="city">
-                            <el-select v-model="formData.city" clearable placeholder="请选择市" class="flex-1">
-                                <el-option v-for="(item, index) in datas.cityOptions" :key="index"
-                                    :label="item.city_name" :value="(item.city_code)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="具体地址" prop="address">
-                            <el-input v-model="formData.address" clearable placeholder="请输入具体地址" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="计划开始日期" prop="starting" label-width="120px">
-                            <!-- <el-date-picker class="flex-1 !flex" v-model="formData.starting" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="请选择日期" disabled> -->
-                            <el-date-picker class="flex-1 !flex" v-model="formData.starting" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="所在市区" prop="city">
+              <el-select v-model="formData.city" clearable placeholder="请选择市" class="flex-1">
+                <el-option v-for="(item, index) in datas.cityOptions" :key="index"
+                           :label="item.city_name" :value="(item.city_code)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="具体地址" prop="address">
+              <el-input v-model="formData.address" clearable placeholder="请输入具体地址"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划开始日期" prop="starting" label-width="120px">
+              <!-- <el-date-picker class="flex-1 !flex" v-model="formData.starting" clearable type="date"
+                  value-format="YYYY-MM-DD" placeholder="请选择日期" disabled> -->
+              <el-date-picker class="flex-1 !flex" v-model="formData.starting" clearable type="date"
+                              value-format="YYYY-MM-DD" placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="计划结束日期" prop="endtime" label-width="120px">
-                            <!-- <el-date-picker class="flex-1 !flex" v-model="formData.endtime" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="请选择日期" disabled> -->
-                            <el-date-picker class="flex-1 !flex" v-model="formData.endtime" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="计划工期" prop="jhgq">
-                            <el-input v-model="formData.jhgq" clearable placeholder="请输入计划工期(天)" type="number" />
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划结束日期" prop="endtime" label-width="120px">
+              <!-- <el-date-picker class="flex-1 !flex" v-model="formData.endtime" clearable type="date"
+                  value-format="YYYY-MM-DD" placeholder="请选择日期" disabled> -->
+              <el-date-picker class="flex-1 !flex" v-model="formData.endtime" clearable type="date"
+                              value-format="YYYY-MM-DD" placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划工期" prop="jhgq">
+              <el-input v-model="formData.jhgq" clearable placeholder="请输入计划工期(天)" type="number"/>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="项目所属部门" prop="depar" :rules="[
+          <el-col :span="8">
+            <el-form-item label="项目所属部门" prop="depar" :rules="[
                             { required: true, message: '不可为空', trigger: 'blur' },
                         ]">
-                            <el-select class="flex-1" v-model="formData.depar" clearable placeholder="请选择部门">
-                                <el-option v-for="(item, index) in deptList" :key="index" :label="item.name"
-                                    :value="item.id" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目负责人" prop="principal">
-                            <!-- <el-input v-model="formData.principal" clearable placeholder="请输入项目负责人"
-                                @click="userclick('principal')" disabled /> -->
-                            <el-input v-model="formData.principal_name" clearable placeholder="请输入项目负责人"
-                                @click="userclick('principal')" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目相关人员" prop="person" label-width="120px">
-                            <el-input v-model="formData.person_text" clearable placeholder="请输入项目相关人员"
-                                @click="userclick('person')" />
-                        </el-form-item>
-                    </el-col>
+              <el-select class="flex-1" v-model="formData.depar" clearable placeholder="请选择部门">
+                <el-option v-for="(item, index) in deptList" :key="index" :label="item.name"
+                           :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目负责人" prop="principal">
+              <!-- <el-input v-model="formData.principal" clearable placeholder="请输入项目负责人"
+                  @click="userclick('principal')" disabled /> -->
+              <el-input v-model="formData.principal_name" clearable placeholder="请输入项目负责人"
+                        @click="userclick('principal')"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目相关人员" prop="person" label-width="120px">
+              <el-input v-model="formData.person_text" clearable placeholder="请输入项目相关人员"
+                        @click="userclick('person')"/>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="项目总投资" prop="invest">
-                            <!-- <el-input v-model="formData.invest" clearable placeholder="请输入项目总投资（元）" type="number"
-                                disabled /> -->
-                            <el-input v-model="formData.invest" clearable placeholder="请输入项目总投资（元）" type="number" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="预算造价" prop="budget">
-                            <el-input v-model="formData.budget" clearable placeholder="请输入预算造价（元）" type="number" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="送审造价" prop="cost">
-                            <el-input v-model="formData.cost" clearable placeholder="请输入送审造价（元）" type="number" />
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目总投资" prop="invest">
+              <!-- <el-input v-model="formData.invest" clearable placeholder="请输入项目总投资（元）" type="number"
+                  disabled /> -->
+              <el-input v-model="formData.invest" clearable placeholder="请输入项目总投资（元）" type="number"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预算造价" prop="budget">
+              <el-input v-model="formData.budget" clearable placeholder="请输入预算造价（元）" type="number"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="送审造价" prop="cost">
+              <el-input v-model="formData.cost" clearable placeholder="请输入送审造价（元）" type="number"/>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="审定造价" prop="approval">
-                            <el-input v-model="formData.approval" clearable placeholder="请输入审定造价（元）" type="number" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="委托单位" prop="aunit">
-                            <!-- <el-input v-model="formData.aunit" clearable placeholder="请输入委托单位" disabled /> -->
-                            <el-input v-model="formData.aunit_name" clearable placeholder="请输入委托单位" />
+          <el-col :span="8">
+            <el-form-item label="审定造价" prop="approval">
+              <el-input v-model="formData.approval" clearable placeholder="请输入审定造价（元）" type="number"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托单位" prop="aunit">
+              <!-- <el-input v-model="formData.aunit" clearable placeholder="请输入委托单位" disabled /> -->
+              <el-input v-model="formData.aunit_name" clearable placeholder="请输入委托单位"/>
 
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="委托方联系人" prop="Acontact" label-width="120px">
-                            <!-- <el-input v-model="formData.Acontact" clearable placeholder="请输入委托方联系人" disabled /> -->
-                            <el-input v-model="formData.Acontact" clearable placeholder="请输入委托方联系人" />
-                        </el-form-item>
-                    </el-col>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="委托方联系人" prop="Acontact" label-width="120px">
+              <!-- <el-input v-model="formData.Acontact" clearable placeholder="请输入委托方联系人" disabled /> -->
+              <el-input v-model="formData.Acontact" clearable placeholder="请输入委托方联系人"/>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="联系电话" prop="acontactnum">
-                            <el-input v-model="formData.acontactnum" clearable placeholder="请输入联系电话" type="number" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="登记日期" prop="date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目规模及概括" prop="generalize" label-width="120px">
-                            <!-- <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括" disabled
-                                type="textarea" /> -->
-                            <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括"
-                                type="textarea" />
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系电话" prop="acontactnum">
+              <el-input v-model="formData.acontactnum" clearable placeholder="请输入联系电话" type="number"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="登记日期" prop="date">
+              <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="date"
+                              value-format="YYYY-MM-DD" placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目规模及概括" prop="generalize" label-width="120px">
+              <!-- <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括" disabled
+                  type="textarea" /> -->
+              <el-input v-model="formData.generalize" clearable placeholder="请输入项目规模及概括"
+                        type="textarea"/>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="建设单位" prop="js_unit">
-                            <el-input v-model="formData.js_unit" clearable placeholder="请输入建设单位" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="注意事项" prop="note">
-                            <el-input v-model="formData.note" clearable placeholder="请输入注意事项" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="备注" prop="remark">
-                            <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-col :span="8">
-                    <el-form-item label="附件" prop="annex">
-                        <uploadAnnex :formData="formData"></uploadAnnex>
-                    </el-form-item>
-                </el-col>
-                <el-dialog v-model="showDialog" title="选择合同" width="70%">
-                    <dialogTable :config="cost_approved_projects" @customEvent="customEvent"
-                        :query="{ status: 0, business_nature: 4 }">
-                    </dialogTable>
-                </el-dialog>
-                <div v-if="showDialog1">
-                    <personnelselector ref="personnel" @confirm="submituser" :type="persoleType">
-                    </personnelselector>
-                </div>
-            </el-form>
-        </popup>
-    </div>
+          <el-col :span="8">
+            <el-form-item label="建设单位" prop="js_unit">
+              <el-input v-model="formData.js_unit" clearable placeholder="请输入建设单位"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="注意事项" prop="note">
+              <el-input v-model="formData.note" clearable placeholder="请输入注意事项"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-col :span="8">
+          <el-form-item label="附件" prop="annex">
+            <uploadAnnex :formData="formData"></uploadAnnex>
+          </el-form-item>
+        </el-col>
+        <el-dialog v-model="showDialog" title="选择合同" width="70%">
+          <dialogTable :config="cost_approved_projects" @customEvent="customEvent"
+                       :query="{ status: 0, business_nature: 4 }">
+          </dialogTable>
+        </el-dialog>
+        <div v-if="showDialog1">
+          <personnelselector ref="personnel" @confirm="submituser" :type="persoleType">
+          </personnelselector>
+        </div>
+      </el-form>
+    </popup>
+  </div>
 </template>
 
 <script lang="ts" setup name="costProjectEdit">
-import type { FormInstance } from "element-plus";
+import type {FormInstance} from "element-plus";
 import Popup from "@/components/popup/index.vue";
-import { apiCostProjectAdd, apiCostProjectEdit } from "@/api/cost_project";
-import { apiCostApprovedProjectDetail } from '@/api/cost_approved_project'
-import type { PropType } from "vue";
-import { useRoute } from "vue-router";
-import { cost_approved_projects } from "@/components/dialogTable/dialogTableConfig";
-import { apiCityList, apiProvinceList } from "@/api/common";
-import { checkPhone } from "@/utils/validate"
-
-
+import {apiCostProjectAdd, apiCostProjectEdit} from "@/api/cost_project";
+import {apiCostApprovedProjectDetail} from '@/api/cost_approved_project'
+import type {PropType} from "vue";
+import {useRoute} from "vue-router";
+import {cost_approved_projects} from "@/components/dialogTable/dialogTableConfig";
+import {apiCityList, apiProvinceList} from "@/api/common";
+import {checkPhone} from "@/utils/validate"
 
 
 defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({}),
-    },
-    deptList: Array
+  dictData: {
+    type: Object as PropType<Record<string, any[]>>,
+    default: () => ({}),
+  },
+  deptList: Array
 });
 const emit = defineEmits(["success", "close"]);
 const formRef = shallowRef<FormInstance>();
@@ -243,252 +241,260 @@ const route = useRoute();
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == "edit" ? "编辑造价项目台账" : "新增造价项目台账";
+  return mode.value == "edit" ? "编辑造价项目台账" : "新增造价项目台账";
 });
 
 // 表单数据
 const formData = reactive({
-    id: "",
-    project_num: "",
-    project_name: "",
-    contract_id: "",
-    contract_name: "",
-    contract_type: "",
-    contract_type_text: "",
-    types: "",
-    industry: "",
-    province: "",
-    city: "",
-    org_id: "",
-    js_unit: "",
-    address: "",
-    starting: "",
-    endtime: "",
-    jhgq: "",
-    depar: "",
-    principal: "",
-    principal_name: "",
-    person: "",
-    person_text: "",
-    invest: "",
-    budget: "",
-    cost: "",
-    approval: "",
-    aunit: "",
-    Acontact: "",
-    aunit_name: "",
-    acontactnum: "",
-    date: "",
-    generalize: "",
-    note: "",
-    remark: "",
-    annex: [],
+  id: "",
+  project_num: "",
+  project_name: "",
+  contract_id: "",
+  contract_name: "",
+  contract_type: "",
+  contract_type_text: "",
+  types: "",
+  industry: "",
+  province: "",
+  city: "",
+  org_id: "",
+  js_unit: "",
+  address: "",
+  starting: "",
+  endtime: "",
+  jhgq: "",
+  depar: "",
+  principal: "",
+  principal_name: "",
+  person: "",
+  person_text: "",
+  invest: "",
+  budget: "",
+  cost: "",
+  approval: "",
+  aunit: "",
+  Acontact: "",
+  aunit_name: "",
+  acontactnum: "",
+  date: "",
+  generalize: "",
+  note: "",
+  remark: "",
+  annex: [],
 });
 
 
 const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
+  provinceOptions: [],
+  cityOptions: [],
 });
 
 const customEvent = (e) => {
-    formData.contract_id = e.id;
-    formData.contract_name = e.contract_name;
-    formData.project_name = e.contract_name;
-    formData.depar = e.supervise_dept;
-    formData.industry = e.industry_nature
-    formData.starting = e.start_date
-    formData.endtime = e.end_date
-    formData.principal_name = e.project_director
-    formData.contract_type = e.contract_type
-    formData.contract_type_text = e.contract_type_text
-    formData.invest = e.project_money
-    formData.aunit_name = e.part_a_name
-    formData.aunit = e.part_a
-    formData.generalize = e.project_scale
-    formData.jhgq = e.jhgq
-    formData.address = e.part_a_address
-    formData.Acontact = e.part_a_acontact
-    formData.acontactnum = e.telephone
-    showDialog.value = false;
+
+  formData.project_num = e.contract_code;
+  formData.contract_id = e.id;
+  formData.contract_name = e.contract_name;
+  formData.project_name = e.contract_name;
+  formData.depar = e.supervise_dept;
+  formData.industry = e.industry_nature
+  formData.starting = e.start_date
+  formData.endtime = e.end_date
+  formData.principal_name = e.project_director
+  formData.contract_type = e.contract_type
+  formData.contract_type_text = e.contract_type_text
+  formData.invest = e.project_money
+  formData.aunit_name = e.part_a_name
+  formData.aunit = e.part_a
+  formData.generalize = e.project_scale
+  formData.jhgq = e.jhgq
+  formData.address = e.part_a_address
+  formData.Acontact = e.part_a_acontact
+  formData.acontactnum = e.part_a_acontactnum
+  formData.province = e.province
+  formData.city = e.city
+  formData.principal = e.signed_head
+  showDialog.value = false;
+  if(e.city!=''){
+    getCityList()
+  }
 };
 
 const getProvinceList = async () => {
-    const data = await apiProvinceList({});
-    datas["provinceOptions"] = data;
+  const data = await apiProvinceList({});
+  datas["provinceOptions"] = data;
 };
 const getCityList = async () => {
-    const data = await apiCityList({ province_code: formData.province });
-    datas["cityOptions"] = data;
+  const data = await apiCityList({province_code: formData.province});
+  datas["cityOptions"] = data;
 };
 
 //获取省份
 function province_change(value: string) {
-    getCityList();
+  getCityList();
 }
 
 
 const chekcDate = (rule: any, value: any, callback: any) => {
-    if (new Date(formData.date) < new Date(formData.starting)) {
-        callback(new Error('登记日期不能早于计划开始日期'))
-    } else {
-        callback()
-    }
+  if (new Date(formData.date) < new Date(formData.starting)) {
+    callback(new Error('登记日期不能早于计划开始日期'))
+  } else {
+    callback()
+  }
 }
 
 // 表单验证
 const formRules = reactive<any>({
-    project_name: [
-        {
-            required: true,
-            message: "请输入项目名称",
-            trigger: ["blur"],
-        },
-    ],
-    contract_id: [
-        {
-            required: true,
-            message: "请输入关联合同",
-            trigger: ["blur"],
-        },
-    ],
-    starting: [
-        {
-            required: true,
-            message: "请输入计划开始日期",
-            trigger: ["blur"],
-        },
-    ],
-    endtime: [
-        {
-            required: true,
-            message: "请输入计划结束日期",
-            trigger: ["blur"],
-        },
-    ],
-    date: [{
-        required: true,
-        message: '请输入登记日期',
-        trigger: ['blur']
+  project_name: [
+    {
+      required: true,
+      message: "请输入项目名称",
+      trigger: ["blur"],
+    },
+  ],
+  contract_id: [
+    {
+      required: true,
+      message: "请输入关联合同",
+      trigger: ["blur"],
+    },
+  ],
+  starting: [
+    {
+      required: true,
+      message: "请输入计划开始日期",
+      trigger: ["blur"],
+    },
+  ],
+  endtime: [
+    {
+      required: true,
+      message: "请输入计划结束日期",
+      trigger: ["blur"],
+    },
+  ],
+  date: [{
+    required: true,
+    message: '请输入登记日期',
+    trigger: ['blur']
+  },
+    {
+      validator: chekcDate,
+      trigger: ['blur']
+    }],
+  jhgq: [
+    {
+      required: true,
+      message: "请输入计划工期（天）",
+      trigger: ["blur"],
+    },
+  ],
+  principal: [
+    {
+      required: true,
+      message: "请输入项目负责人",
+      trigger: ["blur"],
+    },
+  ],
+  acontactnum: [
+    {
+      required: true,
+      message: "请输入联系电话",
+      trigger: ["blur"],
     },
     {
-        validator: chekcDate,
-        trigger: ['blur']
-    }],
-    jhgq: [
-        {
-            required: true,
-            message: "请输入计划工期（天）",
-            trigger: ["blur"],
-        },
-    ],
-    principal: [
-        {
-            required: true,
-            message: "请输入项目负责人",
-            trigger: ["blur"],
-        },
-    ],
-    acontactnum: [
-        {
-            required: true,
-            message: "请输入联系电话",
-            trigger: ["blur"],
-        },
-        {
-            validator: checkPhone,
-            trigger: ["blur"],
-        }
-    ],
-    aunit: [
-        {
-            required: true,
-            message: "请输入委托单位",
-            trigger: ["blur"],
-        },
-    ],
+      validator: checkPhone,
+      trigger: ["blur"],
+    }
+  ],
+  aunit: [
+    {
+      required: true,
+      message: "请输入委托单位",
+      trigger: ["blur"],
+    },
+  ],
 });
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key];
-        }
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
     }
-    // formData.province = Number(formData.province);
-    // formData.city = Number(formData.city);
-    // formData.depar = Number(formData.depar);
-    // formData.contract_name = data.contract.contract_name;
-    // formData.principal = data.contract?.signing_person
-    // formData.starting = data.contract.start_date
-    // formData.endtime = data.contract.end_date
-    getCityList();
+  }
+  // formData.province = Number(formData.province);
+  // formData.city = Number(formData.city);
+  // formData.depar = Number(formData.depar);
+  // formData.contract_name = data.contract.contract_name;
+  // formData.principal = data.contract?.signing_person
+  // formData.starting = data.contract.start_date
+  // formData.endtime = data.contract.end_date
+  getCityList();
 };
 
 // 提交按钮
 const handleSubmit = async () => {
-    Array.isArray(formData.annex) ? "" : (formData.annex = []);
-    await formRef.value?.validate();
-    const data = { ...formData };
-    mode.value == "edit"
-        ? await apiCostProjectEdit(data)
-        : await apiCostProjectAdd(data);
-    popupRef.value?.close();
-    emit("success");
+  Array.isArray(formData.annex) ? "" : (formData.annex = []);
+  await formRef.value?.validate();
+  const data = {...formData};
+  mode.value == "edit"
+      ? await apiCostProjectEdit(data)
+      : await apiCostProjectAdd(data);
+  popupRef.value?.close();
+  emit("success");
 };
 
 //打开弹窗
 const open = (type = "add") => {
-    mode.value = type;
-    popupRef.value?.open();
+  mode.value = type;
+  popupRef.value?.open();
 };
 //打开弹窗
 const userclick = async (e: any) => {
-    e == "person" ? (persoleType.value = 2) : (persoleType.value = 1);
-    showDialog1.value = true;
-    await nextTick();
-    personnel.value.open();
+  e == "person" ? (persoleType.value = 2) : (persoleType.value = 1);
+  showDialog1.value = true;
+  await nextTick();
+  personnel.value.open();
 };
 
 const persoleType = ref("1");
 //确认
 const submituser = (e: any) => {
-    let flag = Array.isArray(e);
-    let personl;
-    let personl_id;
-    personl = flag ? e.map((item) => [item.name]).join(",") : e.name;
-    personl_id = flag ? e.map((item) => item.id) : e.id;
-    if (flag) {
-        formData.person_text = personl;
-        formData.person = personl_id;
-    } else {
-        formData.principal_name = personl;
-        formData.principal = personl_id;
-    }
-    showDialog1.value = false;
+  let flag = Array.isArray(e);
+  let personl;
+  let personl_id;
+  personl = flag ? e.map((item) => [item.name]).join(",") : e.name;
+  personl_id = flag ? e.map((item) => item.id) : e.id;
+  if (flag) {
+    formData.person_text = personl;
+    formData.person = personl_id;
+  } else {
+    formData.principal_name = personl;
+    formData.principal = personl_id;
+  }
+  showDialog1.value = false;
 };
 
 // 关闭回调
 const handleClose = () => {
-    emit("close");
+  emit("close");
 };
 
 if (route.query.contractId) {
-    // handleAdd()
-    apiCostApprovedProjectDetail({ id: route.query.contractId }).then(res => {
-        customEvent(res)
-    })
-    // // handleAdd()
-    // formData.contract_id = route.query.contractId;
-    // formData.contract_name = route.query.contractName;
+  // handleAdd()
+  apiCostApprovedProjectDetail({id: route.query.contractId}).then(res => {
+    customEvent(res)
+  })
+  // // handleAdd()
+  // formData.contract_id = route.query.contractId;
+  // formData.contract_name = route.query.contractName;
 }
 
 getProvinceList();
 
 defineExpose({
-    open,
-    setFormData,
+  open,
+  setFormData,
 });
 </script>
diff --git a/src/views/marketing_contract/edit.vue b/src/views/marketing_contract/edit.vue
index 5d1f0fb..f76d9e0 100644
--- a/src/views/marketing_contract/edit.vue
+++ b/src/views/marketing_contract/edit.vue
@@ -805,6 +805,9 @@ const setFormData = async (data: Record<any, any>) => {
       formData.framework_agreement_name = data['framework_agreement_name']
     }
   }
+  if(data.city!=''){
+    getCityList()
+  }
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -847,7 +850,6 @@ const open = (type = 'add') => {
   mode.value = type
   popupRef.value?.open()
 }
-
 // 关闭回调
 const handleClose = () => {
   emit('close')
diff --git a/src/views/supervision_project/edit.vue b/src/views/supervision_project/edit.vue
index 68a3d3c..5e98940 100644
--- a/src/views/supervision_project/edit.vue
+++ b/src/views/supervision_project/edit.vue
@@ -1,253 +1,254 @@
 <template>
-    <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
-            @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules"
-                :disabled="mode == 'detail'">
-                <el-row>
-                    <el-col :span="8">
-                        <el-form-item label="项目名称" prop="project_name">
-                            <el-input v-model="formData.project_name" clearable placeholder="请输入项目名称" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="行业">
-                            <el-select class="flex-1" v-model="formData.industry" clearable placeholder="请选择行业">
-                                <el-option v-for="(item, index) in dictData.supervision_project_industry" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="性质">
-                            <el-select class="flex-1" v-model="formData.nature" clearable placeholder="请选择性质">
-                                <el-option v-for="(item, index) in dictData.supervision_project_nature" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
+  <div class="edit-popup">
+    <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
+           @close="handleClose">
+      <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules"
+               :disabled="mode == 'detail'">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="项目名称" prop="project_name">
+              <el-input v-model="formData.project_name" clearable placeholder="请输入项目名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="行业">
+              <el-select class="flex-1" v-model="formData.industry" clearable placeholder="请选择行业">
+                <el-option v-for="(item, index) in dictData.supervision_project_industry" :key="index"
+                           :label="item.name" :value="parseInt(item.value)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="性质">
+              <el-select class="flex-1" v-model="formData.nature" clearable placeholder="请选择性质">
+                <el-option v-for="(item, index) in dictData.supervision_project_nature" :key="index"
+                           :label="item.name" :value="parseInt(item.value)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="建设单位">
-                            <el-input v-model="formData.build_unit_name" clearable placeholder="请输入建设单位"
-                                @click="showDialog1 = true" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="建设区域">
-                            <el-select class="flex-1" v-model="formData.build_area" clearable placeholder="请选择建设区域">
-                                <el-option v-for="(item, index) in dictData.supervision_project_build_area" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目地址">
-                            <el-input v-model="formData.address" clearable placeholder="请输入项目地址" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+          <el-col :span="8">
+            <el-form-item label="建设单位">
+              <el-input v-model="formData.build_unit_name" clearable placeholder="请输入建设单位"
+                        @click="showDialog1 = true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="建设区域">
+              <el-select class="flex-1" v-model="formData.build_area" clearable placeholder="请选择建设区域">
+                <el-option v-for="(item, index) in dictData.supervision_project_build_area" :key="index"
+                           :label="item.name" :value="parseInt(item.value)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目地址">
+              <el-input v-model="formData.address" clearable placeholder="请输入项目地址"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="8">
-                        <el-form-item label="项目等级">
-                            <el-select class="flex-1" v-model="formData.project_level" clearable placeholder="请选择盖章名称">
-                                <el-option v-for="(item, index) in dictData.supervision_project_level" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="总投资（元）" label-width="120px">
-                            <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资（元）"
-                                type="number" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="立项日期">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.initiation_date" clearable
-                                type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="项目等级">
+              <el-select class="flex-1" v-model="formData.project_level" clearable placeholder="请选择盖章名称">
+                <el-option v-for="(item, index) in dictData.supervision_project_level" :key="index"
+                           :label="item.name" :value="parseInt(item.value)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="总投资（元）" label-width="120px">
+              <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资（元）"
+                        type="number"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="立项日期">
+              <el-date-picker class="flex-1 !flex" v-model="formData.initiation_date" clearable
+                              type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="关联合同">
-                            <el-input v-model="formData.contract_name" clearable placeholder="请输入关联合同"
-                                @click="showDialog = true" readonly />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="合同金额">
-                            <el-input v-model="formData.contract_amount" clearable placeholder="请输入合同金额"
-                                type="number" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="实际开工日期" label-width="120px" prop="actual_start_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.actual_start_date" clearable
-                                type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联合同">
+              <el-input v-model="formData.contract_name" clearable placeholder="请输入关联合同"
+                        @click="showDialog = true" readonly/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合同金额">
+              <el-input v-model="formData.contract_amount" clearable placeholder="请输入合同金额"
+                        type="number"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="实际开工日期" label-width="120px" prop="actual_start_date">
+              <el-date-picker class="flex-1 !flex" v-model="formData.actual_start_date" clearable
+                              type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="实际竣工日期" label-width="120px" prop="actual_end_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.actual_end_date" clearable
-                                type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="计划开工日期" label-width="120px" prop="planned_start_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.planned_start_date" clearable
-                                type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="计划竣工日期" label-width="120px" prop="planned_end_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.planned_end_date" clearable
-                                type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="实际竣工日期" label-width="120px" prop="actual_end_date">
+              <el-date-picker class="flex-1 !flex" v-model="formData.actual_end_date" clearable
+                              type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划开工日期" label-width="120px" prop="planned_start_date">
+              <el-date-picker class="flex-1 !flex" v-model="formData.planned_start_date" clearable
+                              type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划竣工日期" label-width="120px" prop="planned_end_date">
+              <el-date-picker class="flex-1 !flex" v-model="formData.planned_end_date" clearable
+                              type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="监管部门">
-                            <el-select v-model="formData.supervision_department" placeholder="请选择监管部门" class="flex-1">
-                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="实施部门">
-                            <el-select v-model="formData.implementation_department" placeholder="请选择实施部门"
-                                class="flex-1">
-                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="监管部门">
+              <el-select v-model="formData.supervision_department" placeholder="请选择监管部门" class="flex-1">
+                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="实施部门">
+              <el-select v-model="formData.implementation_department" placeholder="请选择实施部门"
+                         class="flex-1">
+                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="项目部">
-                            <el-select v-model="formData.project_department" placeholder="请选择项目部门" class="flex-1">
-                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="工程状态">
-                            <el-select class="flex-1" v-model="formData.engineering_status" clearable
-                                placeholder="请选择盖章名称">
-                                <el-option v-for="(item, index) in dictData.supervision_project_status" :key="index"
-                                    :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目负责人员" label-width="120px">
-                            <el-input v-model="formData.project_manager_name" clearable placeholder="请输入项目负责人员"
-                                @click="userclick('project_manager')" />
-                        </el-form-item>
-                    </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目部">
+              <el-select v-model="formData.project_department" placeholder="请选择项目部门" class="flex-1">
+                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工程状态">
+              <el-select class="flex-1" v-model="formData.engineering_status" clearable
+                         placeholder="请选择盖章名称">
+                <el-option v-for="(item, index) in dictData.supervision_project_status" :key="index"
+                           :label="item.name" :value="parseInt(item.value)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目负责人员" label-width="120px">
+              <el-input v-model="formData.project_manager_name" clearable placeholder="请输入项目负责人员"
+                        @click="userclick('project_manager')"/>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="8">
-                        <el-form-item label="甲方单位">
-                            <el-input v-model="formData.part_a_unit" clearable placeholder="请输入甲方单位"
-                                @click="showDialog2 = true" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="创建人" prop="create_user">
-                            <el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="创建时间" prop="create_time">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.create_time" clearable
-                                type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择创建时间">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="合同服务内容" label-width="120px">
-                            <el-input v-model="formData.contract_content" clearable placeholder="请输入合同服务内容"
-                                type="textarea" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目概况">
-                            <el-input v-model="formData.project_overview" clearable placeholder="请输入项目概况"
-                                type="textarea" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="项目要求">
-                            <el-input v-model="formData.project_requirements" clearable placeholder="请输入项目要求"
-                                type="textarea" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="备注">
-                            <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="附件">
-                            <uploadAnnex :formData="formData"></uploadAnnex>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <div v-if="showDialog">
-                <personnelselector ref="personnel" @confirm="submituser" type="1">
-                </personnelselector>
-            </div>
-            <el-dialog v-model="showDialog1" title="选择甲方单位" width="70%">
-                <dialogTable :config="marketing_custom" @customEvent="customEvent1"> </dialogTable>
-            </el-dialog>
-            <el-dialog v-model="showDialog2" title="选择甲方单位" width="70%">
-                <dialogTable :config="marketing_custom" @customEvent="customEvent2"> </dialogTable>
-            </el-dialog>
-            <el-dialog v-model="showDialog" title="选择合同" width="70%">
-                <dialogTable :config="cost_approved_projects" @customEvent="customEvent333"
-                    :query="{ status: 0, business_nature: 1 }">
-                </dialogTable>
-            </el-dialog>
-        </popup>
-    </div>
+          <el-col :span="8">
+            <el-form-item label="甲方单位">
+              <el-input v-model="formData.part_a_unit" clearable placeholder="请输入甲方单位"
+                        @click="showDialog2 = true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="创建人" prop="create_user">
+              <el-input v-model="formData.create_user" clearable placeholder="请输入创建人"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="创建时间" prop="create_time">
+              <el-date-picker class="flex-1 !flex" v-model="formData.create_time" clearable
+                              type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择创建时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合同服务内容" label-width="120px">
+              <el-input v-model="formData.contract_content" clearable placeholder="请输入合同服务内容"
+                        type="textarea"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目概况">
+              <el-input v-model="formData.project_overview" clearable placeholder="请输入项目概况"
+                        type="textarea"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目要求">
+              <el-input v-model="formData.project_requirements" clearable placeholder="请输入项目要求"
+                        type="textarea"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注">
+              <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="附件">
+              <uploadAnnex :formData="formData"></uploadAnnex>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div v-if="showDialog">
+        <personnelselector ref="personnel" @confirm="submituser" type="1">
+        </personnelselector>
+      </div>
+      <el-dialog v-model="showDialog1" title="选择甲方单位" width="70%">
+        <dialogTable :config="marketing_custom" @customEvent="customEvent1"></dialogTable>
+      </el-dialog>
+      <el-dialog v-model="showDialog2" title="选择甲方单位" width="70%">
+        <dialogTable :config="marketing_custom" @customEvent="customEvent2"></dialogTable>
+      </el-dialog>
+      <el-dialog v-model="showDialog" title="选择合同" width="70%">
+        <dialogTable :config="cost_approved_projects" @customEvent="customEvent333"
+                     :query="{ status: 0, business_nature: 1 }">
+        </dialogTable>
+      </el-dialog>
+    </popup>
+  </div>
 </template>
 
 <script lang="ts" setup name="supervisionProjectEdit">
-import type { FormInstance } from 'element-plus'
-import { cost_approved_projects } from "@/components/dialogTable/dialogTableConfig";
+import type {FormInstance} from 'element-plus'
+import {cost_approved_projects} from "@/components/dialogTable/dialogTableConfig";
 import Popup from '@/components/popup/index.vue'
 import {
-    apiSupervisionProjectAdd,
-    apiSupervisionProjectEdit,
-    apiSupervisionProjectDetail
+  apiSupervisionProjectAdd,
+  apiSupervisionProjectEdit,
+  apiSupervisionProjectDetail
 } from '@/api/supervision_project'
-import type { PropType } from 'vue'
-import { apiCostApprovedProjectDetail } from '@/api/cost_approved_project'
+import type {PropType} from 'vue'
+import {apiCostApprovedProjectDetail} from '@/api/cost_approved_project'
 import {
-    marketing_framework_agreement,
-    marketing_custom
+  marketing_framework_agreement,
+  marketing_custom
 } from '@/components/dialogTable/dialogTableConfig'
-import { timeFormat } from '@/utils/util'
+import {timeFormat} from '@/utils/util'
 import useUserStore from '@/stores/modules/user'
+
 const userStore = useUserStore().userInfo
 const route = useRoute()
 
 defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    },
-    deptList: Array
+  dictData: {
+    type: Object as PropType<Record<string, any[]>>,
+    default: () => ({})
+  },
+  deptList: Array
 })
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
@@ -260,369 +261,371 @@ const personnel = ref(null)
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑工程监理--监理项目信息' : '新增工程监理--监理项目信息'
+  return mode.value == 'edit' ? '编辑工程监理--监理项目信息' : '新增工程监理--监理项目信息'
 })
 
 const customEvent333 = (e) => {
-    formData.contract = e.id;
-    formData.contract_name = e.contract_name;
+  formData.contract = e.id;
+  formData.contract_name = e.contract_name;
 
-    // formData.Acontact = e.part_a_contract
-    showDialog.value = false;
+  // formData.Acontact = e.part_a_contract
+  showDialog.value = false;
 };
 // 表单数据
 const formData = reactive({
-    id: '',
-    project_name: '',
-    project_code: '',
-    industry: '',
-    nature: '',
-    build_unit: '',
-    build_unit_name: '',
-    build_area: '',
-    address: '',
-    project_level: '',
-    total_investment: '',
-    initiation_date: '',
-    contract: '',
-    contract_name: '',
-    contract_amount: '',
-    actual_start_date: '',
-    actual_end_date: '',
-    planned_start_date: '',
-    planned_end_date: '',
-    contract_content: '',
-    project_overview: '',
-    project_requirements: '',
-    remark: '',
-    supervision_department: '',
-    implementation_department: '',
-    project_department: '',
-    engineering_status: '',
-    project_manager: '',
-    project_manager_name: '',
-    part_a_unit: '',
-    part_a: '',
-    annex: [],
-    create_user: userStore.account,
-    create_time: timeFormat('', 'yyyy-mm-dd hh:MM:ss')
+  id: '',
+  project_name: '',
+  project_code: '',
+  industry: '',
+  nature: '',
+  build_unit: '',
+  build_unit_name: '',
+  build_area: '',
+  address: '',
+  project_level: '',
+  total_investment: '',
+  initiation_date: '',
+  contract: '',
+  contract_name: '',
+  contract_amount: '',
+  actual_start_date: '',
+  actual_end_date: '',
+  planned_start_date: '',
+  planned_end_date: '',
+  contract_content: '',
+  project_overview: '',
+  project_requirements: '',
+  remark: '',
+  supervision_department: '',
+  implementation_department: '',
+  project_department: '',
+  engineering_status: '',
+  project_manager: '',
+  project_manager_name: '',
+  part_a_unit: '',
+  part_a: '',
+  annex: [],
+  create_user: userStore.account,
+  create_time: timeFormat('', 'yyyy-mm-dd hh:MM:ss')
 })
 
 const chekcDate = (rule: any, value: any, callback: any) => {
-    if (new Date(formData.actual_end_date) < new Date(formData.actual_start_date)) {
-        callback(new Error('实际竣工日期不能早于实际开工日期'))
-    } else {
-        callback()
-    }
+  if (new Date(formData.actual_end_date) < new Date(formData.actual_start_date)) {
+    callback(new Error('实际竣工日期不能早于实际开工日期'))
+  } else {
+    callback()
+  }
 }
 
 const chekcDate1 = (rule: any, value: any, callback: any) => {
-    if (new Date(formData.planned_end_date) < new Date(formData.planned_start_date)) {
-        callback(new Error('计划竣工日期不能早于计划开工日期'))
-    } else {
-        callback()
-    }
+  if (new Date(formData.planned_end_date) < new Date(formData.planned_start_date)) {
+    callback(new Error('计划竣工日期不能早于计划开工日期'))
+  } else {
+    callback()
+  }
 }
 
 // 表单验证
 const formRules = reactive<any>({
-    project_name: [
-        {
-            required: true,
-            message: '请输入项目名称',
-            trigger: ['blur']
-        }
-    ],
-    project_code: [
-        {
-            required: true,
-            message: '请输入项目编号',
-            trigger: ['blur']
-        }
-    ],
-    industry: [
-        {
-            required: true,
-            message: '请输入行业',
-            trigger: ['blur']
-        }
-    ],
-    nature: [
-        {
-            required: true,
-            message: '请输入性质',
-            trigger: ['blur']
-        }
-    ],
-    build_unit: [
-        {
-            required: true,
-            message: '请输入建设单位',
-            trigger: ['blur']
-        }
-    ],
-    build_area: [
-        {
-            required: true,
-            message: '请输入建设区域',
-            trigger: ['blur']
-        }
-    ],
-    address: [
-        {
-            required: true,
-            message: '请输入项目地址',
-            trigger: ['blur']
-        }
-    ],
-    project_level: [
-        {
-            required: true,
-            message: '请输入项目等级',
-            trigger: ['blur']
-        }
-    ],
-    total_investment: [
-        {
-            required: true,
-            message: '请输入总投资（元）',
-            trigger: ['blur']
-        }
-    ],
-    initiation_date: [
-        {
-            required: true,
-            message: '请输入立项日期',
-            trigger: ['blur']
-        }
-    ],
-    contract: [
-        {
-            required: true,
-            message: '请输入关联合同',
-            trigger: ['blur']
-        }
-    ],
-    contract_amount: [
-        {
-            required: true,
-            message: '请输入合同金额',
-            trigger: ['blur']
-        }
-    ],
-    actual_start_date: [
-        {
-            required: true,
-            message: '请输入实际开工日期',
-            trigger: ['blur']
-        }
-    ],
-    actual_end_date: [
-        {
-            required: true,
-            message: '请输入实际竣工日期',
-            trigger: ['blur']
-        },
-        {
-            validator: chekcDate,
-            trigger: ['blur']
-        }
-    ],
-    planned_start_date: [
-        {
-            required: true,
-            message: '请输入计划开工日期',
-            trigger: ['blur']
-        }
-    ],
-    planned_end_date: [
-        {
-            required: true,
-            message: '请输入计划竣工日期',
-            trigger: ['blur']
-        },
-        {
-            validator: chekcDate1,
-            trigger: ['blur']
-        }
-    ],
-    contract_content: [
-        {
-            required: true,
-            message: '请输入合同服务内容',
-            trigger: ['blur']
-        }
-    ],
-    project_overview: [
-        {
-            required: true,
-            message: '请输入项目概况',
-            trigger: ['blur']
-        }
-    ],
-    project_requirements: [
-        {
-            required: true,
-            message: '请输入项目要求',
-            trigger: ['blur']
-        }
-    ],
-    remark: [
-        {
-            required: true,
-            message: '请输入备注',
-            trigger: ['blur']
-        }
-    ],
-    supervision_department: [
-        {
-            required: true,
-            message: '请输入监管部门',
-            trigger: ['blur']
-        }
-    ],
-    implementation_department: [
-        {
-            required: true,
-            message: '请输入实施部门',
-            trigger: ['blur']
-        }
-    ],
-    project_department: [
-        {
-            required: true,
-            message: '请输入项目部',
-            trigger: ['blur']
-        }
-    ],
-    engineering_status: [
-        {
-            required: true,
-            message: '请输入工程状态',
-            trigger: ['blur']
-        }
-    ],
-    project_manager: [
-        {
-            required: true,
-            message: '请输入项目负责人员',
-            trigger: ['blur']
-        }
-    ],
-    part_a_unit: [
-        {
-            required: true,
-            message: '请输入甲方单位',
-            trigger: ['blur']
-        }
-    ],
-    create_user: [
-        {
-            required: true,
-            message: '请输入创建人',
-            trigger: ['blur']
-        }
-    ]
+  project_name: [
+    {
+      required: true,
+      message: '请输入项目名称',
+      trigger: ['blur']
+    }
+  ],
+  project_code: [
+    {
+      required: true,
+      message: '请输入项目编号',
+      trigger: ['blur']
+    }
+  ],
+  industry: [
+    {
+      required: true,
+      message: '请输入行业',
+      trigger: ['blur']
+    }
+  ],
+  nature: [
+    {
+      required: true,
+      message: '请输入性质',
+      trigger: ['blur']
+    }
+  ],
+  build_unit: [
+    {
+      required: true,
+      message: '请输入建设单位',
+      trigger: ['blur']
+    }
+  ],
+  build_area: [
+    {
+      required: true,
+      message: '请输入建设区域',
+      trigger: ['blur']
+    }
+  ],
+  address: [
+    {
+      required: true,
+      message: '请输入项目地址',
+      trigger: ['blur']
+    }
+  ],
+  project_level: [
+    {
+      required: true,
+      message: '请输入项目等级',
+      trigger: ['blur']
+    }
+  ],
+  total_investment: [
+    {
+      required: true,
+      message: '请输入总投资（元）',
+      trigger: ['blur']
+    }
+  ],
+  initiation_date: [
+    {
+      required: true,
+      message: '请输入立项日期',
+      trigger: ['blur']
+    }
+  ],
+  contract: [
+    {
+      required: true,
+      message: '请输入关联合同',
+      trigger: ['blur']
+    }
+  ],
+  contract_amount: [
+    {
+      required: true,
+      message: '请输入合同金额',
+      trigger: ['blur']
+    }
+  ],
+  actual_start_date: [
+    {
+      required: true,
+      message: '请输入实际开工日期',
+      trigger: ['blur']
+    }
+  ],
+  actual_end_date: [
+    {
+      required: true,
+      message: '请输入实际竣工日期',
+      trigger: ['blur']
+    },
+    {
+      validator: chekcDate,
+      trigger: ['blur']
+    }
+  ],
+  planned_start_date: [
+    {
+      required: true,
+      message: '请输入计划开工日期',
+      trigger: ['blur']
+    }
+  ],
+  planned_end_date: [
+    {
+      required: true,
+      message: '请输入计划竣工日期',
+      trigger: ['blur']
+    },
+    {
+      validator: chekcDate1,
+      trigger: ['blur']
+    }
+  ],
+  contract_content: [
+    {
+      required: true,
+      message: '请输入合同服务内容',
+      trigger: ['blur']
+    }
+  ],
+  project_overview: [
+    {
+      required: true,
+      message: '请输入项目概况',
+      trigger: ['blur']
+    }
+  ],
+  project_requirements: [
+    {
+      required: true,
+      message: '请输入项目要求',
+      trigger: ['blur']
+    }
+  ],
+  remark: [
+    {
+      required: true,
+      message: '请输入备注',
+      trigger: ['blur']
+    }
+  ],
+  supervision_department: [
+    {
+      required: true,
+      message: '请输入监管部门',
+      trigger: ['blur']
+    }
+  ],
+  implementation_department: [
+    {
+      required: true,
+      message: '请输入实施部门',
+      trigger: ['blur']
+    }
+  ],
+  project_department: [
+    {
+      required: true,
+      message: '请输入项目部',
+      trigger: ['blur']
+    }
+  ],
+  engineering_status: [
+    {
+      required: true,
+      message: '请输入工程状态',
+      trigger: ['blur']
+    }
+  ],
+  project_manager: [
+    {
+      required: true,
+      message: '请输入项目负责人员',
+      trigger: ['blur']
+    }
+  ],
+  part_a_unit: [
+    {
+      required: true,
+      message: '请输入甲方单位',
+      trigger: ['blur']
+    }
+  ],
+  create_user: [
+    {
+      required: true,
+      message: '请输入创建人',
+      trigger: ['blur']
+    }
+  ]
 })
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key]
     }
+  }
 }
 
 const getDetail = async (row: Record<string, any>) => {
-    const data = await apiSupervisionProjectDetail({
-        id: row.id
-    })
-    setFormData(data)
+  const data = await apiSupervisionProjectDetail({
+    id: row.id
+  })
+  setFormData(data)
 }
 
 // 提交按钮
 const handleSubmit = async () => {
-    if (mode.value == 'detail') {
-        popupRef.value?.close()
-        return
-    }
-    await formRef.value?.validate()
-    const data = { ...formData }
-    mode.value == 'edit'
-        ? await apiSupervisionProjectEdit(data)
-        : await apiSupervisionProjectAdd(data)
+  if (mode.value == 'detail') {
     popupRef.value?.close()
-    emit('success')
+    return
+  }
+  await formRef.value?.validate()
+  const data = {...formData}
+  mode.value == 'edit'
+      ? await apiSupervisionProjectEdit(data)
+      : await apiSupervisionProjectAdd(data)
+  popupRef.value?.close()
+  emit('success')
 }
 
 //打开弹窗
 const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
+  mode.value = type
+  popupRef.value?.open()
 }
 
 // 关闭回调
 const handleClose = () => {
-    emit('close')
+  emit('close')
 }
 
 if (route.query.contractId) {
-    apiCostApprovedProjectDetail({ id: route.query.contractId }).then((res) => {
-        customEvent(res)
-    })
+  apiCostApprovedProjectDetail({id: route.query.contractId}).then((res) => {
+    customEvent(res)
+  })
 }
 const customEvent = (e) => {
-    console.log(e)
-    formData.contract = e.id
-    formData.contract_name = e.contract_name
-    formData.nature = e.industry_nature
-    formData.planned_start_date = e.start_date
-    formData.planned_end_date = e.end_date
-    formData.project_manager = e.project_director
-    formData.part_a = e.part_a
-    formData.part_a_unit = e.part_a_name
-    formData.build_area = e.const_area
-    formData.total_investment = e.project_money
-    formData.contract_amount = e.signed_amount
-    formData.supervision_department = e.supervise_dept
-    // formData.nature = e.industry_nature
-    // formData.contract_type = e.contract_type
-    // formData.contract_type_text = e.contract_type_text
-    // formData.aunit_name = e.part_a_name
-    // formData.aunit = e.part_a
-    formData.project_overview = e.project_scale
-    // formData.Acontact = e.part_a_contract
-    // showDialog.value = false;
+  formData.contract = e.id
+  formData.contract_name = e.contract_name
+  formData.project_name = e.contract_name;
+  formData.nature = e.industry_nature
+  formData.planned_start_date = e.start_date
+  formData.planned_end_date = e.end_date
+  formData.project_manager = e.project_director
+  formData.part_a = e.part_a
+  formData.part_a_unit = e.part_a_name
+  formData.build_unit_name = e.part_b
+  formData.build_unit = e.part_b_signatory
+  formData.build_area = e.const_area
+  formData.total_investment = e.project_money
+  formData.contract_amount = e.signed_amount
+  formData.supervision_department = e.supervise_dept
+  // formData.nature = e.industry_nature
+  // formData.contract_type = e.contract_type
+  // formData.contract_type_text = e.contract_type_text
+  // formData.aunit_name = e.part_a_name
+  // formData.aunit = e.part_a
+  formData.project_overview = e.project_scale
+  // formData.Acontact = e.part_a_contract
+  // showDialog.value = false;
 }
 const customEvent1 = (e) => {
-    formData.build_unit = e.id
-    formData.build_unit_name = e.invoice_company
-    showDialog1.value = false
+  formData.build_unit = e.id
+  formData.build_unit_name = e.invoice_company
+  showDialog1.value = false
 }
 const customEvent2 = (e) => {
-    formData.part_a = e.id
-    formData.part_a_unit = e.invoice_company
-    showDialog2.value = false
+  formData.part_a = e.id
+  formData.part_a_unit = e.invoice_company
+  showDialog2.value = false
 }
 let value
 const userclick = async (val) => {
-    showDialog.value = true
-    value = val
-    await nextTick()
-    personnel.value.open()
+  showDialog.value = true
+  value = val
+  await nextTick()
+  personnel.value.open()
 }
 //确认
 const submituser = (e: any) => {
-    formData[value + '_name'] = e.name
-    formData[value] = e.id
-    showDialog.value = false
+  formData[value + '_name'] = e.name
+  formData[value] = e.id
+  showDialog.value = false
 }
 
 defineExpose({
-    open,
-    setFormData,
-    getDetail
+  open,
+  setFormData,
+  getDetail
 })
 </script>