材料设置模块功能

This commit is contained in:
jia 2024-01-04 18:07:12 +08:00
parent 6c08e98b56
commit 01b8a2ba6e
28 changed files with 1484 additions and 839 deletions

View File

@ -0,0 +1,31 @@
import request from '@/utils/request'
// 材料分类列表
export function apimaterialLists(params: any) {
return request.get({ url: '/material.material_classify/lists', params })
}
// 添加材料分类
export function apimaterialAdd(params: any) {
return request.post({ url: '/material.material_classify/add', params })
}
// 编辑材料分类
export function apimaterialEdit(params: any) {
return request.post({ url: '/material.material_classify/edit', params })
}
// 删除材料分类
export function apimaterialDelete(params: any) {
return request.post({ url: '/material.material_classify/delete', params })
}
// 材料分类详情
export function apimaterialDetail(params: any) {
return request.get({ url: '/material.material_classify/detail', params })
}
//某个分类下的子分类列表
export function apimaterialDatas(params: any) {
return request.get({ url: '/material.material_classify/datas', params })
}

27
src/api/material_list.ts Normal file
View File

@ -0,0 +1,27 @@
import request from '@/utils/request'
// 材料分类列表
export function materialLists(params: any) {
return request.get({ url: '/material.material/lists', params })
}
// 添加材料分类
export function materialAdd(params: any) {
return request.post({ url: '/material.material/add', params })
}
// 编辑材料分类
export function materialEdit(params: any) {
return request.post({ url: '/material.material/edit', params })
}
// 删除材料分类
export function materialDelete(params: any) {
return request.post({ url: '/material.material/delete', params })
}
// 材料分类详情
export function materialDetail(params: any) {
return request.get({ url: '/material.material/detail', params })
}

View File

@ -0,0 +1,27 @@
import request from '@/utils/request'
// 仓库管理列表
export function materialwarehouseLists(params: any) {
return request.get({ url: '/material.material_warehouse/lists', params })
}
// 添加仓库管理
export function materialwarehouseAdd(params: any) {
return request.post({ url: '/material.material_warehouse/add', params })
}
// 编辑仓库管理
export function materialwarehouseEdit(params: any) {
return request.post({ url: '/material.material_warehouse/edit', params })
}
// 删除仓库管理
export function materialwarehouseDelete(params: any) {
return request.post({ url: '/material.material_warehouse/delete', params })
}
// 仓库管理详情
export function materialwarehouseDetail(params: any) {
return request.get({ url: '/material.material_warehouse/detail', params })
}

View File

@ -16,13 +16,15 @@
<div class="mt-4">
<el-table :data="pager.lists" @cell-click="handleCurrentChange">
<el-table-column label="序号" property="name" />
<el-table-column label="材料大类" property="custom_type" />
<el-table-column label="材料名称" property="credit_rating" />
<el-table-column label="材料编码" property="province_name" />
<el-table-column label="品牌" property="city_name" />
<el-table-column label="单位" property="street_name" />
<el-table-column label="参数说明" property="master_name" />
<el-table-column label="材料大类" prop="first_level_name" show-overflow-tooltip />
<el-table-column label="材料中类" prop="second_level_name" show-overflow-tooltip />
<el-table-column label="材料小类" prop="three_level_name" show-overflow-tooltip />
<el-table-column label="材料名称" prop="name" show-overflow-tooltip />
<el-table-column label="材料编码" prop="code" show-overflow-tooltip />
<el-table-column label="品牌" prop="brand" show-overflow-tooltip />
<el-table-column label="单位" prop="unit" show-overflow-tooltip />
<el-table-column label="规格型号" prop="specs" show-overflow-tooltip />
<el-table-column label="参数说明" prop="parameter_description" show-overflow-tooltip />
</el-table>
</div>
@ -36,7 +38,7 @@
<script lang="ts" setup>
import { usePaging } from "@/hooks/usePaging"
import { useDictData } from "@/hooks/useDictOptions"
import { apiCustomLists } from '@/api/custom'
import { materialLists } from '@/api/material_list'
import { defineEmits } from "vue"
//
@ -55,7 +57,7 @@ const handleCurrentChange = (value: any) => {
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiCustomLists,
fetchFun: materialLists,
params: queryParams,
});

View File

