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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-05-18 19:12:29 +08:00
parent 05bd8992a8 d21bf3ca03
commit e071997498
10 changed files with 279 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@
</el-select>
<el-button type="primary" size="small" icon="el-icon-search" style="margin-left: 15px;margin-top: 5px" plain @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
<el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
<el-button v-positive="'loading'" type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="AddTableData()">新增</el-button>
</el-row>
@@ -486,61 +486,54 @@
<!-- @current-change="handleCurrentChange2"/>-->
<!-- </div>-->
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center width="780px">
<el-row>
<span>零件图号:</span>
<el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
<el-input v-model="SparePartsNumber" style="width: 150px" size="small"/>
<span>零件名称:</span>
<el-input v-model="SparePartsName" style="width: 200px" size="small"/>
<el-input v-model="SparePartsName" style="width: 150px" size="small"/>
</el-row>
<el-table
:data="tableData5"
style="width: 100%;margin-top: 20px"
size="mini"
height="300"
stripe
highlight-current-row
border>
<el-table-column align="center" label="工序顺序" width="70">
<el-table :data="tableData5" style="width: 100%;margin-top: 20px" size="mini" height="320" stripe highlight-current-row border>
<el-table-column align="center" label="工序" width="70">
<template slot-scope="scope">
{{ scope.row.工序顺序 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺名称" width="120">
<el-table-column align="center" label="工艺名称" width="90">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺要求">
<el-table-column align="center" label="工艺要求" width="205" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工">
<el-table-column align="center" label="操作工" width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作员 }}
{{ scope.row.工序间是否外协 === 2 ? '外协' : scope.row.操作员 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成数量" width="120">
<el-table-column align="center" label="完成数量" width="80">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺是否完成" width="120">
<el-table-column align="center" label="状态" width="80">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
<span v-if="parseInt(scope.row.工序状态)===4" style="color: #67C23A">已完</span>
<span v-if="parseInt(scope.row.工序状态)===5" style="color: #E6A23C">报废</span>
<span v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" style="color: #409EFF">未完</span>
</template>
</el-table-column>
<el-table-column align="center" label="质检数量" width="120">
<el-table-column align="center" label="质检数" width="65">
<template slot-scope="scope">
{{ scope.row.数量 }}
{{ scope.row.数量 === null ? 0 : scope.row.数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数" width="120">
<el-table-column align="center" label="不良数" width="65">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
{{ scope.row.不合格数量 === null ? 0 : scope.row.不合格数量 }}
</template>
</el-table-column>
</el-table>
@@ -691,9 +684,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 { mapGetters } from 'vuex'
// import { mapGetters } from 'vuex'
export default {
data() {
return {
@@ -1110,13 +1101,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].文件内容)
}
}
})
},

