bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

直转申请

This commit is contained in:
bb_pan 2025-02-18 11:23:38 +08:00
parent 088d784cbb
commit 5f43342bbc
4 changed files with 88 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/views/business/businessHandling/directApply.vue
View File

@ -71,9 +71,9 @@
<el-col :span="7" :offset="0"> <el-col :span="7" :offset="0">
<el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px"> <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px">
<!-- card body --> <!-- card body -->
<el-form-item label="转入单位" prop="unitId"> <el-form-item label="转入单位" prop="unitIdTo">
<treeselect <treeselect
v-model="maForm.unitId" v-model="maForm.unitIdTo"
:disabled="isDetail" :disabled="isDetail"
:options="uniteList" :options="uniteList"
:normalizer="normalizer" :normalizer="normalizer"
@ -87,9 +87,9 @@
@select="uniteChange" @select="uniteChange"
/> />
</el-form-item> </el-form-item>
<el-form-item label="转入工程" prop="projectId"> <el-form-item label="转入工程" prop="projectIdTo">
<treeselect <treeselect
v-model="maForm.projectId" v-model="maForm.projectIdTo"
:disabled="isDetail" :disabled="isDetail"
:options="projectList" :options="projectList"
:normalizer="normalizer" :normalizer="normalizer"
@ -103,9 +103,9 @@
@select="projectChange" @select="projectChange"
/> />
</el-form-item> </el-form-item>
<el-form-item label="转入人" prop="leasePerson"> <el-form-item label="转入人" prop="leasePersonTo">
<el-input <el-input
v-model="maForm.leasePerson" v-model="maForm.leasePersonTo"
placeholder="请输入转入人" placeholder="请输入转入人"
clearable clearable
maxlength="50" maxlength="50"
@ -113,9 +113,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phoneTo">
<el-input <el-input
v-model="maForm.phone" v-model="maForm.phoneTo"
placeholder="请输入联系电话" placeholder="请输入联系电话"
clearable clearable
maxlength="11" maxlength="11"
@ -136,7 +136,7 @@
:key="uploadKey" :key="uploadKey"
:limit="3" :limit="3"
list-type="picture-card" list-type="picture-card"
accept="*/image" accept=".png, .jpg, .jpeg, .pdf"
:on-change="handleChangeBusinessList" :on-change="handleChangeBusinessList"
:class="{ disabledFbs: uploadDisabled }" :class="{ disabledFbs: uploadDisabled }"
:on-preview="picturePreviewFbs" :on-preview="picturePreviewFbs"
@ -151,7 +151,10 @@
<p class="file-name">{{ file.name }}</p> <p class="file-name">{{ file.name }}</p>
</div> </div>
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="picturePreviewFbs(file)"> <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
<i class="el-icon-download" />
</span>
<span v-else class="el-upload-list__item-preview" @click="picturePreviewFbs(file)">
<i class="el-icon-zoom-in" /> <i class="el-icon-zoom-in" />
</span> </span>
<span <span
@ -375,21 +378,21 @@ export default {
unitId: [ unitId: [
{ {
required: true, required: true,
message: '请选择租赁单位', message: '请选择转出单位',
trigger: 'blur' trigger: 'blur'
} }
], ],
projectId: [ projectId: [
{ {
required: true, required: true,
message: '请选择租赁工程', message: '请选择转出工程',
trigger: 'blur' trigger: 'blur'
} }
], ],
leasePerson: [ leasePerson: [
{ {
required: true, required: true,
message: '请输入领料人', message: '请输入转出人',
trigger: 'blur' trigger: 'blur'
} }
], ],
@ -401,10 +404,32 @@ export default {
trigger: 'blur' trigger: 'blur'
} }
], ],
applyCode: [ unitIdTo: [
{ {
required: true, required: true,
message: '请输入采购申请编号', message: '请选择转入单位',
trigger: 'blur'
}
],
projectIdTo: [
{
required: true,
message: '请选择转入工程',
trigger: 'blur'
}
],
leasePersonTo: [
{
required: true,
message: '请输入转入人',
trigger: 'blur'
}
],
phoneTo: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' },
{
pattern: /^(?:(?:\+|00)86)?1[3-9]\d{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur' trigger: 'blur'
} }
], ],
@ -576,13 +601,13 @@ export default {
return item.uid != file.uid return item.uid != file.uid
}) })
const parts = file.name.split('.') const parts = file.name.split('.')
const extension = parts.pop() const extension = parts.pop().toLowerCase()
if (fileList.length > 3) { if (fileList.length > 3) {
this.$message.warning('最多上传3张附件') this.$message.warning('最多上传3张附件')
fileList = fileList.filter(item => { fileList = fileList.filter(item => {
return item.uid != file.uid return item.uid != file.uid
}) })
} else if (!(extension === 'png' || extension === 'jpg' || extension === 'jpeg')) { } else if (!(extension === 'png' || extension === 'jpg' || extension === 'jpeg' || extension === 'pdf')) {
this.$message.warning('文件格式不正确') this.$message.warning('文件格式不正确')
fileList = fileList.filter(item => { fileList = fileList.filter(item => {
return item.uid != file.uid return item.uid != file.uid
@ -603,11 +628,11 @@ export default {
return item.uid != file.uid return item.uid != file.uid
}) })
} }
// fileList.forEach(file => { fileList.forEach(file => {
// if (extension === 'pdf') { if (extension === 'pdf') {
// this.urlTemp = require('@/assets/file.png') this.urlTemp = require('@/assets/file.png')
// } }
// }) })
this.maForm.bmFileInfos = fileList this.maForm.bmFileInfos = fileList
console.log('🚀 ~ handleChangeBusinessList ~ this.bmFileInfos:', this.bmFileInfos) console.log('🚀 ~ handleChangeBusinessList ~ this.bmFileInfos:', this.bmFileInfos)
// 手动触发表单验证 // 手动触发表单验证
@ -626,14 +651,14 @@ export default {
updataIf(e) { updataIf(e) {
if (e.fileName) { if (e.fileName) {
const parts = e.fileName.split('.') const parts = e.fileName.split('.')
const extension = parts.pop() const extension = parts.pop().toLowerCase()
if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') { if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
return false return false
} else { } else {
return true return true
} }
} else { } else {
const parts = e.name.split('.') const parts = e.name.split('.').toLowerCase()
const extension = parts.pop() const extension = parts.pop()
if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') { if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
return false return false
@ -667,7 +692,16 @@ export default {
this.delBusinessFileIdList.push(file.url) this.delBusinessFileIdList.push(file.url)
} }
console.log('delBusinessFileIdList', this.delBusinessFileIdList) console.log('delBusinessFileIdList', this.delBusinessFileIdList)
},
handleDownload(file) {
console.log(file)
if (file.status === 'ready') {
downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
} else if (file.status === 'success') {
downloadFileData({ fileName: file.name, fileUrl: file.url })
// downloadFileData({ fileName: file.name,fileUrl:file.url })
} }
},
} }
} }
</script> </script>

