mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
lxz 2024-01-18 18:29:21 +08:00
parent 38a2c08bd8
commit 8729c9942d
20 changed files with 1333 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip Normal file
View File

Binary file not shown.

15
src/api/contract_ticket_difference.ts Normal file
View File

@ -0,0 +1,15 @@
import request from '@/utils/request'
// 合同洽商列表
export function finance_refund_invoice_difference(params: any) {
return request.get({ url: '/finance.finance_refund_invoice_difference/lists', params })
}
// 合同洽商列表
export function finance_payment_receipt_difference(params: any) {
return request.get({ url: '/finance.finance_payment_receipt_difference/procure', params })
}
// 合同洽商列表
export function finance_payment_receipt_difference_subcontract(params: any) {
return request.get({ url: '/finance.finance_payment_receipt_difference/subcontract', params })
}

26
src/api/project_labor_budget.ts Normal file
View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 人工预算列表
export function apiProjectLaborBudgetLists(params: any) {
return request.get({ url: '/project.project_labor_budget/lists', params })
}
// 添加人工预算
export function apiProjectLaborBudgetAdd(params: any) {
return request.post({ url: '/project.project_labor_budget/add', params })
}
// 编辑人工预算
export function apiProjectLaborBudgetEdit(params: any) {
return request.post({ url: '/project.project_labor_budget/edit', params })
}
// 删除人工预算
export function apiProjectLaborBudgetDelete(params: any) {
return request.post({ url: '/project.project_labor_budget/delete', params })
}
// 人工预算详情
export function apiProjectLaborBudgetDetail(params: any) {
return request.get({ url: '/project.project_labor_budget/detail', params })
}

11
src/components/procurement/index.vue
View File

@ -48,7 +48,7 @@
</el-table>
</div>
<div class="flex mt-4 justify-end">
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
@ -59,12 +59,15 @@
import { usePaging } from "@/hooks/usePaging"
import { useDictData } from "@/hooks/useDictOptions"
import { apiSubcontractingContractLists } from '@/api/subcontracting_contract'
import { defineEmits } from "vue"
import { defineEmits, defineProps } from "vue"
const props = defineProps({
project_id: Number
})
// 查询条件
const queryParams = reactive({
name: ''
name: '',
project_id: props.project_id
});
const { dictData } = useDictData('procurement_contract_type,account_period,tax_rate,pay_type,pay_period ')

2
src/components/product/index.vue
View File

@ -28,7 +28,7 @@
</el-table>
</div>
<div class="flex mt-4 justify-end">
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>

14
src/components/project_personnel/index.vue
View File

@ -15,7 +15,6 @@
<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 label="序号" property="name" />
<el-table-column label="项目编码" property="project_code" />
<el-table-column label="项目名称" property="project_name" />
<el-table-column label="姓名" property="name" />
@ -24,49 +23,42 @@
<el-table-column label="身份证正面" property="idcard_front">
<template #default="{ row }">
<div v-if="row.file && row.idcard_front.length > 0">
<el-link :href="row.idcard_front" target="_blank">文件{{ i + 1 }}查看</el-link>
</div>
<div v-else>
暂无文件
</div>
</template>
</el-table-column>
<el-table-column label="身份证反面" property="idcard_backend">
<template #default="{ row }">
<div v-if="row.file && row.idcard_backend.length > 0">
<el-link :href="row.idcard_backend" target="_blank">文件{{ i + 1 }}查看</el-link>
</div>
<div v-else>
暂无文件
</div>
</template>
</el-table-column>
<el-table-column label="银行卡照片" property="bank_card">
<template #default="{ row }">
<div v-if="row.file && row.bank_card.length > 0">
<el-link :href="row.bank_card" target="_blank">文件{{ i + 1 }}查看</el-link>
</div>
<div v-else>
暂无文件
</div>
</template>
</el-table-column>
<el-table-column label="银行卡号" property="bank_no" />
<el-table-column label="开户银行" property="deposit_bank" />
<el-table-column label="工种" property="work_type_text" />
<el-table-column label="人工单价" property="deposit_bank" />
<el-table-column label="备注" property="master_name" />
</el-table>
</div>
<div class="flex mt-4 justify-end">
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>

54
src/views/contract_ticket_difference/index.vue Normal file
View File

