bug修复

src/api/project_cost_budget.ts

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 // 费用预算列表
 export function apiProjectCostBudgetLists(params: any) {
-    return request.get({ url: '/project.project_cost_budget_detail/lists', params })
+    return request.get({ url: '/project.project_cost_budget/lists', params })
 }
 
 // 添加费用预算

src/api/project_cost_budget_detail.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 费用预算明细列表
+export function apiProjectCostBudgetDetailLists(params: any) {
+    return request.get({ url: '/project.project_cost_budget_detail/lists', params })
+}
+
+// 添加费用预算明细
+export function apiProjectCostBudgetDetailAdd(params: any) {
+    return request.post({ url: '/project.project_cost_budget_detail/add', params })
+}
+
+// 编辑费用预算明细
+export function apiProjectCostBudgetDetailEdit(params: any) {
+    return request.post({ url: '/project.project_cost_budget_detail/edit', params })
+}
+
+// 删除费用预算明细
+export function apiProjectCostBudgetDetailDelete(params: any) {
+    return request.post({ url: '/project.project_cost_budget_detail/delete', params })
+}
+
+// 费用预算明细详情
+export function apiProjectCostBudgetDetailDetail(params: any) {
+    return request.get({ url: '/project.project_cost_budget_detail/detail', params })
+}

src/api/project_equipment_budget.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 机具预算列表
+export function apiProjectEquipmentBudgetLists(params: any) {
+    return request.get({ url: '/project.project_equipment_budget/lists', params })
+}
+
+// 添加机具预算
+export function apiProjectEquipmentBudgetAdd(params: any) {
+    return request.post({ url: '/project.project_equipment_budget/add', params })
+}
+
+// 编辑机具预算
+export function apiProjectEquipmentBudgetEdit(params: any) {
+    return request.post({ url: '/project.project_equipment_budget/edit', params })
+}
+
+// 删除机具预算
+export function apiProjectEquipmentBudgetDelete(params: any) {
+    return request.post({ url: '/project.project_equipment_budget/delete', params })
+}
+
+// 机具预算详情
+export function apiProjectEquipmentBudgetDetail(params: any) {
+    return request.get({ url: '/project.project_equipment_budget/detail', params })
+}

src/components/project_equipment_budget_detail/index.vue

@@ -0,0 +1,68 @@
+<template>
+    <div>
+        <!-- <el-card class="!border-none" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="查询" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" 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">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="项目id" prop="project_id" show-overflow-tooltip />
+                    <el-table-column label="机具预算单号" prop="equipment_budget_code" show-overflow-tooltip />
+                    <el-table-column label="金额" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="附件" prop="annex" show-overflow-tooltip align="center">
+                        <template #default="{ row }">
+                            <el-link style="margin-right: 4px;" type="primary" :href="item.uri"
+                                v-for="(item, index) in row.annex">文件{{
+                                    index + 1 }}</el-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { useDictData } from "@/hooks/useDictOptions"
+import { apiProjectEquipmentBudgetLists } from '@/api/project_equipment_budget'
+
+import { defineEmits } from "vue"
+
+// 查询条件
+const queryParams = reactive({
+    // name: ''
+});
+
+const { dictData } = useDictData('supplier_grade,supplier_group,supplier_category,sex')
+
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectEquipmentBudgetLists,
+    params: queryParams,
+});
+
+getLists();
+</script>

src/components/project_labor_contract/index.vue

@@ -0,0 +1,69 @@
+<template>
+    <div>
+        <!-- <el-card class="!border-none" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="查询" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" 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">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="项目id" prop="project_id" show-overflow-tooltip />
+                    <el-table-column label="人工预算单号" prop="labor_budget_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="remark" show-overflow-tooltip />
+                    <el-table-column label="附件" prop="annex" show-overflow-tooltip align="center">
+                        <template #default="{ row }">
+                            <el-link style="margin-right: 4px;" type="primary" :href="item.uri"
+                                v-for="(item, index) in row.annex">文件{{
+                                    index + 1 }}</el-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+  
+<script lang="ts" setup>
+import { usePaging } from "@/hooks/usePaging"
+import { useDictData } from "@/hooks/useDictOptions"
+import { projectlaborcontractLists } from '@/api/project_labor_contract'
+
+import { defineEmits } from "vue"
+
+// 查询条件
+const queryParams = reactive({
+    // name: ''
+});
+
+const { dictData } = useDictData('supplier_grade,supplier_group,supplier_category,sex')
+
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: projectlaborcontractLists,
+    params: queryParams,
+});
+
+getLists();
+</script>