@ -1,283 +0,0 @@
<template>
<div class="detail-popup">
<popup ref="popupRef" title="开票申请详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="160px">
<el-card class="mb-2">
<el-row>
<el-col :span="8">
<el-form-item label="项目名称">
{{ formData.project_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称">
{{ formData.custom.name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目编码">
{{ formData.project_code
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同编号">
{{ formData.contract.contract_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同名称">
{{ formData.contract ? formData.contract.contract_code : '暂无数据' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同金额">
{{ formData.contract.amount
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="期次">
<dict-value :options="dictData.pay_period" :value="formData.period" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="累计开票金额">
{{ formData.accumulate_amount }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="累计回款金额">
{{ formData.accumulated_payments_received }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="税率">
{{ formData.tax_rate }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票类型">
<dict-value :options="dictData.invoice_type" :value="formData.invoice_type" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票金额(含税)">
{{ formData.invoicing_amount }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额大写">
{{ formData.invoicing_amount_daxie }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票金额(税额)">
{{ formData.invoicing_amount }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票金额(非税)">
{{ formData.amount_including_tax }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票内容">
{{ formData.content }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票编号">
{{ formData.invoice_no }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票公司名称">
{{ formData.invoicing_company_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="纳税人识别号">
{{ formData.taxpayer_identification_number }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户银行">
{{ formData.deposit_bank }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="账号">
{{ formData.bank_accnout }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户地址及电话">
{{ formData.address_phone }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收票地址">
{{ formData.receiving_address }}
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="联系人">
{{ formData.contacts }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话">
{{ formData.phone }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮寄时间">
{{ formData.mailing_time }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮寄方式">
{{ formData.mailing_type }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮寄单号">
{{ formData.mailing_no }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注">
{{ formData.remark }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件">
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="customdetail">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCustomDetail } from '@/api/custom'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const formDataannex = reactive([])
const datas = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
});
//
const formData = reactive({
})
//
const setFormData = async (data: Record<any, any>) => {
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)
}
// for (const key in formData) {
// if (data[key] != null && data[key] != undefined) {
// //@ts-ignore
// formData[key] = data[key]
// }
// }
Object.assign(formData, data)
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiCustomDetail({
id: formData.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
popupRef.value?.close()
}
//
const open = () => {
console.log('1111111')
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>
<style lang="scss">
.tit {
font-size: 1.2em;
margin-bottom: 10px;
}
</style>

View File

@ -2,12 +2,8 @@
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="材料大类" prop="contract_id">
<el-input v-model="project_name" clearable placeholder="材料大类" />
@ -288,7 +284,7 @@ const customEvent1 = (e: any) => {
};
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑月度盘点表' : '新增月度盘点表'
return mode.value == 'edit' ? '编辑自购材料表' : '新增自购材料表'
})
//

View File

@ -1,283 +0,0 @@
<template>
<div class="detail-popup">
<popup ref="popupRef" title="开票申请详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="160px">
<el-card class="mb-2">
<el-row>
<el-col :span="8">
<el-form-item label="项目名称">
{{ formData.project_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称">
{{ formData.custom.name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目编码">
{{ formData.project_code
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同编号">
{{ formData.contract.contract_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同名称">
{{ formData.contract ? formData.contract.contract_code : '暂无数据' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同金额">
{{ formData.contract.amount
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="期次">
<dict-value :options="dictData.pay_period" :value="formData.period" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="累计开票金额">
{{ formData.accumulate_amount }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="累计回款金额">
{{ formData.accumulated_payments_received }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="税率">
{{ formData.tax_rate }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票类型">
<dict-value :options="dictData.invoice_type" :value="formData.invoice_type" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票金额(含税)">
{{ formData.invoicing_amount }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额大写">
{{ formData.invoicing_amount_daxie }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票金额(税额)">
{{ formData.invoicing_amount }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票金额(非税)">
{{ formData.amount_including_tax }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票内容">
{{ formData.content }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票编号">
{{ formData.invoice_no }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票公司名称">
{{ formData.invoicing_company_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="纳税人识别号">
{{ formData.taxpayer_identification_number }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户银行">
{{ formData.deposit_bank }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="账号">
{{ formData.bank_accnout }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户地址及电话">
{{ formData.address_phone }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收票地址">
{{ formData.receiving_address }}
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="联系人">
{{ formData.contacts }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话">
{{ formData.phone }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮寄时间">
{{ formData.mailing_time }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮寄方式">
{{ formData.mailing_type }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮寄单号">
{{ formData.mailing_no }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注">
{{ formData.remark }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件">
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="customdetail">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCustomDetail } from '@/api/custom'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const formDataannex = reactive([])
const datas = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
});
//
const formData = reactive({
})
//
const setFormData = async (data: Record<any, any>) => {
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)
}
// for (const key in formData) {
// if (data[key] != null && data[key] != undefined) {
// //@ts-ignore
// formData[key] = data[key]
// }
// }
Object.assign(formData, data)
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiCustomDetail({
id: formData.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
popupRef.value?.close()
}
//
const open = () => {
console.log('1111111')
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>
<style lang="scss">
.tit {
font-size: 1.2em;
margin-bottom: 10px;
}
</style>

View File

@ -17,7 +17,7 @@
<el-input v-model="matsname" clearable disabled placeholder="系统自动填写" />
</el-form-item></el-col><el-col :span="8">
<!-- @click="showDialog1 = true" -->
<el-form-item label="产品id" prop="product_id">
<el-form-item label="产品" prop="product_id" @click="showDialog1 = true">
<el-input v-model="formData.product_id" readonly clearable placeholder="请输入产品" />
</el-form-item></el-col><el-col :span="8">
<el-form-item label="产品数量" prop="product_num">
@ -57,7 +57,7 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import biddocumentTable from "@/components/biddocument/index.vue"
import prodctTable from "@/components/product/index.vue"
import prodctTable from '@/components/product/index.vue'
import { apiBidDocumentExaminationDetailAdd, apiBidDocumentExaminationDetailEdit, apiBidDocumentExaminationDetailDetail } from '@/api/bid_document_examination_detail'
import { timeFormat } from '@/utils/util'
import projectTable from "@/components/project/index.vue"

View File

@ -0,0 +1,180 @@
<template>
<div class="detail-popup">
<popup ref="popupRef" title="自购材料详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="160px">
<el-card class="mb-2">
<el-row>
<el-col :span="8">
<el-form-item label="材料大类">
{{ formData.project_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料中类">
{{ formData.custom.name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料小类">
{{ formData.project_code
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料名称">
{{ formData.contract.contract_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料编码">
{{ formData.contract ? formData.contract.contract_code : '暂无数据' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="品牌">
{{ formData.contract.amount
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格型号">
<dict-value :options="dictData.pay_period" :value="formData.period" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参数说明">
{{ formData.accumulate_amount }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位">
{{ formData.accumulated_payments_received }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件">
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="customdetail">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCustomDetail } from '@/api/custom'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const formDataannex = reactive([])
const datas = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
});
//
const formData = reactive({
})
//
const setFormData = async (data: Record<any, any>) => {
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)
}
// for (const key in formData) {
// if (data[key] != null && data[key] != undefined) {
// //@ts-ignore
// formData[key] = data[key]
// }
// }
Object.assign(formData, data)
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiCustomDetail({
id: formData.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
popupRef.value?.close()
}
//
const open = () => {
console.log('1111111')
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>
<style lang="scss">
.tit {
font-size: 1.2em;
margin-bottom: 10px;
}
</style>

View File

@ -0,0 +1,147 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="父级分类" prop="pid">
<el-select class="w-[280px]" v-model="formData.pid" clearable placeholder="请选择父级分类">
<el-option label="全部" :value="0"></el-option>
<el-option v-for="(item, index) in imaterialList" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分类名称" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.name" clearable placeholder="分类名称" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="projectEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apimaterialLists, apimaterialAdd, apimaterialEdit, apimaterialDetail } from '@/api/material_classify'
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 base_url = configs.baseUrl + configs.urlPrefix
const userStore = useUserStore();
const imaterialList = ref([])
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: '',
pid: '',
name: ''
})
//
const formRules = reactive<any>({
})
//
const imateriallist = () => {
apimaterialLists({ page_no: 1, page_size: 9999 }).then((res) => {
console.log(res)
imaterialList.value = res.lists
})
}
//
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 apimaterialDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData }
mode.value == 'edit'
? await apimaterialEdit(data)
: await apimaterialAdd(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
imateriallist()
mode.value = type
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

View File

@ -0,0 +1,137 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="分类名称" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入分类名称" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['InvoicingRequests.InvoicingRequests/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id" lazy :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="分类名称" prop="name" 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)">
编辑
</el-button>
<!-- <el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" type="danger" link @click="handleDelete(row.id)">
删除
</el-button> -->
<!-- <el-button v-perms="['InvoicingRequests.InvoicingRequests/detail']" link @click="handledetail(row)">
详情
</el-button> -->
</template>
</el-table-column>
</el-table>
</div>
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" />
</div>
</template>
<script lang="ts" setup name="projectLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apimaterialLists, apimaterialDelete, apimaterialDetail } from '@/api/material_classify'
import { timeFormat } from '@/utils/util'
import { apiContractLists } from '@/api/contract'
import { apiCustomLists } from '@/api/custom'
import { getAllProjectTypes } from '@/api/projecttype'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import DetailPopup from './detail.vue'
const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
const showDtail = ref(false)
//
const queryParams = reactive({
name: '',
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('pay_period,invoice_type')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apimaterialLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
let res = await apimaterialDetail({ 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 apimaterialDelete({ id })
getLists()
}
//
const handledetail = async (data: any) => {
let res = await apimaterialDetail({ id: data.id })
showDtail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
}
getLists()
</script>

View File

@ -0,0 +1,182 @@
<template>
<div class="detail-popup">
<popup ref="popupRef" title="自购材料详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="160px">
<el-card class="mb-2">
<el-row>
<el-col :span="8">
<el-form-item label="材料大类">
{{ formData.first_level_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料中类">
{{ formData.second_level_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料小类">
{{ formData.three_level_name
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料名称">
{{ formData.name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料编码">
{{ formData.code }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="品牌">
{{ formData.brand
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格型号">
{{ formData.specs }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参数说明">
{{ formData.parameter_description }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位">
{{ formData.unit }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件">
<div v-if="formDataannex && formDataannex.length > 0">
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
<div>暂无附件</div>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="customdetail">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCustomDetail } from '@/api/custom'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const formDataannex = reactive([])
const datas = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
});
//
const formData = reactive({
})
//
const setFormData = async (data: Record<any, any>) => {
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)
}
// for (const key in formData) {
// if (data[key] != null && data[key] != undefined) {
// //@ts-ignore
// formData[key] = data[key]
// }
// }
Object.assign(formData, data)
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiCustomDetail({
id: formData.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
popupRef.value?.close()
}
//
const open = () => {
console.log('1111111')
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>
<style lang="scss">
.tit {
font-size: 1.2em;
margin-bottom: 10px;
}
</style>

View File

@ -0,0 +1,293 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="材料大类" prop="first_level" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-select v-model="formData.first_level" clearable placeholder="请选择材料大类" @change="firstChange">
<el-option v-for="(item, index) in firstList" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料中类" prop="second_level">
<el-select v-model="formData.second_level" clearable placeholder="请选择材料中类" @change="secondChange">
<el-option v-for="(item, index) in secondList" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料小类" prop="three_level">
<!-- <el-input v-model="formData.three_level" clearable placeholder="材料小类" /> -->
<el-select v-model="formData.three_level" clearable placeholder="请选择材料小类">
<el-option v-for="(item, index) in threedList" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料编码" prop="code" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.code" clearable placeholder="请输入材料编码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="品牌" prop="brand">
<el-input v-model="formData.brand" clearable placeholder="请输入品牌" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="材料名称" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.name" clearable placeholder="请输入材料名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格型号" prop="specs" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.specs" clearable placeholder="请输入规格型号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unit" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.unit" clearable placeholder="请输入单位" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="安全库存量" prop="inventory">
<el-input v-model="formData.inventory" clearable placeholder="请输入安全库存量" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="参数说明" prop="parameter_description">
<el-input v-model="formData.parameter_description" type="textarea" clearable placeholder="请输入参数说明" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附件" prop="field127">
<el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
</el-upload>
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="销售指导价" prop="sales_price">
<el-input v-model="formData.sales_price" clearable placeholder="请输入销售指导价" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预算成本价" prop="cost_price">
<el-input v-model="formData.cost_price" clearable placeholder="请输入预算成本价" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="projectEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { materialAdd, materialEdit, materialDetail } from '@/api/material_list'
import { apimaterialLists, apimaterialDatas } from '@/api/material_classify'
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 base_url = configs.baseUrl + configs.urlPrefix
const userStore = useUserStore();
const formDataannex = reactive([])
const firstList = ref([])
const secondList = ref([])
const threedList = ref([])
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 handleAvatarSuccess_four = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg);
return;
}
formDataannex.push(
{ uri: response.data.uri, name: response.data.name }
);
};
//
const firstChange = (e: any) => {
// console.log(e)
apimaterialDatas({ page_no: 1, page_size: 9999, pid: e }).then((res) => {
secondList.value = res
})
}
const secondChange = (e: any) => {
apimaterialDatas({ page_no: 1, page_size: 9999, pid: e }).then((res) => {
threedList.value = res
})
}
//
const delFileFn = (index: number) => {
formDataannex.splice(index, 1)
}
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑自购材料表' : '新增自购材料表'
})
//
const formData = reactive({
id: '',
first_level: '',
second_level: '',
three_level: '',
code: '',
brand: '',
name: '',
specs: '',
unit: '',
parameter_description: '',
inventory: '',
sales_price: '',
cost_price: '',
annex: '',
})
//
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.annex && data.annex.length > 0) {
const arry1 = data.annex.map((item: any, index: any) => {
return {
name: `文件${index + 1}`,
uri: item
};
});
Object.assign(formDataannex, arry1)
}
if (data.first_level) {
firstChange(data.first_level)
}
if (data.second_level) {
setTimeout(() => {
secondChange(data.second_level)
}, 1000)
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await materialDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
if (formDataannex.length > 0) {
formData.annex = JSON.stringify(formDataannex.map((item: any) => item.uri))
}
await formRef.value?.validate()
const data = { ...formData }
mode.value == 'edit'
? await materialEdit(data)
: await materialAdd(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
//
const materialLists = () => {
apimaterialLists({ page_no: 1, page_size: 9999 }).then((res) => {
firstList.value = res.lists
})
}
materialLists()
defineExpose({
open,
setFormData,
getDetail
})
</script>

View File

@ -1,23 +1,26 @@
<template>
<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-input class="w-[280px]" v-model="queryParams.invoicing_company_name" clearable placeholder="请输入开票公司名称" />
<el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
<el-form-item label="材料大类" prop="first_level">
<el-input class="w-[280px]" v-model="queryParams.first_level" clearable placeholder="请输入材料大类" />
</el-form-item>
<el-form-item label="材料中类" prop="second_level">
<el-input class="w-[280px]" v-model="queryParams.second_level" clearable placeholder="请输入材料中类" />
</el-form-item>
<el-form-item label="材料小类" prop="three_level">
<el-input class="w-[280px]" v-model="queryParams.three_level" clearable placeholder="请输入材料小类" />
</el-form-item>
<el-form-item label="材料编码" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入材料编码" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input class="w-[280px]" v-model="queryParams.brand" clearable placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="材料名称" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入材料名称" />
</el-form-item>
<el-form-item 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>
@ -41,17 +44,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="invoicing_date" show-overflow-tooltip />
<el-table-column label="材料中类" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="材料小类" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="材料名称" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="材料编码" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="材料名称" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="品牌" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="规格型号" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="参数说明" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="单位" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="材料大类" prop="first_level_name" show-overflow-tooltip />
<el-table-column label="材料中类" prop="second_level_name" show-overflow-tooltip />
<el-table-column label="材料小类" prop="three_level_name" show-overflow-tooltip />
<el-table-column label="材料名称" prop="name" show-overflow-tooltip />
<el-table-column label="材料编码" prop="code" show-overflow-tooltip />
<el-table-column label="品牌" prop="brand" show-overflow-tooltip />
<el-table-column label="规格型号" prop="specs" show-overflow-tooltip />
<el-table-column label="参数说明" prop="parameter_description" show-overflow-tooltip />
<el-table-column label="单位" prop="unit" 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)">
@ -79,12 +80,13 @@
<script lang="ts" setup name="projectLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiinvoiceapplyLists, apiinvoiceapplyDelete, apiinvoiceapplyDetail } from '@/api/InvoicingRequests'
import { apimaterialLists } from '@/api/material_classify'
import { materialLists, materialDelete, materialDetail } from '@/api/material_list'
import { timeFormat } from '@/utils/util'
import { apiContractLists } from '@/api/contract'
import { apiCustomLists } from '@/api/custom'
import { getAllProjectTypes } from '@/api/projecttype'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import DetailPopup from './detail.vue'
@ -95,14 +97,16 @@ const showEdit = ref(false)
const showDtail = ref(false)
const list = ref([])
const list1 = ref([])
const imaterialList = ref([])
//
const queryParams = reactive({
invoicing_company_name: '',
contract_id: '',
customer_id: '',
first_level: '',
second_level: '',
three_level: '',
code: '',
brand: '',
name: '',
})
@ -120,7 +124,7 @@ const { dictData } = useDictData('pay_period,invoice_type')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiinvoiceapplyLists,
fetchFun: materialLists,
params: queryParams
})
@ -133,7 +137,7 @@ const handleAdd = async () => {
//
const handleEdit = async (data: any) => {
let res = await apiinvoiceapplyDetail({ id: data.id })
let res = await materialDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
@ -143,38 +147,30 @@ const handleEdit = async (data: any) => {
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiinvoiceapplyDelete({ id })
await materialDelete({ id })
getLists()
}
//
const handledetail = async (data: any) => {
let res = await apiinvoiceapplyDetail({ id: data.id })
let res = await materialDetail({ id: data.id })
showDtail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
}
//
const getlist1 = () => {
apiContractLists().then((res) => {
list.value = res.lists
})
}
//
const getlist2 = () => {
apiCustomLists().then((res) => {
// console.log(res)
list1.value = res.lists
//
const imateriallist = () => {
apimaterialLists({ page_no: 1, page_size: 9999 }).then((res) => {
console.log(res)
imaterialList.value = res.lists
})
}
getlist1()
getlist2()
imateriallist()
getLists()
</script>

View File

@ -0,0 +1,194 @@
<template>
<div class="detail-popup">
<popup ref="popupRef" title="仓库管理详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="160px">
<el-card class="mb-2">
<el-row>
<el-col :span="8">
<el-form-item label="组织名称">
{{ formData.org_name
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门名称">
{{ formData.dept_name
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目名称">
{{ formData.project_name }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目编码">
{{ formData.project_code
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库编码">
{{ formData.code }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库名称">
{{ formData.name
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否MRP仓库">
{{ formData.is_mrp_text
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="负责人">
{{ formData.head_user_name
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="地址">
{{ formData.address
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注">
{{ formData.remark }}
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附件">
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</el-form-item>
</el-col>
</el-row>
</el-card>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="customdetail">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCustomDetail } from '@/api/custom'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const formDataannex = reactive([])
const datas = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
});
//
const formData = reactive({
})
//
const setFormData = async (data: Record<any, any>) => {
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)
}
// for (const key in formData) {
// if (data[key] != null && data[key] != undefined) {
// //@ts-ignore
// formData[key] = data[key]
// }
// }
Object.assign(formData, data)
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiCustomDetail({
id: formData.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
popupRef.value?.close()
}
//
const open = () => {
console.log('1111111')
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>
<style lang="scss">
.tit {
font-size: 1.2em;
margin-bottom: 10px;
}
</style>

View File

@ -6,49 +6,46 @@
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="项目名称" prop="contract_id">
<el-input v-model="project_name" clearable disabled placeholder="系统自动填写" />
<el-form-item label="项目名称" prop="project_id" @click="showDialog = true">
<el-input v-model="project_name" clearable readonly placeholder="请选择项目" />
</el-form-item>
</el-col> <el-col :span="8">
<el-form-item label="项目编码" prop="contract_id">
<el-form-item label="项目编码" prop="project_id">
<el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库编码" prop="contract_id">
<el-input v-model="project_code" clearable disabled placeholder="仓库编码" />
<el-form-item label="仓库编码">
<el-input v-model="code" clearable disabled placeholder="系统自动生成" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库名称" prop="contract_id">
<el-input v-model="project_code" clearable disabled placeholder="仓库名称" />
<el-form-item label="仓库名称" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="formData.name" clearable placeholder="仓库名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="MRP仓库" prop="contract_id">
<el-input v-model="project_code" clearable disabled placeholder="MRP仓库" />
</el-form-item>
</el-col>
<el-form-item label="MRP仓库" prop="is_mrp" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<!-- <el-input v-model="project_code" clearable disabled placeholder="MRP仓库" /> -->
<el-switch v-model="formData.is_mrp" :active-value="1" :inactive-value="0" inline-prompt active-text="是" inactive-text="否" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="负责人" prop="invoice_no">
<el-input v-model="formData.invoice_no" clearable placeholder="请输入负责人" />
<el-form-item label="负责人" prop="head_user" @click="userclick" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="head_user_name" readonly clearable placeholder="请输入负责人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="地址" prop="address">
<el-input v-model="formData.address" clearable placeholder="请输入地址" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="地址" prop="invoice_no">
<el-input v-model="formData.invoice_no" clearable placeholder="请输入地址" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话" prop="invoice_no">
<el-input v-model="formData.invoice_no" clearable placeholder="请输入联系电话" />
<el-form-item label="联系电话" prop="telephone">
<el-input v-model="formData.telephone" clearable placeholder="请输入联系电话" />
</el-form-item>
</el-col>
@ -70,7 +67,7 @@
</el-upload>
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<div v-for="( item, index ) in formDataannex " style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
@ -80,11 +77,12 @@
</el-col>
</el-row>
<el-dialog v-model="showDialog1" title="选择项目" width="70%">
<projectDialog @customEvent="customEvent1" contract_type="2"></projectDialog>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<projectDialog @customEvent="customEvent" contract_type="2"></projectDialog>
</el-dialog>
</el-form>
</popup>
<personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
</div>
</template>
@ -92,9 +90,10 @@
<script lang="ts" setup name="projectEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import personnelselector from '@/components/personnelselector/index.vue'
import { toChinesNum } from "@/utils/util";
import projectDialog from '@/components/project/index.vue'
import { apiinvoiceapplyAdd, apiinvoiceapplyEdit, apiinvoiceapplyDetail } from '@/api/InvoicingRequests'
import { materialwarehouseAdd, materialwarehouseEdit, materialwarehouseDetail } from '@/api/material_warehouse'
import { getAllProjectTypes } from '@/api/projecttype'
import { timeFormat } from '@/utils/util'
import { isEmail, isIdCard, isPhone } from '@/utils/validate'
@ -106,13 +105,12 @@ const base_url = configs.baseUrl + configs.urlPrefix
const userStore = useUserStore();
const active = ref(0)
const formDataannex = reactive([])
const contract_name = ref('')
const head_user_name = ref('')
const project_name = ref('')
const project_code = ref('')
const project_amount = ref('')
const contract_no = ref('')
const custom_name = ref('')
const code = ref('')
const personnel = ref<any>()
const next = () => {
if (active.value++ > 3) active.value = 0
}
@ -148,13 +146,7 @@ const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined)
}
};
//
const amountinput = (e) => {
// console.log(e)
if (e && e > 0) {
formData.invoicing_amount_daxie = toChinesNum(e)
}
}
//
const delFileFn = (index: number) => {
formDataannex.splice(index, 1)
@ -170,22 +162,14 @@ const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog = ref(false)
const showDialog1 = ref(false)
const customEvent = (e: any) => {
formData.customer_id = e.id;
custom_name.value = e.name;
showDialog.value = false;
};
const customEvent1 = (e: any) => {
formData.contract_id = e.id;
project_name.value = e.project_name;
formData.project_id = e.id;
project_name.value = e.name;
project_code.value = e.project_code;
contract_name.value = e.contract_name;
contract_no.value = e.contract_code
project_amount.value = e.amount
showDialog1.value = false;
showDialog.value = false;
};
//
const popupTitle = computed(() => {
@ -195,34 +179,16 @@ const popupTitle = computed(() => {
//
const formData = reactive({
id: '',
customer_id: '',
contract_id: '',
approve_id: '',
invoicing_date: "",
period: "",
accumulate_amount: '',
accumulated_payments_received: '',
tax_rate: "",
invoice_type: '',
invoicing_amount: '',
invoicing_amount_daxie: "",
tax: '',
amount_including_tax: '',
content: "",
invoice_no: "",
remark: "",
annex: "",
invoicing_company_name: "",
taxpayer_identification_number: "",
deposit_bank: "",
bank_accnout: "",
address_phone: "",
receiving_address: "",
contacts: "",
phone: "",
mailing_time: "",
mailing_type: "",
mailing_no: ""
org_id: '',
dept_id: '',
project_id: '',
name: '',
is_mrp: 1,
head_user: '',
address: '',
telephone: '',
remark: '',
annex: '',
})
@ -231,7 +197,16 @@ const formRules = reactive<any>({
})
const userclick = () => {
// console.log(personnel.value, '1111111')
personnel.value.open()
}
//
const submituser = (e: any) => {
formData.head_user = e.id;
head_user_name.value = e.name;
}
//
const setFormData = async (data: Record<any, any>) => {
if (data.annex && data.annex.length > 0) {
@ -256,17 +231,19 @@ const setFormData = async (data: Record<any, any>) => {
if (formData.invoicing_amount) {
toChinesNum(formData.invoicing_amount)
}
custom_name.value = data.custom.name
project_name.value = data.contract_name;
project_code.value = data.contract_code
project_amount.value = data.contract.amount
contract_name.value = data.contract.contract_name;
contract_no.value = data.contract.contract_code
project_name.value = data.project_name;
project_code.value = data.project_code
code.value = data.code
head_user_name.value = data.head_user_name
// contract_name.value = data.contract.contract_name;
// contract_no.value = data.contract.contract_code
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiinvoiceapplyDetail({
const data = await materialwarehouseDetail({
id: row.id
})
setFormData(data)
@ -285,8 +262,8 @@ const handleSubmit = async () => {
const data = { ...formData }
mode.value == 'edit'
? await apiinvoiceapplyEdit(data)
: await apiinvoiceapplyAdd(data)
? await materialwarehouseEdit(data)
: await materialwarehouseAdd(data)
popupRef.value?.close()
emit('success')
}

View File

@ -1,21 +1,23 @@
<template>
<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-input class="w-[280px]" v-model="queryParams.invoicing_company_name" clearable placeholder="请输入开票公司名称" />
<el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
<el-form-item label="仓库编码" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" 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 label="仓库名称" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入仓库名称" />
</el-form-item>
<el-form-item label="合同" prop="contract_id">
<el-select class="w-[280px]" v-model="queryParams.contract_id" clearable placeholder="请选择合同">
<el-form-item label="项目名称" prop="project_name">
<el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
</el-form-item>
<el-form-item label="MRP仓库" prop="is_mrp">
<el-select class="w-[280px]" v-model="queryParams.is_mrp" clearable placeholder="请选择是否MRP仓库">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in list" :key="index" :label="item.contract_name" :value="item.id" />
<el-option v-for="(item, index) in dictData.is_mrp" :key="index" :label="item.contract_name" :value="item.id" />
</el-select>
</el-form-item>
@ -43,12 +45,12 @@
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="仓库编码" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="仓库名称" prop="tax" show-overflow-tooltip />
<el-table-column label="MRP仓库" prop="tax" show-overflow-tooltip />
<el-table-column label="负责人" prop="tax" show-overflow-tooltip />
<el-table-column label="地址" prop="tax" show-overflow-tooltip />
<el-table-column label="备注" prop="tax" show-overflow-tooltip />
<el-table-column label="仓库编码" prop="code" show-overflow-tooltip />
<el-table-column label="仓库名称" prop="name" show-overflow-tooltip />
<el-table-column label="是否MRP仓库" prop="is_mrp" show-overflow-tooltip />
<el-table-column label="负责人" prop="head_user" show-overflow-tooltip />
<el-table-column label="地址" prop="address" 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="['InvoicingRequests.InvoicingRequests/edit']" type="primary" link @click="handleEdit(row)">
@ -76,11 +78,8 @@
<script lang="ts" setup name="projectLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiinvoiceapplyLists, apiinvoiceapplyDelete, apiinvoiceapplyDetail } from '@/api/InvoicingRequests'
import { materialwarehouseLists, materialwarehouseDelete, materialwarehouseDetail } from '@/api/material_warehouse'
import { timeFormat } from '@/utils/util'
import { apiContractLists } from '@/api/contract'
import { apiCustomLists } from '@/api/custom'
import { getAllProjectTypes } from '@/api/projecttype'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -89,17 +88,15 @@ const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
const showDtail = ref(false)
const list = ref([])
const list1 = ref([])
//
const queryParams = reactive({
invoicing_company_name: '',
code: '',
contract_id: '',
customer_id: '',
name: '',
})
@ -117,7 +114,7 @@ const { dictData } = useDictData('pay_period,invoice_type')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiinvoiceapplyLists,
fetchFun: materialwarehouseLists,
params: queryParams
})
@ -130,7 +127,7 @@ const handleAdd = async () => {
//
const handleEdit = async (data: any) => {
let res = await apiinvoiceapplyDetail({ id: data.id })
let res = await materialwarehouseDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
@ -140,36 +137,18 @@ const handleEdit = async (data: any) => {
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiinvoiceapplyDelete({ id })
await materialwarehouseDelete({ id })
getLists()
}
//
const handledetail = async (data: any) => {
let res = await apiinvoiceapplyDetail({ id: data.id })
let res = await materialwarehouseDetail({ id: data.id })
showDtail.value = true
await nextTick()
detailRef.value?.open()
detailRef.value?.setFormData(res)
}
//
const getlist1 = () => {
apiContractLists().then((res) => {
list.value = res.lists
})
}
//
const getlist2 = () => {
apiCustomLists().then((res) => {
// console.log(res)
list1.value = res.lists
})
}
getlist1()
getlist2()
getLists()

View File

@ -4,7 +4,7 @@
<el-form ref="formRef" :model="formData" label-width="160px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目" prop="project_id" @click="showDialog = true">
<el-form-item label="项目" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="project_name" readonly clearable placeholder="请选择项目" />
</el-form-item> </el-col>
<el-col :span="8">

View File

@ -4,7 +4,7 @@
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目类型" prop="project_id" @click="showDialog = true">
<el-form-item label="项目类型" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'cahange' }]">
<el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="parseInt(item.id)" />
@ -12,10 +12,10 @@
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="科目编码" prop="formData.subject_code">
<el-input v-model="formData.subject_code" clearable placeholder="请输入科目编码" />
<el-input v-model="formData.subject_code" clearable disabled placeholder="系统自动生成" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="一级科目" prop="first_level_subject">
<el-form-item label="一级科目" prop="first_level_subject" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.first_level_subject" clearable placeholder="请输入一级科目" />
</el-form-item> </el-col>
<el-col :span="8">
@ -86,7 +86,7 @@ const project_name = ref('')
const project_code = ref('')
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑项目WBS设置' : '新增项目WBS设置'
return mode.value == 'edit' ? '编辑项目费用模板' : '新增项目费用模板'
})
//

View File

@ -4,18 +4,18 @@
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目类型" prop="project_id" @click="showDialog = true">
<el-form-item label="项目类型" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="parseInt(item.id)" />
</el-select>
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="文档大类" prop="formData.large_category">
<el-form-item label="文档大类" prop="formData.large_category" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.large_category" clearable placeholder="请选择文档大类" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="文档中类" prop="middle_category">
<el-form-item label="文档中类" prop="middle_category" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.middle_category" clearable placeholder="请输入文档中类" />
</el-form-item> </el-col>
<el-col :span="8">
@ -32,7 +32,7 @@
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="必传" prop="is_upload">
<el-form-item label="必传" prop="is_upload" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-switch v-model="formData.is_upload" active-value="1" :inactive-value="2" />
</el-form-item>
</el-col>
@ -41,9 +41,10 @@
<el-col :span="8">
<el-form-item label="排序号" prop="sort">
<el-form-item label="排序号" prop="sort" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.sort" clearable placeholder="请输入排序号" />
</el-form-item> </el-col>
</el-form-item>
</el-col>
</el-row>
@ -93,7 +94,7 @@ const formData = reactive({
describe: '',
content: '',
is_upload: 1,
sort: []
sort: ''
})

View File

@ -12,20 +12,23 @@
<el-input v-model="project_code" readonly clearable placeholder="请选择项目" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="主题" prop="theme">
<el-form-item label="主题" prop="theme" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.theme" clearable placeholder="请输入节点名称" />
</el-form-item> </el-col>
<el-col :span="24">
<el-form-item label="联系人" prop="contacts">
<el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
</el-form-item> </el-col>
<el-col :span="24">
<el-form-item label="日志详情" prop="content">
<el-input v-model="formData.content" type="textarea" clearable placeholder="请输入日志详情" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="类型" prop="follow_type">
<el-select class="w-[280px]" v-model="formData.follow_type" clearable placeholder="请选择负责角色">
<el-form-item label="日期" prop="date" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择下次回访日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="类型" prop="follow_type" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-select class="w-[280px]" v-model="formData.follow_type" clearable placeholder="请选择类型">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in dictData.follow_type" :key="index" :label="item.name" :value="parseInt(item.value)" />
</el-select>
@ -38,18 +41,17 @@
<el-form-item label="执行人" prop="executor">
<el-input v-model="formData.executor" clearable placeholder="请输入排序号" />
</el-form-item> </el-col>
<el-col :span="24">
<el-form-item label="日志详情" prop="content">
<el-input v-model="formData.content" type="textarea" clearable placeholder="请输入日志详情" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="下次回访日期" prop="next_follow_up_date">
<el-date-picker class="flex-1 !flex" v-model="formData.next_follow_up_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择下次回访日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="日期" prop="date">
<el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择下次回访日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>

View File

@ -18,7 +18,6 @@
<el-button @click="userone('1')">添加</el-button>
<div style=" display: block;width: 100%;margin-top: 10px;">
<el-tag v-for="(tag, index) in technician" :key="index" closable @close="removeTag1(index)" style="margin-right: 10px;">
{{ tag.name }}
</el-tag>
@ -287,16 +286,28 @@ const userclick = () => {
if (leixin.value === '1') {
// leixin 1
formData.technician_ids = radiolist.value.map((item) => item.id).toString()
technician.value = radiolist.value.map((item) => item)
console.log(technician.value)
const newArray = radiolist.value.map((item) => item)
if (!technician.value.some(elem => newArray.some(newElem => JSON.stringify(elem) === JSON.stringify(newElem)))) {
// newElem cont
technician.value.push(...newArray);
}
} else if (leixin.value === '2') {
// leixin 2
formData.business_people_ids = radiolist.value.map((item) => item.id).toString()
business_people.value = radiolist.value.map((item) => item)
const newArray = radiolist.value.map((item) => item)
if (!business_people.value.some(elem => newArray.some(newElem => JSON.stringify(elem) === JSON.stringify(newElem)))) {
// newElem cont
business_people.value.push(...newArray);
}
} else {
// leixin 1 2
formData.cross_departmental_personnel_ids = radiolist.value.map((item) => item.id).toString()
cross_departmental_personnel.value = radiolist.value.map((item) => item)
const newArray = radiolist.value.map((item) => item)
if (!cross_departmental_personnel.value.some(elem => newArray.some(newElem => JSON.stringify(elem) === JSON.stringify(newElem)))) {
// newElem cont
cross_departmental_personnel.value.push(...newArray);
}
}
dialogVisible.value = false

View File

@ -4,14 +4,14 @@
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目类型" prop="project_type_id" @click="showDialog = true">
<el-form-item label="项目类型" prop="project_type_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in list" :key="index" :label="item.name" :value="parseInt(item.id)" />
</el-select>
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="最低利润率(%)" prop="formData.profit_rate">
<el-form-item label="最低利润率(%)" prop="formData.profit_rate" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.profit_rate" type="number" clearable placeholder="请输入最低利润率(%)" />
</el-form-item> </el-col>
<el-col :span="8">

View File

@ -4,10 +4,10 @@
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="角色名称" prop="contract_no">
<el-form-item label="角色名称" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.name" clearable placeholder="请输入角色名称" />
</el-form-item> </el-col>
<el-form-item label="排序号" prop="sort">
<el-form-item label="排序号" prop="sort" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input class="w-[280px]" type="number" v-model="formData.sort" clearable placeholder="请输入排序号" />
</el-form-item>
</el-row>

View File

@ -4,7 +4,7 @@
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目类型" prop="contract_no">
<el-form-item label="项目类型" prop="project_type_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-select class="w-[280px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
<el-option label="全部" value=""></el-option>
@ -15,11 +15,11 @@
<el-input v-model="formData.sup_wbs_code" clearable placeholder="请输入父级WBS编码" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="WBS编码" prop="wbs_code">
<el-form-item label="WBS编码" prop="wbs_code" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.wbs_code" clearable placeholder="请输入WBS编码" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="节点名称" prop="name">
<el-form-item label="节点名称" prop="name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.name" clearable placeholder="请输入节点名称" />
</el-form-item> </el-col>
<el-col :span="24">
@ -42,11 +42,11 @@
<el-input v-model="formData.output_data" clearable placeholder="请输入输出资料" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="排序号" prop="sort">
<el-form-item label="排序号" prop="sort" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.sort" clearable placeholder="请输入排序号" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="权重" prop="weight">
<el-form-item label="权重" prop="weight" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.weight" clearable placeholder="请输入权重" />
</el-form-item> </el-col>

View File

@ -93,48 +93,52 @@
<el-button @click="handleDelete(row)">-</el-button>
</template>
</el-table-column>
<el-table-column label="产品名称" prop="name1">
<el-table-column label="产品名称" prop="name">
<template #default="{ row }">
<el-input v-model="row.name1" disabled placeholder="系统自动填写" />
<el-input v-model="row.name" disabled placeholder="系统自动填写" />
</template>
</el-table-column>
<el-table-column label="产品编码" prop="name2">
<template #default="{ row }"> <el-input v-model="row.name2" disabled placeholder="系统自动填写" /> </template></el-table-column>
<el-table-column label="规格型号" prop="value1">
<template #default="{ row }"> <el-input v-model="row.value1" disabled placeholder="系统自动填写" /> </template></el-table-column>
<el-table-column label="产品编码" prop="code">
<template #default="{ row }"> <el-input v-model="row.code" disabled placeholder="系统自动填写" /> </template></el-table-column>
<el-table-column label="规格型号" prop="specs">
<template #default="{ row }"> <el-input v-model="row.specs" disabled placeholder="系统自动填写" /> </template></el-table-column>
<el-table-column label="品牌" prop="value2">
<el-table-column label="品牌" prop="brand">
<template #default="{ row }">
<el-input v-model="row.value2" disabled placeholder="系统自动填写" />
<el-input v-model="row.brand" disabled placeholder="系统自动填写" />
</template>
</el-table-column>
<el-table-column label="参数说明" prop="value3">
<template #default="{ row }"> <el-input v-model="row.value3" /> </template></el-table-column>
<el-table-column label="参数说明" prop="parameter_description">
<template #default="{ row }"> <el-input v-model="row.parameter_description" disabled /> </template></el-table-column>
<el-table-column label="单位" prop="unit">
<template #default="{ row }"> <el-input v-model="row.unit" disabled /> </template></el-table-column>
<el-table-column label="数量" prop="product_num">
<template #default="{ row }">
<el-input v-model="row.product_num" />
</template>
</el-table-column>
<el-table-column label="税率" prop="tax_rate">
<el-table-column label="税率(%)" prop="tax_rate">
<template #default="{ row }">
<el-input v-model="row.tax_rate" />
<el-select class="flex-1" v-model="row.tax_rate" clearable placeholder="请选择税率">
<el-option v-for="(item, index) in dictData.tax_rate" :key="index" :label="item.name" :value="item.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="含税单价" prop="value6">
<el-table-column label="含税单价" prop="price">
<template #default="{ row }">
<el-input v-model="row.value6" />
<el-input v-model="row.price" />
</template>
</el-table-column>
<el-table-column label="含税金额" prop="value7">
<el-table-column label="含税金额" prop="amount">
<template #default="{ row }">
<el-input v-model="row.value7" />
<el-input v-model="row.amount" disabled />
</template>
</el-table-column>
<el-table-column label="含税金额" prop="amount_including_tax">
<el-table-column label="含税金额" prop="amount_including">
<template #default="{ row }">
<el-input v-model="row.amount_including_tax" />
<el-input v-model="row.amount_including" disabled />
</template>
</el-table-column>
<el-table-column label="备注" prop="remark">
@ -192,7 +196,7 @@ const mode = ref('add')
const showDialog = ref(false)
const showDialog1 = ref(false)
const customer_name = ref('')
const tableData = reactive([{}])
const tableData = ref([])
const formDataannex = reactive([])
import feedback from '@/utils/feedback'
import configs from "@/config"
@ -254,6 +258,7 @@ const formData = reactive({
id: '',
dept_id: '',
org_id: '',
approve_id: 1,
customer_id: '',
quotation_date: '',
contacts: '',
@ -267,7 +272,7 @@ const formData = reactive({
customer_require: '',
remark: '',
annex: '',
approve_id: '',
product: [],
})
@ -278,9 +283,26 @@ const customEvent = (e: any) => {
showDialog.value = false;
};
const customEvent1 = (e: any) => {
tableData.value.push({
product_id: e.id,
name: e.name,
code: e.code,
unit: e.unit,
specs: e.specs,
brand: e.brand,
parameter_description: e.parameter_description,
product_num: 0,
tax_rate: '',
price: 0,
remark: '',
amount: 0,
amount_including: 0,
})
// formData.customer_id = e.id;
// customer_name.value = e.name;
showDialog1.value = false;
console.log(tableData.value)
};
//
const formRules = reactive<any>({
@ -289,14 +311,14 @@ const formRules = reactive<any>({
const handleAdd = (row: any) => {
// row
const index = tableData.indexOf(row);
tableData.splice(index + 1, 0, {});
const index = tableData.value.indexOf(row);
tableData.value.splice(index + 1, 0, {});
};
const handleDelete = (row: any) => {
// row
const index = tableData.indexOf(row);
tableData.splice(index, 1);
const index = tableData.value.indexOf(row);
tableData.value.splice(index, 1);
};
//
const setFormData = async (data: Record<any, any>) => {
@ -335,9 +357,8 @@ const getDetail = async (row: Record<string, any>) => {
setFormData(data)
}
const isMobileNumber = (rule: any, value: string | number | any[], callback: (arg0: Error | undefined) => void) => {
if (!value) {
return new Error("请输入电话号码");
} else {
if (value) {
// return new Error("");
const reg = /^1[3|4|5|7|8][0-9]\d{8}$/;
const isPhone = reg.test(value);
value = Number(value); //
@ -359,6 +380,14 @@ const handleSubmit = async () => {
if (formDataannex.length > 0) {
formData.annex = JSON.stringify(formDataannex.map((item) => item.uri))
}
if (tableData.value.length > 0) {
formData.product = tableData.value.map(item => ({
product_id: item.product_id,
product_num: item.product_num,
tax_rate: item.tax_rate,
remark: item.remark
}));
}
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'

View File

@ -106,7 +106,7 @@ const handleSelectionChange = (val: any[]) => {
}
//
const { dictData } = useDictData('invoice_type')
const { dictData } = useDictData('invoice_type,tax_rate')
//
const { pager, getLists, resetParams, resetPage } = usePaging({

View File

@ -51,7 +51,7 @@
<el-table-column label="票据编号" prop="bill_sn" 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="amount_excluding_tax" show-overflow-tooltip />
<el-table-column label="汇票类型" prop="invoice_amount" show-overflow-tooltip>
<template #default="{ row }">
<dict-value :options="dictData.bill_type" :value="row.bill_type" />