@ -0,0 +1,54 @@
<template>
<div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-form class="mb-[-16px]" inline>
<el-form-item label="合同编码" prop="contract_code">
<el-input class="w-[280px]" v-model="queryParams.contract_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>
<div class="mt-4">
<el-table :data="pager.lists" :default-sort="{ prop: 'create_time', order: 'descending' }">
<el-table-column label="合同编号" :width="250" prop="contract_code" show-overflow-tooltip />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="项目编号" prop="project_code" align="center" show-overflow-tooltip />
<el-table-column label="客户名称" prop="custom_name" align="center" show-overflow-tooltip />
<el-table-column label="签订日期" prop="contract_date" align="center" show-overflow-tooltip />
<el-table-column label="合同金额" prop="contract_amount" align="center" show-overflow-tooltip />
<el-table-column label="已回款金额" prop="has_refund_amount" align="center" show-overflow-tooltip />
<el-table-column label="已开票金额" prop="has_invoice_amount" align="center" show-overflow-tooltip />
<el-table-column label="开票未回款金额" prop="has_invoice_not_refund_amount" align="center"
show-overflow-tooltip />
<el-table-column label="回款未开票金额" prop="has_refund_not_invoice_amount" align="center"
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 setup name="flowTypeLists">
import { reactive } from "vue";
import { usePaging } from "@/hooks/usePaging";
import { finance_refund_invoice_difference } from "@/api/contract_ticket_difference";
// 查询条件
const queryParams = reactive({
contract_code: "",
});
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: finance_refund_invoice_difference,
params: queryParams,
});
getLists()
</script>

94
src/views/finance_payment_apply/edit.vue
View File

@ -2,14 +2,14 @@
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-steps :active="active" align-center style="margin-bottom: 20px;">
<!-- <el-steps :active="active" align-center style="margin-bottom: 20px;">
<el-step title="发起人" />
<el-step title="部门领导审核
" />
<el-step title="财务负责人审核" />
<el-step title="总经理审批
" />
</el-steps>
</el-steps> -->
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
<el-col :span="8">
@ -30,7 +30,6 @@
<el-option label="采购合同" :value="1"></el-option>
<el-option label="分包合同" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
@ -53,30 +52,25 @@
<el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款日期" prop="pay_date">
<el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="期次" prop="period"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-select class="flex-1" v-model="formData.period" clearable placeholder="请选择期次">
<el-select class="flex-1" v-model="formData.period" clearable placeholder="请选择期次" disabled>
<el-option v-for="(item, index) in dictData.pay_period" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-button @click="showDialog2 = true" type="primary">选择待付款计划</el-button>
</el-col>
<el-col :span="12">
<el-form-item label="付款日期" prop="pay_date">
<el-date-picker class="flex-1 !flex" v-model="formData.pay_date" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款性质" prop="payment_nature">
<el-select class="flex-1" v-model="formData.payment_nature" clearable placeholder="请选择付款性质">
@ -140,7 +134,6 @@
上传
</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"
@ -148,24 +141,21 @@
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
<div style="margin: 20px 0;">收款人信息</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="开户银行" prop="bank" @click="showDialog3 = true">
<el-input v-model="formData.bank" clearable placeholder="请输入开户银行" />
<el-input v-model="formData.payee_bank" clearable placeholder="请输入开户银行" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户名称" prop="payee_bank">
<el-input v-model="formData.payee_bank" clearable placeholder="请输入开户名称" />
<el-input v-model="formData.payee_account_name" clearable placeholder="请输入开户名称" />
</el-form-item>
</el-col>
@ -173,10 +163,31 @@
<el-form-item label="账号" prop="payee_account">
<el-input v-model="formData.payee_account" clearable placeholder="请输入账号" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-input v-model="formData.desc" type="textarea" clearable placeholder="请输入备注" /> -->
<!-- <div>付款人信息</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="开户银行" prop="bank" @click="showDialog3 = true">
<el-input v-model="formData.bank" clearable placeholder="请输入开户银行" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户名称" prop="payee_bank">
<el-input v-model="formData.payee_bank" clearable placeholder="请输入开户名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="账号" prop="payee_account">
<el-input v-model="formData.payee_account" clearable placeholder="请输入账号" />
</el-form-item>
</el-col>
</el-row> -->
<el-dialog v-model="showDialog" title="选择供应商" width="70%">
<suppliertable @customEvent="customEvent"></suppliertable>
</el-dialog>
@ -192,7 +203,6 @@
<subcontracting @customEvent="customEvent1">
</subcontracting>
</el-dialog>
</div>
<el-dialog v-model="showDialog2" title="选择待付款计划" width="70%">
@ -201,6 +211,9 @@
<el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
<bankaccountDialog @customEvent="customEvent3"></bankaccountDialog>
</el-dialog>
<el-dialog v-model="showDialog4" title="选择付款银行" width="70%">
<bankaccountDialog @customEvent="customEvent4"></bankaccountDialog>
</el-dialog>
</el-form>
</popup>
@ -301,6 +314,8 @@ const showDialog = ref(false)
const showDialog1 = ref(false)
const showDialog2 = ref(false)
const showDialog3 = ref(false)
const showDialog4 = ref(false)
const customEvent = (e: any) => {
formData.supplier_id = e.id;
@ -324,17 +339,21 @@ const customEvent2 = (e: any) => {
project_name.value = e.project_name;
project_code.value = e.project_code;
formData.amount_daxie = toChinesNum(e.amount)
formData.period = e.period
showDialog2.value = false;
console.log(formData, "formdata")
};
const customEvent3 = (e: any) => {
formData.bank = e.deposit_bank
formData.payee_bank = e.account_name
formData.payee_bank = e.deposit_bank
formData.payee_account_name = e.account_name
formData.payee_account = e.account
showDialog3.value = false;
showDialog3.value = false
};
const customEvent4 = (e: any) => {
formData.bank_account_id = e.id
formData.bank_account_name = e.deposit_bank
showDialog4.value = false
};
//监听输入
const amountinput = (e) => {
// console.log(e)
@ -344,7 +363,7 @@ const amountinput = (e) => {
}
// 弹窗标题
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑退款申请表' : '新增退款申请表'
return mode.value == 'edit' ? '编辑付款申请表' : '新增付款申请表'
})
// 表单数据
@ -368,11 +387,12 @@ const formData = reactive({
account: '',
contract_cate: 1,
"payment_nature": 0,
"apply_user": "string",
"payee_bank": "string",
"payee_account_name": "string",
"payee_account": "string",
"bank_account_id": ''
"apply_user": "",
"payee_bank": "",
"payee_account_name": "",
"payee_account": "",
"bank_account_id": '',
bank_account_name: ""
})