src/views/custom_contacts/edit.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="客户名称" prop="custom_name" @click="showDialog = true">
+                        <el-form-item label="客户名称" prop="custom_name">
-                            <el-input v-model="formData.custom_name" readonly clearable placeholder="请选择客户" />
+                            <el-input v-model="formData.custom_name" clearable placeholder="请选择客户"
+                                @click="showDialog = true" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -20,7 +20,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="手机" prop="phone" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
+                        <el-form-item label="手机" prop="phone">
                             <el-input v-model="formData.phone" clearable placeholder="请输入手机" />
                         </el-form-item>
                     </el-col>
@@ -30,7 +30,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="邮箱" prop="email" :rules="[{ validator: userEmail, trigger: 'blur' }]">
+                        <el-form-item label="邮箱" prop="email">
                             <el-input v-model="formData.email" clearable placeholder="请输入邮箱" />
                         </el-form-item>
                     </el-col>
@@ -44,9 +44,7 @@
                             <material-picker v-model="formData.annex" type="file" />
                         </el-form-item> -->
                         <el-form-item label="附件" prop="field127">
-                            <el-upload
+                            <el-upload accept=".pdf" class="upload-demo" :show-file-list="false" aria-hidden="true"
-                                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">
@@ -61,9 +59,15 @@
                                     <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
                                 </div>
                             </div>
+
+
+
                         </el-form-item>
+
                     </el-col>
                 </el-row>
+
+
                 <el-dialog v-model="showDialog" title="选择客户" width="70%">
                     <customDialog @customEvent="customEvent"></customDialog>
                 </el-dialog>
@@ -83,12 +87,12 @@ import useUserStore from "@/stores/modules/user";
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 import configs from "@/config"
-console.log(configs, 55)
 const base_url = configs.baseUrl + configs.urlPrefix
 const userStore = useUserStore();
 // 上传文件
 const handleAvatarSuccess_four = (
-    response: any
+    response,
+    uploadFile
 ) => {
     if (response.code == 0) {
         ElMessage.error(response.msg);
@@ -181,24 +185,8 @@ const getDetail = async (row: Record<string, any>) => {
     })
     setFormData(data)
 }
-//验证
-const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
 
-    if (value && !/^1[3|4|5|7|8][0-9]{9}$/.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 && !mailReg.test(value)) {
-        return callback(new Error('请输入正确的邮箱格式'))
-    } else {
-        callback()
-    }
-};
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()

src/views/custom_follow/edit.vue

@@ -1,70 +1,50 @@
 <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="auto" :rules="formRules">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="主题" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                <el-form-item label="主题" prop="name">
                     <el-input v-model="formData.name" clearable placeholder="请输入主题" />
                 </el-form-item>
-                <el-form-item label="客户名称" prop="custom_id" @click="showDialog = true">
+                <el-form-item label="客户名称" prop="custom_name">
-                    <el-input v-model="formData.custom_name" readonly clearable placeholder="请选择客户" />
+                    <el-input v-model="formData.custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
                 </el-form-item>
                 <el-form-item label="联系人" prop="contacts">
                     <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
                 </el-form-item>
-                <el-form-item label="日期" prop="date" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                <el-form-item label="日期" prop="date">
-                    <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="date"
+                    <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="datetime"
-                        value-format="YYYY-MM-DD" placeholder="选择日期">
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="类型" prop="types" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                <el-form-item label="类型" prop="types">
                     <el-select class="flex-1" v-model="formData.types" clearable placeholder="请选择类型">
-                        <el-option v-for="(item, index) in dictData.follow_type" :key="index" :label="item.name"
+                        <el-option v-for="(item, index) in dictData.types" :key="index" :label="item.name"
                             :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="执行人" prop="executor">
+                <el-form-item label="执行人" prop="admin_id">
-                    <el-input v-model="formData.executor" clearable placeholder="请输入执行人" />
+                    <el-input v-model="formData.admin_id" clearable placeholder="请输入执行人" />
                 </el-form-item>
                 <el-form-item label="行动描述" prop="description">
                     <el-input v-model="formData.description" clearable placeholder="请输入行动描述" />
                 </el-form-item>
                 <el-form-item label="附件/现场照片" prop="annex">
