From 2822c8a030f5dbe5cecb5b6ee677f97bba935107 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 28 Dec 2023 17:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=8A=9B=E6=94=AF=E5=87=BA=E5=8F=8A?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/procurement/index.vue          |   4 +-
 src/views/bid_document_examination/edit.vue   |  18 +-
 src/views/custom/edit.vue                     |  39 +--
 src/views/custom_follow/edit.vue              |   7 +-
 src/views/custom_follow/index.vue             |   8 +-
 .../procurement_contract_change/edit.vue      |  67 ++--
 src/views/project/edit.vue                    |  78 ++---
 src/views/project_estimate/edit.vue           | 183 ++++++-----
 .../project_salary_detail/detail.vue          | 186 -----------
 .../project_salary_detail/edit.vue            | 288 ------------------
 .../project_salary_detail/index.vue           | 176 -----------
 src/views/project_salary_detail/index.vue     | 116 +++++++
 .../detail.vue                                |  33 +-
 .../list => project_salary_payment}/edit.vue  |   0
 .../list => project_salary_payment}/index.vue |  10 +-
 src/views/quotation/edit.vue                  |  11 +-
 16 files changed, 348 insertions(+), 876 deletions(-)
 delete mode 100644 src/views/project_salary/project_salary_detail/detail.vue
 delete mode 100644 src/views/project_salary/project_salary_detail/edit.vue
 delete mode 100644 src/views/project_salary/project_salary_detail/index.vue
 create mode 100644 src/views/project_salary_detail/index.vue
 rename src/views/{project_salary/list => project_salary_payment}/detail.vue (87%)
 rename src/views/{project_salary/list => project_salary_payment}/edit.vue (100%)
 rename src/views/{project_salary/list => project_salary_payment}/index.vue (94%)

diff --git a/src/components/procurement/index.vue b/src/components/procurement/index.vue
index b0e86ce..57c4226 100644
--- a/src/components/procurement/index.vue
+++ b/src/components/procurement/index.vue
@@ -16,8 +16,8 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="项目名称" prop="org_id" show-overflow-tooltip />
-                    <el-table-column label="供应商名称" prop="department_id" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
 
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
                     <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
diff --git a/src/views/bid_document_examination/edit.vue b/src/views/bid_document_examination/edit.vue
index 0268e05..3ec0128 100644
--- a/src/views/bid_document_examination/edit.vue
+++ b/src/views/bid_document_examination/edit.vue
@@ -3,12 +3,12 @@
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules" inline>
                 <el-steps :active="2" align-center style="margin-bottom: 30px;">
-                    <el-step title="销售发起" description="Some description" />
-                    <el-step title="商务部技术部" description="Some description" />
-                    <el-step title="财务部" description="Some description" />
-                    <el-step title="事业部总工" description="Some description" />
-                    <el-step title="事业部总经理审批" description="Some description" />
-                    <el-step title="销售副总" description="Some description" />
+                    <el-step title="销售发起" />
+                    <el-step title="商务部技术部" />
+                    <el-step title="财务部" />
+                    <el-step title="事业部总工" />
+                    <el-step title="事业部总经理审批" />
+                    <el-step title="销售副总" />
                 </el-steps>
                 <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
 
@@ -22,11 +22,7 @@
 
 
                 <el-row>
-                    <el-col :span="8">
-                        <el-form-item label="审批id" prop="approve_id">
-                            <el-input v-model="formData.approve_id" clearable placeholder="请输入审批id" />
-                        </el-form-item>
-                    </el-col>
+
                     <el-col :span="8">
                         <el-form-item label="标书编号" prop="buy_bidding_document_id" @click="showDialog = true">
                             <el-input v-model="bid_document_no" clearable readonly placeholder="请选择标书编号" />
diff --git a/src/views/custom/edit.vue b/src/views/custom/edit.vue
index abbeac6..7252def 100644
--- a/src/views/custom/edit.vue
+++ b/src/views/custom/edit.vue
@@ -29,7 +29,7 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="上级公司" prop="parent_company">
-                                <el-input v-model="formData.parent_company" type="number" placeholder="请输入上级公司" clearable :style="{ width: '100%' }">
+                                <el-input v-model="companyname" readonly placeholder="请输入上级公司" clearable :style="{ width: '100%' }" @click="showDialog = true">
                                     <template #append>
                                         <el-button>选择</el-button>
                                     </template>
@@ -233,6 +233,7 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
+const companyname = ref('')
 const list1 = reactive([])
 const showDialog = ref(false);
 const list2 = reactive([])
@@ -245,8 +246,8 @@ const datas = reactive({
 });
 
 const customEvent = (e: any) => {
-    formData.custom_id = e.id;
-    formData.custom_name = e.name;
+    formData.parent_company = e.id;
+    companyname.value = e.name;
     showDialog.value = false;
 };
 
@@ -255,39 +256,19 @@ const customEvent = (e: any) => {
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑客户表' : '新增客户表'
 })
+//验证
 const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
-    const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
-    // if (!value) {
-    //     return callback(new Error('电话号码不能为空'))
-    // }
-    // setTimeout(() => {
-    //     if (phoneReg.test(value)) {
-    //         callback()
-    //     } else {
-    //         callback(new Error('电话号码格式不正确'))
-    //     }
 