54
src/views/procure_ticket_difference/index.vue Normal file
View File

@ -0,0 +1,54 @@
<template>
<div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-form class="mb-[-16px]" inline>
<el-form-item label="合同编码" prop="contract_no">
<el-input class="w-[280px]" v-model="queryParams.contract_no" 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>
<div class="mt-4">
<el-table :data="pager.lists" :default-sort="{ prop: 'create_time', order: 'descending' }">
<el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
<el-table-column label="供应商编号" :width="250" prop="supplier_code" show-overflow-tooltip />
<el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" align="center" show-overflow-tooltip />
<el-table-column label="项目编号" prop="project_code" align="center" show-overflow-tooltip />
<el-table-column label="签订日期" prop="signing_date" align="center" show-overflow-tooltip />
<el-table-column label="合同金额" prop="contract_amount" align="center" show-overflow-tooltip />
<el-table-column label="已付款金额" prop="has_payment_amount" align="center" show-overflow-tooltip />
<el-table-column label="已收票金额" prop="has_receipt_amount" align="center" show-overflow-tooltip />
<el-table-column label="已收票未付款金额" prop="has_receipt_not_payment_amount" align="center"
show-overflow-tooltip />
<el-table-column label="已付款未收票金额" prop="has_payment_not_receipt_amount" align="center"
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 setup name="flowTypeLists">
import { reactive } from "vue";
import { usePaging } from "@/hooks/usePaging";
import { finance_payment_receipt_difference } from "@/api/contract_ticket_difference";
// 查询条件
const queryParams = reactive({
contract_no: "",
});
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: finance_payment_receipt_difference,
params: queryParams,
});
getLists()
</script>