-                    <material-picker v-model="formData.annex" :limit="20" />
+                    <material-picker v-model="formData.annex" />
                 </el-form-item>
                 <el-form-item label="位置" prop="coordinate">
                     <el-input v-model="formData.coordinate" clearable placeholder="请输入位置" />
                 </el-form-item>
                 <el-form-item label="下次回访日期" prop="next_follow_date">
-                    <el-date-picker class="flex-1 !flex" v-model="formData.next_follow_date" clearable type="date"
+                    <el-date-picker class="flex-1 !flex" v-model="formData.next_follow_date" clearable type="datetime"
-                        value-format="YYYY-MM-DD" placeholder="选择下次回访日期">
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择下次回访日期">
                     </el-date-picker>
                 </el-form-item>
             </el-form>
         </popup>
 
         <el-dialog v-model="showDialog" title="选择客户" width="70%">
-
             <customDialog @customEvent="customEvent"></customDialog>
-
-
-            <!-- <el-table style="cursor: pointer;" :data="pager.lists" @current-change="handleCurrentChange">
-                <el-table-column label="客户名称" prop="name" show-overflow-tooltip />
-                <el-table-column label="客户属性" prop="custom_type">
-                    <template #default="{ row }">
-                        <dict-value :options="dictData.custom_type" :value="row.custom_type" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="省" prop="province_name" show-overflow-tooltip />
-                <el-table-column label="职务" prop="master_position" show-overflow-tooltip />
-                <el-table-column label="电话" prop="master_telephone" show-overflow-tooltip />
-                <el-table-column label="手机" prop="master_phone" show-overflow-tooltip />
-                <el-table-column label="备注" prop="master_notes" show-overflow-tooltip />
-                <el-table-column label="负责人" show-overflow-tooltip />
-                <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
-                <el-table-column label="最后跟进" show-overflow-tooltip />
-                <el-table-column label="下次回访日期" show-overflow-tooltip />
-            </el-table> -->
         </el-dialog>
     </div>
 </template>