6
src/views/business/businessHandling/index.vue
View File

@ -751,7 +751,7 @@ export default {
return item.uid != file.uid return item.uid != file.uid
}) })
const parts = file.name.split('.') const parts = file.name.split('.')
const extension = parts.pop() const extension = parts.pop().toLowerCase()
if (fileList.length > 5) { if (fileList.length > 5) {
this.$message.warning('最多上传5张附件') this.$message.warning('最多上传5张附件')
fileList = fileList.filter(item => { fileList = fileList.filter(item => {
@ -802,7 +802,7 @@ export default {
updataIf(e) { updataIf(e) {
if (e.fileName) { if (e.fileName) {
const parts = e.fileName.split('.') const parts = e.fileName.split('.')
const extension = parts.pop() const extension = parts.pop().toLowerCase()
if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') { if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
return false return false
} else { } else {
@ -810,7 +810,7 @@ export default {
} }
} else { } else {
const parts = e.name.split('.') const parts = e.name.split('.')
const extension = parts.pop() const extension = parts.pop().toLowerCase()
if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') { if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
return false return false
} else { } else {

25
src/views/business/businessHandlingRecord/directApplyRecord.vue
View File

@ -37,7 +37,7 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">领料申请</el-button> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">直转申请</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
@ -78,8 +78,17 @@
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button> <el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button>
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row, 2)">编辑</el-button>
<el-button <el-button
v-if="scope.row.taskStatus == '0'"
type="text"
size="mini"
icon="el-icon-edit"
@click="handleEdit(scope.row, 2)"
>
编辑
</el-button>
<el-button
v-if="scope.row.taskStatus == '0'"
type="text" type="text"
size="mini" size="mini"
icon="el-icon-delete" icon="el-icon-delete"
@ -128,13 +137,11 @@ export default {
tableColumns: [ tableColumns: [
{ label: '申请时间', prop: 'createTime' }, { label: '申请时间', prop: 'createTime' },
{ label: '申请人', prop: 'createBy' }, { label: '申请人', prop: 'createBy' },
{ label: '领用单位', prop: 'leaseUnit' }, { label: '转出单位', prop: 'leaseUnit' },
{ label: '领用工程', prop: 'leaseProject' }, { label: '转出工程', prop: 'leaseProject' },
{ label: '领料物资类型', prop: 'maTypeNames' }, { label: '转入单位', prop: 'leaseUnitTo' },
{ label: '协议号', prop: 'agreementCode' }, { label: '转入工程', prop: 'leaseProjectTo' },
{ label: '采购申请单号', prop: 'applyCode' }, { label: '物资类型', prop: 'maTypeNames' },
{ label: '领料人', prop: 'leasePerson' },
{ label: '领料人电话', prop: 'phone' },
{ label: '状态', prop: 'taskStatus' } { label: '状态', prop: 'taskStatus' }
], ],
// 表格数据 // 表格数据

11
src/views/business/businessHandlingRecord/index.vue
View File

@ -78,8 +78,17 @@
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button> <el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button>
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row, 2)">编辑</el-button>
<el-button <el-button
v-if="scope.row.taskStatus == '0'"
type="text"
size="mini"
icon="el-icon-edit"
@click="handleEdit(scope.row, 2)"
>
编辑
</el-button>
<el-button
v-if="scope.row.taskStatus == '0'"
type="text" type="text"
size="mini" size="mini"
icon="el-icon-delete" icon="el-icon-delete"