132
src/views/project_attendance_record/edit.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="85vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row>
@ -55,27 +55,94 @@
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
</el-form-item>
</el-col>
<div class="tit">考勤记录清单</div>
</el-row>
<div class="tit" style="font-size: 16px;font-weight: bold;margin-bottom: 10px;">考勤记录清单</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.attendance_detail" width="100%">
<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="姓名" prop="name">
<template #default="{ row }">
<el-input v-model="row.name" readonly placeholder="点击选择" @click="showDialog1 = true" />
</template>
</el-table-column>
<el-table-column label="身份证号" prop="code">
<template #default="{ row }"> <el-input v-model="row.idcard" disabled placeholder="自动填写" />
</template></el-table-column>
<el-table-column label="工种" prop="specs">
<template #default="{ row }"> <el-input v-model="row.work_type_text" disabled
placeholder="自动填写" />
</template></el-table-column>
<el-table-column label="上班时间" prop="brand">
<template #default="{ row }">
<!-- <el-date-picker clearable v-model="row.work_start_time" type="date"
value-format="YYYY-MM-DD" placeholder="请选择" style="width: 100px;">
</el-date-picker> -->
<el-time-select v-model="row.work_start_time" start="06:30" step="00:15" end="23:30"
placeholder="请选择" />
</template>
</el-table-column>
<el-table-column label="下班时间" prop="parameter_description">
<template #default="{ row }">
<!-- <el-date-picker clearable v-model="row.work_end_time" type="date" value-format="YYYY-MM-DD"
placeholder="请选择" style="width: 100px;">
</el-date-picker> -->
<el-time-select v-model="row.work_end_time" start="06:30" step="00:15" end="23:30"
placeholder="请选择" />
</template></el-table-column>
<el-table-column label="记工数量">
<template #default="{ row }">
<el-input v-model="row.work_record_num" type="number" />
</template></el-table-column>
<el-table-column label="日工资">
<template #default="{ row }">
<el-input v-model="row.daily_salary" type="number" />
</template>
</el-table-column>
<el-table-column label="日生活费" prop="price">
<template #default="{ row }">
<el-input v-model="row.daily_living" type="number" />
</template>
</el-table-column>
<el-table-column label="日补贴" prop="amount">
<template #default="{ row }">
<el-input v-model="row.daily_subsidy" />
</template>
</el-table-column>
<el-table-column label="日其他" prop="amount_including">
<template #default="{ row }">
<el-input v-model="row.daily_other" />
</template>
</el-table-column>
<el-table-column label="日收入" prop="remark">
<template #default="{ row }">
<el-input v-model="row.daily_income" />
</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-form>
</popup>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<projectDialog @customEvent="customEvent"></projectDialog>
</el-dialog>
<el-dialog v-model="showDialog1" title="选择项目人员" width="70%">
<customDialog @customEvent="customEvent1" :project_id="formData.project_id"></customDialog>
<projectPersonnel @customEvent="customEvent1" :project_id="formData.project_id"></projectPersonnel>
</el-dialog>
</div>
</template>
@ -85,43 +152,56 @@ import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import projectDialog from '@/components/project/index.vue'
import { attendanceRecordAdd, attendanceRecordEdit, attendanceRecordDetail } from '@/api/project_attendance_record'
import customDialog from '@/components/project_personnel/index.vue'
import { timeFormat } from '@/utils/util'
import projectPersonnel from '@/components/project_personnel/index.vue'
import type { PropType } from 'vue'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
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 showDialog1 = ref(false)
const project_name = ref('')
const project_code = ref('')
const renshu = ref('')
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
const base_url = configs.baseUrl + configs.urlPrefix
const userStore = useUserStore();
const formDataannex = reactive([])
import feedback from '@/utils/feedback'
const userInfo = userStore.userInfo
const handleAdd = (row: any) => {
const index = formData.attendance_detail.indexOf(row);
formData.attendance_detail.splice(index + 1, 0, {});
};
const handleDelete = (row: any) => {
const index = formData.attendance_detail.indexOf(row);
formData.attendance_detail.splice(index, 1);
};
//获取值
const customEvent = (e) => {
formData.project_id = e.id
project_name.value = e.name
project_code.value = e.project_code
showDialog.value = false
}
//获取值
const customEvent1 = (e) => {
formData.attendance_detail[formData.attendance_detail.length - 1].name = e.name
formData.attendance_detail[formData.attendance_detail.length - 1].idcard = e.idcard
formData.attendance_detail[formData.attendance_detail.length - 1].work_type_text = e.work_type_text
formData.attendance_detail[formData.attendance_detail.length - 1].person_id = e.id
showDialog1.value = false
console.log(e)
}
// 弹窗标题
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑考勤记录' : '新增考勤记录'
@ -152,7 +232,7 @@ const formData = reactive({
attendance_date: '',
remark: '',
file: '',
attendance_detail: '',
attendance_detail: [{}],
})
@ -206,6 +286,10 @@ const handleSubmit = async () => {
formData.annex = formDataannex.map((item: any) => item.uri)
}
await formRef.value?.validate()
formData.attendance_detail.forEach(item => {
item.work_start_time = item.work_start_time ? formData.attendance_date + ` ${item.work_start_time}` : ""
item.work_end_time = item.work_end_time ? formData.attendance_date + ` ${item.work_end_time}` : ""
})
const data = { ...formData, }
mode.value == 'edit'
? await attendanceRecordEdit(data)