@@ -104,9 +84,9 @@ const formData = reactive({
     contacts: '',
     date: '',
     types: '',
-    executor: '',
+    admin_id: '',
     description: '',
-    annex: [],
+    annex: '',
     coordinate: '',
     next_follow_date: '',
     status: '',
@@ -131,6 +111,11 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
+
+    //@ts-ignore
+    formData.date = timeFormat(formData.date, 'yyyy-mm-dd hh:MM:ss')
+    //@ts-ignore
+    formData.next_follow_date = timeFormat(formData.next_follow_date, 'yyyy-mm-dd hh:MM:ss')
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -148,9 +133,6 @@ const customEvent = (e: any) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    if (formData.annex && formData.annex.length > 0) {
-        formData.annex = formData.annex
-    }
     await formRef.value?.validate()
     const data = { ...formData, }
     mode.value == 'edit'

src/views/project_cost_budget/edit.vue

@@ -0,0 +1,287 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="85vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
+
+                    <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
+                        <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
+                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                </div>
+                <el-form-item label="项目名称" prop="project_id">
+                    <el-input v-model="formData.project_name" readonly clearable placeholder="点击选择项目"
+                        @click="showDialog = true" />
+                </el-form-item>
+                <el-form-item label="项目编码" prop="remark">
+                    <el-input v-model="formData.project_code" disabled clearable placeholder="系统自动输入" />
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                </el-form-item>
+
+                <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 formData.annex" 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-col :span="24">
+                    <div style="margin-bottom: 30px;">机器预算清单</div>
+                    <div style="margin-bottom: 30px;">
+                        <el-table :data="formData.cost_budget_detail">
+                            <el-table-column label="序号">
+                                <template #default="{ row }">
+                                    <el-button @click="handleAdd(row)" size="small">+</el-button>
+                                    <el-button @click="handleDelete(row)" size="small">-</el-button>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="一级科目">
+                                <template #default="{ row }">
+                                    <!-- <el-select v-model="row.type">
+                                        <el-option label="电工" :value="1"></el-option>
+                                    </el-select> -->
+                                    <el-input v-model="row.project_cost_temp_id" />
+                                </template></el-table-column>
+                            <el-table-column label="单位">
+                                <template #default="{ row }"> <el-input v-model="row.unit" />
+                                </template></el-table-column>
+                            <el-table-column label="预算金额">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.amount" type="number" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="编制标准">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.standard" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="备注" prop="remark">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.remark" />
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </el-col>
+
+            </el-form>
+            <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                <projectDialog @customEvent="customEvent"></projectDialog>
+            </el-dialog>
+            <!-- <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                <projectDialog @customEvent="customEvent"></projectDialog>
+            </el-dialog> -->
+
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectCostBudgetEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiProjectCostBudgetAdd, apiProjectCostBudgetEdit, apiProjectCostBudgetDetail } from '@/api/project_cost_budget'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import projectDialog from '@/components/project/index.vue'
+
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const list1 = reactive([])
+const list2 = reactive([])
+const showDialog = ref(false)
+
+
+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 popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑费用预算' : '新增费用预算'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    "org_id": 1,
+    "dept_id": 2,
+    "project_id": 1,
+    project_code: "",
+    "remark": "bbb",
+    "annex": [],
+    project_name: "",
+    "cost_budget_detail": [
+        {
+            "project_cost_temp_id": 2,
+            "unit": "元",
+            "amount": 100,
+            "standard": "aaaa22",
+            "remark": "bbbb"
+        }
+    ]
+})
+const customEvent = (e) => {
+    console.log(e)
+    formData.project_id = e.id
+    formData.project_code = e.project_code
+    formData.project_name = e.name
+    showDialog.value = false
+}
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    cost_budget_code: [{
+        required: true,
+        message: '请输入费用预算单号',
+        trigger: ['blur']
+    }],
+    org_id: [{
+        required: true,
+        message: '请输入组织id',
+        trigger: ['blur']
+    }],
+    dept_id: [{
+        required: true,
+        message: '请输入部门id',
+        trigger: ['blur']
+    }]
+})
+
+// 上传文件
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => {
+    formData.annex.splice(index, 1)
+}
+
+// 获取详情
+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]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiProjectCostBudgetDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiProjectCostBudgetEdit(data)
+        : await apiProjectCostBudgetAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+    getlist()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+        if (res.length > 0 && !formData.org_id) {
+            formData.org_id = res[0].id
+            deptAll({ 'org_id': res[0].id }).then((res) => {
+                if (res.length > 0) {
+                    Object.assign(list2, res)
+                    formData.dept_id = res[0].id
+                }
+            })
+        }
+    })
+}
+//获取部门
+const deptrmt = (e: any) => {
+    formData.dept_id = ''
+    getlist1(e)
+}
+
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        list2.splice(0, list2.length, ...res)
+    })
+}
+
+const handleAdd = (row: any) => {
+    // 在 row 后面插入一行数据
+    const index = formData.cost_budget_detail.indexOf(row);
+    formData.cost_budget_detail.splice(index + 1, 0, {});
+};
+
+const handleDelete = (row: any) => {
+    // 删除 row
+    if (formData.cost_budget_detail.length <= 1) return
+    const index = formData.cost_budget_detail.indexOf(row);
+    formData.cost_budget_detail.splice(index, 1);
+};
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>

src/views/project_cost_budget/index.vue

