Browse Source

2025/8/5

master
Aoi_Tori 5 months ago
parent
commit
48e9555179
  1. 2
      src/api/part/partInformation.js
  2. 129
      src/views/modules/project/projectInfo/com_project_info_part.vue
  3. 2
      src/views/modules/sampleManagement/technicalSpecificationList.vue
  4. 525
      src/views/modules/todo/todoList.vue

2
src/api/part/partInformation.js

@ -219,6 +219,8 @@ export const uploadProjectPartExcel = data => createAPI(`/plm/partInformation/up
// 查询文件ID
export const queryFileId = data => createAPI(`/plm/partInformation/queryFileId`,'post',data)
export const readPartFromFile = data => createAPI(`/plm/partInformation/readPartFromFile`,'post',data)
// 下载文件
export const downLoadFile = data => createAPI(`/plm/partInformation/downLoadFile?id=`+data.id,'post','download')

129
src/views/modules/project/projectInfo/com_project_info_part.vue

@ -792,6 +792,7 @@
<div>
<el-button type="primary" @click="addPart">添加>></el-button>
<el-button type="primary" @click="deletePart">删除<<</el-button>
<el-button type="primary" icon="el-icon-upload" @click="uploadVisible = true">上传</el-button>
</div>
</el-main>
<el-footer style="width: 880px;height: 200px;padding: 0 0 0 0;">
@ -877,6 +878,27 @@
</el-footer>
</el-dialog>
<el-dialog title="文件导入" @close="closeUploadDialog" :close-on-click-modal="false" :visible.sync="uploadVisible" width="390px" style="height: 520px;">
<el-form :inline="true" label-position="top" label-width="80px">
<el-form-item>
<el-button type="primary" @click="downloadFile()">下载文件模板</el-button>
</el-form-item>
<el-row>
<el-col :span="24">
<el-upload class="customer-upload" drag action="javascript:void(0);" ref="uploadFile" :limit="1" accept=".xlsx,.xls"
:before-upload="beforeUploadHandle" :on-remove="onRemove" :on-change="onChange" :auto-upload="false" style="text-align: left;">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
</el-upload>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" :disabled="isLoading" @click="saveUploadFile">确定</el-button>
<el-button type="primary" @click="closeUploadDialog">关闭</el-button>
</span>
</el-dialog>
<!-- 导入 -->
<project-part-upload ref="projectPartUpload" @refreshPageTables="searchTable" v-drag></project-part-upload>
@ -923,6 +945,7 @@ import {
import Chooselist from '@/views/modules/common/Chooselist'
import DictDataSelect from "../../sys/dict-data-select.vue"
import ProjectPartUpload from "./project_part_upload.vue";
import {downLoadFile, queryFileId, readPartFromFile} from "../../../../api/part/partInformation";
export default {
components: {
@ -991,6 +1014,7 @@ import {
pageSize2: 20,
totalPage2: 0,
visible: false,
isLoading: false,
currentRow: '',
columnList:[
{
@ -1194,6 +1218,13 @@ import {
exportName: '项目物料'+this.dayjs().format('YYYYMMDDHHmmss'),
exportHeader: ["项目物料"],
exportFooter: [],
fileList: [],
pageData: {
projectId: '',
createBy: '',
site: '',
customerNo: ''
},
// end
//
itemModalData:{
@ -1611,6 +1642,7 @@ import {
partDesc: ''
},
partModelFlag: false,
uploadVisible: false,
buList: [],
unitCostList: [],
characteristicList: [],
@ -3486,6 +3518,103 @@ import {
})
},
async downloadFile () {
let file = {
id: 0,
fileName: ''
}
let tempData = {
orderRef1: this.pageData.site,
orderRef2: 'projectPart'
}
await queryFileId(tempData).then(({data}) => {
if (data && data.code === 0) {
file.id = data.data.id
file.fileName = data.data.fileName
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
await downLoadFile(file).then(({data}) => {
//
const blob = new Blob([data], {type: "application/octet-stream"})
//
const fileName = file.fileName
// a
const linkNode = document.createElement('a')
// adownload
linkNode.download = fileName
linkNode.style.display = 'none'
// Blob URL
linkNode.href = URL.createObjectURL(blob)
document.body.appendChild(linkNode)
//
linkNode.click()
// URL
URL.revokeObjectURL(linkNode.href)
document.body.removeChild(linkNode)
})
},
beforeUploadHandle(file) {
let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase()
if (!(extName === '.xlsx' || extName === '.xls')) {
this.$message.error('数据导入失败,请选择正确的xlsx模板文件')
return false
}
},
//
onRemove(file, fileList){
this.fileList = fileList
},
onChange(file, fileList){
this.fileList = fileList
},
closeUploadDialog () {
this.fileList = []
//
this.$refs.uploadFile.clearFiles()
//
this.uploadVisible = false
},
saveUploadFile () {
//
if (null == this.fileList || 0 === this.fileList.length) {
this.$message.error("请先上传文件!")
return false
}
let partNos = this.partList2.map(part => part.partNo)
this.searchData.partNos = partNos.join(",")
const formData = new FormData()
formData.append("file", this.fileList[0].raw)
formData.append("createBy", this.$store.state.user.name)
formData.append("orderRef1", this.searchData.site)
formData.append("orderRef2", this.searchData.projectId)
formData.append("orderRef3", this.searchData.customerId)
formData.append("searchType", this.searchData.searchType)
formData.append("partNos", this.searchData.partNos)
formData.append("limit", this.searchData.limit)
formData.append("page", this.searchData.page)
this.isLoading = true
readPartFromFile(formData).then(({data}) => {
if (data && data.code === 0) {
data.rows.list.forEach(item => {
item.partNo = item.plmPartNo
this.partList2.push(item)
})
this.isLoading = false
this.uploadVisible = false
} else {
this.isLoading = false
this.$message.warning(data.msg)
}
})
},
},
}
</script>

2
src/views/modules/sampleManagement/technicalSpecificationList.vue

@ -1492,6 +1492,7 @@
type: 'warning'
}).then(() => {
row.username = this.$store.state.user.name
row.nodeConclusion = 'B'
bmStatusToDead(row).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
@ -1530,6 +1531,7 @@
type: 'warning'
}).then(() => {
row.username = this.$store.state.user.name
row.nodeConclusion = 'A'
bmStatusToFinish(row).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')

525
src/views/modules/todo/todoList.vue

@ -0,0 +1,525 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'单据号'">
<el-input v-model="searchData.documentNo" clearable style="width: 110px"></el-input>
</el-form-item>
<el-form-item :label="'流程ID'">
<el-input v-model="searchData.workflowId" clearable style="width: 60px"></el-input>
</el-form-item>
<el-form-item :label="'流程名称'">
<el-input v-model="searchData.workflowName" clearable style="width: 150px"></el-input>
</el-form-item>
<el-form-item :label="'当前节点ID'">
<el-input v-model="searchData.nodeId" clearable style="width: 60px"></el-input>
</el-form-item>
<el-form-item :label="'当前节点名称'">
<el-input v-model="searchData.nodeName" clearable style="width: 150px"></el-input>
</el-form-item>
<el-form-item :label="'流程创建人'">
<el-input v-model="searchData.createBy" clearable style="width: 80px"></el-input>
</el-form-item>
<el-form-item label="单据类型">
<el-select v-model="searchData.documentType" clearable style="width: 100px">
<el-option label="技术参数卡" value="BM"></el-option>
<el-option label="ECN" value="ECN"></el-option>
<el-option label="打样申请" value="PROOFING"></el-option>
<el-option label="询价申请" value="QUOTATION"></el-option>
<el-option label="测试申请" value="TEST"></el-option>
<el-option label="刀具申请" value="TOOL"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getDataList()">查询</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ "导出" }}
</download-excel>
</el-form-item>
</el-form>
<el-table
:height="height"
:data="dataList"
border
ref="processTable"
:row-style="rowStyle"
@row-click="processClickRow"
@selection-change="selectionProcess"
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<div v-if="item.columnProp === 'displayNo'">
<el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="handleClick(scope.row)"> {{ scope.row[item.columnProp] }}</el-link>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
<div v-else>
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
</template>
</el-table-column>
</el-table>
<selectDiv ref="selectDiv"></selectDiv>
<!-- 分页栏 -->
<el-pagination style="margin-top: 0px"
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 200, 500]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</div>
</template>
<script>
import {
getProcessFlowInformation, //
processIntervention, //
} from '@/api/processManagement/processManagement.js'
import Chooselist from '@/views/modules/common/Chooselist'
export default {
components: {
Chooselist
},
data () {
return {
//
exportData: [],
exportName: '制造商' + this.dayjs().format('YYYYMMDDHHmmss'),
exportHeader: ['制造商'],
exportFooter: [],
resultList: [],
// ======== ========
height: 200,
// ======== ========
pageIndex: 1,
pageSize: 50,
totalPage: 0,
//
searchData: {
site: this.$store.state.user.site,
workflowId: '',
workflowName: '',
nodeId: '',
nodeName: '',
documentNo: '',
documentStatus: '审批中',
page: 1,
limit: 10,
documentType: '',
updateBy: this.$store.state.user.name,
userId: this.$store.state.user.id.toString()
},
// ======== ========
processSelections: [],
// ======== ========
processCurrentRow: {},
// ======== ========
dataList: [],
//
columnList: [
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1DocumentTypeDesc',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'documentTypeDesc',
headerAlign: "center",
align: "left",
columnLabel: '单据类型',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1DisplayNo',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'displayNo',
headerAlign: "center",
align: "left",
columnLabel: '单据号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1RevisionNo',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'revisionNo',
headerAlign: "center",
align: "right",
columnLabel: '版本号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1DocumentStatus',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'documentStatus',
headerAlign: "center",
align: "center",
columnLabel: '单据状态',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 90
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1WorkflowId',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'workflowId',
headerAlign: "center",
align: "right",
columnLabel: '流程ID',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1WorkflowName',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'workflowName',
headerAlign: "center",
align: "left",
columnLabel: '流程名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200
},
{
functionId: 109002,
serialNumber: '109002Table1NodeId',
tableId: '109002Table1',
tableName: '流程流转信息表',
columnProp: 'nodeId',
headerAlign: 'center',
align: 'right',
columnLabel: '当前节点ID',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1NodeName',
tableId: '109002Table1',
tableName: '流程流转信息表',
columnProp: 'nodeName',
headerAlign: 'center',
align: 'left',
columnLabel: '当前节点名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1RejectFlagDesc',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'rejectFlagDesc',
headerAlign: "center",
align: "center",
columnLabel: '是否被驳回',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1RejectOpinion',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'rejectOpinion',
headerAlign: "center",
align: "left",
columnLabel: '驳回意见',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1CreateBy',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'createBy',
headerAlign: "center",
align: "center",
columnLabel: '流程创建人',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1CreateDate',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'createDate',
headerAlign: "center",
align: "center",
columnLabel: '流程创建时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 170
},
{
userId: this.$store.state.user.name,
functionId: 109002,
serialNumber: '109002Table1UpdateBy',
tableId: "109002Table1",
tableName: "流程流转信息表",
columnProp: 'updateBy',
headerAlign: "center",
align: "center",
columnLabel: '当前节点审批人',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
],
processLoading: false
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 170
})
},
created () {
this.getDataList()
},
methods: {
rowStyle ({row}) {
if (this.processCurrentRow.id === row.id) {
return { 'background-color': '#E8F7F6', cursor: 'pointer' }
}
},
//
processClickRow (row,column) {
this.processCurrentRow = JSON.parse(JSON.stringify(row))
},
//
selectionProcess (val) {
this.processSelections = val
this.$refs.selectDiv.setLengthselected(this.processSelections.length)
},
//
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
//
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
},
//
getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
getProcessFlowInformation(this.searchData).then(({data}) => {
if (data.code === 0) {
this.dataList = data.page.list
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length)
//
if (this.dataList.length > 0) {
//
this.$refs.processTable.setCurrentRow(this.dataList[0])
this.processClickRow(this.dataList[0])
} else {
this.processCurrentRow = {}
}
}
})
},
//excel
async createExportData() {
this.searchData.limit = -1
this.searchData.page = 1
await getProcessFlowInformation(this.searchData).then(({data}) => {
this.exportList= data.page.list
})
return this.exportList
},
startDownload() {},
finishDownload() {},
fields() {
let json = "{"
this.columnList.forEach((item, index) => {
if (index == this.columnList.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
}
})
json += "}"
let s = eval("(" + json + ")")
return s
},
handleClick(row){
if (row.documentType==='BM') {
if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{codeNo:row.displayNo?row.displayNo:' '},})
}
} else if (row.documentType==='ECN') {
if (this.$router.resolve(`/changeManagement-changeRecord`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`changeManagement-changeRecord`,params:{changeNo:row.displayNo?row.displayNo:' '},})
}
} else if (row.documentType==='PROOFING') {
if (this.$router.resolve(`/proofing-requestForProofing`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`proofing-requestForProofing`,params:{proofingNo:row.displayNo?row.displayNo:' '},})
}
} else if (row.documentType==='QUOTATION') {
if (this.$router.resolve(`/quotation-requestForQuote`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`quotation-requestForQuote`,params:{quotationBatchNo:row.displayNo?row.displayNo:' '},})
}
} else if (row.documentType==='TEST') {
if (this.$router.resolve(`/test-requestForTest`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`test-requestForTest`,params:{testNo:row.displayNo?row.displayNo:' '},})
}
} else if (row.documentType==='TOOL') {
if (this.$router.resolve(`/tooling-toolingInfo`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`tooling-toolingInfo`,params:{toolNo:row.displayNo?row.displayNo:' '},})
}
}
}
}
}
</script>
<style scoped lang="scss">
/deep/ .customer-tab .el-tabs__content {
padding: 0px !important;
height: 459px;
}
</style>
Loading…
Cancel
Save