176
src/views/project_labor_budget/detail.vue Normal file
View File

@ -0,0 +1,176 @@
<template>
<div class="detail-popup">
<popup ref="popupRef" title="分包预算详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-descriptions :column="2" border>
<el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{
formData.project_name }}</el-descriptions-item>
<el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{
formData.project_code }}</el-descriptions-item>
<el-descriptions-item label="分包预算单号" label-align="left" align="left" label-class-name="my-label"> {{
formData.subpackage_budget_code }}</el-descriptions-item>
<el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{
formData.remark
}}</el-descriptions-item>
<el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
<div v-if="formData.annex && formData.annex.length > 0">
<div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
<el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
target="_blank">文件{{ index + 1 }}查看</el-link>
</div>
</div>
<div v-else>
暂无附件
</div>
</el-descriptions-item>
</el-descriptions>
<div>
<el-table :data="tableData" stripe style="width: 100%">
<el-table-column label="序号" type="index" show-overflow-tooltip />
<el-table-column label="工作类型" prop="work_type" show-overflow-tooltip />
<el-table-column label="工作内容" prop="work_content" show-overflow-tooltip />
<el-table-column label="项目特征" prop="project_features" show-overflow-tooltip />
<el-table-column label="单位" prop="unit" 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>
</div>
<div style="margin: 10px 0;">
<el-pagination v-model:current-page="pager1.page_no" v-model:page-size="pager1.page_size"
:page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
</div>
</popup>
</div>
</template>
<script lang="ts" setup name="customdetail">
import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail'
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 pager1 = reactive({
page_size: 10,
page_no: 1,
customer_demand_id: ""
})
const total = ref(0)
const datas = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
});
const tableData = ref([])
// 表单数据
const formData = reactive({
})
//条数
const handleSizeChange1 = (val: number) => {
pager1.page_size = val
budgetDetailLists(formData.id)
}
//分页
const handleCurrentChange1 = (val: number) => {
console.log(`current page: ${val}`)
pager1.page_no = val
budgetDetailLists(formData.id)
}
//获取预算明细列表
const budgetDetailLists = (id) => {
subpackagdetailLists({ 'page_no': pager1.page_no, 'page_size': pager1.page_size, subpackage_budget_id: id }).then((res) => {
tableData.value = res.lists
total.value = res.count
})
}
// 获取详情
const setFormData = async (data: Record<any, any>) => {
Object.assign(formData, data)
budgetDetailLists(data.id)
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" scoped>
.tit {
font-size: 1.2em;
margin-bottom: 10px;
}
:deep(.my-label) {
width: 150px;
}</style>

296
src/views/project_labor_budget/edit.vue Normal file
View File

@ -0,0 +1,296 @@
<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.labor_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.job_type_id">
<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.desc" />
</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.num" 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="projectLaborBudgetEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiProjectLaborBudgetAdd, apiProjectLaborBudgetEdit, apiProjectLaborBudgetDetail } from '@/api/project_labor_budget'
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({
"org_id": '',
"dept_id": '',
"project_id": '',
"project_name": '',
"project_code": '',
"remark": "",
"annex": [],
"labor_budget_detail": [
{
"job_type_id": '',
"desc": "",
"unit": "",
"num": 0,
"price": 0,
"remark": ""
}
]
})
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 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']
}],
labor_budget_code: [{
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]
}
}
console.log(data)
console.log(formData, "formdata")
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiProjectLaborBudgetDetail({
id: row.id
})
setFormData(data)
}
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiProjectLaborBudgetEdit(data)
: await apiProjectLaborBudgetAdd(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.labor_budget_detail.indexOf(row);
formData.labor_budget_detail.splice(index + 1, 0, {});
};
const handleDelete = (row: any) => {
// 删除 row
if (formData.labor_budget_detail.length <= 1) return
const index = formData.labor_budget_detail.indexOf(row);
formData.labor_budget_detail.splice(index, 1);
};
defineExpose({
open,
setFormData,
getDetail
})
</script>