-    // }, 100)
-
-    if (value && phoneReg.test(value)) {
-        return callback(new Error('电话号码格式不正确'))
+    if (value && !/^1\d{10}$/.test(value)) {
+        callback(new Error('请输入正确的手机号码'));
     } else {
         callback()
     }
+
 }
 const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => {
     const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/
-    // if (!value) {
-    //     return callback(new Error('邮箱不能为空'))
-    // }
-    // setTimeout(() => {
-    //     if (mailReg.test(value)) {
-    //         callback()
-    //     } else {
-    //         callback(new Error('请输入正确的邮箱格式'))
-    //     }
-    // }, 100)
-    if (value && mailReg.test(value)) {
+    if (value && !mailReg.test(value)) {
         return callback(new Error('请输入正确的邮箱格式'))
     } else {
         callback()
@@ -328,7 +309,7 @@ const formData = reactive({
     org_id: '',
     name: '',
     custom_type: '',
-    parent_company: 5565665,
+    parent_company: '',
     phone: '',
     credit_rating: '',
     province: '',
diff --git a/src/views/custom_follow/edit.vue b/src/views/custom_follow/edit.vue
index 88d3893..1ebb3a7 100644
--- a/src/views/custom_follow/edit.vue
+++ b/src/views/custom_follow/edit.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="60%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-form-item label="主题" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                     <el-input v-model="formData.name" clearable placeholder="请输入主题" />
                 </el-form-item>
@@ -28,7 +28,7 @@
                     <el-input v-model="formData.description" clearable placeholder="请输入行动描述" />
                 </el-form-item>
                 <el-form-item label="附件/现场照片" prop="annex">
-                    <material-picker v-model="formData.annex" />
+                    <material-picker v-model="formData.annex" :limit="20" />
                 </el-form-item>
                 <el-form-item label="位置" prop="coordinate">
                     <el-input v-model="formData.coordinate" clearable placeholder="请输入位置" />
@@ -150,6 +150,9 @@ const customEvent = (e: any) => {
 
 // 提交按钮
 const handleSubmit = async () => {
+    if (formData.annex && formData.annex.length > 0) {
+        formData.annex = JSON.stringify(formData.annex)
+    }
     await formRef.value?.validate()
     const data = { ...formData, }
     mode.value == 'edit'
diff --git a/src/views/custom_follow/index.vue b/src/views/custom_follow/index.vue
index 502f24e..d1c4703 100644
--- a/src/views/custom_follow/index.vue
+++ b/src/views/custom_follow/index.vue
@@ -49,7 +49,13 @@
                     <el-table-column label="行动描述" prop="description" show-overflow-tooltip />
                     <el-table-column label="附件/现场照片" prop="annex">
                         <template #default="{ row }">
-                            <el-image style="width:50px;height:50px;" :src="row.annex" />
+
+                            <div v-if="row.annex && row.annex.length > 0">
+                                <div v-for="item in row.annex">
+                                    <el-image style="width:50px;height:50px;z-index: 9999;" :src="item" />
+                                </div>
+                            </div>
+                            <div v-else>暂无附件/现场照片</div>
                         </template>
                     </el-table-column>
                     <el-table-column label="位置" prop="coordinate" show-overflow-tooltip />
diff --git a/src/views/procurement_contract_change/edit.vue b/src/views/procurement_contract_change/edit.vue
index eadf0cd..949ec2a 100644
--- a/src/views/procurement_contract_change/edit.vue
+++ b/src/views/procurement_contract_change/edit.vue
@@ -14,8 +14,8 @@
 
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="合同编号" prop="contract_no">
-                            <el-input v-model="formData.contract_no" clearable placeholder="请输入合同编号" />
+                        <el-form-item label="合同编号" prop="contract_no" @click="showDialog = true">
+                            <el-input v-model="formData.contract_no" readonly clearable placeholder="点击选择要变更的采购合同" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="供应商合同号" prop="supplier_contract_no">
@@ -23,31 +23,26 @@
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="供应商名称" prop="supplier_contract_no">
-                            <el-input v-model="formData.supplier_contract_no" clearable placeholder="请输入供应商合同号" />
+                            <el-input v-model="supplier_name" clearable disabled placeholder="系统自动填写" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="供应商编码" prop="supplier_contract_no">
-                            <el-input v-model="formData.supplier_contract_no" clearable placeholder="请输入供应商合同号" />
-                        </el-form-item> </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="供应商编码" prop="supplier_contract_no">
-                            <el-input v-model="formData.supplier_contract_no" clearable placeholder="请输入供应商合同号" />
+                            <el-input v-model="supplier_code" clearable disabled placeholder="系统自动填写" />
                         </el-form-item> </el-col>
+
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="supplier_contract_no">
-                            <el-input v-model="formData.supplier_contract_no" clearable placeholder="请输入供应商合同号" />
+                            <el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="项目编码" prop="supplier_contract_no">
-                            <el-input v-model="formData.supplier_contract_no" clearable placeholder="请输入供应商合同号" />
+                            <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
                         </el-form-item> </el-col>
 
 
                     <el-col :span="24">
-
-
                         <el-form-item label="合同类型" prop="contract_type">
-                            <el-radio-group v-model="formData.contract_type" placeholder="请选择合同类型">
+                            <el-radio-group v-model="formData.contract_type" placeholder="请选择合同类型" readonly>
                                 <el-radio v-for="(item, index) in dictData.procurement_contract_type" :key="index" :label="parseInt(item.value)">
                                     {{ item.name }}
                                 </el-radio>
@@ -55,17 +50,14 @@
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="签订日期" prop="signing_date">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.signing_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="amount">
-                            <el-input v-model="formData.amount" clearable placeholder="请输入合同金额" />
-                        </el-form-item> </el-col>
+
                     <el-col :span="24">
                         <el-form-item label="付款方式" prop="pay_type">
-                            <el-radio-group v-model="formData.pay_type" placeholder="请选择付款方式">
+                            <el-radio-group v-model="formData.pay_type" placeholder="请选择付款方式" readonly>
                                 <el-radio v-for="(item, index) in dictData.pay_type" :key="index" :label="parseInt(item.value)">
                                     {{ item.name }}
                                 </el-radio>
@@ -73,20 +65,23 @@
                         </el-form-item> </el-col>
                     <el-col :span="24">
                         <el-form-item label="账期" prop="account_period">
-                            <el-radio-group v-model="formData.account_period" placeholder="请选择账期">
+                            <el-radio-group v-model="formData.account_period" placeholder="请选择账期" readonly>
                                 <el-radio v-for="(item, index) in dictData.account_period" :key="index" :label="parseInt(item.value)">
                                     {{ item.name }}
                                 </el-radio>
                             </el-radio-group>
                         </el-form-item> </el-col>
-
+                    <el-col :span="8">
+                        <el-form-item label="合同金额" prop="amount">
+                            <el-input v-model="formData.amount" clearable disabled placeholder="系统自动计算" />
+                        </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="不含税金额" prop="amount_excluding_tax">
-                            <el-input v-model="formData.amount_excluding_tax" clearable placeholder="请输入不含税金额" />
+                            <el-input v-model="formData.amount_excluding_tax" clearable disabled placeholder="系统自动计算" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="金额大写" prop="amount_daxie">
-                            <el-input v-model="formData.amount_daxie" clearable placeholder="请输入金额大写" />
+                            <el-input v-model="formData.amount_daxie" clearable disabled placeholder="系统自动填写" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="质保金比例" prop="retention_money_rate">
@@ -94,7 +89,7 @@
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="质保金" prop="retention_money">
-                            <el-input v-model="formData.retention_money" clearable placeholder="请输入质保金" />
+                            <el-input v-model="formData.retention_money" clearable disabled placeholder="系统自动计算" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="备注" prop="remark">
@@ -219,7 +214,7 @@
                 </div>
             </el-form>
         </popup>
-        <el-dialog v-model="showDialog" title="选择项目" width="70%">
+        <el-dialog v-model="showDialog" title="选择采购合同" width="70%">
             <procurementTable @customEvent="customEvent"></procurementTable>
         </el-dialog>
 
@@ -253,6 +248,8 @@ const showDialog = ref(false)
 const showDialog1 = ref(false)
 const project_name = ref('')
 const project_code = ref('')
+const supplier_name = ref('')
+const supplier_code = ref('')
 const formDataannex = reactive([])
 const tableData = reactive([])
 const tableData1 = reactive([])
@@ -365,17 +362,25 @@ const formData = reactive({
 })
 const customEvent = (e: any) => {
     project_name.value = e.name
-    formData.project_id = e.id
+    formData.procurement_contract_id = e.id
+    formData.supplier_id = e.supplier_id
+    formData.contract_no = e.contract_name
+    formData.contract_type = e.contract_type
+    formData.pay_type = e.pay_type
+    formData.account_period = e.account_period
+    formData.signing_date = e.signing_date
+    formData.amount = e.amount
+    formData.amount_daxie = e.amount_daxie
+    formData.retention_money = e.retention_money
+    formData.amount_excluding_tax = e.amount_excluding_tax
+    project_name.value = e.project_name
+    supplier_name.value = e.supplier_name
+    supplier_code.value = e.supplier_code
     project_code.value = e.project_code
     showDialog.value = false;
-    showDialog.value = false;
 };
-const customEvent1 = (e: any) => {
 
 
-    showDialog1.value = false;
-};
-
 // 表单验证
 const formRules = reactive<any>({
 
diff --git a/src/views/project/edit.vue b/src/views/project/edit.vue
index fc8fec3..e2d0f01 100644
--- a/src/views/project/edit.vue
+++ b/src/views/project/edit.vue
@@ -3,12 +3,12 @@
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <el-row :gutter="10">
-                    <el-col :span="12">
+                    <el-col :span="128">
                         <el-form-item label="客户名称" prop="custom_name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="项目类型" prop="project_type" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-select class="flex-1" v-model="formData.project_type" clearable placeholder="请选择项目类型">
                                 <el-option v-for="(item, index) in protype" :key="index" :label="item.name" :value="parseInt(item.id)" />
@@ -16,11 +16,11 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="项目名称" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.name" clearable placeholder="请输入项目名称" />
                         </el-form-item>
-                    </el-col> <el-col :span="12">
+                    </el-col> <el-col :span="8">
                         <el-form-item label="项目编码" prop="project_code">
                             <el-input v-model="formData.project_code" clearable placeholder="请输入项目编码" />
                         </el-form-item>
@@ -34,28 +34,28 @@
                             </el-checkbox-group>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="24">
+                    <el-col :span="8">
                         <el-form-item label="项目估算" prop="project_estimation">
                             <el-input v-model="formData.project_estimation" clearable placeholder="请输入项目估算" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="项目所在地" prop="project_address">
                             <el-input v-model="formData.project_address" clearable placeholder="请输入项目所在地" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="预计工期" prop="estimated_construction">
                             <el-input v-model="formData.estimated_construction" clearable placeholder="请输入预计工期" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="投标时间" prop="bidding_time">
                             <el-date-picker class="flex-1 !flex" v-model="formData.bidding_time" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择投标时间">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="24">
                         <el-form-item label="招标方式" prop="bidding_method">
                             <el-radio-group v-model="formData.bidding_method" placeholder="请选择招标方式">
                                 <el-radio v-for="(item, index) in dictData.bidding_method" :key="index" :label="parseInt(item.value)">
@@ -64,31 +64,55 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="联系人" prop="contacts">
                             <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="联系人职位" prop="position">
                             <el-input v-model="formData.position" clearable placeholder="请输入联系人职位" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="联系电话" prop="telephone">
                             <el-input v-model="formData.telephone" clearable placeholder="请输入联系电话" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="联系人部门" prop="department">
                             <el-input v-model="formData.department" clearable placeholder="请输入联系人部门" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="负责人" prop="person">
                             <el-input v-model="formData.person" clearable placeholder="请输入负责人" />
                         </el-form-item>
                     </el-col>
+
+                    <el-col :span="8">
+                        <el-form-item label="发现时间" prop="discovery_time" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.discovery_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="信息来源" prop="information_sources" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-select class="flex-1" v-model="formData.information_sources" clearable placeholder="请选择信息来源">
+                                <el-option v-for="(item, index) in dictData.information_sources" :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="construction_payment_method">
+                            <el-input v-model="formData.construction_payment_method" clearable placeholder="请输入建设方付款方式" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="竞争对手" prop="competitor">
+                            <el-input v-model="formData.competitor" clearable placeholder="请输入竞争对手" />
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="12">
                         <el-form-item label="关系度" prop="relationship">
                             <el-radio-group v-model="formData.relationship" placeholder="请选择关系度">
@@ -98,24 +122,6 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="发现时间" prop="discovery_time" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-date-picker class="flex-1 !flex" v-model="formData.discovery_time" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择发现时间">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="信息来源" prop="information_sources" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-select class="flex-1" v-model="formData.information_sources" clearable placeholder="请选择信息来源">
-                                <el-option v-for="(item, index) in dictData.information_sources" :key="index" :label="item.name" :value="parseInt(item.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="竞争对手" prop="competitor">
-                            <el-input v-model="formData.competitor" clearable placeholder="请输入竞争对手" />
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="12">
                         <el-form-item label="项目建设资金来源" prop="construction_funds_sources">
                             <el-radio-group v-model="formData.construction_funds_sources" placeholder="请选择项目建设资金来源">
@@ -125,11 +131,7 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="建设方付款方式" prop="construction_payment_method">
-                            <el-input v-model="formData.construction_payment_method" clearable placeholder="请输入建设方付款方式" />
-                        </el-form-item>
-                    </el-col>
+
                     <el-col :span="12">
                         <el-form-item label="建设方财务状况" prop="construction_financial_status">
                             <el-radio-group v-model="formData.construction_financial_status" placeholder="请选择建设方财务状况">
@@ -184,7 +186,7 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="24">
                         <!-- <el-form-item label="附件" prop="annex">
                             <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
                         </el-form-item> -->
diff --git a/src/views/project_estimate/edit.vue b/src/views/project_estimate/edit.vue
index 8c9a473..6147fe7 100644
--- a/src/views/project_estimate/edit.vue
+++ b/src/views/project_estimate/edit.vue
@@ -1,87 +1,94 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="组织" prop="org_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                    <el-select class="flex-1" readonly v-model="formData.org_id" clearable placeholder="请选择组织" @change="area_change">
-                        <el-option v-for="(item, index) in orglist" :key="index" :label="item.name" :value="parseInt(item.id)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="部门" readonly prop="dept_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                    <el-select class="flex-1" v-model="formData.dept_id" clearable placeholder="请选择部门" @change="area_change1">
-                        <el-option v-for="(item, index) in jobs" :key="index" :label="item.name" :value="parseInt(item.id)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="项目名称" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                    <el-input v-model="project_name" readonly clearable placeholder="请输入项目名称" />
-                </el-form-item>
-                <el-form-item label="项目编码" prop="project_id">
-                    <el-input v-model="project_code" disabled clearable placeholder="系统自动填写" />
-                </el-form-item>
-                <el-form-item label="客户名称" prop="project_id">
-                    <el-input v-model="custom_name" disabled placeholder="系统自动填写" />
-                </el-form-item>
-                <el-form-item label="需求名称" prop="customer_demand_id" @click="showDialog1 = true">
-                    <el-input v-model="customer_demand_name" clearable readonly placeholder="请选择需求" />
-                </el-form-item>
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="60%" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="组织" prop="org_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-select class="flex-1" readonly v-model="formData.org_id" clearable placeholder="请选择组织" @change="area_change">
+                                <el-option v-for="(item, index) in orglist" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                            </el-select>
+                        </el-form-item> </el-col><el-col :span="12">
+                        <el-form-item label="部门" readonly prop="dept_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-select class="flex-1" v-model="formData.dept_id" clearable placeholder="请选择部门" @change="area_change1">
+                                <el-option v-for="(item, index) in jobs" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                            </el-select>
+                        </el-form-item></el-col><el-col :span="12">
+                        <el-form-item label="项目名称" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                            <el-input v-model="project_name" readonly clearable placeholder="请输入项目名称" />
+                        </el-form-item></el-col><el-col :span="12">
+                        <el-form-item label="项目编码" prop="project_id">
+                            <el-input v-model="project_code" disabled clearable placeholder="系统自动填写" />
+                        </el-form-item></el-col><el-col :span="12">
+                        <el-form-item label="客户名称" prop="project_id">
+                            <el-input v-model="custom_name" disabled placeholder="系统自动填写" />
+                        </el-form-item></el-col><el-col :span="12">
+                        <el-form-item label="需求名称" prop="customer_demand_id" @click="demandclck">
+                            <el-input v-model="customer_demand_name" clearable readonly placeholder="请选择需求" />
+                        </el-form-item></el-col><el-col :span="12">
 
-                <el-form-item label="联系人" prop="contact_id" @click="showDialog2 = true">
-                    <el-input v-model="contact_name" clearable readonly placeholder="请输入联系人" />
-                </el-form-item>
+                        <el-form-item label="联系人" prop="contact_id" @click="showDialog2 = true">
+                            <el-input v-model="contact_name" clearable readonly placeholder="请选择联系人" />
+                        </el-form-item></el-col><el-col :span="12">
 
-                <el-form-item label="联系电话" prop="customer_demand_id">
-                    <el-input v-model="contact_phone" clearable readonly placeholder="请输入联系电话" />
-                </el-form-item>
-                <el-form-item label="概算来源" prop="estimate_source">
-                    <el-radio-group v-model="formData.estimate_source" placeholder="请选择概算来源">
-                        <el-radio v-for="(item, index) in dictData.estimate_source" :key="index" :label="parseInt(item.value)">
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="制单人" prop="create_user">
-                    <el-input v-model="formData.create_user" clearable placeholder="请输入制单人" />
-                </el-form-item>
-                <el-form-item label="报价日期" prop="quotation_date">
-                    <el-date-picker class="flex-1 !flex" v-model="formData.quotation_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择报价日期">
-                    </el-date-picker>
-                </el-form-item>
+                        <el-form-item label="联系电话" prop="contact_phone" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
+                            <el-input v-model="contact_phone" clearable disabled placeholder="系统自动填写" />
+                        </el-form-item></el-col><el-col :span="24">
+                        <el-form-item label="概算来源" prop="estimate_source">
+                            <el-radio-group v-model="formData.estimate_source" placeholder="请选择概算来源">
+                                <el-radio v-for="(item, index) in dictData.estimate_source" :key="index" :label="parseInt(item.value)">
+                                    {{ item.name }}
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item></el-col><el-col :span="12">
+                        <el-form-item label="制单人" prop="create_user">
+                            <el-input v-model="formData.create_user" clearable placeholder="请输入制单人" />
+                        </el-form-item>
+                        <el-form-item label="报价日期" prop="quotation_date">
+                            <el-date-picker class="flex-1 !flex" v-model="formData.quotation_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择报价日期">
+                            </el-date-picker>
+                        </el-form-item></el-col>
+                    <el-col :span="24">
 
-                <el-form-item label="发票类型" prop="invoice_type">
-                    <el-radio-group v-model="formData.invoice_type" placeholder="请选择发票类型">
-                        <el-radio v-for="(item, index) in dictData.invoice_type" :key="index" :label="parseInt(item.value)">
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="技术人员id" prop="technician">
+                        <el-form-item label="发票类型" prop="invoice_type">
+                            <el-radio-group v-model="formData.invoice_type" placeholder="请选择发票类型">
+                                <el-radio v-for="(item, index) in dictData.invoice_type" :key="index" :label="parseInt(item.value)">
+                                    {{ item.name }}
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item></el-col><el-col :span="12">
+                        <el-form-item label="技术人员id" prop="technician">
 
-                    <el-select class="flex-1" v-model="formData.technician" clearable placeholder="请输入技术人员">
-                        <el-option v-for="(item, index) in jlist" :key="index" :label="item.name" :value="parseInt(item.id)" />
-                    </el-select>
-                    <!-- <el-input v-model="formData.technician" clearable placeholder="请输入技术人员id" /> -->
-                </el-form-item>
-                <el-form-item label="概算金额" prop="estimate_amount">
-                    <el-input v-model="formData.estimate_amount" clearable placeholder="请输入概算金额" />
-                </el-form-item>
-                <el-form-item label="要求" prop="ask">
-                    <el-input v-model="formData.ask" clearable placeholder="请输入要求" />
-                </el-form-item>
-                <el-form-item label="附件" prop="field127">
-                    <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
-                        <el-button type="primary">
-                            上传
-                        </el-button>
-                    </el-upload>
+                            <el-select class="flex-1" v-model="formData.technician" clearable placeholder="请输入技术人员">
+                                <el-option v-for="(item, index) in jlist" :key="index" :label="item.name" :value="parseInt(item.id)" />
+                            </el-select>
+                            <!-- <el-input v-model="formData.technician" clearable placeholder="请输入技术人员id" /> -->
+                        </el-form-item></el-col><el-col :span="12">
+                        <el-form-item label="概算金额" prop="estimate_amount">
+                            <el-input v-model="formData.estimate_amount" clearable placeholder="请输入概算金额" />
+                        </el-form-item></el-col><el-col :span="12">
+                        <el-form-item label="要求" prop="ask">
+                            <el-input v-model="formData.ask" clearable placeholder="请输入要求" />
+                        </el-form-item></el-col><el-col :span="24">
+                        <el-form-item label="附件" prop="field127">
+                            <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+                                <el-button type="primary">
+                                    上传
+                                </el-button>
+                            </el-upload>
 
-                    <div>
-                        <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-                            <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                        </div>
-                    </div>
-                </el-form-item>
+                            <div>
+                                <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
+                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
+                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
+                                </div>
+                            </div>
+                        </el-form-item>
+
+                    </el-col>
+                </el-row>
             </el-form>
+
         </popup>
         <el-dialog v-model="showDialog" title="选择项目" width="70%">
             <projectTable @customEvent="customEvent"></projectTable>
@@ -132,6 +139,7 @@ const formDataannex = reactive([])
 import configs from "@/config"
 const base_url = configs.baseUrl + configs.urlPrefix
 import useUserStore from "@/stores/modules/user";
+import feedback from '@/utils/feedback'
 
 const userStore = useUserStore();
 // 上传文件
@@ -152,6 +160,8 @@ const handleAvatarSuccess_four = (
 const delFileFn = (index: number) => {
     formDataannex.splice(index, 1)
 }
+
+
 // dialog
 const showDialog = ref(false)
 const showDialog1 = ref(false)
@@ -198,12 +208,31 @@ const area_change = (e: any) => {
 const area_change1 = (e: any) => {
     formData.dept_id = e
     let data = { 'dept_id': e }
-    console.log(data)
+    // console.log(data)
     getAdminsByDept(data).then((res) => {
         Object.assign(jlist, res)
     })
 }
 
+//打开弹窗
+const demandclck = () => {
+    if (formData.project_id) {
+        showDialog1.value = true;
+    } else {
+        feedback.msgError('请先选择项目')
+    }
+}
+
+//验证
+const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
+
+    if (value && !/^1\d{10}$/.test(value)) {
+        callback(new Error('请输入正确的手机号码'));
+    } else {
+        callback()
+    }
+
+}
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑项目概算' : '新增项目概算'
diff --git a/src/views/project_salary/project_salary_detail/detail.vue b/src/views/project_salary/project_salary_detail/detail.vue
deleted file mode 100644
index 35e19a5..0000000
--- a/src/views/project_salary/project_salary_detail/detail.vue
+++ /dev/null
@@ -1,186 +0,0 @@
-
-<template>
-    <div class="detail-popup">
-        <popup ref="popupRef" title="保险管理详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px">
-                <el-card class="mb-2">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="项目名称">
-                                {{ formData.project_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目编号">
-                                {{ formData.project_code }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="姓名">
-                                {{ formData.person_name }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="身份证号">
-                                {{ formData.person_idcard }}
-                            </el-form-item>
-                        </el-col>
-
-
-                        <el-col :span="12">
-                            <el-form-item label="投保日期">
-                                {{ formData.insurance_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="到期日期">
-                                {{ formData.due_date }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="保费（元）">
-                                {{ formData.insurance }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="投保金额（万元）">
-                                {{ formData.insured_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="保险公司">
-                                {{ formData.insurance_company }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="保单明细">
-                                {{ formData.insurance_detail }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="发票编号">
-                                {{ formData.invoice_no
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="经办人">
-                                {{ formData.handler
-                                }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                            <el-form-item label="合同附件">
-                                <div v-if="formDataannex.length > 0">
-                                    <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-                                        <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                    </div>
-                                </div>
-                                <div v-else>暂无附件</div>
-                            </el-form-item>
-                        </el-col>
-
-                    </el-row>
-                </el-card>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="customdetail">
-
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiCustomDetail } from '@/api/custom'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const formDataannex = reactive([])
-
-
-const datas = reactive({
-    provinceOptions: [],
-    cityOptions: [],
-    areaOptions: [],
-});
-
-
-// 表单数据
-const formData = reactive({
-
-})
-
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    Object.assign(formData, data)
-    if (data.annex && data.annex.length > 0) {
-
-        const arry1 = data.annex.map((item: any, index: any) => {
-            return {
-                name: `文件${index + 1}`,
-                uri: item
-            };
-        });
-        Object.assign(formDataannex, arry1)
-
-
-    }
-
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiCustomDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    popupRef.value?.close()
-
-}
-
-//打开弹窗
-const open = () => {
-    console.log('1111111')
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-
-
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
-<style lang="scss">
-.tit {
-    font-size: 1.2em;
-    margin-bottom: 10px;
-}
-</style>
diff --git a/src/views/project_salary/project_salary_detail/edit.vue b/src/views/project_salary/project_salary_detail/edit.vue
deleted file mode 100644
index 01fc96e..0000000
--- a/src/views/project_salary/project_salary_detail/edit.vue
+++ /dev/null
@@ -1,288 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <el-form-item label="组织id" prop="org_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                    <el-select class="flex-1" v-model="formData.org_id" clearable placeholder="请选择组织id" @change="area_change">
-                        <el-option v-for="(item, index) in orglist" :key="index" :label="item.name" :value="parseInt(item.id)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="部门id" prop="dept_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                    <el-select class="flex-1" v-model="formData.dept_id" clearable placeholder="请选择部门id">
-                        <el-option v-for="(item, index) in jobs" :key="index" :label="item.name" :value="parseInt(item.id)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="项目名称" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                    <el-input v-model="project_name" clearable placeholder="请输入项目id" />
-                </el-form-item>
-                <el-form-item label="项目编码" prop="project_id">
-                    <el-input v-model="project_code
-                        " clearable placeholder="请输入项目id" />
-                </el-form-item>
-
-                <el-form-item label="唯一标识" prop="theme">
-                    <el-input v-model="formData.theme" clearable placeholder="请输入唯一标识" />
-                </el-form-item>
-                <el-form-item label="日期" prop="recording_time">
-                    <el-date-picker class="flex-1 !flex" v-model="formData.recording_time" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
-                    </el-date-picker>
-                </el-form-item>
-
-                <el-form-item label="姓名" prop="supplier">
-                    <el-input v-model="formData.supplier" clearable placeholder="请输入姓名" />
-                </el-form-item>
-                <el-form-item label="身份证号" prop="supplier_contacts" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
-                    <el-input v-model="formData.supplier_contacts" clearable placeholder="身份证号" />
-                </el-form-item>
-                <el-form-item label="工种" prop="importance">
-                    <el-radio-group v-model="formData.importance" placeholder="请选择工种">
-                        <el-radio v-for="(item, index) in dictData.importance" :key="index" :label="parseInt(item.value)">
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-
-                <el-form-item label="总收入" prop="demand_content">
-                    <el-input v-model="formData.demand_content" clearable placeholder="请输入总收入" />
-                </el-form-item>
-
-                <el-form-item label="总支出" prop="demand_content">
-                    <el-input v-model="formData.demand_content" clearable placeholder="请输入总支出" />
-                </el-form-item>
-
-                <el-form-item label="未发放" prop="demand_content">
-                    <el-input v-model="formData.demand_content" clearable placeholder="请输入未发放" />
-                </el-form-item>
-
-
-                <el-form-item label="本次申请付款金额" prop="demand_content">
-                    <el-input v-model="formData.demand_content" clearable placeholder="请输入本次申请付款金额" />
-                </el-form-item>
-
-                <el-form-item label="备注" prop="demand_content">
-                    <el-input v-model="formData.demand_content" clearable placeholder="请输入备注" />
-                </el-form-item>
-                <el-form-item label="银行卡号" prop="demand_content">
-                    <el-input v-model="formData.demand_content" clearable placeholder="请输入银行卡号" />
-                </el-form-item>
-                <el-form-item label="开户银行" prop="demand_content">
-                    <el-input v-model="formData.demand_content" clearable placeholder="请输入开户银行" />
-                </el-form-item>
-
-
-                <el-form-item label="附件" prop="field127">
-                    <el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
-                        <el-button type="primary">
-                            上传
-                        </el-button>
-                    </el-upload>
-
-                    <div>
-                        <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
-                            <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                        </div>
-                    </div>
-                </el-form-item>
-            </el-form>
-        </popup>
-        <el-dialog v-model="showDialog" title="选择项目" width="70%">
-            <projectTable @customEvent="customEvent"></projectTable>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup name="customerDemandEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { deptAll } from '@/api/org/department'
-import { getAll } from '@/api/org/organization'
-import projectTable from "@/components/project/index.vue"
-import { apiCustomerDemandAdd, apiCustomerDemandEdit, apiCustomerDemandDetail } from '@/api/customer_demand'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-const orglist = reactive([])
-const jobs = reactive([])
-const project_name
-    = ref('')
-const project_code
-    = ref('')
-const custom_name
-    = ref('')
-const formDataannex = reactive([])
-import configs from "@/config"
-const base_url = configs.baseUrl + configs.urlPrefix
-import useUserStore from "@/stores/modules/user";
-
-const userStore = useUserStore();
-// 上传文件
-const handleAvatarSuccess_four = (
-    response,
-    uploadFile
-) => {
-    if (response.code == 0) {
-        ElMessage.error(response.msg);
-        return;
-    }
-    formDataannex.push(
-        { uri: response.data.uri, name: response.data.name }
-
-    );
-};
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formDataannex.splice(index, 1)
-}
-// dialog
-const showDialog = ref(false)
-const customEvent = (e: any) => {
-    formData.project_id = e.id;
-    project_name.value = e.name;
-    project_code
-        .value = e.project_code;
-    custom_name
-        .value = e.custom_name;
-    showDialog.value = false;
-};
-
-const getlista = () => {
-    getAll().then((res) => {
-        // orglist = res.data
-
-        Object.assign(orglist, res)
-
-    })
-}
-
-const area_change = (e: any) => {
-    formData.org_id = e
-    let data = { 'org_id': e }
-    // console.log(data)
-    deptAll(data).then((res) => {
-
-        Object.assign(jobs, res)
-
-    })
-}
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑客户需求' : '新增客户需求'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    org_id: '',
-    dept_id: '',
-    project_id: '',
-    theme: '',
-    supplier: '',
-    supplier_contacts: '',
-    importance: '',
-    recording_time: '',
-    demand_content: '',
-    annex: '',
-})
-const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
-    const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
-    // if (!value) {
-    //     return callback(new Error('电话号码不能为空'))
-    // }
-    if (value) {
-        setTimeout(() => {
-            if (phoneReg.test(value)) {
-                callback()
-            } else {
-                callback(new Error('电话号码格式不正确'))
-            }
-
-        }, 100)
-    }
-
-}
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    deptAll({ 'org_id': data.org_id }).then((res) => {
-        Object.assign(jobs, res)
-    })
-    if (data.annex && data.annex.length > 0) {
-        const arry1 = data.annex.map((item: any, index: any) => {
-            return {
-                name: `文件${index + 1}`,
-                uri: item
-            };
-        });
-        Object.assign(formDataannex, arry1)
-    }
-    project_name.value = data.project_name
-    custom_name.value = data.custom_name
-    project_code.value = data.project_code
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-
-    //@ts-ignore
-    formData.recording_time = timeFormat(formData.recording_time, 'yyyy-mm-dd hh:MM:ss')
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiCustomerDemandDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    if (formDataannex.length > 0) {
-        formData.annex = JSON.stringify(formDataannex.map((item) => item.uri))
-    }
-    await formRef.value?.validate()
-    const data = { ...formData, }
-    mode.value == 'edit'
-        ? await apiCustomerDemandEdit(data)
-        : await apiCustomerDemandAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-getlista()
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/project_salary/project_salary_detail/index.vue b/src/views/project_salary/project_salary_detail/index.vue
deleted file mode 100644
index 3439f49..0000000
--- a/src/views/project_salary/project_salary_detail/index.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-
-                <el-form-item label="保单号" prop="insurance_no">
-                    <el-input v-model="queryParams.insurance_no" clearable placeholder="请输入保单号" />
-                </el-form-item>
-                <el-form-item label="保险种类" prop="type">
-                    <el-input v-model="queryParams.type" clearable placeholder="请输入保险种类" />
-                </el-form-item>
-                <el-form-item label="保险公司" prop="insurance_company">
-                    <el-input v-model="queryParams.insurance_company" clearable placeholder="请输入保险公司" />
-                </el-form-item>
-                <el-form-item label="发票编号" prop="invoice_no">
-                    <el-input v-model="queryParams.invoice_no" clearable placeholder="请输入发票编号" />
-                </el-form-item>
-                <el-form-item label="经办人" prop="handler">
-                    <el-input v-model="queryParams.handler" clearable placeholder="请输入经办人" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['project.project_salary/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button v-perms="['project.project_salary/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
-                删除
-            </el-button>
-
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="序号" type="index" show-overflow-tooltip />
-                    <el-table-column label="处理流程" prop="person_idcard" show-overflow-tooltip />
-                    <el-table-column label="流程步骤" prop="person_idcard" show-overflow-tooltip />
-                    <el-table-column label="工资付款单号" prop="person_idcard" show-overflow-tooltip />
-                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="姓名" prop="person_name" show-overflow-tooltip />
-                    <el-table-column label="付款类型" prop="person_idcard" show-overflow-tooltip />
-                    <el-table-column label="申请日期" prop="insurance_date" show-overflow-tooltip />
-                    <el-table-column label="合计金额" prop="due_date" show-overflow-tooltip />
-                    <el-table-column label="合计金额大写" prop="insurance_no" show-overflow-tooltip />
-                    <el-table-column label="账户编码）" prop="insurance" show-overflow-tooltip />
-                    <el-table-column label="投保金额（万元）" prop="insured_amount" show-overflow-tooltip />
-                    <el-table-column label="开户银行" prop="insurance_company" show-overflow-tooltip />
-                    <el-table-column label="账号" prop="insurance_detail" show-overflow-tooltip />
-                    <el-table-column label="开户名称" prop="invoice_no" show-overflow-tooltip />
-                    <el-table-column label="是否计息" prop="handler" show-overflow-tooltip />
-                    <el-table-column label="开始计息日期" prop="handler" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="附件" prop="annex" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <div v-if="row.annex && row.annex.length > 0">
-                                <div v-for="(item, i) in row.annex " :key='i'>
-                                    <el-link :href="item" target="_blank">文件{{ i + 1 }}查看</el-link>
-                                </div>
-                            </div>
-                            <div v-else>
-                                暂无文件
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <!-- <el-table-column label="人员标识" prop="per_daily_living" show-overflow-tooltip /> -->
-                    <el-table-column label="操作" width="160" fixed="right">
-                        <template #default="{ row }">
-                            <el-button v-perms="['project.project_salary/edit']" type="primary" link @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button v-perms="['project.project_salary/delete']" type="danger" link @click="handleDelete(row.id)">
-                                删除
-                            </el-button>
-                            <el-button v-perms="['project.project_salary/detail']" link @click="handledetail(row)">
-                                详情
-                            </el-button>
-
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex justify-end mt-4">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-        <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="projectLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { projectsalaryDetailLists, projectsalaryDetailDelete, projectsalaryDetailDetail } from '@/api/project_salary_detail'
-import { timeFormat } from '@/utils/util'
-import { getAllProjectTypes } from '@/api/projecttype'
-const protype = reactive([])
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDtail = ref(false)
-
-// 查询条件
-const queryParams = reactive({
-    type: '',
-    insurance_no: '',
-    insurance_company: '',
-    invoice_no: '',
-    handler: '',
-
-})
-
-
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('labor_contract_status,labor_contract_type,labor_contract_name')
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: projectsalaryDetailLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-
-// 编辑
-const handleEdit = async (data: any) => {
-    console.log(data.id)
-    let res = await projectsalaryDetailDetail({ id: data.id })
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(res)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await projectsalaryDetailDelete({ id })
-    getLists()
-}
-const handledetail = async (data: any) => {
-    let res = await projectsalaryDetailDetail({ id: data.id })
-    showDtail.value = true
-    await nextTick()
-    detailRef.value?.open()
-    detailRef.value?.setFormData(res)
-}
-
-
-getLists()
-</script>
-
diff --git a/src/views/project_salary_detail/index.vue b/src/views/project_salary_detail/index.vue
new file mode 100644
index 0000000..4f3bef3
--- /dev/null
+++ b/src/views/project_salary_detail/index.vue
@@ -0,0 +1,116 @@
+<template>
+    <div>
+
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+
+
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="序号" type="index" show-overflow-tooltip />
+                    <el-table-column label="工资付款单号" prop="payment_code" show-overflow-tooltip />
+                    <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
+                    <el-table-column label="日期" prop="apply_date" show-overflow-tooltip />
+                    <el-table-column label="姓名" prop="person_name" show-overflow-tooltip />
+                    <el-table-column label="身份证号" prop="person_idcard" show-overflow-tooltip />
+                    <el-table-column label="工种" prop="person_work_type_text" show-overflow-tooltip />
+                    <el-table-column label="总收入" prop="total_income" show-overflow-tooltip />
+                    <el-table-column label="总支出" prop="total_pay_out" show-overflow-tooltip />
+                    <el-table-column label="未发放" prop="balance" show-overflow-tooltip />
+                    <el-table-column label="本次申请付款金额" prop="apply_amount" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <!-- <el-table-column label="银行卡号" prop="handler" show-overflow-tooltip />
+                    <el-table-column label="开户银行" prop="remark" show-overflow-tooltip /> -->
+
+
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { projectsalaryDetailLists } from '@/api/project_salary_detail'
+import { timeFormat } from '@/utils/util'
+import { getAllProjectTypes } from '@/api/projecttype'
+const protype = reactive([])
+import feedback from '@/utils/feedback'
+// import EditPopup from './edit.vue'
+// import DetailPopup from './detail.vue'
+// const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
+// const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// // 是否显示编辑框
+// const showEdit = ref(false)
+// const showDtail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    type: '',
+    insurance_no: '',
+    insurance_company: '',
+    invoice_no: '',
+    handler: '',
+
+})
+
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('labor_contract_status,labor_contract_type,labor_contract_name')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: projectsalaryDetailLists,
+    params: queryParams
+})
+
+// // 添加
+// const handleAdd = async () => {
+//     showEdit.value = true
+//     await nextTick()
+//     editRef.value?.open('add')
+// }
+
+
+// // 编辑
+// const handleEdit = async (data: any) => {
+//     console.log(data.id)
+//     let res = await projectsalaryDetailDetail({ id: data.id })
+//     showEdit.value = true
+//     await nextTick()
+//     editRef.value?.open('edit')
+//     editRef.value?.setFormData(res)
+// }
+
+// // 删除
+// const handleDelete = async (id: number | any[]) => {
+//     await feedback.confirm('确定要删除？')
+//     await projectsalaryDetailDelete({ id })
+//     getLists()
+// }
+// const handledetail = async (data: any) => {
+//     let res = await projectsalaryDetailDetail({ id: data.id })
+//     showDtail.value = true
+//     await nextTick()
+//     detailRef.value?.open()
+//     detailRef.value?.setFormData(res)
+// }
+
+
+getLists()
+</script>
+
diff --git a/src/views/project_salary/list/detail.vue b/src/views/project_salary_payment/detail.vue
similarity index 87%
rename from src/views/project_salary/list/detail.vue
rename to src/views/project_salary_payment/detail.vue
index 533f587..ac5b657 100644
--- a/src/views/project_salary/list/detail.vue
+++ b/src/views/project_salary_payment/detail.vue
@@ -32,41 +32,26 @@
                         </el-col>
 
 
+
+                        <el-col :span="12">
+                            <el-form-item label="付款类型">
+                                {{ formData.payment_type }}
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="12">
                             <el-form-item label="申请日期">
                                 {{ formData.apply_date }}
                             </el-form-item>
                         </el-col>
-
                         <el-col :span="12">
                             <el-form-item label="合计金额">
-                                {{ formData.total_amount }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="合计金额大写">
-                                {{ formData.total_amount_uppercase }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="保险公司">
-                                {{ formData.insurance_company }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="保单明细">
-                                {{ formData.insurance_detail }}
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="发票编号">
-                                {{ formData.invoice_no
+                                {{ formData.total_amount
                                 }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="经办人">
-                                {{ formData.handler
+                            <el-form-item label="合计金额大写">
+                                {{ formData.total_amount_uppercase
                                 }}
                             </el-form-item>
                         </el-col>
diff --git a/src/views/project_salary/list/edit.vue b/src/views/project_salary_payment/edit.vue
similarity index 100%
rename from src/views/project_salary/list/edit.vue
rename to src/views/project_salary_payment/edit.vue
diff --git a/src/views/project_salary/list/index.vue b/src/views/project_salary_payment/index.vue
similarity index 94%
rename from src/views/project_salary/list/index.vue
rename to src/views/project_salary_payment/index.vue
index 796e305..ee39896 100644
--- a/src/views/project_salary/list/index.vue
+++ b/src/views/project_salary_payment/index.vue
@@ -24,13 +24,13 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['project.project_salary/add']" type="primary" @click="handleAdd">
+            <el-button v-perms="['project.project_salary_payment/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['project.project_salary/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['project.project_salary_payment/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
 
@@ -72,13 +72,13 @@
                     <!-- <el-table-column label="人员标识" prop="per_daily_living" show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['project.project_salary/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['project.project_salary_payment/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['project.project_salary/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['project.project_salary_payment/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['project.project_salary/detail']" link @click="handledetail(row)">
+                            <el-button v-perms="['project.project_salary_payment/detail']" link @click="handledetail(row)">
                                 详情
                             </el-button>
 
diff --git a/src/views/quotation/edit.vue b/src/views/quotation/edit.vue
index 5974600..205578a 100644
--- a/src/views/quotation/edit.vue
+++ b/src/views/quotation/edit.vue
@@ -86,7 +86,7 @@
                 <div style=" display: flex;justify-content: flex-end;margin-bottom: 30px;"> <el-button @click="showDialog1 = true">选择产品</el-button></div>
 
                 <div style="margin-bottom: 30px;">
-                    <el-table :data="tableData" :summary-method="getSummaries" show-summary>
+                    <el-table :data="tableData">
                         <el-table-column label="序号">
                             <template #default="{ row }">
                                 <el-button @click="handleAdd(row)">+</el-button>
@@ -95,17 +95,17 @@
                         </el-table-column>
                         <el-table-column label="产品名称" prop="name1">
                             <template #default="{ row }">
-                                <el-input v-model="row.name1" />
+                                <el-input v-model="row.name1" disabled placeholder="系统自动填写" />
                             </template>
                         </el-table-column>
                         <el-table-column label="产品编码" prop="name2">
-                            <template #default="{ row }"> <el-input v-model="row.name2" /> </template></el-table-column>
+                            <template #default="{ row }"> <el-input v-model="row.name2" disabled placeholder="系统自动填写" /> </template></el-table-column>
                         <el-table-column label="规格型号" prop="value1">
-                            <template #default="{ row }"> <el-input v-model="row.value1" /> </template></el-table-column>
+                            <template #default="{ row }"> <el-input v-model="row.value1" disabled placeholder="系统自动填写" /> </template></el-table-column>
 
                         <el-table-column label="品牌" prop="value2">
                             <template #default="{ row }">
-                                <el-input v-model="row.value2" />
+                                <el-input v-model="row.value2" disabled placeholder="系统自动填写" />
                             </template>
                         </el-table-column>
 
@@ -161,7 +161,6 @@
         </el-dialog>
 
         <el-dialog v-model="showDialog1" title="选择产品" width="70%">
-
             <customDialog1 @customEvent="customEvent1"></customDialog1>
         </el-dialog>