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

add

Browse Source
This commit is contained in:
zmj 2024-03-21 16:46:09 +08:00
commit 6e5c3054b5
15 changed files with 139 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/api/subcontracting_contract.ts
View File

@ -1,26 +1,45 @@
import request from '@/utils/request'
import request from "@/utils/request";
// 分包合同列表
export function apiSubcontractingContractLists(params: any) {
return request.get({ url: '/contract.subcontracting_contract/lists', params })
return request.get({
url: "/contract.subcontracting_contract/lists",
params,
});
}
// 添加分包合同
export function apiSubcontractingContractAdd(params: any) {
return request.post({ url: '/contract.subcontracting_contract/add', params })
return request.post({ url: "/contract.subcontracting_contract/add", params });
}
// 编辑分包合同
export function apiSubcontractingContractEdit(params: any) {
return request.post({ url: '/contract.subcontracting_contract/edit', params })
return request.post({
url: "/contract.subcontracting_contract/edit",
params,
});
}
// 删除分包合同
export function apiSubcontractingContractDelete(params: any) {
return request.post({ url: '/contract.subcontracting_contract/delete', params })
return request.post({
url: "/contract.subcontracting_contract/delete",
params,
});
}
// 分包合同详情
export function apiSubcontractingContractDetail(params: any) {
return request.get({ url: '/contract.subcontracting_contract/detail', params })
}
return request.get({
url: "/contract.subcontracting_contract/detail",
params,
});
}
export function apiSubcontractingContractSearch(params: any) {
return request.get({
url: "/contract.subcontracting_contract/datas",
params,
});
}

67
src/views/InvoicingRequests/index.vue
View File