339
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"
@@ -41,173 +23,156 @@
<el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportExcel()">导出</el-button>
</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-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="50px" fixed>
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="173px" 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>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70px">
<template slot-scope="scope">
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废时间" width="85px">
<template slot-scope="scope">
{{ scope.row.报废时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废人" width="85px">
<template slot-scope="scope">
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工序" width="85px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.报废原因 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工人" width="100px" 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>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检员" width="85px">
<template slot-scope="scope">
{{ scope.row.质检人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工时(分)" width="105px">
<template slot-scope="scope">
{{ scope.row.报废工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="补投时间" width="85px">
<template slot-scope="scope">
{{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column align="center" label="补投人" width="85px">
<template slot-scope="scope">
{{ scope.row.补投人 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</el-col>
<el-col style="width: 430px">
<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-column
width="50px"
prop="province1"
label="顺序"
align="center"
>
<template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
</el-table-column>
<el-table-column
width="80px"
prop="province2"
label="工艺名称"
align="center"
>
<template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
</el-table-column>
<el-table-column
prop="province4"
label="工艺要求"
align="center"
width="80px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
</el-table-column>
<el-table-column
width="60px"
prop="province5"
label="单件定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
</el-table-column>
<el-table-column
width="60px"
prop="province6"
label="准结定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.准结定额工时 }}</template>
</el-table-column>
<el-table-column
width="77px"
prop="province7"
label="完成状态"
align="center"
>
<template slot-scope="scope">
<div v-if="scope.row.工序状态 === 4"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
<div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完</div>
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
<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>
<el-table-column align="center" label="机床图号" width="80px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="50px" fixed>
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<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="100px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70px">
<template slot-scope="scope">
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废时间" width="85px">
<template slot-scope="scope">
{{ scope.row.报废时间 }}
</template>
</el-table-column>
<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="80px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<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="80px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废备注" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检员" width="85px">
<template slot-scope="scope">
{{ scope.row.质检人 }}
</template>
</el-table-column>
<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="85px">
<template slot-scope="scope">
{{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column align="center" label="补投人" width="80px">
<template slot-scope="scope">
{{ scope.row.补投人 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80px">
<template slot-scope="scope">
<el-button type="text" plain size="small" @click="fetchTableData2(scope.row)">加工过程</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogVisible" title="离线合同请款" center style="min-height: 300px" width="1000px">
<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"
label="顺序"
align="center"
>
<template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
</el-table-column>
<el-table-column
width="80px"
prop="province2"
label="工艺名称"
align="center"
>
<template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
</el-table-column>
<el-table-column
prop="province4"
label="工艺要求"
align="center"
width="80px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
</el-table-column>
<el-table-column
width="60px"
prop="province5"
label="单件定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
</el-table-column>
<el-table-column
width="60px"
prop="province6"
label="准结定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.准结定额工时 }}</template>
</el-table-column>
<el-table-column
width="77px"
prop="province7"
label="完成状态"
align="center"
>
<template slot-scope="scope">
<div v-if="scope.row.工序状态 === 4"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
<div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完</div>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
@@ -216,6 +181,7 @@ import { searchMachine, searchTable1, searchTable2, TableDta2Select } from '@/ap
export default {
data() {
return {
dialogVisible: false,
pageCurrent: 1,
pageSize: 20,
total: 0,
@@ -282,6 +248,7 @@ export default {
fetchTableData2(row) {
TableDta2Select(row.补投流水号).then(response => {
this.tableData2 = response.data
this.dialogVisible = true
})
},
exportExcel() {

10
src/views/ManufacturingCenter/MachiningParts/index.vue
View File

@@ -164,9 +164,6 @@
<span v-if="parseInt(scope.row.工序状态)===4" style="color: #67C23A">已完</span>
<span v-if="parseInt(scope.row.工序状态)===5" style="color: #E6A23C">报废</span>
<span v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" style="color: #409EFF">未完</span>
<!--<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完</el-tag>-->
</template>
</el-table-column>
<el-table-column align="center" label="质检数" width="65">
@@ -179,13 +176,6 @@
{{ scope.row.不合格数量 === null ? 0 : scope.row.不合格数量 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="工序质检" width="80">
<template slot-scope="scope">
<span v-if="parseInt(scope.row.是否质检)===1" style="color: #67C23A">合格</span>
<span v-if="parseInt(scope.row.是否质检)===2" style="color: #E6A23C">不合格</span>
<span v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" style="color: #409EFF">未检</span>
</template>
</el-table-column> -->
</el-table>
</el-dialog>
</div>

8
src/views/ManufacturingCenter/MaterialArrival/index.vue
View File

@@ -140,7 +140,7 @@ export default {
pageCurrent: 1,
pageSize: 50,
total: 0,
Name: 0,
Name: 1,
Partpaint: '',
tableData1: [], // 工序表
radio: '',
@@ -345,7 +345,11 @@ export default {
},
getRow(row) {
this.processSerialNumber = row.工序流水号
row.完成日期 ? this.Name = 1 : this.Name = 0
if (row.工艺名称 === '备料' && !row.完成日期) {
this.Name = 0
} else {
this.Name = 1
}
},
handleSizeChange(val) {
this.pageSize = val

41
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -1,7 +1,6 @@
<template>
<div>
<el-card>
<!--<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>-->
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
@@ -22,11 +21,9 @@
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
<el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button v-positive="'loading'" :disabled="false" type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>-->
</el-card>
<el-row>
<el-col style="width: 37%">
<el-col style="width: 49%">
<el-card>
<el-table v-loading="loading2" :data="tableData1" :row-class-name="tableRowClassName1" class="table" height="660" style="max-height: 830px" highlight-current-row empty-text=" " border @row-click="getRow">
<el-table-column align="center" label="工序" show-overflow-tooltip width="50">
@@ -34,27 +31,27 @@
{{ scope.row.工序顺序 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺名" show-overflow-tooltip min-width="70">
<el-table-column align="center" label="工艺名" show-overflow-tooltip width="70">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="投产数" width="80">
<el-table-column align="center" label="投产数" width="65">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成数" width="80">
<el-table-column align="center" label="完成数" width="65">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检数" width="80">
<el-table-column align="center" label="质检数" width="65">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不良数" width="80">
<el-table-column align="center" label="不良数" width="65">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
@@ -77,7 +74,7 @@
</el-table>
</el-card>
</el-col>
<el-col style="width: 63%">
<el-col style="width: 49%">
<el-card>
<el-table v-loading="loading" ref="singleTable" :data="tableData" :row-class-name="tableRowClassName" class="table" highlight-current-row border height="630" @row-click="getCurrentRow">
<el-table-column align="center" label="跟单号" show-overflow-tooltip width="160">
@@ -100,11 +97,6 @@
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70">
<template slot-scope="scope">
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检数" width="70">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
@@ -115,14 +107,29 @@
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70">
<template slot-scope="scope">
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工完成" width="100">
<template slot-scope="scope">
{{ scope.row.机加工实际完成时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="计划完成" width="100">
<el-table-column align="center" label="加工完成" width="100">
<template slot-scope="scope">
{{ scope.row.机加工结束时间 }}
{{ scope.row.机加工实际完成时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="100">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="用户名称" show-overflow-tooltip min-width="110">

95
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -2,114 +2,42 @@
<div class="app-container">
<el-card style="padding: 3px">
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 0px"/>
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">设备</el-button>
<!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
</el-tooltip>
<!-- <span style="margin-left: 40px">有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- &lt;!&ndash;<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>&ndash;&gt;-->
<!-- <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- &lt;!&ndash;<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>&ndash;&gt;-->
<!-- <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
</el-card>
<el-card>
<el-table :data="List" border size="small" stripe highlight-current-row height="700px" style="width: 570px">
<el-table-column label="设备名称" prop="设备名称" align="center" width="120px" >
<el-table :data="List" border size="small" stripe highlight-current-row height="840px" style="width: 750px">
<el-table-column label="设备名称" prop="设备名称" align="center" width="150px" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
</template>
</el-table-column>
<el-table-column label="设备编号" prop="设备编号" align="center" width="120px" >
<el-table-column label="设备编号" prop="设备编号" align="center">
<template slot-scope="scope">
{{ scope.row.设备编号 }}
</template>
</el-table-column>
<el-table-column label="设备型号" rop="设备型号" align="center" width="120px" >
<el-table-column label="设备型号" rop="设备型号" align="center" width="150px" >
<template slot-scope="scope">
{{ scope.row.设备型号 }}
</template>
</el-table-column>
<!-- <el-table-column label="设备性能指标" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备性能指标 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="设备加工能力" align="center" >-->
<!-- <template slot-scope="scope">p-->
<!-- {{ scope.row.设备加工能力工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="设备加工工艺" align="center" width="120px">
<el-table-column label="设备加工工艺" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.工艺属性 }}
</template>
</el-table-column>
<!-- <el-table-column label="班次类型" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.班次类型 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="设备工时系数" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备工时系数 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="整改工时系数" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.整改工时比例 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="预留工时系数" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备预留工时系数 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="70px">
<el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:5px" @click="handleEdit(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" style="margin-left:5px" @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
<!-- <el-card>-->
<!-- <span>有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
<!-- </el-card>-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px" class="demo-ruleForm">
@@ -259,7 +187,6 @@ export default {
}
getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
this.List = response.data
// this.total = response.data.total
})
},
initialization() {
@@ -430,16 +357,6 @@ export default {
.el-card{
margin-bottom: 1px;
}
/*.el-button--success {*/
/* background: #ecf5ff;*/
/* border-color: #2d72d5;*/
/* color: #2d72d5;*/
/*}*/
/*.el-button--primary {*/
/* background: #fdf6ec;*/
/* border-color: #ff9759;*/
/* color: #ff9759;*/
/*}*/
</style>
<style lang="scss">
.button111{

14
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-row style="width: 720px">
<el-row style="width: 890px">
<el-card style="margin-bottom: 5px">
<el-row>
<el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
@@ -18,28 +18,28 @@
<el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="getParts()">查询</el-button>
<el-button v-positive="'loading'" :disabled="false" type="success" plain class="el-icon-download" style="margin-left: 30px" size="small" @click="exportExcel">导出</el-button>
</el-row>
<el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 690px;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
<el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 100%;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="厂家" prop="外协厂家名称" align="center" min-width="230px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
</template>
</el-table-column>
<el-table-column label="外协金额(元)" prop="总价" align="center" width="110px">
<el-table-column label="外协金额(元)" prop="总价" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.总价 }}
</template>
</el-table-column>
<el-table-column label="到票金额(元)" align="center" width="110px" prop="开票金额">
<el-table-column label="到票金额(元)" align="center" width="130px" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column label="付款金额(元)" align="center" width="110px">
<el-table-column label="付款金额(元)" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.付款金额 }}
</template>
</el-table-column>
<el-table-column label="未付金额(元)" align="center" width="110px">
<el-table-column label="未付金额(元)" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.应付金额 }}
</template>

12
src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-card style="width: 645px">
<el-card style="width: 750px">
<el-row style="width: 645px">
<el-input v-model="partNumber" placeholder="零件图号" style="width: 180px" size="small" clearable/>
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
@@ -18,15 +18,15 @@
</el-upload>
</el-row>
</el-card>
<el-card style="width: 645px">
<el-table v-loading="loading" :data="tableData" border size="mini" style="width: 635px;height: 700px" height="520">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="零件图号" align="center" width="180px">
<el-card style="width: 750px">
<el-table v-loading="loading" :data="tableData" border size="mini" style="width: 100%" height="550">
<el-table-column label="序号" align="center" type="index" width="70"/>
<el-table-column label="零件图号" align="center" min-width="180px">
<template slot-scope="scope">
{{ scope.row.name }}
</template>
</el-table-column>
<el-table-column label="文件格式" align="center" width="80px">
<el-table-column label="文件格式" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.suffix }}
</template>

80
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -15,15 +15,11 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-select v-model="ModelValue" placeholder="规格" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="">-->
<!--<el-option-->
<!--v-for="item in Model"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="ModelValue" placeholder="名称规格型号" style="width: 180px" size="small" clearable/>
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
<el-button v-positive="'loading'" type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
</el-card>
<el-card>
<div v-for="(file, key) in hadFile" :key="key">
@@ -42,7 +38,7 @@
</div>
</el-card>
<el-card>
<h3>自制件</h3>
<div style="font-size: 22px;font-weight: bold;margin-top: 5px">自制件</div>
<el-table
v-loading="loading"
:data="tableData"
@@ -175,21 +171,14 @@
</div>
</el-card>
<el-card>
<h3>外购件</h3>
<el-table
v-loading="loadingWB"
:data="tableDataWB"
style="width: 100%;min-height: 600px;"
size="mini"
stripe
height="500"
highlight-current-row
border>
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<div style="font-size: 22px;font-weight: bold;margin-top: 5px">
外购件
<el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
<el-button v-positive="'loading'" type="warning" size="small" icon="el-icon-download" plain style="float: right;margin: 3px 150px 5px 0" @click="exportExcel2()">导出</el-button>
</el-tooltip>
</div>
<el-table v-loading="loadingWB" :data="tableDataWB" style="width: 100%;min-height: 600px;" size="mini" stripe height="500" highlight-current-row border>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column align="center" prop="物料名称" label="物料名称">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
@@ -328,11 +317,6 @@ export default {
}
},
watch: {
// machine(val) {
// if (val.length > 0) {
// this.machineValue = val[0].value
// }
// },
machineValue(val) {
this.groupValue = ''
this.group = []
@@ -359,6 +343,42 @@ export default {
this.fetchData()
},
methods: {
exportExcel() {
if (this.tableData.length === 0) {
this.$message.warning('请先查询要导出的数据')
} else {
const machine_check = this.machineValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0
const Model_check = this.ModelValue ? 1 : 0
var param = []
param[0] = ['机床流水号_check', machine_check]
param[1] = ['机床流水号', this.machineValue]
param[2] = ['组件流水号_check', group_check]
param[3] = ['组件流水号', this.groupValue]
param[4] = ['规格_check', Model_check]
param[5] = ['规格', this.ModelValue]
var Data = this.CreateData('2001', '报表_PDM_零件明细表_基本件_查询数据_综合gj', param)
this.exportExcel_NPOI(Data)
}
},
exportExcel2() {
if (this.tableDataWB.length === 0) {
this.$message.warning('请先查询要导出的数据')
} else {
const machine_check = this.machineValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0
const Model_check = this.ModelValue ? 1 : 0
var param = []
param[0] = ['机床流水号_check', machine_check]
param[1] = ['机床流水号', this.machineValue]
param[2] = ['组件流水号_check', group_check]
param[3] = ['组件流水号', this.groupValue]
param[4] = ['规格_check', Model_check]
param[5] = ['规格', this.ModelValue]
var Data = this.CreateData('2001', '报表_PDM_零件明细表_标准件和外购件_查询数据', param)
this.exportExcel_NPOI(Data)
}
},
// 在什么情况下需要查询上传的附件，调用this.getFileData()即可根据
getFileData(machineValue) {
this.hadFile = []
@@ -394,11 +414,9 @@ export default {
param[2] = group_check
param[3] = this.groupValue
this.getSelect(searchModel, ['规格', '规格'], 'Model', param)
console.log(this.Model, 989898)
},
getTableData() {
this.getFileData(this.machineValue)
console.log(this.hadFile, 88899)
if (this.machineValue) {
const machine_check = this.machineValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0
@@ -408,7 +426,6 @@ export default {
this.loading = false
const res = response.data
this.total = res.total
console.log(this.tableData)
this.tableData = res.rows.map(item => {
if (item.整改类型 === '1') {
item.整改类型 = '新增'
@@ -432,7 +449,6 @@ export default {
const data = response.data
this.totalWB = data.total
this.tableDataWB = data.rows.map(item => {
console.log(item)
if (item.整改类型 === '1') {
item.整改类型 = '新增'
} else if (item.整改类型 === '2') {

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)