126
src/views/project_labor_budget/index.vue Normal file
View File

@ -0,0 +1,126 @@
<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="labor_budget_code">
<el-input class="w-[280px]" v-model="queryParams.labor_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_labor_budget/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['project.project_labor_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="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-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['project.project_labor_budget/edit']" type="primary" link
@click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['project.project_labor_budget/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</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" />
</div>
</template>
<script lang="ts" setup name="projectLaborBudgetLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiProjectLaborBudgetLists, apiProjectLaborBudgetDelete, apiProjectLaborBudgetDetail } from '@/api/project_labor_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: '',
labor_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: apiProjectLaborBudgetLists,
params: queryParams
})
// 添加
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
// 编辑
const handleEdit = async (data: any) => {
let res = await apiProjectLaborBudgetDetail({ 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 apiProjectLaborBudgetDelete({ id })
getLists()
}
getLists()
</script>

164
src/views/project_labor_budget_detail/edit.vue Normal file
View File

@ -0,0 +1,164 @@
<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="labor_budget_id">
<el-input v-model="formData.labor_budget_id" clearable placeholder="请输入人工预算id" />
</el-form-item>
<el-form-item label="工种id" prop="job_type_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="请输入人工说明" />
</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">
<el-input v-model="formData.num" clearable placeholder="请输入数量" />
</el-form-item>
<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>
</popup>
</div>
</template>
<script lang="ts" setup name="projectLaborBudgetDetailEdit">
import type { FormInstance } from 'element-plus'
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'
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: '',
labor_budget_id: '',
job_type_id: '',
desc: '',
unit: '',
num: '',
price: '',
amount: '',
remark: '',
})
// 表单验证
const formRules = reactive<any>({
project_id: [{
required: true,
message: '请输入项目id',
trigger: ['blur']
}],
labor_budget_id: [{
required: true,
message: '请输入人工预算id',
trigger: ['blur']
}],
job_type_id: [{
required: true,
message: '请输入工种id',
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 apiProjectLaborBudgetDetailDetail({
id: row.id
})
setFormData(data)
}
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiProjectLaborBudgetDetailEdit(data)
: await apiProjectLaborBudgetDetailAdd(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>

122
src/views/project_labor_budget_detail/index.vue Normal file
View File

@ -0,0 +1,122 @@
<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="labor_budget_id">
<el-input class="w-[280px]" v-model="queryParams.labor_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_labor_budget_detail/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['project.project_labor_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="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 />
<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_labor_budget_detail/edit']" type="primary" link
@click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['project.project_labor_budget_detail/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</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" />
</div>
</template>
<script lang="ts" setup name="projectLaborBudgetDetailLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiProjectLaborBudgetDetailLists, apiProjectLaborBudgetDetailDelete } from '@/api/project_labor_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: '',
labor_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: apiProjectLaborBudgetDetailLists,
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 apiProjectLaborBudgetDetailDelete({ id })
getLists()
}
getLists()
</script>

10
src/views/project_material_budget/edit.vue
View File

@ -115,7 +115,6 @@
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
@ -221,6 +220,9 @@ const handleAvatarSuccess_four = (
const delFileFn = (index: number) => {
formDataannex.splice(index, 1)
}
//获取所有组织
const getlist = () => {
getAll().then((res) => {
@ -249,6 +251,12 @@ const getlist1 = (id: any) => {
list2.splice(0, list2.length, ...res)
})
}
//获取预算明细列表
const budgetDetailLists = (id) => {
MaterialbudgetDetailLists({ 'page_no': 1, 'page_size': 20, material_budget_id: id }).then((res) => {

47
src/views/project_material_budget_detail/edit.vue
View File

@ -5,28 +5,32 @@
<el-row>
<el-col :span="8">
<el-form-item label="项目名称" prop="material_budget_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-form-item label="项目名称" prop="material_budget_id" @click="showDialog = true"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="project_name" clearable placeholder="请选择项目材料预算" />
</el-form-item> </el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="项目编码" prop="material_budget_id">
<el-input v-model="project_code" clearable placeholder="系统自动填写" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="类型" prop="budget_type">
<el-select v-model="formData.budget_type" clearable placeholder="请选择类型">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in dictData.budget_type" :key="index" :label="item.name" :value="item.value" />
<el-option v-for="(item, index) in dictData.budget_type" :key="index" :label="item.name"
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料名称">
<el-input v-model="material_name" disabled clearable placeholder="系统自动填写" />
<el-form-item label="材料名称" prop="material_id">
<el-input v-model="formData.material_name" readonly @click="showDialog1 = true" clearable
placeholder="点击选择材料" />
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="材料编码">
<el-input v-model="material_code" disabled clearable placeholder="系统自动填写" />
</el-form-item>
@ -40,17 +44,17 @@
<el-form-item label="品牌">
<el-input v-model="material_brand" disabled clearable placeholder="系统自动填写" />
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="单位">
<el-input v-model="material_unit" disabled clearable placeholder="系统自动填写" />
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="参数说明">
<el-input v-model="material_parameter_description" disabled clearable placeholder="请输入单位" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="单价" prop="price">
<el-input v-model="formData.price" clearable placeholder="请输入单价" />
@ -78,7 +82,9 @@
<el-dialog v-model="showDialog" title="选择材料预算" width="70%">
<projectDialog @customEvent="customEvent"></projectDialog>
</el-dialog>
<el-dialog v-model="showDialog1" title="选择材料" width="70%">
<product @customEvent="customEvent2"></product>
</el-dialog>
</div>
</template>
@ -86,6 +92,7 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import projectDialog from '@/components/material_budget/index.vue'
import product from '@/components/product/index.vue'
import { MaterialbudgetDetailLists, MaterialbudgetDetailAdd, MaterialbudgetDetailEdit, MaterialbudgetDetailDetail } from '@/api/project_material_budget_detail'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
@ -116,14 +123,23 @@ const material_specs = ref('')
//获取值
const customEvent = (e) => {
const customEvent = (e: any) => {
formData.material_budget_id = e.id
project_name.value = e.project_name
project_code.value = e.project_code
showDialog.value = false
budgetDetailLists(e.id)
}
//获取值
const customEvent2 = (e: any) => {
formData.material_id = e.id
formData.material_name = e.name
showDialog1.value = false
// project_name.value = e.project_name
// project_code.value = e.project_code
// showDialog.value = false
// budgetDetailLists(e.id)
}
// 弹窗标题
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑项目材料预算调整' : '新增项目材料预算调整'
@ -138,6 +154,7 @@ const formData = reactive({
price: '',
num: '',
remark: '',
material_name: ""
})
// 获取详情

49
src/views/project_subcontract_settlement/edit.vue
View File

@ -4,25 +4,10 @@
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<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-input v-model="formData.project_name" clearable placeholder="点击选择项目" />
</el-form-item>
<el-form-item label="项目编码" prop="project_id">
<el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="合同名称" prop="project_id" @click="showDialog1 = true">
<el-input v-model="project_code" clearable readonly placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="合同编号" prop="project_id">
<el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="客户名称" prop="project_id">
<el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="合同金额" prop="project_id">
<el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="合同金额大写" prop="project_id">
<el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
<el-form-item label="合同名称" prop="contract_id" @click="showDialog1 = true">
<el-input v-model="formData.contract_name" clearable readonly placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="结算金额" prop="settlement_amount">
<el-input v-model="formData.settlement_amount" clearable placeholder="请输入结算金额" @input="amountinput" />
@ -31,7 +16,7 @@
<el-input v-model="formData.settlement_amount_uppercase" readonly disabled placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="结算差异" prop="remaining_amount">
<el-input v-model="formData.remaining_amount" readonly disabled placeholder="系统自动计算" />
<el-input v-model="formData.remaining_amount" placeholder="请输入" />
</el-form-item>
<el-form-item label="结算日期" prop="settlement_date">
<el-date-picker class="flex-1 !flex" v-model="formData.settlement_date" clearable type="date"
@ -76,7 +61,7 @@ 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 contractTable from "@/components/project_contract/index.vue"
import contractTable from "@/components/procurement/index.vue"
import { subcontractsettlementAdd, subcontractsettlementEdit, subcontractsettlementDetail } from '@/api/project_subcontract_settlement'
import { timeFormat, toChinesNum } from '@/utils/util'
@ -127,21 +112,14 @@ const showDialog = ref(false)
const showDialog1 = 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;
formData.project_name = e.name;
showDialog.value = false;
};
const customEvent1 = (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;
formData.contract_id = e.id;
formData.contract_name = e.contract_name;
showDialog1.value = false;
// console.log(e)
};
const getlista = () => {
@ -170,11 +148,10 @@ const popupTitle = computed(() => {
// 表单数据
const formData = reactive({
id: '',
org_id: '',
dept_id: '',
project_name: "",
project_id: '',
contract_id: '',
contract_name: '',
settlement_amount: '',
settlement_amount_uppercase: '',
remaining_amount: '',
@ -204,7 +181,7 @@ const amountinput = (e) => {
// console.log(e)
if (e && e > 0) {
formData.remaining_amount = e
// formData.remaining_amount = e
formData.settlement_amount_uppercase = toChinesNum(e)
}
}

21
src/views/project_subpackage_budget_detail/edit.vue
View File

@ -5,7 +5,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="项目名称" prop="subpackage_budget_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-form-item label="项目名称" prop="subpackage_budget_id" @click="showDialog = true"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="project_name" readonly clearable placeholder="请输入项目名称" />
</el-form-item> </el-col>
<el-col :span="8">
@ -34,11 +35,13 @@
</el-col>
<el-col :span="8">
<el-form-item label="工作量" prop="num">
<el-input v-model="formData.num" clearable placeholder="请输入工作量" />
<!-- <el-input-number v-model="formData.num" :max="10000" placeholder="请输入工作量"
oninput="if(formData.num.length>4)formData.num=formData.num.slice(0,4)" /> -->
<el-input v-model="formData.num" clearable placeholder="请输入工作量" @change="numberChange" />
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="单价" prop="price">
<el-input v-model="formData.price" clearable placeholder="请输入单价" />
<el-input v-model="formData.price" clearable placeholder="请输入单价" @change="numberChange" />
</el-form-item>
</el-col>
<el-col :span="24">
@ -92,7 +95,10 @@ const base_url = configs.baseUrl + configs.urlPrefix
const userStore = useUserStore();
const formDataannex = reactive([])
const numberChange = () => {
if (formData.num > 10000) formData.num = 10000
if (formData.price > 10000) formData.price = 10000
}
//获取值
const customEvent = (e) => {
@ -117,9 +123,10 @@ const formData = reactive({
work_content: '',
project_features: '',
unit: '',
num: '',
price: '',
remark: 3
num: 0,
price: 0,
remark: '',
project_id: "",
})

54
src/views/subcontract_ticket_difference/index.vue Normal file
View File

@ -0,0 +1,54 @@
<template>
<div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-form class="mb-[-16px]" inline>
<el-form-item label="合同编码" prop="contract_no">
<el-input class="w-[280px]" v-model="queryParams.contract_no" 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>
<div class="mt-4">
<el-table :data="pager.lists" :default-sort="{ prop: 'create_time', order: 'descending' }">
<el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
<el-table-column label="供应商编号" :width="250" prop="supplier_code" show-overflow-tooltip />
<el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" align="center" show-overflow-tooltip />
<el-table-column label="项目编号" prop="project_code" align="center" show-overflow-tooltip />
<el-table-column label="签订日期" prop="signing_date" align="center" show-overflow-tooltip />
<el-table-column label="合同金额" prop="contract_amount" align="center" show-overflow-tooltip />
<el-table-column label="已付款金额" prop="has_payment_amount" align="center" show-overflow-tooltip />
<el-table-column label="已收票金额" prop="has_receipt_amount" align="center" show-overflow-tooltip />
<el-table-column label="已收票未付款金额" prop="has_receipt_not_payment_amount" align="center"
show-overflow-tooltip />
<el-table-column label="已付款未收票金额" prop="has_payment_not_receipt_amount" align="center"
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 setup name="flowTypeLists">
import { reactive } from "vue";
import { usePaging } from "@/hooks/usePaging";
import { finance_payment_receipt_difference_subcontract } from "@/api/contract_ticket_difference";
// 查询条件
const queryParams = reactive({
contract_no: "",
});
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: finance_payment_receipt_difference_subcontract,
params: queryParams,
});
getLists()
</script>