meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
Vergil
2020-05-18 11:35:25 +08:00
parent cd622ee59e
commit ca3574dce5
3 changed files with 23 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -691,7 +691,7 @@
<script>
import { initProject, searchgroup, selecttable, QualityType, searchPic, searchTableDetail, searchData, searchData1, processingStatus, initPerson, Prohibit, initDisqualificationTreatment, initReasonsForNonconformity, searchparts, searchprocedure, searchoperators, submitTable, confirmEdit, searchproceductnum, deleterow } from '@/api/Assembly/QualityInspectionInformationInquiry'
import { readFile } from '@/utils/request'
// import { readFile } from '@/utils/request'
import { mapGetters } from 'vuex'
// import { mapGetters } from 'vuex'
export default {
@@ -1110,13 +1110,14 @@ export default {
},
viewPicture(row) {
this.dialogFormVisible = true
console.log(row)
this.urls = []
searchPic(row.质检流水号).then(response => {
console.log(response.data, 222)
this.urls = []
// this.URL = readFile + response.data[0].文件标识 + '.' + response.data[0].文件后缀
for (let i = 0; i < response.data.length; i++) {
this.urls.push(readFile + response.data[i].文件标识 + '.' + response.data[i].文件后缀)
if (response.data[i].文件内容 !== null) {
// this.urls.push(readFile + response.data[i].文件标识 + '.' + response.data[i].文件后缀)
this.urls.push('data:image/png;base64,' + response.data[i].文件内容)
}
}
})
},

58
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -1,25 +1,7 @@
<template>
<div class="app-container">
<el-card style="width: 1255px">
<el-card>
<el-row>
<!--<span>项目名称:</span>-->
<!--<el-select-->
<!--v-model="entryNameValue"-->
<!--:remote-method="remoteMethod"-->
<!--placeholder="项目名称"-->
<!--style="margin-right: 10px; width: 150px"-->
<!--size="small"-->
<!--clearable-->
<!--filterable-->
<!--remote-->
<!--@change="projectChange"-->
<!--@focus="projectInit">-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-select v-model="machineNameValue" placeholder="机床图号" style="width: 150px" size="small" filterable clearable @change="machineChange">
<el-option
v-for="item in machineName"
@@ -42,18 +24,9 @@
</el-row>
</el-card>
<el-row>
<el-col style="width: 825px">
<el-card style="margin-top: 15px;width: 825px">
<el-table
v-loading="listLoading"
:data="tableData"
style="width: 100%"
stripe
size="small"
height="590"
highlight-current-row
border
@row-click="fetchTableData2">
<el-col>
<el-card style="margin-top: 15px">
<el-table v-loading="listLoading" :data="tableData" style="width: 100%" stripe size="small" height="590" highlight-current-row border @row-click="fetchTableData2">
<el-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -64,12 +37,12 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="173px" show-overflow-tooltip fixed>
<el-table-column align="center" label="零件图号" width="140px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" width="129px" show-overflow-tooltip fixed>
<el-table-column align="center" label="零件名称" width="100px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -89,22 +62,22 @@
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工序" width="85px">
<el-table-column align="center" label="报废工序" width="80px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
<el-table-column align="center" label="报废原因" width="80px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.报废原因 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工人" width="100px" show-overflow-tooltip>
<el-table-column align="center" label="操作工人" width="80px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip>
<el-table-column align="center" label="报废备注" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
@@ -142,16 +115,9 @@
</div>
</el-card>
</el-col>
<el-col style="width: 430px">
<el-col>
<el-card>
<el-table
:data="tableData2"
element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(226,223,223,1)"
height="630"
border
style="width: 430px">
<el-table :data="tableData2" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(226,223,223,1)" height="630" border style="width: 430px">
<el-table-column
width="50px"
prop="province1"

13
src/views/WorkshopProcurement/ScrappedSupplementaryInvestment1/index.vue
View File

@@ -23,7 +23,6 @@
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
<!--<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;loginsession()">session</el-button>-->
</el-row>
</el-card>
</div>
@@ -55,7 +54,6 @@
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center" width="173px" show-overflow-tooltip>
<!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -75,11 +73,6 @@
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column label="补投数" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.补投数量 }}
</template>
</el-table-column>
<el-table-column label="报废日期" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.报废时间 ? scope.row.报废时间.split(' ')[0] : '' }}
@@ -90,6 +83,11 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="补投数" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.补投数量 === 0 ? '-' : scope.row.补投数量 }}
</template>
</el-table-column>
<el-table-column label="补投日期" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
@@ -214,7 +212,6 @@ export default {
this.partName ? check1 = 1 : check1 = 0
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
searchtable(check, this.machineNameValue, check1, this.partName, check7, this.outTime[0], this.outTime[1], this.pageCurrent, this.pageSize).then(response => {
console.log(response.data, 123)
this.tableData = response.data.result
this.loading = false
this.total = parseInt(response.data.output[0].ItemCount)