@ -2,26 +2,22 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="开票公司名称" prop="invoicing_company_name">
<el-form-item label="关联合同" prop="contract_id">
<selectRemote :formData="queryParams" model="contract_id" :api="apiContractSearch" />
</el-form-item>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiProjectSearch" />
</el-form-item>
<el-form-item label="客户名称" prop="custom_id">
<selectRemote :formData="queryParams" model="custom_id" :api="apiCustomSearch" />
</el-form-item>
<el-form-item label="开票编号" prop="invoicing_code">
<el-input class="w-[280px]" v-model="queryParams.invoicing_code" clearable placeholder="请输入开票编号" />
</el-form-item>
<el-form-item label="开票公司" prop="invoicing_company_name">
<el-input class="w-[280px]" v-model="queryParams.invoicing_company_name" clearable
placeholder="请输入开票公司名称" />
</el-form-item>
<el-form-item label="客户" prop="customer_id">
<el-select class="w-[280px]" v-model="queryParams.customer_id" clearable placeholder="请选择客户">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, i) in list1" :key="i" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="合同" prop="contract_id">
<el-select class="w-[280px]" v-model="queryParams.contract_id" clearable placeholder="请选择合同">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in list" :key="index" :label="item.contract_name"
:value="item.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -46,18 +42,18 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
<el-table-column label="项目编码" prop="project_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="custom_name" show-overflow-tooltip />
<el-table-column label="开票编号" prop="invoicing_code" show-overflow-tooltip />
<el-table-column label="开票公司" prop="invoicing_company_name" show-overflow-tooltip />
<el-table-column label="开票日期" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="期次" prop="period" show-overflow-tooltip />
<el-table-column label="发票类型" prop="invoice_type" show-overflow-tooltip />
<el-table-column label="开票金额(含税)" prop="invoicing_amount" show-overflow-tooltip />
<el-table-column label="开票金额(非税)" prop="amount_including_tax" show-overflow-tooltip />
<el-table-column label="税率(%)" prop="tax_rate" show-overflow-tooltip />
<!-- <el-table-column label="开票金额(税额)" prop="tax" show-overflow-tooltip /> -->
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<el-button v-perms="['InvoicingRequests.InvoicingRequests/edit']" type="primary" link
@click="handleEdit(row)">
@ -88,10 +84,9 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiinvoiceapplyLists, apiinvoiceapplyDelete, apiinvoiceapplyDetail } from '@/api/InvoicingRequests'
import { timeFormat } from '@/utils/util'
import { apiContractLists } from '@/api/contract'
import { apiCustomLists } from '@/api/custom'
import { getAllProjectTypes } from '@/api/projecttype'
import { apiContractSearch } from '@/api/contract'
import { apiProjectSearch } from '@/api/project'
import { apiCustomSearch } from '@/api/custom'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -111,11 +106,11 @@ const list1 = ref([])
// 查询条件
const queryParams = reactive({
invoicing_code: '',
invoicing_company_name: '',
contract_id: '',
customer_id: '',
project_id: ''
})
// 选中数据
@ -166,24 +161,6 @@ const handledetail = async (data: any) => {
detailRef.value?.setFormData(res)
}
//获取客户
const getlist1 = () => {
apiContractLists().then((res) => {
list.value = res.lists
})
}
//获取合同
const getlist2 = () => {
apiCustomLists().then((res) => {
list1.value = res.lists
})
}
getlist1()
getlist2()
if (route.query?.listId) {
handledetail({ id: route.query.listId })

19
src/views/bank_account/detail.vue
View File

@ -2,10 +2,6 @@
<div class="detail-popup">
<popup ref="popupRef" title="银行账户详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-descriptions :column="3" border>
<el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{
formData.org_name }}</el-descriptions-item>
<el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{
formData.dept_name }}</el-descriptions-item>
<el-descriptions-item label="账户编码" label-align="left" align="left" label-class-name="my-label">{{
formData.account_sn }}</el-descriptions-item>
<el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{
@ -28,7 +24,6 @@
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({
@ -57,14 +52,6 @@ const formData = reactive({
// 获取详情
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]
// }
// }
if (data.annex && data.annex.length > 0) {
const arry1 = data.annex.map((item: any, index: any) => {
@ -106,12 +93,6 @@ const handleClose = () => {
}
defineExpose({
open,
setFormData,

82
src/views/bank_account/edit.vue
View File

@ -5,26 +5,6 @@
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
<el-col :span="24">
<el-form-item label="组织名称" prop="org_id"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-select v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt"
class="flex-1">
<el-option v-for="(item, index) in list1" :key="index" :label="item.name"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部门名称" prop="dept_id"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-select v-model="formData.dept_id" clearable placeholder="请选择部门" class="flex-1">
<el-option v-for="( item, index ) in list2 " :key="index" :label="item.name"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="账户编码">
<el-input v-model="bank_no" clearable disabled placeholder="系统自动生成" />
@ -73,17 +53,7 @@
<el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
<bankaccountDialog @customEvent="customEvent3"></bankaccountDialog>
</el-dialog> -->
</el-form>
</popup>
@ -91,24 +61,10 @@
</template>
<script lang="ts" setup name="projectEdit">
import porjectDialog from '@/components/project/index.vue'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { bankaccountAdd, bankaccountEdit, bankaccountDetail } from '@/api/bank_account'
import { toChinesNum } from "@/utils/util";
import { getAllProjectTypes } from '@/api/projecttype'
import { timeFormat } from '@/utils/util'
import { isEmail, isIdCard, isPhone } from '@/utils/validate'
import type { PropType } from 'vue'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
const list1 = reactive([])
const list2 = reactive([])
const showDialog = ref(false)
const bank_no = ref('')
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
const emit = defineEmits(['success', 'close'])
@ -117,27 +73,6 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog3 = ref(false)
//获取所有组织
const getlist = () => {
getAll().then((res) => {
Object.assign(list1, res)
})
}
//获取部门
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑质量目标表' : '新增质量目标表'
@ -146,8 +81,6 @@ const popupTitle = computed(() => {
// 表单数据
const formData = reactive({
id: '',
org_id: '',
dept_id: '',
deposit_bank: '',
account_name: '',
account: '',
@ -171,22 +104,13 @@ const formRules = reactive<any>({
// 获取详情
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]
}
}
if (data.dept_id) {
getlist1(data.org_id)
}
bank_no.value = data.account_sn
}
const getDetail = async (row: Record<string, any>) => {
const data = await bankaccountDetail({
@ -198,7 +122,6 @@ const getDetail = async (row: Record<string, any>) => {
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData }
mode.value == 'edit'
@ -210,11 +133,8 @@ const handleSubmit = async () => {
//打开弹窗
const open = (type = 'add') => {
getlist()
mode.value = type
popupRef.value?.open()
}
// 关闭回调
@ -222,8 +142,6 @@ const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,

15
src/views/bank_account/index.vue
View File

@ -37,22 +37,12 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="组织名称" prop="org_name" show-overflow-tooltip />
<el-table-column label="部门名称" prop="dept_name" show-overflow-tooltip />
<el-table-column label="账户编码" prop="account_sn" show-overflow-tooltip />
<el-table-column label="开户银行" prop="deposit_bank" show-overflow-tooltip />
<el-table-column label="开户名称" prop="account_name" show-overflow-tooltip />
<el-table-column label="账号" prop="account" show-overflow-tooltip />
<el-table-column label="开户日期" prop="account_opening_date" show-overflow-tooltip />
<el-table-column label="期初金额" prop="opening_amount" show-overflow-tooltip />
<!-- <el-table-column label="入账金额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="出账金额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="账户余额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="账户资金余额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="汇票账户余额" prop="bidder_amount" show-overflow-tooltip /> -->
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
@ -82,11 +72,6 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { bankaccountLists, bankaccountDelete, bankaccountDetail } from '@/api/bank_account'
import {
apiBidDocumentExaminationLists
} from '@/api/bid_document_examination'
import { timeFormat } from '@/utils/util'
import { apiProjectLists } from '@/api/project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import DetailPopup from './detail.vue'

4
src/views/procurement_contract_detail/index.vue
View File

@ -34,10 +34,10 @@
<el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
<el-table-column label="合同类型" prop="contract_type_text" show-overflow-tooltip />
<el-table-column label="税率" prop="tax_rate_text" show-overflow-tooltip />
<el-table-column label="材料类别" prop="material_first_level" show-overflow-tooltip />
<el-table-column label="材料中类" prop="material_second_level" show-overflow-tooltip />
<el-table-column label="材料小类" prop="material_three_level" show-overflow-tooltip />
<el-table-column label="材料名称" prop="material_name" show-overflow-tooltip />
<el-table-column label="材料类别" prop="material_first_level" show-overflow-tooltip />
<el-table-column label="材料中类" prop="material_second_level" show-overflow-tooltip />
<el-table-column label="材料编码" prop="material_code" show-overflow-tooltip />
<el-table-column label="规格型号" prop="material_specs" show-overflow-tooltip />
<el-table-column label="品牌" prop="material_brand" show-overflow-tooltip />

18
src/views/project_material_budget_detail/detail.vue
View File

@ -44,10 +44,10 @@
}}</el-descriptions-item>
</el-descriptions>
<flowProcess v-if="!formData?.approve_id || formData.approve_check_status == 4" :flows="flows"
<!-- <flowProcess v-if="!formData?.approve_id || formData.approve_check_status == 4" :flows="flows"
:submitApi="apiproject_material_budget_detailApprove" :id="formData?.id" @off="handleClose">
</flowProcess>
<flowDetail v-else :approve_id="formData?.approve_id" @off="handleClose" />
<flowDetail v-else :approve_id="formData?.approve_id" @off="handleClose" /> -->
<!-- import { apiproject_material_budget_detailApprove, apiproject_material_budget_detailFlows } from '@/api/flowSet'
// 获取审批流程
const flows = ref([])
@ -107,7 +107,7 @@ const setFormData = async (data: Record<any, any>) => {
Object.assign(formDataannex, arry1)
}
getbidDocumentExaminationFlows()
// getbidDocumentExaminationFlows()
}
@ -136,12 +136,12 @@ const handleClose = () => {
}
// 获取审批流程
const flows = ref([])
const getbidDocumentExaminationFlows = async () => {
if (formData?.approve_id) return
let res = await apiproject_material_budget_detailFlows()
flows.value = res
}
// const flows = ref([])
// const getbidDocumentExaminationFlows = async () => {
// if (formData?.approve_id) return
// let res = await apiproject_material_budget_detailFlows()
// flows.value = res
// }

26
src/views/project_subpackage_budget_detail/detail.vue
View File

@ -31,8 +31,8 @@
}}</el-descriptions-item>
<el-descriptions-item label="单价" label-align="left" align="left" label-class-name="my-label"> {{
formData.price
}}</el-descriptions-item>
formData.price
}}</el-descriptions-item>
<!-- <el-descriptions-item label="剩余预算工作量" label-align="left" align="left" label-class-name="my-label"> {{
@ -44,17 +44,17 @@
<el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{
formData.remark
}}</el-descriptions-item>
formData.remark
}}</el-descriptions-item>
</el-descriptions>
<flowProcess v-if="!formData?.approve_id || formData.approve_check_status == 4" :flows="flows"
<!-- <flowProcess v-if="!formData?.approve_id || formData.approve_check_status == 4" :flows="flows"
:submitApi="apiproject_subpackage_budget_detailApprove" :id="formData?.id" @off="handleClose">
</flowProcess>
<flowDetail v-else :approve_id="formData?.approve_id" @off="handleClose" />
<flowDetail v-else :approve_id="formData?.approve_id" @off="handleClose" /> -->
<!-- import { apiproject_subpackage_budget_detailApprove, approject_subpackage_budget_detailFlows } from '@/api/flowSet'
// 获取审批流程
const flows = ref([])
@ -106,7 +106,7 @@ const formData = reactive({
// 获取详情
const setFormData = async (data: Record<any, any>) => {
Object.assign(formData, data)
getbidDocumentExaminationFlows()
// getbidDocumentExaminationFlows()
}
@ -137,12 +137,12 @@ const handleClose = () => {
// 获取审批流程
const flows = ref([])
const getbidDocumentExaminationFlows = async () => {
if (formData?.approve_id) return
let res = await approject_subpackage_budget_detailFlows()
flows.value = res
}
// const flows = ref([])
// const getbidDocumentExaminationFlows = async () => {
// if (formData?.approve_id) return
// let res = await approject_subpackage_budget_detailFlows()
// flows.value = res
// }

27
src/views/remittance/index.vue
View File

@ -2,6 +2,15 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="关联合同" prop="contract_id">
<selectRemote :formData="queryParams" model="contract_id" :api="apiContractSearch" />
</el-form-item>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiProjectSearch" />
</el-form-item>
<el-form-item label="客户名称" prop="custom_id">
<selectRemote :formData="queryParams" model="custom_id" :api="apiCustomSearch" />
</el-form-item>
<el-form-item label="期次" prop="project_name">
<el-select class="flex-1" v-model="queryParams.period" clearable placeholder="请选择期次">
<el-option v-for="(item, index) in dictData.pay_period" :key="index" :label="item.name"
@ -14,7 +23,6 @@
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -39,11 +47,10 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip />
<el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
<el-table-column label="客户名称" prop="custom_name" 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" show-overflow-tooltip />
<el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
<el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
<el-table-column label="期次" prop="period" show-overflow-tooltip />
<el-table-column label="计划回款日期" prop="return_date" show-overflow-tooltip />
<el-table-column label="状态" prop="return_status" show-overflow-tooltip />
@ -53,7 +60,6 @@
<el-table-column label="回款责任人" prop="return_duty" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="150" fixed="right">
<template #default="{ row }">
<el-button v-perms="['remittance.remittance/edit']" type="primary" link
@click="handleEdit(row)">
@ -66,7 +72,6 @@
<el-button v-perms="['remittance.remittance/detail']" link @click="handledetail(row)">
详情
</el-button>
</template>
</el-table-column>
</el-table>
@ -84,8 +89,9 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apireturnedLists, apireturnedDelete, apireturnedDetail } from '@/api/remittance'
import { timeFormat } from '@/utils/util'
import { getAllProjectTypes } from '@/api/projecttype'
import { apiContractSearch } from '@/api/contract'
import { apiProjectSearch } from '@/api/project'
import { apiCustomSearch } from '@/api/custom'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -100,12 +106,9 @@ const showDtail = ref(false)
const queryParams = reactive({
period: '',
return_status: '',
})
// 选中数据
const selectData = ref<any[]>([])

11
src/views/subcontracting_contract/detail.vue
View File

@ -5,7 +5,10 @@
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="基本信息" name="demo-tabs-1">
<el-descriptions :column="2" border>
<el-descriptions-item label="供应商编码" label-align="left" align="left"
label-class-name="my-label">{{ formData.supplier_code }}</el-descriptions-item>
<el-descriptions-item label="供应商名称" label-align="left" align="left"
label-class-name="my-label">{{ formData.supplier_name }}</el-descriptions-item>
<el-descriptions-item label="项目名称" label-align="left" align="left"
label-class-name="my-label">
@ -17,10 +20,7 @@
label-class-name="my-label">{{ formData.contract_name }}</el-descriptions-item>
<el-descriptions-item label="合同编号" label-align="left" align="left"
label-class-name="my-label">{{ formData.contract_no }}</el-descriptions-item>
<el-descriptions-item label="供应商编码" label-align="left" align="left"
label-class-name="my-label">{{ formData.supplier_code }}</el-descriptions-item>
<el-descriptions-item label="供应商名称" label-align="left" align="left"
label-class-name="my-label">{{ formData.supplier_name }}</el-descriptions-item>
<el-descriptions-item label="合同类型" label-align="left" align="left"
label-class-name="my-label">
{{ formData.contract_type_text }}
@ -36,7 +36,6 @@
{{ formData.pay_type_text }}
</el-descriptions-item>
<el-descriptions-item label="账期" label-align="left" align="left"
label-class-name="my-label">
{{ formData.account_period_text }}

52
src/views/subcontracting_contract/edit.vue
View File

@ -3,18 +3,6 @@
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :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-row>
<el-col :span="8">
<el-form-item label="供应商名称" prop="supplier_id" @click="showDialog1 = true"
@ -251,10 +239,6 @@ import projectTable from '@/components/project/index.vue'
import suppliertable from '@/components/supplier/index.vue'
import subpackageTable from '@/components/subpackage_budget_detail/index.vue'
import { useDictData } from '@/hooks/useDictOptions'
const list1 = reactive([])
const list2 = reactive([])
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
import { paymentplanLists } from '@/api/paymentplan'
import { apiSubcontractingContractDetailLists } from '@/api/subcontracting_contract_detail'
import { apiSubcontractingContractAdd, apiSubcontractingContractEdit, apiSubcontractingContractDetail } from '@/api/subcontracting_contract'
@ -345,41 +329,9 @@ const paymentplanList = (id: any) => {
})
}
//获取所有组织
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 formData = reactive({
id: '',
dept_id: '',
org_id: '',
supplier_id: '',
project_id: '',
contract_name: '',
@ -463,9 +415,6 @@ const formRules = reactive<any>({
// 获取详情
const setFormData = async (data: Record<any, any>) => {
if (data.dept_id) {
getlist1(data.org_id)
}
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
@ -526,7 +475,6 @@ const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
getlist()
}
// 关闭回调

22
src/views/subcontracting_contract/index.vue
View File

@ -2,11 +2,15 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
<el-form-item label="供应商" prop="supplier_id">
<selectRemote :formData="queryParams" model="supplier_id" :api="apiSupplierSearch" />
</el-form-item>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiProjectSearch" />
</el-form-item>
<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>
@ -30,11 +34,10 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
<el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
<el-table-column label="签订日期" prop="signing_date" show-overflow-tooltip />
<el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
<el-table-column label="合同金额" prop="contract_amount" show-overflow-tooltip />
@ -80,9 +83,8 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSubcontractingContractLists, apiSubcontractingContractDelete, apiSubcontractingContractDetail } from '@/api/subcontracting_contract'
import { timeFormat } from '@/utils/util'
import { apiProjectLists } from '@/api/project'
import { apisupplierLists } from '@/api/suppler_list'
import { apiProjectSearch } from '@/api/project'
import { apiSupplierSearch } from '@/api/suppler_list'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import DetailPopup from './detail.vue'
@ -94,9 +96,9 @@ const showDtail = ref(false)
// 查询条件
const queryParams = reactive({
contract_no: '',
supplier_id: '',
project_id: '',
contract_no: ''
})
// 选中数据

24
src/views/subcontracting_contract_detail/index.vue
View File

@ -1,6 +1,18 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="分包合同" prop="contract_id">
<selectRemote :formData="queryParams" model="contract_id" :api="apiSubcontractingContractSearch" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
<export-data class="ml-2.5" :fetch-fun="apiSubcontractingContractDetailLists" :params="queryParams"
:page-size="pager.size" />
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button v-perms="['contract.subcontracting_contract/add']" type="primary" @click="handleAdd">
<template #icon>
@ -19,10 +31,10 @@
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<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="supplier_name" show-overflow-tooltip />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
<el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
<el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
<el-table-column label="供应商名称" prop="supplier_name" 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 />
@ -31,9 +43,7 @@
<el-table-column label="工作量" prop="num" show-overflow-tooltip />
<el-table-column label="不含税金额" prop="amount_excluding_tax" show-overflow-tooltip />
<el-table-column label="含税金额" prop="amount_including_tax" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<!-- <el-button v-perms="['contract.subcontracting_contract/edit']" type="primary" link @click="handleEdit(row)">
编辑
@ -62,7 +72,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSubcontractingContractDetailLists, apiSubcontractingContractDetailDelete, apiSubcontractingContractDetailDetail } from '@/api/subcontracting_contract_detail'
import { timeFormat } from '@/utils/util'
import { apiSubcontractingContractSearch } from '@/api/subcontracting_contract'
import feedback from '@/utils/feedback'
// import EditPopup from './edit.vue'
import DetailPopup from './detail.vue'
@ -75,7 +85,7 @@ const showDtail = ref(false)
// 查询条件
const queryParams = reactive({
contract_id: ''
})
// 选中数据

57
src/views/subcontracting_contract_negotiation/edit.vue
View File

@ -3,16 +3,6 @@
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="160px" :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-row>
<el-col :span="8">
<el-form-item label="合同编号" prop="subcontracting_contract_id" @click="showDialog = true"
@ -163,8 +153,6 @@ import Popup from '@/components/popup/index.vue'
import { useDictData } from '@/hooks/useDictOptions'
import procurementTable from '@/components/procurement/index.vue'
import { apinegotiationAdd, apinegotiationEdit, apinegotiationDetail } from '@/api/subcontractor'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
const { dictData } = useDictData('negotiation_type')
let props = defineProps({
project: Object
@ -174,10 +162,6 @@ const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog = ref(false)
const list1 = reactive([])
const list2 = reactive([])
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
const project_name = ref('')
const project_code = ref('')
const formDataannex = reactive([])
@ -234,59 +218,28 @@ const delFileFn1 = (index: number) => {
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑分包洽商' : '新增分包洽商'
})
//获取所有组织
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 formData = reactive({
id: '',
dept_id: '',
org_id: '',
subcontracting_contract_id: '1',
negotiation_name: '',
negotiation_no: '',
negotiation_amount: '',
negotiation_type: '',
signing_date: '',
sign_date: '',
warranty_amount: '',
Warranty_expire_date: '',
warranty_expire_date: '',
negotiation_content: '',
negotiation_quotation: [],
negotiation_basis: [],
negotiation_detail: "",
"sign_date": "",
})
const customEvent = (e: any) => {
contract_no.value = e.contract_no;
supplier_name.value = e.supplier_name;
supplier_code.value = e.supplier_code;
formData.signing_date = e.signing_date;
formData.sign_date = e.signing_date;
project_name.value = e.project_name;
formData.subcontracting_contract_id = e.id;
project_code.value = e.project_code
@ -317,9 +270,6 @@ const setFormData = async (data: Record<any, any>) => {
});
Object.assign(formDataannex, arry1)
}
if (data.dept_id) {
getlist1(data.org_id)
}
if (data.negotiation_basis.length > 0) {
const arry1 = data.negotiation_basis.map((item: any, index: any) => {
@ -374,7 +324,6 @@ const handleSubmit = async () => {
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
getlist()
}
// 关闭回调

28
src/views/subcontracting_contract_negotiation/index.vue
View File

@ -2,11 +2,13 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="洽商单名称" prop="negotiation_name">
<el-input class="w-[280px]" v-model="queryParams.negotiation_name" clearable
placeholder="请输入洽商单名称" />
<el-form-item label="关联合同" prop="subcontracting_contract_id">
<selectRemote :formData="queryParams" model="subcontracting_contract_id"
:api="apiSubcontractingContractSearch" />
</el-form-item>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiProjectSearch" />
</el-form-item>
<el-form-item label="洽商编号" prop="negotiation_no">
<el-input class="w-[280px]" v-model="queryParams.negotiation_no" clearable placeholder="请输入洽商编号" />
</el-form-item>
@ -41,17 +43,15 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="洽商编号" prop="negotiation_no" show-overflow-tooltip />
<el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
<el-table-column label="洽商单名称" prop="negotiation_name" show-overflow-tooltip />
<el-table-column label="供应商名称" prop="supplier_name" 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="supplier_name" show-overflow-tooltip />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
<el-table-column label="洽商编号" prop="negotiation_no" show-overflow-tooltip />
<el-table-column label="洽商单名称" prop="negotiation_name" show-overflow-tooltip />
<el-table-column label="洽商金额" prop="negotiation_amount" show-overflow-tooltip />
<el-table-column label="洽商类别" prop="negotiation_type_text" show-overflow-tooltip />
<el-table-column label="洽商质保金额" prop="warranty_amount" show-overflow-tooltip />
<el-table-column label="洽商质保到期时间" prop="warranty_expire_date" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
@ -84,6 +84,8 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apinegotiationLists, apinegotiationDelete, apinegotiationDetail } from '@/api/subcontractor'
import { apiSubcontractingContractSearch } from '@/api/subcontracting_contract'
import { apiProjectSearch } from '@/api/project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import DetailPopup from './detail.vue'
@ -96,9 +98,9 @@ const showDtail = ref(false)
// 查询条件
const queryParams = reactive({
negotiation_no: '',
negotiation_name: '',
negotiation_type: ''
subcontracting_contract_id: '',
negotiation_type: '',
project_id: ''
})
// 选中数据