@@ -0,0 +1,128 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="项目id" prop="project_id">
+                    <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
+                </el-form-item>
+                <el-form-item label="费用预算单号" prop="cost_budget_code">
+                    <el-input class="w-[280px]" v-model="queryParams.cost_budget_code" clearable placeholder="请输入费用预算单号" />
+                </el-form-item>
+                <el-form-item label="" prop="annex">
+                    <el-input class="w-[280px]" v-model="queryParams.annex" 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_cost_budget/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['project.project_cost_budget/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="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="费用预算单号" prop="cost_budget_code" show-overflow-tooltip />
+                    <el-table-column label="金额" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="附件" prop="annex" show-overflow-tooltip align="center">
+                        <template #default="{ row }">
+                            <el-link style="margin-right: 4px;" type="primary" :href="item.uri"
+                                v-for="(item, index) in row.annex">文件{{
+                                    index + 1 }}</el-link>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['project.project_cost_budget/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['project.project_cost_budget/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectCostBudgetLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiProjectCostBudgetLists, apiProjectCostBudgetDelete } from '@/api/project_cost_budget'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    cost_budget_code: '',
+    annex: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectCostBudgetLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiProjectCostBudgetDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+

src/views/project_cost_budget_detail/edit.vue

@@ -0,0 +1,146 @@
+<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="项目id" prop="project_id">
+                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
+                </el-form-item>
+                <el-form-item label="费用预算id" prop="cost_budget_id">
+                    <el-input v-model="formData.cost_budget_id" clearable placeholder="请输入费用预算id" />
+                </el-form-item>
+                <el-form-item label="项目费用模板id" prop="project_cost_temp_id">
+                    <el-input v-model="formData.project_cost_temp_id" clearable placeholder="请输入项目费用模板id" />
+                </el-form-item>
+                <el-form-item label="单位" prop="unit">
+                    <el-input v-model="formData.unit" clearable placeholder="请输入单位" />
+                </el-form-item>
+                <el-form-item label="预算金额" prop="amount">
+                    <el-input v-model="formData.amount" clearable placeholder="请输入预算金额" />
+                </el-form-item>
+                <el-form-item label="编制标准" prop="standard">
+                    <el-input v-model="formData.standard" clearable placeholder="请输入编制标准" />
+                </el-form-item>
+                <el-form-item label="" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectCostBudgetDetailEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiProjectCostBudgetDetailAdd, apiProjectCostBudgetDetailEdit, apiProjectCostBudgetDetailDetail } from '@/api/project_cost_budget_detail'
+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 popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑费用预算明细' : '新增费用预算明细'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    project_id: '',
+    cost_budget_id: '',
+    project_cost_temp_id: '',
+    unit: '',
+    amount: '',
+    standard: '',
+    remark: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    cost_budget_id: [{
+        required: true,
+        message: '请输入费用预算id',
+        trigger: ['blur']
+    }],
+    project_cost_temp_id: [{
+        required: true,
+        message: '请输入项目费用模板id',
+        trigger: ['blur']
+    }],
+    unit: [{
+        required: true,
+        message: '请输入单位',
+        trigger: ['blur']
+    }],
+    amount: [{
+        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]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiProjectCostBudgetDetailDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiProjectCostBudgetDetailEdit(data)
+        : await apiProjectCostBudgetDetailAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>

src/views/project_cost_budget_detail/index.vue

@@ -0,0 +1,120 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="项目id" prop="project_id">
+                    <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
+                </el-form-item>
+                <el-form-item label="费用预算id" prop="cost_budget_id">
+                    <el-input class="w-[280px]" v-model="queryParams.cost_budget_id" clearable placeholder="请输入费用预算id" />
+                </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_cost_budget_detail/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['project.project_cost_budget_detail/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="项目id" prop="project_id" show-overflow-tooltip />
+                    <el-table-column label="费用预算id" prop="cost_budget_id" show-overflow-tooltip />
+                    <el-table-column label="项目费用模板id" prop="project_cost_temp_id" show-overflow-tooltip />
+                    <el-table-column label="单位" prop="unit" show-overflow-tooltip />
+                    <el-table-column label="预算金额" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="编制标准" prop="standard" show-overflow-tooltip />
+                    <el-table-column label="" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['project.project_cost_budget_detail/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['project.project_cost_budget_detail/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectCostBudgetDetailLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiProjectCostBudgetDetailLists, apiProjectCostBudgetDetailDelete } from '@/api/project_cost_budget_detail'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    cost_budget_id: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectCostBudgetDetailLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiProjectCostBudgetDetailDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+

src/views/project_equipment_budget/edit.vue

@@ -0,0 +1,297 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="85vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
+
+                    <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
+                        <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
+                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                </div>
+                <el-form-item label="项目名称" prop="project_id">
+                    <el-input v-model="formData.project_name" readonly clearable placeholder="点击选择项目"
+                        @click="showDialog = true" />
+                </el-form-item>
+                <el-form-item label="项目编码" prop="remark">
+                    <el-input v-model="formData.project_code" disabled clearable placeholder="系统自动输入" />
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                </el-form-item>
+
+                <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 formData.annex" 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-col :span="24">
+                    <div style="margin-bottom: 30px;">机器预算清单</div>
+                    <div style="margin-bottom: 30px;">
+                        <el-table :data="formData.equipment_budget_detail">
+                            <el-table-column label="序号">
+                                <template #default="{ row }">
+                                    <el-button @click="handleAdd(row)" size="small">+</el-button>
+                                    <el-button @click="handleDelete(row)" size="small">-</el-button>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="机具类别">
+                                <template #default="{ row }">
+                                    <el-select v-model="row.type">
+                                        <el-option label="电工" :value="1"></el-option>
+                                    </el-select>
+                                </template></el-table-column>
+                            <el-table-column label="机具名称">
+                                <template #default="{ row }"> <el-input v-model="row.name" />
+                                </template></el-table-column>
+                            <el-table-column label="规格型号">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.spec" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="单价">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.price" type="number" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="预算数量">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.num" type="number" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="单位">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.unit" type="number" />
+                                </template>
+                            </el-table-column>
+                            <!-- <el-table-column label="金额">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.price" type="number" />
+                                </template>
+                            </el-table-column> -->
+                            <el-table-column label="备注" prop="remark">
+                                <template #default="{ row }">
+                                    <el-input v-model="row.remark" />
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </el-col>
+
+            </el-form>
+            <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                <projectDialog @customEvent="customEvent"></projectDialog>
+            </el-dialog>
+
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEquipmentBudgetEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiProjectEquipmentBudgetAdd, apiProjectEquipmentBudgetEdit, apiProjectEquipmentBudgetDetail } from '@/api/project_equipment_budget'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import projectDialog from '@/components/project/index.vue'
+
+const base_url = configs.baseUrl + configs.urlPrefix
+const userStore = useUserStore();
+const list1 = reactive([])
+const list2 = reactive([])
+const showDialog = ref(false)
+
+
+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 customEvent = (e) => {
+    console.log(e)
+    formData.project_id = e.id
+    formData.project_code = e.project_code
+    formData.project_name = e.name
+    showDialog.value = false
+}
+
+
+// 上传文件
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => {
+    formData.annex.splice(index, 1)
+}
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑机具预算' : '新增机具预算'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    "org_id": '',
+    "dept_id": '',
+    "project_id": 0,
+    "project_name": '',
+    project_code: "",
+    "remark": "",
+    "annex": [],
+    "equipment_budget_detail": [
+        {
+            "type": "",
+            "name": "",
+            "spec": "",
+            "unit": "",
+            "num": 0,
+            "price": 0,
+            "remark": ""
+        }
+    ]
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    org_id: [{
+        required: true,
+        message: '请输入组织id',
+        trigger: ['blur']
+    }],
+    dept_id: [{
+        required: true,
+        message: '请输入部门id',
+        trigger: ['blur']
+    }],
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        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]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiProjectEquipmentBudgetDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiProjectEquipmentBudgetEdit(data)
+        : await apiProjectEquipmentBudgetAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+    getlist()
+
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+        if (res.length > 0 && !formData.org_id) {
+            formData.org_id = res[0].id
+            deptAll({ 'org_id': res[0].id }).then((res) => {
+                if (res.length > 0) {
+                    Object.assign(list2, res)
+                    formData.dept_id = res[0].id
+                }
+            })
+        }
+    })
+}
+//获取部门
+const deptrmt = (e: any) => {
+    formData.dept_id = ''
+    getlist1(e)
+}
+
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        list2.splice(0, list2.length, ...res)
+    })
+}
+
+const handleAdd = (row: any) => {
+    // 在 row 后面插入一行数据
+    const index = formData.equipment_budget_detail.indexOf(row);
+    formData.equipment_budget_detail.splice(index + 1, 0, {});
+};
+
+const handleDelete = (row: any) => {
+    // 删除 row
+    if (formData.equipment_budget_detail.length <= 1) return
+    const index = formData.equipment_budget_detail.indexOf(row);
+    formData.equipment_budget_detail.splice(index, 1);
+};
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>

