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

优化

This commit is contained in:
bb_pan 2025-05-21 17:01:34 +08:00
parent 17ac0b7e6f
commit f2e49aeba6
4 changed files with 518 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/purchase/goodsArrived.js
View File

@ -73,10 +73,11 @@ export function bmNoticeInfo(data) {
//通知-添加人员-未选择人员 //通知-添加人员-未选择人员
export function getListUnSelected() { export function getListUnSelected(params) {
return request({ return request({
url: '/material/purchase_notice_person/listUnSelected', url: '/material/purchase_notice_person/listUnSelected',
method: 'get', method: 'get',
params,
}) })
} }
// 通知人员--删除 // 通知人员--删除

29
src/views/material/part/partArrived/component/home.vue
View File

@ -369,6 +369,11 @@
<el-form-item label="通知内容:" prop="remark" label-width="100px"> <el-form-item label="通知内容:" prop="remark" label-width="100px">
<el-input v-model="form.remark" type="textarea" maxlength="100" :autosize="{ minRows: 3, maxRows: 6 }" placeholder="请输入通知内容" style="width: 450px"/> <el-input v-model="form.remark" type="textarea" maxlength="100" :autosize="{ minRows: 3, maxRows: 6 }" placeholder="请输入通知内容" style="width: 450px"/>
</el-form-item> </el-form-item>
<el-form-item label="人员名称:" prop="userName" label-width="100px">
<el-input v-model="form.userName" placeholder="请输入人员名称" style="width: 240px; margin-right: 10px"/>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getNoticeList">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetDiaQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
</el-col> </el-col>
</el-row> </el-row>
@ -395,6 +400,13 @@
<!-- 人员添加 --> <!-- 人员添加 -->
<el-dialog title="人员添加" :visible.sync="peopleOpen" v-if="peopleOpen" width="1000px" append-to-body> <el-dialog title="人员添加" :visible.sync="peopleOpen" v-if="peopleOpen" width="1000px" append-to-body>
<el-form :model="userForm" size="small" inline>
<el-form-item label="人员名称:" prop="userName" label-width="100px">
<el-input v-model="userForm.userName" placeholder="请输入人员名称" style="width: 240px; margin-right: 10px"/>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getAllUserList">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="restUser">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionAddUser" height="450"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionAddUser" height="450">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
@ -484,6 +496,8 @@ export default {
}, },
form: { form: {
remark: "", remark: "",
taskId: "",
userName: "",
}, },
// 表单校验 // 表单校验
rules: { rules: {
@ -491,6 +505,9 @@ export default {
{ required: true, message: "通知内容不能为空", trigger: "blur" }, { required: true, message: "通知内容不能为空", trigger: "blur" },
], ],
}, },
userForm: {
userName: "",
},
openPrint: false, openPrint: false,
printData: {}, printData: {},
printDataSign: {}, printDataSign: {},
@ -665,23 +682,31 @@ export default {
}, },
getNoticeList() { getNoticeList() {
const taskId = this.form.taskId; const taskId = this.form.taskId;
getNoticePeople({ taskId: taskId }).then((response) => { getNoticePeople({ taskId: taskId, userName: this.form.userName }).then((response) => {
this.getListPeople = response.rows; this.getListPeople = response.rows;
this.showPeople = true; this.showPeople = true;
this.loadingTwo = false; this.loadingTwo = false;
this.title = "通知"; this.title = "通知";
}); });
}, },
resetDiaQuery() {
this.form.userName = ""
this.getNoticeList();
},
addUserOpen() { addUserOpen() {
this.getAllUserList(); this.getAllUserList();
this.peopleOpen = true; this.peopleOpen = true;
}, },
/** 查询所有用户列表--可添加人员 */ /** 查询所有用户列表--可添加人员 */
getAllUserList() { getAllUserList() {
getListUnSelected().then((response) => { getListUnSelected({userName: this.userForm.userName}).then((response) => {
this.userList = response.rows; this.userList = response.rows;
}); });
}, },
restUser() {
this.userForm.userName = "";
this.getAllUserList();
},
// 多选框选中-添加人员 // 多选框选中-添加人员
handleSelectionAddUser(selection) { handleSelectionAddUser(selection) {

737
src/views/material/purchase/goodsAccept/detail.vue
View File

@ -1,105 +1,195 @@
<template> <template>
<div class="app-container" id="acceptDetail"> <div class="app-container" id="acceptDetail">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"> <el-row :gutter="20">
<el-form-item label="类型规格：" prop="typeId"> <el-col :span="19" :offset="0">
<el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable > <el-form
<el-option :model="queryParams"
v-for="dict in materialModelList" ref="queryForm"
:key="dict.value" size="small"
:label="dict.label" :inline="true"
:value="dict.value" v-show="showSearch"
/> label-width="90px"
</el-select>
</el-form-item>
<!-- <el-form-item label="机具厂家：" prop="supplierId">
<el-select v-model="queryParams.supplierId" placeholder="请选择机具厂家" clearable>
<el-option
v-for="dict in supplierList"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="出厂日期：" prop="productionTime">
<el-date-picker
v-model="queryParams.productionTime"
placeholder="请选择出厂日期"
value-format="yyyy-MM-dd"
type="date"
> >
</el-date-picker> <el-form-item label="类型规格：" prop="typeId">
</el-form-item> <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable>
<el-form-item> <el-option v-for="dict in materialModelList" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-button type="primary" icon="el-icon-search" size="mini" </el-select>
@click="handleQuery">查询</el-button> </el-form-item>
<el-button icon="el-icon-refresh" size="mini" <!-- <el-form-item label="机具厂家：" prop="supplierId">
@click="resetQuery">重置</el-button> <el-select v-model="queryParams.supplierId" placeholder="请选择机具厂家" clearable>
</el-form-item> <el-option
</el-form> v-for="dict in supplierList"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="出厂日期：" prop="productionTime">
<el-date-picker
v-model="queryParams.productionTime"
placeholder="请选择出厂日期"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8" style="display: flex;align-items: center"> <el-row :gutter="10" class="mb8" style="display: flex; align-items: center">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" size="mini" icon="el-icon-back" <el-button type="primary" size="mini" icon="el-icon-back" @click="jumpList">新购到货验收</el-button>
@click="jumpList">新购到货验收</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" </el-col>
@click="handleExport">导出</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="el-icon-check" size="mini" <el-button
@click="batchPass" v-show="!isView" :disabled="multiple">合格</el-button> type="success"
</el-col> icon="el-icon-check"
size="mini"
@click="batchPass"
v-show="!isView"
:disabled="multiple"
>
合格
</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" icon="el-icon-close" size="mini" <el-button
@click="batchReject" v-show="!isView" :disabled="multiple">不合格</el-button> type="danger"
icon="el-icon-close"
size="mini"
@click="batchReject"
v-show="!isView"
:disabled="multiple"
>
不合格
</el-button>
</el-col>
<!-- <el-col :span="1.5">
<span>验收人：{{ checkUser }}</span>
</el-col> -->
</el-row>
<el-table
v-loading="loading"
:data="tableList"
ref="multipleTable"
row-key="typeId"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="selectable"
:reserve-selection="true"
v-if="!isView"
/>
<el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
<el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" />
<el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
<el-table-column
label="购置单价(元含税)"
align="center"
prop="purchaseTaxPrice"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="购置单价（元不含税）"
align="center"
prop="purchasePrice"
:show-overflow-tooltip="true"
/> -->
<!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
<el-table-column label="是否未固定资产" align="center" prop="fixCodeStr" :show-overflow-tooltip="true" />
<el-table-column label="出厂日期" align="center" prop="productionTime" :show-overflow-tooltip="true" />
<el-table-column label="相关配套资料" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div
style="color: #02a7f0; cursor: pointer"
@click="openFileDialog(scope.row)"
v-if="scope.row.isExitFile == 0"
>
报告管理
</div>
<div
style="color: red; cursor: pointer"
@click="openFileDialog(scope.row)"
v-if="scope.row.isExitFile == 1"
>
报告管理
</div>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.purchase_task_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true" />
<!-- <el-table-column label="操作" align="center" width="180" v-if="!isView">
<template slot-scope="scope">
<el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status==2||scope.row.status==13||scope.row.status==14">
合格
</el-button>
<el-button size="mini" type="danger" @click="reject(scope.row)" v-if="scope.row.status==2||scope.row.status==13||scope.row.status==14">
不合格
</el-button>
</template>
</el-table-column> -->
</el-table>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="5" :offset="0">
<span>验收人：{{ checkUser }}</span> <div class="right-container">
<div class="right-title">
<div></div>
<div></div>
<div>流程记录</div>
</div>
<div class="process-record">
<el-steps :space="120" direction="vertical">
<el-step v-for="(step, index) in auditingList" :key="index" :title="step.nodeName">
<template slot="description">
<div class="custom-description">
审核结果:
<el-tag size="mini" type="primary" v-if="step.isAccept === 0">待审批</el-tag>
<el-tag size="mini" type="success" v-if="step.isAccept === 1">已通过</el-tag>
<el-tag size="mini" type="danger" v-if="step.isAccept === 2">已驳回</el-tag>
</div>
<div class="node-info" v-if="step.name">
审核人:
{{ step.name }}
</div>
<div class="node-info" v-if="step.createTime">
审核时间:
{{ step.createTime }}
</div>
<div class="node-info" v-if="step.remark">
审核意见:
{{ step.remark }}
</div>
</template>
</el-step>
</el-steps>
</div>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="typeId" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :selectable="selectable" :reserve-selection="true" v-if="!isView"/>
<el-table-column label="序号" align="center" width="80" type="index">
</el-table-column>
<el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"/>
<el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true"/>
<el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
<el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
<el-table-column label="是否未固定资产" align="center" prop="fixCodeStr" :show-overflow-tooltip="true"/>
<el-table-column label="出厂日期" align="center" prop="productionTime" :show-overflow-tooltip="true"/>
<el-table-column label="相关配套资料" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div style="color: #02A7F0;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==0">报告管理</div>
<div style="color: red;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==1">报告管理</div>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.purchase_task_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="操作" align="center" width="180" v-if="!isView">
<template slot-scope="scope">
<el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status==2||scope.row.status==13||scope.row.status==14">
合格
</el-button>
<el-button size="mini" type="danger" @click="reject(scope.row)" v-if="scope.row.status==2||scope.row.status==13||scope.row.status==14">
不合格
</el-button>
</template>
</el-table-column> -->
</el-table>
<!-- <pagination <!-- <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -111,8 +201,8 @@
<el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body> <el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body>
<el-table v-loading="dialogLoading" :data="fileDataList" width="100%" height="350px"> <el-table v-loading="dialogLoading" :data="fileDataList" width="100%" height="350px">
<el-table-column label="序号" type="index" width="55" align="center" /> <el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true"/> <el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true" />
<el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true"/> <el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" :show-overflow-tooltip="true"> <el-table-column label="类型名称" align="center" :show-overflow-tooltip="true">
<template> <template>
<div>{{ this.rowData.maTypeName }}</div> <div>{{ this.rowData.maTypeName }}</div>
@ -127,19 +217,29 @@
<el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> --> <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex; align-items: center; justify-content: center">
<el-upload ref="upload" :limit="3" :headers="upload.headers" <el-upload
:action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx" ref="upload"
:on-success="handleFileSuccess" :auto-upload="true" :limit="3"
> :headers="upload.headers"
<el-button size="mini" type="text" @click="beforeFileUpload(scope.row)" v-if="!isView"> :action="upload.url"
上传 :show-file-list="false"
</el-button> accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
</el-upload> :on-success="handleFileSuccess"
:auto-upload="true"
>
<el-button size="mini" type="text" @click="beforeFileUpload(scope.row)" v-if="!isView">上传</el-button>
</el-upload>
<el-button size="mini" type="text" @click="picturePreview(scope.row)" v-if="scope.row.url" style="margin-left: 10px;"> <el-button
查看 size="mini"
</el-button> type="text"
@click="picturePreview(scope.row)"
v-if="scope.row.url"
style="margin-left: 10px"
>
查看
</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -153,11 +253,18 @@
<!-- 验收弹窗 --> <!-- 验收弹窗 -->
<el-dialog title="验收" :visible.sync="confirmShow" width="600px" height="300px"> <el-dialog title="验收" :visible.sync="confirmShow" width="600px" height="300px">
<div style="width: 100%; height: 80%; display: flex;margin-bottom: 10px;"> <div style="width: 100%; height: 80%; display: flex; margin-bottom: 10px">
<div style="width:15%;">验收结论：</div> <div style="width: 15%">验收结论：</div>
<el-input type="textarea" :rows="3" style="width:80%;" placeholder="请输入结论" v-model="checkResult" maxlength="100"></el-input> <el-input
type="textarea"
:rows="3"
style="width: 80%"
placeholder="请输入结论"
v-model="checkResult"
maxlength="100"
></el-input>
</div> </div>
<div style="width: 100%;height: 20%;display: flex;justify-content: flex-end;align-items: center;"> <div style="width: 100%; height: 20%; display: flex; justify-content: flex-end; align-items: center">
<el-button type="primary" @click="confirmCheck">确认</el-button> <el-button type="primary" @click="confirmCheck">确认</el-button>
<el-button size="mini" @click="confirmShow = false">取消</el-button> <el-button size="mini" @click="confirmShow = false">取消</el-button>
</div> </div>
@ -165,25 +272,25 @@
</div> </div>
</template> </template>
<script> <script>
import { getDeviceType } from "@/api/ma/device"; import { getDeviceType } from '@/api/ma/device'
import { getManufacturerSelect } from "@/api/ma/supplier"; import { getManufacturerSelect } from '@/api/ma/supplier'
import { import {
getPurchaseDetailsList, getPurchaseDetailsList,
acceptInnerVerifyer, acceptInnerVerifyer,
getPurchaseFileList, getPurchaseFileList,
uploadPurchaseFile, uploadPurchaseFile,
getCheckUserList, getCheckUserList
} from "@/api/purchase/goodsAccept"; } from '@/api/purchase/goodsAccept'
import { downloadFile } from "@/utils/download"; import { downloadFile } from '@/utils/download'
import { getToken } from "@/utils/auth"; import { getToken } from '@/utils/auth'
export default { export default {
name: "AcceptDetail", name: 'AcceptDetail',
dicts: ["purchase_task_status"], dicts: ['purchase_task_status'],
data() { data() {
return { return {
Id: "", Id: '',
taskId: "", taskId: '',
// 遮罩层 // 遮罩层
loading: false, loading: false,
dialogLoading: false, dialogLoading: false,
@ -203,18 +310,18 @@ export default {
total: 0, total: 0,
//表格数据 //表格数据
tableList: [], tableList: [],
fixCodeList: ["否", "是"], fixCodeList: ['否', '是'],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
rowData: {}, rowData: {},
fileDataList: [ fileDataList: [
{ dictLabel: "合格证", fileType: "0", name: "", url: "" }, { dictLabel: '合格证', fileType: '0', name: '', url: '' },
{ dictLabel: "型式试验报告", fileType: "1", name: "", url: "" }, { dictLabel: '型式试验报告', fileType: '1', name: '', url: '' },
{ dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" }, { dictLabel: '出厂检测报告', fileType: '2', name: '', url: '' },
{ dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" }, { dictLabel: '第三方监测报告', fileType: '3', name: '', url: '' },
{ dictLabel: "其他", fileType: "4", name: "", url: "" }, { dictLabel: '其他', fileType: '4', name: '', url: '' }
], ],
// 查询参数 // 查询参数
queryParams: { queryParams: {
@ -222,49 +329,54 @@ export default {
// pageSize: 10, // pageSize: 10,
typeId: undefined, typeId: undefined,
supplierId: undefined, supplierId: undefined,
productionTime: undefined, productionTime: undefined
}, },
//确认弹窗 //确认弹窗
confirmShow: false, confirmShow: false,
taskStatus: "", //3合格、1不合格 taskStatus: '', //3合格、1不合格
checkResult: "", checkResult: '',
verifyPass: true, //true合格、false不合格 verifyPass: true, //true合格、false不合格
//图片查看弹窗 //图片查看弹窗
dialogImageUrl: "", dialogImageUrl: '',
dialogVisible: false, dialogVisible: false,
//上传 //上传
upload: { upload: {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: 'Bearer ' + getToken() },
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/file/upload", url: process.env.VUE_APP_BASE_API + '/file/upload'
}, },
checkUserList: [], // 验收人列表 checkUserList: [], // 验收人列表
checkUser: '', // 验收人 checkUser: '', // 验收人
}; auditingList: [
{ nodeName: '供应科审核', isAccept: 1, name: '姚士超', createTime: '2025-05-21' },
{ nodeName: '技术科审核', isAccept: 0 },
{ nodeName: '库管班审核', isAccept: 0 }
]
}
}, },
mounted() { mounted() {
const taskId = this.$route.query && this.$route.query.taskId; const taskId = this.$route.query && this.$route.query.taskId
const Id = this.$route.query && this.$route.query.Id; const Id = this.$route.query && this.$route.query.Id
const isView = this.$route.query && this.$route.query.isView; const isView = this.$route.query && this.$route.query.isView
this.taskId = taskId; this.taskId = taskId
this.Id = Id; this.Id = Id
if (isView == "true") { if (isView == 'true') {
this.isView = true; this.isView = true
} else { } else {
this.isView = false; this.isView = false
} }
this.getDeviceType(); this.getDeviceType()
// this.getSupplierList() // this.getSupplierList()
console.log(this.isView); console.log(this.isView)
this.getList(); this.getList()
this.getCheckUser() this.getCheckUser()
}, },
methods: { methods: {
// 获取验收人 // 获取验收人
async getCheckUser() { async getCheckUser() {
try { try {
const res = await getCheckUserList({taskId: this.taskId}) const res = await getCheckUserList({ taskId: this.taskId })
console.log('🚀 ~ getCheckUser ~ res:', res) console.log('🚀 ~ getCheckUser ~ res:', res)
if (res.data) { if (res.data) {
res.data.forEach(item => { res.data.forEach(item => {
@ -283,195 +395,193 @@ export default {
//是否可用勾选框 //是否可用勾选框
selectable(row) { selectable(row) {
console.log(row) console.log(row)
if (row.status == 2||row.status == 13 ||row.status == 14) { if (row.status == 2 || row.status == 13 || row.status == 14) {
return true return true
} else { } else {
return false return false
} }
}, },
// 返回列表页 // 返回列表页
jumpList() { jumpList() {
const obj = { path: "/purchase/goodsAccept" }; const obj = { path: '/purchase/goodsAccept' }
this.$tab.closeOpenPage(obj); this.$tab.closeOpenPage(obj)
}, },
getDeviceType() { getDeviceType() {
getDeviceType({ level: 4, skipPermission: 1 }).then((response) => { getDeviceType({ level: 4, skipPermission: 1 }).then(response => {
let matModelRes = response.data; let matModelRes = response.data
this.materialModelList = matModelRes.map((item) => { this.materialModelList = matModelRes.map(item => {
return { return {
label: item.typeName, label: item.typeName,
value: item.typeId, value: item.typeId
}; }
}); })
}); })
}, },
getSupplierList() { getSupplierList() {
getManufacturerSelect().then((response) => { getManufacturerSelect().then(response => {
let arrRes = response.rows; let arrRes = response.rows
this.supplierList = arrRes.map((item) => { this.supplierList = arrRes.map(item => {
return { return {
label: item.supplier, label: item.supplier,
value: item.supplierId, value: item.supplierId
}; }
}); })
}); })
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.loading = true; this.loading = true
this.queryParams.id = this.Id; this.queryParams.id = this.Id
this.queryParams.taskId = this.taskId; this.queryParams.taskId = this.taskId
this.queryParams.taskStage = 2; this.queryParams.taskStage = 2
getPurchaseDetailsList(this.queryParams).then((response) => { getPurchaseDetailsList(this.queryParams).then(response => {
this.tableList = response.data.purchaseCheckDetailsList; this.tableList = response.data.purchaseCheckDetailsList
this.tableList.forEach((item) => { this.tableList.forEach(item => {
item.fixCodeStr = this.fixCodeList[Number(item.fixCode)]; item.fixCodeStr = this.fixCodeList[Number(item.fixCode)]
}); })
// this.total = response.total; // this.total = response.total;
this.loading = false; this.loading = false
}); })
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm')
this.queryParams.keyWord = null; this.queryParams.keyWord = null
this.handleQuery(); this.handleQuery()
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection; this.ids = selection
this.single = selection.length != 1; this.single = selection.length != 1
this.multiple = !selection.length; this.multiple = !selection.length
}, },
//合格 //合格
pass(row) { pass(row) {
this.taskStatus = "3"; this.taskStatus = '3'
this.checkResult = "合格"; this.checkResult = '合格'
this.verifyPass = true; this.verifyPass = true
let obj = { let obj = {
taskId: row.taskId, taskId: row.taskId,
typeId: row.typeId, typeId: row.typeId,
status: this.taskStatus, status: this.taskStatus,
checkResult: this.checkResult, checkResult: this.checkResult,
manageType: row.manageType, manageType: row.manageType
}; }
this.checkList = []; this.checkList = []
this.checkList.push(obj); this.checkList.push(obj)
this.confirmShow = true; this.confirmShow = true
}, },
//不合格 //不合格
reject(row) { reject(row) {
this.taskStatus = "1"; this.taskStatus = '1'
this.checkResult = "不合格"; this.checkResult = '不合格'
this.verifyPass = false; this.verifyPass = false
let obj = { let obj = {
taskId: row.taskId, taskId: row.taskId,
typeId: row.typeId, typeId: row.typeId,
status: this.taskStatus, status: this.taskStatus,
checkResult: this.checkResult, checkResult: this.checkResult,
manageType: row.manageType, manageType: row.manageType
}; }
this.checkList = []; this.checkList = []
this.checkList.push(obj); this.checkList.push(obj)
this.confirmShow = true; this.confirmShow = true
}, },
//批量合格 //批量合格
batchPass() { batchPass() {
this.taskStatus = "3"; this.taskStatus = '3'
this.checkResult = "合格"; this.checkResult = '合格'
this.verifyPass = true; this.verifyPass = true
this.checkList = []; this.checkList = []
this.checkList = this.ids.map((item) => { this.checkList = this.ids.map(item => {
let obj = { let obj = {
taskId: item.taskId, taskId: item.taskId,
typeId: item.typeId, typeId: item.typeId,
status: this.taskStatus, status: this.taskStatus,
checkResult: this.checkResult, checkResult: this.checkResult,
manageType: item.manageType, manageType: item.manageType
}; }
return obj; return obj
}); })
this.confirmShow = true; this.confirmShow = true
}, },
//批量不合格 //批量不合格
batchReject() { batchReject() {
this.taskStatus = "1"; this.taskStatus = '1'
this.checkResult = "不合格"; this.checkResult = '不合格'
this.verifyPass = false; this.verifyPass = false
this.checkList = []; this.checkList = []
this.checkList = this.ids.map((item) => { this.checkList = this.ids.map(item => {
let obj = { let obj = {
taskId: item.taskId, taskId: item.taskId,
typeId: item.typeId, typeId: item.typeId,
status: this.taskStatus, status: this.taskStatus,
checkResult: this.checkResult, checkResult: this.checkResult,
manageType: item.manageType, manageType: item.manageType
}; }
return obj; return obj
}); })
this.confirmShow = true; this.confirmShow = true
}, },
//验收确认请求 //验收确认请求
confirmCheck() { confirmCheck() {
this.checkList.forEach((item) => { this.checkList.forEach(item => {
item.checkResult = this.checkResult; item.checkResult = this.checkResult
}); })
let param = { let param = {
purchaseCheckDetailsList:this.checkList, purchaseCheckDetailsList: this.checkList,
verifyPass:this.verifyPass verifyPass: this.verifyPass
} }
console.log(param); console.log(param)
acceptInnerVerifyer(param).then((response) => { acceptInnerVerifyer(param).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess(response.msg); this.$modal.msgSuccess(response.msg)
this.confirmShow = false; this.confirmShow = false
this.getList(); this.getList()
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection()
} }
}); })
}, },
//文件管理 //文件管理
openFileDialog(row) { openFileDialog(row) {
this.rowData = row; this.rowData = row
this.fileDataList = [ this.fileDataList = [
{ dictLabel: "合格证", fileType: "0", name: "", url: "" }, { dictLabel: '合格证', fileType: '0', name: '', url: '' },
{ dictLabel: "型式试验报告", fileType: "1", name: "", url: "" }, { dictLabel: '型式试验报告', fileType: '1', name: '', url: '' },
{ dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" }, { dictLabel: '出厂检测报告', fileType: '2', name: '', url: '' },
{ dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" }, { dictLabel: '第三方监测报告', fileType: '3', name: '', url: '' },
{ dictLabel: "其他", fileType: "4", name: "", url: "" }, { dictLabel: '其他', fileType: '4', name: '', url: '' }
]; ]
this.getFileData(); this.getFileData()
this.open = true; this.open = true
}, },
//获取已上传文件 //获取已上传文件
getFileData() { getFileData() {
let param = { let param = {
modelId: this.rowData.typeId, modelId: this.rowData.typeId,
taskType: 0, taskType: 0,
taskId: this.rowData.taskId, taskId: this.rowData.taskId
}; }
getPurchaseFileList(param) getPurchaseFileList(param)
.then((response) => { .then(response => {
if (response.rows.length > 0) { if (response.rows.length > 0) {
response.rows.forEach((item) => { response.rows.forEach(item => {
let index = this.fileDataList.findIndex( let index = this.fileDataList.findIndex(v => v.fileType == item.fileType)
(v) => v.fileType == item.fileType this.fileDataList[index].name = item.name
); this.fileDataList[index].url = item.url
this.fileDataList[index].name = item.name; })
this.fileDataList[index].url = item.url;
});
} }
}) })
.catch(() => {}); .catch(() => {})
}, },
//上传 //上传
beforeFileUpload(row) { beforeFileUpload(row) {
this.rowData.fileType = row.fileType; this.rowData.fileType = row.fileType
// this.rowData.dictLabel=row.dictLabel; // this.rowData.dictLabel=row.dictLabel;
}, },
// 文件上传成功处理 // 文件上传成功处理
@ -479,47 +589,54 @@ export default {
if (response.code == 200) { if (response.code == 200) {
let param = { let param = {
taskId: this.taskId, taskId: this.taskId,
taskType: "0", taskType: '0',
name: response.data.name, name: response.data.name,
url: response.data.url, url: response.data.url,
modelId: this.rowData.typeId, modelId: this.rowData.typeId,
fileType: this.rowData.fileType, fileType: this.rowData.fileType
}; }
console.log(param); console.log(param)
uploadPurchaseFile(param) uploadPurchaseFile(param)
.then((response) => { .then(response => {
this.$modal.msgSuccess("上传成功"); this.$modal.msgSuccess('上传成功')
this.getFileData(); this.getFileData()
}) })
.catch(() => { .catch(() => {
this.$modal.msgError("上传失败"); this.$modal.msgError('上传失败')
}); })
} }
}, },
//图片查看 //图片查看
picturePreview(file) { picturePreview(file) {
this.dialogImageUrl = file.url.replaceAll('#','%23'); this.dialogImageUrl = file.url.replaceAll('#', '%23')
const parts = file.name.split("."); const parts = file.name.split('.')
const extension = parts.pop(); const extension = parts.pop()
if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') { if (
const windowName = file.name; extension === 'doc' ||
window.open(file.url, windowName); extension === 'DOC' ||
extension === 'docx' ||
extension === 'DOCX' ||
extension === 'pdf' ||
extension === 'PDF'
) {
const windowName = file.name
window.open(file.url, windowName)
} else { } else {
this.dialogVisible = true; this.dialogVisible = true
} }
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
"/material/purchase_check_info/exportDetails", '/material/purchase_check_info/exportDetails',
{ taskId: this.taskId, taskStage: 2,id:this.Id }, { taskId: this.taskId, taskStage: 2, id: this.Id },
`新购到货详情_${new Date().getTime()}.xlsx` `新购到货详情_${new Date().getTime()}.xlsx`
); )
}, }
}, }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.uploadImg { .uploadImg {
padding-top: 20px; padding-top: 20px;
display: flex; display: flex;
@ -541,4 +658,70 @@ export default {
display: none; display: none;
} }
} }
.right-container {
padding: 0 20px;
}
.right-title {
display: flex;
align-items: center;
font-size: 14px;
& div:first-child {
width: 16px;
height: 16px;
border-radius: 50%;
background-color: #19a4a0;
z-index: 9;
}
& div:nth-child(2) {
width: 16px;
height: 16px;
border-radius: 50%;
background-color: #b2e1e0;
transform: translateX(-50%);
}
}
.process-record {
margin-top: 20px;
// height: 60vh;
}
.btn-container {
margin-top: 10px;
display: flex;
justify-content: space-around;
}
::v-deep .el-step__icon.is-text {
background-color: #19a4a0;
color: #19a4a0;
border: none;
width: 16px;
height: 16px;
}
::v-deep .el-step.is-vertical .el-step__line {
width: 2px;
top: 26px;
bottom: 8px;
left: 7px;
}
::v-deep .el-step__title.is-finish {
font-weight: bold;
color: #303133;
font-size: 16px;
}
::v-deep .el-step__title.is-wait {
font-weight: bold;
color: #303133;
font-size: 16px;
}
// 居中
.cont-center {
display: flex;
justify-content: center;
align-items: center;
}
</style> </style>

33
src/views/material/purchase/goodsArrived/component/home.vue
View File

@ -83,7 +83,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="typeList" row-key="id" border> <el-table v-loading="loading" :data="typeList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column width="50" align="center" label="序号" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" /> <el-table-column width="50" align="center" label="序号" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" />
<el-table-column align="center" width="110" label="到货时间" prop="arrivalTime" :show-overflow-tooltip="true"/> <el-table-column align="center" width="110" label="到货时间" prop="arrivalTime" :show-overflow-tooltip="true"/>
@ -223,11 +223,16 @@
<el-form-item label="通知内容:" prop="remark" label-width="100px"> <el-form-item label="通知内容:" prop="remark" label-width="100px">
<el-input v-model="form.remark" type="textarea" maxlength="100" :autosize="{ minRows: 3, maxRows: 6 }" placeholder="请输入通知内容" style="width: 450px"/> <el-input v-model="form.remark" type="textarea" maxlength="100" :autosize="{ minRows: 3, maxRows: 6 }" placeholder="请输入通知内容" style="width: 450px"/>
</el-form-item> </el-form-item>
<el-form-item label="人员名称:" prop="userName" label-width="100px">
<el-input v-model="form.userName" placeholder="请输入人员名称" style="width: 240px; margin-right: 10px"/>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getNoticeList">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetDiaQuery">重置</el-button>
</el-form-item>
</el-form> </el-form>
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="getListPeople" width="600px" height="450" @selection-change="handleSelectionUser"> <el-table :data="getListPeople" width="600px" height="450" @selection-change="handleSelectionUser" row-key="id">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/> <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table-column label="人员名称" align="center" prop="userName" :show-overflow-tooltip="true"/> <el-table-column label="人员名称" align="center" prop="userName" :show-overflow-tooltip="true"/>
<el-table-column label="所属机构" align="center" prop="deptName" :show-overflow-tooltip="true"/> <el-table-column label="所属机构" align="center" prop="deptName" :show-overflow-tooltip="true"/>
@ -249,6 +254,13 @@
<!-- 人员添加 --> <!-- 人员添加 -->
<el-dialog title="人员添加" :visible.sync="peopleOpen" v-if="peopleOpen" width="1000px" append-to-body> <el-dialog title="人员添加" :visible.sync="peopleOpen" v-if="peopleOpen" width="1000px" append-to-body>
<el-form :model="userForm" size="small" inline>
<el-form-item label="人员名称:" prop="userName" label-width="100px">
<el-input v-model="userForm.userName" placeholder="请输入人员名称" style="width: 240px; margin-right: 10px"/>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getAllUserList">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="restUser">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionAddUser" height="450"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionAddUser" height="450">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
@ -337,6 +349,8 @@ export default {
}, },
form: { form: {
remark: "", remark: "",
taskId: "",
userName: "",
}, },
// 表单校验 // 表单校验
rules: { rules: {
@ -344,6 +358,9 @@ export default {
{ required: true, message: "通知内容不能为空", trigger: "blur" }, { required: true, message: "通知内容不能为空", trigger: "blur" },
], ],
}, },
userForm: {
userName: "",
},
openPrint: false, openPrint: false,
printData: {}, printData: {},
printTableData: [], printTableData: [],
@ -432,23 +449,31 @@ export default {
}, },
getNoticeList() { getNoticeList() {
const taskId = this.form.taskId; const taskId = this.form.taskId;
getNoticePeople({ taskId: taskId }).then((response) => { getNoticePeople({ taskId: taskId, userName: this.form.userName }).then((response) => {
this.getListPeople = response.rows; this.getListPeople = response.rows;
this.showPeople = true; this.showPeople = true;
this.loadingTwo = false; this.loadingTwo = false;
this.title = "通知"; this.title = "通知";
}); });
}, },
resetDiaQuery() {
this.form.userName = ""
this.getNoticeList()
},
addUserOpen() { addUserOpen() {
this.getAllUserList(); this.getAllUserList();
this.peopleOpen = true; this.peopleOpen = true;
}, },
/** 查询所有用户列表--可添加人员 */ /** 查询所有用户列表--可添加人员 */
getAllUserList() { getAllUserList() {
getListUnSelected().then((response) => { getListUnSelected({ userName: this.userForm.userName}).then((response) => {
this.userList = response.rows; this.userList = response.rows;
}); });
}, },
restUser() {
this.userForm.userName = "";
this.getAllUserList();
},
// 多选框选中-添加人员 // 多选框选中-添加人员
handleSelectionAddUser(selection) { handleSelectionAddUser(selection) {