src/views/project_equipment_budget/index.vue

@@ -0,0 +1,125 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="项目id" prop="project_id">
+                    <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
+                </el-form-item>
+                <el-form-item label="机具预算单号" prop="equipment_budget_code">
+                    <el-input class="w-[280px]" v-model="queryParams.equipment_budget_code" 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_equipment_budget/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['project.project_equipment_budget/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="项目id" prop="project_id" show-overflow-tooltip />
+                    <el-table-column label="机具预算单号" prop="equipment_budget_code" show-overflow-tooltip />
+                    <el-table-column label="金额" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="附件" prop="annex" show-overflow-tooltip align="center">
+                        <template #default="{ row }">
+                            <el-link style="margin-right: 4px;" type="primary" :href="item.uri"
+                                v-for="(item, index) in row.annex">文件{{
+                                    index + 1 }}</el-link>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['project.project_equipment_budget/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['project.project_equipment_budget/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEquipmentBudgetLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiProjectEquipmentBudgetLists, apiProjectEquipmentBudgetDelete } from '@/api/project_equipment_budget'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    equipment_budget_code: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectEquipmentBudgetLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiProjectEquipmentBudgetDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+

src/views/project_equipment_budget_detail/edit.vue

@@ -0,0 +1,192 @@
+<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="机具预算id" prop="equipment_budget_id">
+                    <!-- <el-input v-model="formData.equipment_budget_id" clearable placeholder="请输入机具预算id" /> -->
+                    <el-input v-model="formData.project_name" readonly clearable placeholder="点击选择项目"
+                        @click="showDialog = true" />
+                </el-form-item>
+                <el-form-item label="机具类别" prop="type">
+                    <el-input v-model="formData.type" clearable placeholder="请输入机具类别" />
+                </el-form-item>
+                <el-form-item label="机具名称" prop="name">
+                    <el-input v-model="formData.name" clearable placeholder="请输入机具名称" />
+                </el-form-item>
+                <el-form-item label="规格型号" prop="spec">
+                    <el-input v-model="formData.spec" clearable placeholder="请输入规格型号" />
+                </el-form-item>
+                <el-form-item label="单位" prop="unit">
+                    <el-input v-model="formData.unit" clearable placeholder="请输入单位" />
+                </el-form-item>
+                <el-form-item label="数量" prop="num" @change="getAmout">
+                    <el-input v-model="formData.num" clearable placeholder="请输入数量" type="number" />
+                </el-form-item>
+                <el-form-item label="单价" prop="price" @change="getAmout">
+                    <el-input v-model="formData.price" clearable placeholder="请输入单价" />
+                </el-form-item>
+                <el-form-item label="金额" prop="amount">
+                    <el-input v-model="formData.amount" disabled clearable placeholder="请输入金额" type="number" />
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                </el-form-item>
+            </el-form>
+            <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                <projectDialog @customEvent="customEvent"></projectDialog>
+            </el-dialog>
+
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEquipmentBudgetDetailEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiProjectEquipmentBudgetDetailAdd, apiProjectEquipmentBudgetDetailEdit, apiProjectEquipmentBudgetDetailDetail } from '@/api/project_equipment_budget_detail'
+import { timeFormat } from '@/utils/util'
+import projectDialog from '@/components/project_equipment_budget_detail/index.vue'
+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 showDialog = ref(false)
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑机具预算明细' : '新增机具预算明细'
+})
+
+const customEvent = (e) => {
+    console.log(e)
+    formData.equipment_budget_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+}
+// 表单数据
+const formData = reactive({
+    id: '',
+    "equipment_budget_id": 1,
+    project_name: "",
+    "type": "testaa",
+    "name": "aaa",
+    "spec": "bbb",
+    "unit": "ccc",
+    "num": "25",
+    "price": "12",
+    "remark": "fffff",
+    amount: 565
+})
+
+const getAmout = () => {
+    formData.amount = formData.price * formData.num || 0
+}
+
+// 表单验证
+const formRules = reactive<any>({
+    project_id: [{
+        required: true,
+        message: '请输入项目id',
+        trigger: ['blur']
+    }],
+    equipment_budget_id: [{
+        required: true,
+        message: '请输入机具预算id',
+        trigger: ['blur']
+    }],
+    type: [{
+        required: true,
+        message: '请输入机具类别',
+        trigger: ['blur']
+    }],
+    name: [{
+        required: true,
+        message: '请输入机具名称',
+        trigger: ['blur']
+    }],
+    spec: [{
+        required: true,
+        message: '请输入规格型号',
+        trigger: ['blur']
+    }],
+    unit: [{
+        required: true,
+        message: '请输入单位',
+        trigger: ['blur']
+    }],
+    num: [{
+        required: true,
+        message: '请输入数量',
+        trigger: ['blur']
+    }],
+    price: [{
+        required: true,
+        message: '请输入单价',
+        trigger: ['blur']
+    }],
+    amount: [{
+        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]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiProjectEquipmentBudgetDetailDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiProjectEquipmentBudgetDetailEdit(data)
+        : await apiProjectEquipmentBudgetDetailAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>

src/views/project_equipment_budget_detail/index.vue

@@ -0,0 +1,132 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="项目id" prop="project_id">
+                    <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
+                </el-form-item>
+                <el-form-item label="机具预算id" prop="equipment_budget_id">
+                    <el-input class="w-[280px]" v-model="queryParams.equipment_budget_id" clearable
+                        placeholder="请输入机具预算id" />
+                </el-form-item>
+                <el-form-item label="机具类别" prop="type">
+                    <el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入机具类别" />
+                </el-form-item>
+                <el-form-item label="机具名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" 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_equipment_budget_detail/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['project.project_equipment_budget_detail/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="项目名称" prop="project_name" show-overflow-tooltip />
+                    <el-table-column label="机具预算id" prop="equipment_budget_id" show-overflow-tooltip />
+                    <el-table-column label="机具类别" prop="type" show-overflow-tooltip />
+                    <el-table-column label="机具名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="规格型号" prop="spec" show-overflow-tooltip />
+                    <el-table-column label="单位" prop="unit" show-overflow-tooltip />
+                    <el-table-column label="数量" prop="num" show-overflow-tooltip />
+                    <el-table-column label="单价" prop="price" show-overflow-tooltip />
+                    <el-table-column label="金额" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['project.project_equipment_budget_detail/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['project.project_equipment_budget_detail/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEquipmentBudgetDetailLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiProjectEquipmentBudgetDetailLists, apiProjectEquipmentBudgetDetailDelete } from '@/api/project_equipment_budget_detail'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    project_id: '',
+    equipment_budget_id: '',
+    type: '',
+    name: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiProjectEquipmentBudgetDetailLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiProjectEquipmentBudgetDetailDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+

src/views/project_labor_budget_detail/edit.vue

@@ -2,14 +2,17 @@
     <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="项目id" prop="project_id">
+
-                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
+                <el-form-item label="项目名称" prop="labor_budget_id">
+                    <el-input v-model="formData.project_name" clearable readonly placeholder="点击选择项目"
+                        @click="showDialog = true" />
                 </el-form-item>
-                <el-form-item label="人工预算id" prop="labor_budget_id">
+                <el-form-item label="工种" prop="job_type_id">
-                    <el-input v-model="formData.labor_budget_id" clearable placeholder="请输入人工预算id" />
+                    <el-select v-model="formData.job_type_id">
-                </el-form-item>
+                        <el-option label="电工" :value="1"></el-option>
-                <el-form-item label="工种id" prop="job_type_id">
+                    </el-select>
-                    <el-input v-model="formData.job_type_id" clearable placeholder="请输入工种id" />
+                    <!-- <el-input v-model="formData.job_type_id" clearable placeholder="请输入工种id" /> -->
+
                 </el-form-item>
                 <el-form-item label="人工说明" prop="desc">
                     <el-input v-model="formData.desc" clearable placeholder="请输入人工说明" />
@@ -23,13 +26,14 @@
                 <el-form-item label="单价" prop="price">
                     <el-input v-model="formData.price" clearable placeholder="请输入单价" />
                 </el-form-item>
-                <el-form-item label="金额" prop="amount">
-                    <el-input v-model="formData.amount" clearable placeholder="请输入金额" />
-                </el-form-item>
                 <el-form-item label="备注" prop="remark">
                     <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
                 </el-form-item>
             </el-form>
+
+            <el-dialog v-model="showDialog" title="选择项目" width="70%">
+                <projectDialog @customEvent="customEvent"></projectDialog>
+            </el-dialog>
         </popup>
     </div>
 </template>
@@ -40,6 +44,7 @@ import Popup from '@/components/popup/index.vue'
 import { apiProjectLaborBudgetDetailAdd, apiProjectLaborBudgetDetailEdit, apiProjectLaborBudgetDetailDetail } from '@/api/project_labor_budget_detail'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+import projectDialog from "@/components/project_labor_contract/index.vue"
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -50,7 +55,7 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-
+const showDialog = ref(false)
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -59,18 +64,22 @@ const popupTitle = computed(() => {
 
 // 表单数据
 const formData = reactive({
-    id: '',
+    id: "",
-    project_id: '',
+    "labor_budget_id": 0,
-    labor_budget_id: '',
+    project_name: "",
-    job_type_id: '',
+    "job_type_id": '',
-    desc: '',
+    "desc": "",
-    unit: '',
+    "unit": "",
-    num: '',
+    "num": 0,
-    price: '',
+    "price": 0,
-    amount: '',
+    "remark": ""
-    remark: '',
 })
 
+const customEvent = (e) => {
+    formData.labor_budget_id = e.id
+    formData.project_name = e.project_name
+    showDialog.value = false
+}
 
 // 表单验证
 const formRules = reactive<any>({

src/views/project_labor_budget_detail/index.vue

@@ -28,8 +28,6 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="项目id" prop="project_id" show-overflow-tooltip />
-                    <el-table-column label="人工预算id" prop="labor_budget_id" show-overflow-tooltip />
                     <el-table-column label="工种id" prop="job_type_id" show-overflow-tooltip />
                     <el-table-column label="人工说明" prop="desc" show-overflow-tooltip />
                     <el-table-column label="单位" prop="unit" show-overflow-tooltip />