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

更新

Browse Source
This commit is contained in:
liushuai
2019-10-30 12:56:43 +08:00
parent d1939c0e42
commit f7a889e3d6
11 changed files with 397 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/Inventory/CreatePickingList.js
View File

@@ -42,8 +42,8 @@ export function searchTable(...params) {
data: { data: {
type: '1', type: '1',
name: '车间装配管理_领料单_三表_查询数据', name: '车间装配管理_领料单_三表_查询数据',
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&零件类型=${params[12]}`, param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&名称_check=${params[4]}&名称=${params[5]}&型号_check=${params[6]}&型号=${params[7]}&规格_check=${params[8]}&规格=${params[9]}&领料情况_check=${params[10]}&领料情况=${params[11]}&零件类型=${params[14]}`,
Pagination: params[10] + '&' + params[11] Pagination: params[12] + '&' + params[13]
} }
}) })
} }

35
src/api/Inventory/PurchaseInRecord.js
View File

@@ -1,25 +1,13 @@
import request from '@/utils/request' import request from '@/utils/request'
// 初始化项目 // 初始化机床项目
export function initProject() { export function initMachineProject() {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: 'PDM_项目名称_查询数据_按时间排序' name: 'PDM_项目名称_查询数据'
}
})
}
// 机床查询
export function searchMachine(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据',
param: '项目流水号_check=1&项目流水号=' + num
} }
}) })
} }
@@ -36,27 +24,14 @@ export function searchGroup(num) {
}) })
} }
// 查询采购件入库记录 // 查询采购件入库记录
export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, pageCurrent, pageSize) { export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2, pageCurrent, pageSize) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: `库存管理_入库记录_采购件_查询数据`, name: `库存管理_入库记录_采购件_查询数据`,
param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`, param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}&入库时间_check=${check7}&入库开始时间=${time1}&入库结束时间=${time2}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询离线件入库记录
export function searchRecord2(check4, name, check5, spec, check6, model, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: `库存管理_入库记录_离线件_查询数据`,
param: `名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })

18
src/api/Inventory/PurchaseOutRecord.js
View File

@@ -1,25 +1,13 @@
import request from '@/utils/request' import request from '@/utils/request'
// 初始化项目 // 初始化机床项目
export function initProject() { export function initMachineProject() {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: 'PDM_项目名称_查询数据_按时间排序' name: 'PDM_项目名称_查询数据'
}
})
}
// 机床查询
export function searchMachine(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据',
param: '项目流水号_check=1&项目流水号=' + num
} }
}) })
} }

BIN
src/assets/img/img28.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 72 KiB

4
src/utils/request.js
View File

@@ -16,7 +16,7 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
export const url = `http://192.168.0.109:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段 // 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
@@ -25,7 +25,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.0.109:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

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

@@ -361,9 +361,9 @@
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工位" prop="mes终端编号" align="center" width="80px"> <el-table-column label="工位" prop="MES终端编号" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.mes终端编号 }} {{ scope.row.MES终端编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作工" prop="姓名" align="center"> <el-table-column label="操作工" prop="姓名" align="center">

185
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card style="width: 57%">
<div slot="header"> <div slot="header">
<el-row> <el-row>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px" @change="machineChange"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px" @change="machineChange">
@@ -30,34 +30,34 @@
<el-input v-model="Name" placeholder="名称" clearable style="width: 120px" size="small"/> <el-input v-model="Name" placeholder="名称" clearable style="width: 120px" size="small"/>
<el-input v-model="materialSpec" placeholder="物料规格" style="width: 120px" clearable size="small"/> <el-input v-model="materialSpec" placeholder="物料规格" style="width: 120px" clearable size="small"/>
<el-input v-model="materialModel" placeholder="物料型号" style="width: 120px" clearable size="small"/> <el-input v-model="materialModel" placeholder="物料型号" style="width: 120px" clearable size="small"/>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=20;pageCurrent1=1;pageSize1=20;pageCurrent2=1;pageSize2=20;pageCurrent4=1;pageSize4=20;searchTable()">查询</el-button> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=300;pageCurrent1=1;pageSize1=300;pageCurrent2=1;pageSize2=300;pageCurrent4=1;pageSize4=20;searchTable()">查询</el-button>
</el-row> </el-row>
</div> </div>
<el-tabs v-model="PartType" type="card" @tab-click="searchTable()"> <el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件"> <el-tab-pane label="标准件" name="标准件">
<el-table ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50"/> <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
<el-table-column align="center" sortable prop="机床图号" label="机床图号" width="130px"> <el-table-column align="center" prop="机床图号" label="机床图号" width="130px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="组号" label="组号" width="80px"> <el-table-column align="center" prop="组号" label="组号" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="物料名称" label="名称" width="100px"> <el-table-column align="center" prop="物料名称" label="名称" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template>date </template>date
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="型号" label="型号" width="120px"> <el-table-column align="center" prop="型号" label="型号" min-width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 || '—' }} {{ scope.row.物料型号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="规格排序" label="规格" width="150px"> <el-table-column align="center" prop="规格排序" label="规格" min-width="150px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 || '—' }} {{ scope.row.物料规格 || '—' }}
</template> </template>
@@ -72,7 +72,7 @@
{{ scope.row.备件总数量 }} {{ scope.row.备件总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="领料单编号" width="100px"> <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单编号 }} {{ scope.row.领料单编号 }}
</template> </template>
@@ -81,7 +81,7 @@
<div class="block"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent0" :current-page="pageCurrent0"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40, 300]"
:page-size="pageSize0" :page-size="pageSize0"
:total="total0" :total="total0"
style="margin-top:10px;display:inline-block;width:50%" style="margin-top:10px;display:inline-block;width:50%"
@@ -91,29 +91,29 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="外购件" name="外购件"> <el-tab-pane label="外购件" name="外购件">
<el-table ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="tableData1" size="mini" style="max-height: 500px" height="600px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50"/> <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
<el-table-column align="center" sortable prop="机床图号" label="机床图号" width="130px"> <el-table-column align="center" prop="机床图号" label="机床图号" width="130px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="组号" label="组号" width="80px"> <el-table-column align="center" prop="组号" label="组号" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="物料名称" label="名称" width="100px"> <el-table-column align="center" prop="物料名称" label="名称" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="型号" label="型号" width="130px"> <el-table-column align="center" prop="型号" label="型号" min-width="130px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 || '—' }} {{ scope.row.物料型号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="物料规格" label="规格" width="200px"> <el-table-column align="center" prop="物料规格" label="规格" min-width="200px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 || '—' }} {{ scope.row.物料规格 || '—' }}
</template> </template>
@@ -128,7 +128,7 @@
{{ scope.row.备件总数量 }} {{ scope.row.备件总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="领料单编号" width="100px"> <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单编号 }} {{ scope.row.领料单编号 }}
</template> </template>
@@ -137,7 +137,7 @@
<div class="block"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent1" :current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40, 300]"
:page-size="pageSize1" :page-size="pageSize1"
:total="total1" :total="total1"
style="margin-top:10px;display:inline-block;width:50%" style="margin-top:10px;display:inline-block;width:50%"
@@ -147,29 +147,29 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="基本件" name="基本件"> <el-tab-pane label="基本件" name="基本件">
<el-table ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="tableData2" size="mini" style="max-height: 500px" height="600px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50"/> <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
<el-table-column align="center" sortable prop="机床图号" label="机床图号" width="130px"> <el-table-column align="center" prop="机床图号" label="机床图号" width="130px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="组号" label="组号" width="80px"> <el-table-column align="center" prop="组号" label="组号" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="零件名称" label="名称" width="100px"> <el-table-column align="center" prop="零件名称" label="名称" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="图号" sortable prop="零件图号" width="130px"> <el-table-column align="center" label="图号" sortable prop="零件图号" min-width="130px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" sortable prop="规格" label="规格" width="80px"> <el-table-column align="center" prop="规格" label="规格" min-width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 || '—' }} {{ scope.row.规格 || '—' }}
</template> </template>
@@ -189,7 +189,7 @@
{{ scope.row.备件总数量 }} {{ scope.row.备件总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="领料单编号" width="100px"> <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单编号 }} {{ scope.row.领料单编号 }}
</template> </template>
@@ -198,7 +198,7 @@
<div class="block"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent2" :current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40, 300]"
:page-size="pageSize2" :page-size="pageSize2"
:total="total2" :total="total2"
style="margin-top:10px;display:inline-block;width:50%" style="margin-top:10px;display:inline-block;width:50%"
@@ -208,24 +208,24 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="离线采购件" name="离线采购件"> <el-tab-pane label="离线采购件" name="离线采购件">
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="600px" @selection-change="handleSelectionChange1"> <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="500px" @selection-change="handleSelectionChange1">
<el-table-column type="selection" align="center" width="50"/> <el-table-column :selectable="selectable1" type="selection" align="center" width="50"/>
<el-table-column label="物料名称" prop="物料名称" align="center" width="120"> <el-table-column label="物料名称" prop="物料名称" align="center" min-width="140" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料型号" prop="物料型号" align="center" width="120"> <el-table-column label="物料型号" prop="物料型号" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料规格" prop="物料规格" align="center" width="120"> <el-table-column label="物料规格" prop="物料规格" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="库存量" align="center" width="80px"> <el-table-column label="库存量" align="center" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货位存量 }} {{ scope.row.货位存量 }}
</template> </template>
@@ -251,8 +251,9 @@
</el-tabs> </el-tabs>
</el-card> </el-card>
<el-card>
<div slot="header"> <div slot="header">
<el-card>
<el-row style="margin-top: 5px">
<el-input v-model="pickingListNumber" clearable size="small" placeholder="领料单编号" style="width:120px;margin-left: 10px" /> <el-input v-model="pickingListNumber" clearable size="small" placeholder="领料单编号" style="width:120px;margin-left: 10px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button> <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
@@ -260,23 +261,18 @@
<el-button size="small" type="warning" icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button> <el-button size="small" type="warning" icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
</el-tooltip> </el-tooltip>
<el-button :disabled="Number(审批情况)===1" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropList()">删除领料单</el-button> <el-button :disabled="Number(审批情况)===1" size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropList()">删除领料单</el-button>
<span style="font-weight: bold">选中领料单：{{ pickingListNumberShow }}</span> <el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-delete" style="margin-right: 20px;float: right" @click="dropListDetail()">移除领料明细</el-button>
<span style="font-weight: bold">领料人：{{ peopleName }}</span> </el-row>
<el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-delete" style="margin-right: 20px;float: right" @click="dropListDetail(scope.row)">移除领料明细</el-button> </el-card>
</div> </div>
<div style="width: 30%;float: left"> <div style="width: 26%;float: left;margin-right: 16px">
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="300px" @row-click="clickList"> <el-card>
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="400px" @row-click="clickList">
<el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px"> <el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单编号 }} {{ scope.row.领料单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" min-width="100px" >
<template slot-scope="scope">
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="领料人" prop="领料人" align="center" min-width="90px"> <el-table-column label="领料人" prop="领料人" align="center" min-width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
@@ -288,36 +284,38 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="float:right;margin: 10px 0;"> <div class="block" style="float:left;margin: 10px 0;">
<el-pagination <el-pagination
:current-page="pageCurrent3" :current-page="pageCurrent3"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
:page-size="pageSize3" :page-size="pageSize3"
:total="total3" :total="total3"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange3" @size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/> @current-change="handleCurrentChange3"/>
</div> </div>
</el-card>
</div> </div>
<div style="width: 69.8%;float: left"> <div style="width: 72.5%;float: left">
<el-table :data="pickListTable2" border style="width: 100%;" size="mini" height="300px"> <el-card>
<el-table :data="pickListTable2" border style="width: 100%;" size="mini" highlight-current-row height="400px" @row-click="searchMX">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" align="center" prop="名称" min-width="100"> <el-table-column label="名称" align="center" prop="名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" prop="图号或型号" min-width="110px"> <el-table-column label="图号或型号" align="center" prop="图号或型号" min-width="110px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }} {{ scope.row.图号或型号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" prop="规格" min-width="120"> <el-table-column label="规格" align="center" prop="规格" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 || '—' }} {{ scope.row.规格 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" align="center" prop="机床图号" min-width="100"> <el-table-column label="机床图号" align="center" prop="机床图号" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
@@ -327,17 +325,17 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领用数量" align="center" min-width="70"> <el-table-column label="领用数" align="center" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.总数量 }} {{ scope.row.总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备件数量" align="center" min-width="70"> <el-table-column label="备件数" align="center" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备件数量 }} {{ scope.row.备件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已领数量" align="center" min-width="70"> <el-table-column label="已领数" align="center" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库数量1 }} {{ scope.row.出库数量1 }}
</template> </template>
@@ -376,13 +374,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">查看详情</el-button> <el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">领料详情</el-button>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</el-card> </el-card>
</div>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="创建领料单" center width="380px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="创建领料单" center width="380px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left"> <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
@@ -417,6 +415,7 @@ export default {
return { return {
审批情况: '', 审批情况: '',
peopleName: '', peopleName: '',
ListMX: '',
PartType: '基本件', PartType: '基本件',
machineNumberValue: '', machineNumberValue: '',
machineNumber: [], machineNumber: [],
@@ -438,13 +437,13 @@ export default {
tableData1: [], tableData1: [],
tableData2: [], tableData2: [],
pageCurrent0: 1, pageCurrent0: 1,
pageSize0: 20, pageSize0: 300,
total0: 0, total0: 0,
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 20, pageSize1: 300,
total1: 0, total1: 0,
pageCurrent2: 1, pageCurrent2: 1,
pageSize2: 20, pageSize2: 300,
total2: 0, total2: 0,
pickListTable1: [], pickListTable1: [],
pageCurrent3: 1, pageCurrent3: 1,
@@ -481,7 +480,6 @@ export default {
}, },
mounted() { mounted() {
this.fetchData() this.fetchData()
this.searchTable()
this.searchList() this.searchList()
}, },
methods: { methods: {
@@ -550,19 +548,21 @@ export default {
}) })
}, },
tableRowClassName({ row }) { tableRowClassName({ row }) {
return '.warning-row' if (parseInt(row.是否审批) === 1) {
// if (row.是否审批 === 1) { return 'shenpi-row'
// return '.warning-row' } else {
// } else { return ''
// return '' }
// }
}, },
selectable(row, index) { // 控制某行是否可选 selectable(row, index) { // 控制某行是否可选
console.log(row)
return row.领料单编号 === null // 未采购&&确认物料修改 return row.领料单编号 === null // 未采购&&确认物料修改
}, },
selectable1(row) {
return row.领用数量 !== 0
},
// 查三表 // 查三表
searchTable() { searchTable() {
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
this.multipleSelection = [] this.multipleSelection = []
this.multipleSelection1 = [] this.multipleSelection1 = []
if (this.PartType === '标准件') { if (this.PartType === '标准件') {
@@ -574,43 +574,60 @@ export default {
} else if (this.PartType === '离线采购件') { } else if (this.PartType === '离线采购件') {
this.searchTable4() this.searchTable4()
} }
} else {
this.$message.warning('请选择机床后再查询')
}
}, },
// 标准件 // 标准件
searchTable0() { searchTable0() {
let check1, check2, check3, check4, check5 let check1, check2, check3, check4, check5, check6
this.machineNumberValue ? check1 = 1 : check1 = 0 this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0
this.Name ? check3 = 1 : check3 = 0 this.Name ? check3 = 1 : check3 = 0
this.materialModel ? check4 = 1 : check4 = 0 this.materialModel ? check4 = 1 : check4 = 0
this.materialSpec ? check5 = 1 : check5 = 0 this.materialSpec ? check5 = 1 : check5 = 0
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent0, this.pageSize0, 1).then(response => { if (this.PickingValue !== 0 && this.PickingValue !== 1) {
console.log(response.data.rows) check6 = 0
} else {
check6 = 1
}
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent0, this.pageSize0, 1).then(response => {
this.tableData0 = response.data.rows this.tableData0 = response.data.rows
this.total0 = response.data.total this.total0 = response.data.total
}) })
}, },
// 外购件 // 外购件
searchTable1() { searchTable1() {
let check1, check2, check3, check4, check5 let check1, check2, check3, check4, check5, check6
this.machineNumberValue ? check1 = 1 : check1 = 0 this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0
this.Name ? check3 = 1 : check3 = 0 this.Name ? check3 = 1 : check3 = 0
this.materialModel ? check4 = 1 : check4 = 0 this.materialModel ? check4 = 1 : check4 = 0
this.materialSpec ? check5 = 1 : check5 = 0 this.materialSpec ? check5 = 1 : check5 = 0
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent1, this.pageSize1, 2).then(response => { if (this.PickingValue !== 0 && this.PickingValue !== 1) {
check6 = 0
} else {
check6 = 1
}
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent1, this.pageSize1, 2).then(response => {
this.tableData1 = response.data.rows this.tableData1 = response.data.rows
this.total1 = response.data.total this.total1 = response.data.total
}) })
}, },
// 基本件 // 基本件
searchTable2() { searchTable2() {
let check1, check2, check3, check4, check5 let check1, check2, check3, check4, check5, check6
this.machineNumberValue ? check1 = 1 : check1 = 0 this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0
this.Name ? check3 = 1 : check3 = 0 this.Name ? check3 = 1 : check3 = 0
this.materialModel ? check4 = 1 : check4 = 0 this.materialModel ? check4 = 1 : check4 = 0
this.materialSpec ? check5 = 1 : check5 = 0 this.materialSpec ? check5 = 1 : check5 = 0
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, this.pageCurrent2, this.pageSize2, 3).then(response => { if (this.PickingValue !== 0 && this.PickingValue !== 1) {
check6 = 0
} else {
check6 = 1
}
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent2, this.pageSize2, 3).then(response => {
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
this.total2 = response.data.total this.total2 = response.data.total
}) })
@@ -779,7 +796,6 @@ export default {
// 多选 // 多选
handleSelectionChange1(val) { handleSelectionChange1(val) {
this.multipleSelection1 = val this.multipleSelection1 = val
console.log(val, 111)
}, },
// 选入 // 选入
selectInto() { selectInto() {
@@ -846,7 +862,6 @@ export default {
}, },
// 查看领料单明细 // 查看领料单明细
clickList(row) { clickList(row) {
console.log(row)
row ? this.审批情况 = row.是否审批 : this.审批情况 row ? this.审批情况 = row.是否审批 : this.审批情况
row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum row ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow row ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
@@ -855,15 +870,17 @@ export default {
this.pickListTable2 = res.data this.pickListTable2 = res.data
}) })
}, },
searchMX(row) {
this.ListMX = row.领料单明细流水号
},
// 删除领料单明细 // 删除领料单明细
dropListDetail(row) { dropListDetail() {
console.log(row)
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', { this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
dropListDetail(row.领料单明细流水号).then(response => { dropListDetail(this.ListMX).then(response => {
if (Number(response.data[0].result) === 1) { if (Number(response.data[0].result) === 1) {
this.$message.success('删除成功') this.$message.success('删除成功')
this.searchTable() this.searchTable()
@@ -897,10 +914,8 @@ export default {
margin: 0 margin: 0
} }
</style> </style>
<style lang="scss"> <style>
.shenpi{ .el-table .shenpi-row {
.el-table .warning-row { background: #9BD7FC !important;
background: #55a532 !important;
}
} }
</style> </style>

302
src/views/Inventory/MaterialOut/index.vue
View File

@@ -1,83 +1,64 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div slot="header"> <div style="margin-top: 8px;margin-bottom: 8px">
<span style="margin: 5px">领料单编号:</span> <span style="margin: 5px">领料单编号:</span>
<el-input v-model="pickingListNumber" clearable size="small" style="width:200px" /> <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
<el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>
<el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right" @click="inputPassword()">领料确认</el-button>
</div> </div>
<h4 style="margin-top:0">领料单</h4> </el-card>
<el-table :data="pickListTable1" stripe highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList"> <div style="width: 26%;float: left;margin-right: 16px">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-card>
<el-table-column label="领料单编号" prop="领料单编号" align="center" min-width="200"> <el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="730px" @row-click="clickList">
<el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单编号 }} {{ scope.row.领料单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" min-width="200" > <el-table-column label="领料人" prop="领料人" align="center" min-width="90px">
<template slot-scope="scope">
{{ scope.row.操作日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="领料人" prop="姓名" align="center" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料单备注" align="center" min-width="130"> <el-table-column label="备注" prop="备注" align="center" min-width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.领料单备注 }} {{ scope.row.领料单备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批" align="center" min-width="80">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否审批)===0" type="warning" size="small">未审批</el-tag>
<el-tag v-else type="success" size="small">已审批</el-tag>
</template>
</el-table-column>
</el-table> </el-table>
<el-row> <div class="block" style="float:left;margin: 10px 0;">
<el-col style="width:calc(100% - 600px)">
<div class="block" style="margin: 10px 0;">
<el-pagination <el-pagination
:current-page="pageCurrent3" :current-page="pageCurrent3"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
:page-size="pageSize3" :page-size="pageSize3"
:total="total3" :total="total3"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange3" @size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/> @current-change="handleCurrentChange3"/>
</div> </div>
</el-col> </el-card>
</el-row> </div>
<el-row style="margin: 0;"> <div style="width: 72.5%;float: left">
<el-col style="width: 300px"> <el-card>
<h4>领料单明细：{{ pickingListNumberShow }}</h4> <el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="780">
</el-col>
<el-col style="float:left;width: 200px;margin-top:15px">
<el-button :disabled="SELECTION.length===0" size="small" type="warning" @click="prepareConfirm()">备料确认</el-button>
<el-button :disabled="SELECTION.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
</el-col>
</el-row>
<el-table :data="pickListTable2" highlight-current-row stripe border style="width: 100%;" size="mini" height="400" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="55"/>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="名称" prop="名称" align="center" min-width="100"> <el-table-column label="名称" prop="名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="100"> <el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }} {{ scope.row.图号或型号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" align="center" min-width="100"> <el-table-column label="规格" prop="规格" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 || '—' }} {{ scope.row.规格 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" min-width="100"> <el-table-column label="机床图号" prop="机床图号" align="center" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
@@ -87,110 +68,47 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总数量" align="center" min-width="40"> <el-table-column label="领用数" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.总数量 }} {{ scope.row.总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备件数量" align="center" min-width="50"> <el-table-column label="备件数" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备件数量 }} {{ scope.row.备件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="货位存量" align="center" min-width="50"> <el-table-column label="库存数" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货位存量1 }} {{ scope.row.货位存量1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已领数量" align="center" min-width="50"> <el-table-column label="已领数" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库数量1 }} {{ scope.row.出库数量1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出库数量" align="center" width="200"> <el-table-column label="出库数" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.出库数量" size="mini"/> <el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1)" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="true" label="备料确认" align="center" width="100"> <el-table-column v-if="true" label="备料确认" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备料</el-tag> <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备料</el-tag>
<el-tag v-else type="warning" size="mini">未备料</el-tag> <el-tag v-else type="warning" size="mini">未备料</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="true" label="领料确认" align="center" width="100"> <el-table-column v-if="true" label="领料确认" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag> <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领料</el-tag>
<el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag> <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未领完</el-tag>
<el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag> <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column label="操作" align="center" width="100" fixed="right">-->
<!--<template slot-scope="scope">-->
<!--<el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" plain type="primary" @click="sendBack(scope.row)">归还</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table> </el-table>
</el-card> </el-card>
</div>
<!--<el-card>-->
<!--<el-row>-->
<!--<el-col :span="12">-->
<!--<h4 style="margin-top:0">物料货位数量信息</h4>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--占用数量：{{ 占用数量 }}-->
<!--</el-col>-->
<!--</el-row>-->
<!--<el-table :data="StockNumberTable" border stripe style="width: 100%;" size="mini" height="300" show-summary>-->
<!--<el-table-column label="序号" align="center" type="index" width="50"/>-->
<!--<el-table-column label="名称" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料名称 || scope.row.零件名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="图号或型号" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料型号 || scope.row.零件图号 || '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="规格" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料规格 || scope.row.规格 || '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="仓库名称" align="center" min-width="70">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.仓库名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="货位名称" align="center" min-width="70">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.货位名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="货位存量" align="center" min-width="70" prop="货位存量">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.货位存量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="机床图号" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机床图号 || '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="组号" align="center" min-width="70">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.组号 || '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" align="center" width="200px">-->
<!--<template slot-scope="scope" align="center">-->
<!--<el-button :disabled="审批未通过" size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>-->
<!--<el-button :disabled="审批未通过" size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>--><!--</el-card>-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="物料出库" center width="380px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="物料出库" center width="380px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left"> <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
@@ -312,7 +230,7 @@
</template> </template>
<script> <script>
import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, updateRemark, errorRecord, searchStockNumber3, initOutType, pickingSubmit } from '@/api/Inventory/MaterialOut' import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, submitOutStore, initOutType } from '@/api/Inventory/MaterialOut'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import request from '@/utils/request' import request from '@/utils/request'
export default { export default {
@@ -326,7 +244,7 @@ export default {
pickingListNumberShow: '', pickingListNumberShow: '',
pickListTable1: [], pickListTable1: [],
pageCurrent3: 1, pageCurrent3: 1,
pageSize3: 20, pageSize3: 40,
total3: 0, total3: 0,
pickListTable2: [], pickListTable2: [],
StockNumberTable: [], StockNumberTable: [],
@@ -474,22 +392,12 @@ export default {
if (res.data[0].result === '1') { if (res.data[0].result === '1') {
this.$message.success('操作成功') this.$message.success('操作成功')
this.dialogFormVisible4 = false this.dialogFormVisible4 = false
this.clickListDetail()
this.clickList() this.clickList()
} else { } else {
this.$message.error('操作失败') this.$message.error('操作失败')
} }
}) })
}, },
UpdateRemark(row) {
updateRemark(row.领料单明细流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
} else {
this.$message.error('编辑失败')
}
})
},
// 备料确认 // 备料确认
prepareConfirm() { prepareConfirm() {
this.$confirm('是否备料确认?', '提示', { this.$confirm('是否备料确认?', '提示', {
@@ -528,45 +436,6 @@ export default {
console.log(row) console.log(row)
return ((Number(row.总数量) <= Number(row.出库数量1))) === false return ((Number(row.总数量) <= Number(row.出库数量1))) === false
}, },
// 提交领料确认
pickConfirm() {
this.$confirm('是否领料确认?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const param = {
url: '',
method: 'post',
data: {
type: '4',
name: `update 车间装配管理_领料单明细 set 是否领料确认 = 1 where 领料单明细流水号 in (${this.multipleSelection})`
}
}
pickingSubmit(this.pickingPersonNum, this.form3.password).then(res => {
if (res.data[0].result === 'success') {
request(param).then(res => {
if (res.data[0].result === '1') {
this.$message.success('操作成功')
this.dialogFormVisible3 = false
this.clickList()
} else {
this.$message.error('操作失败')
}
})
} else if (res.data[0].result === 'error') {
this.$message.error('密码错误')
} else {
this.$message.error('操作失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
})
})
},
// 初始化数据 // 初始化数据
fetchData() { fetchData() {
this.person = [] this.person = []
@@ -648,6 +517,13 @@ export default {
console.log(this.pickListTable2, 111) console.log(this.pickListTable2, 111)
}) })
}, },
tableRowClassName({ row }) {
if (parseInt(row.是否审批) === 1) {
return 'shenpi-row'
} else {
return ''
}
},
// 多选 // 多选
handleSelectionChange(val) { handleSelectionChange(val) {
console.log(val) console.log(val)
@@ -655,16 +531,18 @@ export default {
}, },
// 提交领料确认 // 提交领料确认
pickConfirm1() { pickConfirm1() {
for (let i = 0; i < this.SELECTION.length; i++) { for (let i = 0; i < this.pickListTable2.length; i++) {
this.multipleSelection.push(this.SELECTION[i].领料单明细流水号) if (this.pickListTable2[i].出库数量 !== 0) {
this.basePartNum.push(this.SELECTION[i].基本件流水号) this.multipleSelection.push(this.pickListTable2[i].领料单明细流水号)
this.materialNum.push(this.SELECTION[i].物料流水号) this.basePartNum.push(this.pickListTable2[i].基本件流水号)
this.parchasePartNum.push(this.SELECTION[i].标准件和外购件流水号) this.materialNum.push(this.pickListTable2[i].物料流水号)
this.purchaseBillNum.push(this.SELECTION[i].请购单明细流水号) this.parchasePartNum.push(this.pickListTable2[i].标准件和外购件流水号)
this.groupNumValue.push(this.SELECTION[i].组件流水号) this.purchaseBillNum.push(this.pickListTable2[i].请购单明细流水号)
this.machineValue.push(this.SELECTION[i].机床流水号) this.groupNumValue.push(this.pickListTable2[i].组件流水号)
this.offlineNum.push(this.SELECTION[i].离线采购件流水号) this.machineValue.push(this.pickListTable2[i].机床流水号)
this.outNumber.push(this.SELECTION[i].出库数量) this.offlineNum.push(this.pickListTable2[i].离线采购件流水号)
this.outNumber.push(this.pickListTable2[i].出库数量)
}
} }
submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum, this.offlineNum).then(response => { submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum, this.offlineNum).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
@@ -684,53 +562,6 @@ export default {
} else { this.$message.error('操作失败') } } else { this.$message.error('操作失败') }
}) })
}, },
// 查看领料单明细相关的物料货位数量
clickListDetail(row) {
row && row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = null, this.parchasePartNum = null, this.purchaseBillNum = null) : this.basePartNum
row && row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.materialNum
row && row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.parchasePartNum
row && row.请购单明细流水号 ? (this.purchaseBillNum = row.请购单明细流水号, this.basePartNum = null, this.materialNum = null, this.parchasePartNum = null) : this.purchaseBillNum
row && row.机床流水号 ? this.machineValue = row.机床流水号 : this.machineValue
row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
if (this.materialNum) {
searchStockNumber1(this.materialNum).then(res => {
this.StockNumberTable = res.data
})
} else if (this.basePartNum) {
searchStockNumber2(this.basePartNum).then(res => {
this.StockNumberTable = res.data
})
} else if (this.purchaseBillNum) {
searchStockNumber3(this.purchaseBillNum).then(res => {
this.StockNumberTable = res.data
})
}
},
// 出库
outStore(row) {
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
}
this.form1.machineValue = this.machineValue
this.inventoryNum = row.仓库流水号
this.locationNum = row.货位流水号
this.outNumber > row.货位存量 ? (this.form1.outNumber = row.货位存量, this.form1.outNumberMax = row.货位存量) : (this.form1.outNumber = this.outNumber, this.form1.outNumberMax = this.outNumber) // 货位存量和领料数量对比取小
this.form1.personValue = Number(this.id)
this.group = []
this.form1.groupNumValue = ''
searchgroup(this.form1.machineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.group.push({
label: response.data[i].组号,
value: Number(response.data[i].组件流水号)
})
}
}).then(() => {
this.form1.groupNumValue = this.groupNumValue
this.dialogFormVisible1 = true
})
},
// 提交出库 // 提交出库
submitOutStore() { submitOutStore() {
this.$refs['form1'].validate((valid) => { this.$refs['form1'].validate((valid) => {
@@ -741,7 +572,6 @@ export default {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('出库成功') this.$message.success('出库成功')
this.dialogFormVisible1 = false this.dialogFormVisible1 = false
this.clickListDetail()
this.clickList() this.clickList()
} else { this.$message.error('操作失败') } } else { this.$message.error('操作失败') }
}) })
@@ -749,33 +579,6 @@ export default {
return false return false
} }
}) })
},
// 异常记录
errorRecord(row) {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
this.form2.errorNumber = ''
this.form2.reason = ''
this.form2.物料流水号 = row.物料流水号
this.form2.基本件流水号 = row.基本件流水号
this.form2.货位流水号 = row.货位流水号
this.dialogFormVisible2 = true
},
// 提交异常记录
submitErrorRecord() {
this.$refs['form2'].validate((valid) => {
if (valid) {
errorRecord(this.form2.errorNumber, this.form2.reason, this.form2.物料流水号, this.form2.基本件流水号, this.form2.货位流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('记录成功')
this.dialogFormVisible2 = false
} else { this.$message.error('操作失败') }
})
} else {
return false
}
})
} }
} }
} }
@@ -795,3 +598,8 @@ export default {
margin: 0 margin: 0
} }
</style> </style>
<style>
.el-table .shenpi-row {
background: #9BD7FC !important;
}
</style>

174
src/views/Inventory/PurchaseInRecord/index.vue
View File

@@ -1,81 +1,70 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card style="width: 900px;margin: 0px 0px 5px 0px">
<div slot="header" class="clearfix"> <el-row style="margin-bottom:10px;margin-top: 10px">
<el-row style="margin-bottom:10px"> <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 150px" @change="machineChange">
<el-col style="width:250px">
<span>项目名称:</span>
<el-select v-model="projectValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width:250px">
<span>机床图号:</span>
<el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
<el-option <el-option
v-for="item in machine" v-for="item in machine"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select> </el-select>
</el-col> <el-select v-model="groupValue" style="width:150px;margin-left: 10px" placeholder="组号" size="small" clearable filterable>
<el-col style="width:250px">
<span>组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
<el-select v-model="groupValue" style="width:150px" placeholder="请选择" size="small" clearable filterable>
<el-option <el-option
v-for="item in group" v-for="item in group"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-col> <el-input v-model="name" placeholder="名称" style="width:150px;margin-left: 10px" clearable size="small"/>
<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />
</el-row> </el-row>
<el-row style="margin-bottom:10px"> <el-row style="margin-bottom:10px">
<el-col style="width:250px"> <el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;width:150px" />
<span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span> <el-date-picker
<el-input v-model="name" clearable size="small" style="width:150px" /> v-model="inTime"
</el-col> type="daterange"
<el-col style="width:250px"> size="small"
<span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span> format="yyyy-MM-dd"
<el-input v-model="spec" clearable size="small" style="width:150px" /> value-format="yyyy-MM-dd"
</el-col> range-separator="~"
<span>图号或型号:</span> style="width:250px;margin-left: 10px"
<el-input v-model="model" clearable size="small" style="width:150px" /> start-placeholder="开始时间"
end-placeholder="结束时间"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
</el-row> </el-row>
</div> </el-card>
<h4 style="margin-top: 0">采购合同入库</h4> <el-card style="width: 900px">
<el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400"> <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="700">
<el-table-column label="名称" prop="名称" align="center" width="100" show-overflow-tooltip> <el-table-column label="名称" prop="名称" align="center" min-width="100" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip> <el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号或型号 }} {{ scope.row.图号或型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" align="center" width="120" show-overflow-tooltip> <el-table-column label="规格" prop="规格" align="center" min-width="180" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库数量" align="center" width="120" show-overflow-tooltip> <el-table-column label="入库数量" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库数量 }} {{ scope.row.入库数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库人" prop="入库人" align="center" width="100" show-overflow-tooltip> <el-table-column label="入库人" prop="入库人" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库人 }} {{ scope.row.入库人 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库时间" prop="入库时间" align="center" min-width="100"> <el-table-column label="入库时间" prop="入库时间" align="center" width="145">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库时间 }} {{ scope.row.入库时间 }}
</template> </template>
@@ -92,62 +81,16 @@
@size-change="handleSizeChange1" @size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/> @current-change="handleCurrentChange1"/>
</div> </div>
<h4>离线合同入库</h4>
<el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
<el-table-column label="名称" prop="名称" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 }}
</template>
</el-table-column>
<el-table-column label="规格" prop="规格" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="入库数量" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.入库数量 }}
</template>
</el-table-column>
<el-table-column label="入库人" prop="入库人" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.入库人 }}
</template>
</el-table-column>
<el-table-column label="入库时间" prop="入库时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize2"
:total="total2"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import { initProject, searchMachine, searchGroup, searchRecord1, searchRecord2 } from '@/api/Inventory/PurchaseInRecord' import { initMachineProject, searchGroup, searchRecord1 } from '@/api/Inventory/PurchaseInRecord'
export default { export default {
name: 'PurchaseInRecord', name: 'PurchaseInRecord',
data() { data() {
return { return {
projectValue: '', // 项目名称
project: [],
machineValue: '', machineValue: '',
machine: [], machine: [],
groupValue: '', groupValue: '',
@@ -155,31 +98,27 @@ export default {
name: '', name: '',
spec: '', spec: '',
model: '', model: '',
inTime: '',
tableData1: [], tableData1: [],
tableData2: [], pageSize1: 40,
pageSize1: 10,
pageCurrent1: 1, pageCurrent1: 1,
total1: 0, total1: 0
pageSize2: 10,
pageCurrent2: 1,
total2: 0
} }
}, },
created() {
this.fetchData()
},
mounted() { mounted() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
this.searchRecord() this.searchRecord()
}, },
methods: { methods: {
projectChange() { fetchData() {
this.machine = [] initMachineProject().then(response => {
this.machineValue = ''
this.group = []
this.groupValue = ''
searchMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.machine.push({ this.machine.push({
value: response.data[i].机床流水号, label: response.data[i].机床图号,
label: response.data[i].机床图号 name: response.data[i].项目名称,
value: response.data[i].机床流水号
}) })
} }
}) })
@@ -198,35 +137,23 @@ export default {
}, },
searchRecord() { searchRecord() {
this.pageCurrent1 = 1 this.pageCurrent1 = 1
this.pageSize1 = 10 this.pageSize1 = 40
this.searchRecord1() this.searchRecord1()
this.pageCurrent2 = 1
this.pageSize2 = 10
this.searchRecord2()
}, },
searchRecord1() { searchRecord1() {
let check1, check2, check3, check4, check5, check6 let check1, check2, check3, check4, check5, check6, check7
this.projectValue ? check1 = 1 : check1 = 0 this.projectValue ? check1 = 1 : check1 = 0
this.machineValue ? check2 = 1 : check2 = 0 this.machineValue ? check2 = 1 : check2 = 0
this.groupValue ? check3 = 1 : check3 = 0 this.groupValue ? check3 = 1 : check3 = 0
this.name ? check4 = 1 : check4 = 0 this.name ? check4 = 1 : check4 = 0
this.spec ? check5 = 1 : check5 = 0 this.spec ? check5 = 1 : check5 = 0
this.model ? check6 = 1 : check6 = 0 this.model ? check6 = 1 : check6 = 0
searchRecord1(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, this.pageCurrent1, this.pageSize1).then(res => { this.outTime ? check7 = 1 : check7 = 0
searchRecord1(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.inTime[0] || '', this.inTime[1] || '', this.pageCurrent1, this.pageSize1).then(res => {
this.tableData1 = res.data.rows this.tableData1 = res.data.rows
this.total1 = res.data.total this.total1 = res.data.total
}) })
}, },
searchRecord2() {
let check4, check5, check6
this.name ? check4 = 1 : check4 = 0
this.spec ? check5 = 1 : check5 = 0
this.model ? check6 = 1 : check6 = 0
searchRecord2(check4, this.name, check5, this.spec, check6, this.model, this.pageCurrent2, this.pageSize2).then(res => {
this.tableData2 = res.data.rows
this.total2 = res.data.total
})
},
handleSizeChange1(val) { handleSizeChange1(val) {
this.pageSize1 = val this.pageSize1 = val
this.pageCurrent1 = 1 this.pageCurrent1 = 1
@@ -235,15 +162,6 @@ export default {
handleCurrentChange1(val) { handleCurrentChange1(val) {
this.pageCurrent1 = val this.pageCurrent1 = val
this.searchRecord1() this.searchRecord1()
},
handleSizeChange2(val) {
this.pageSize2 = val
this.pageCurrent2 = 1
this.searchRecord2()
},
handleCurrentChange2(val) {
this.pageCurrent2 = val
this.searchRecord2()
} }
} }
} }

96
src/views/Inventory/PurchaseOutRecord/index.vue
View File

@@ -1,55 +1,29 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card style="width: 900px;margin: 0px 0px 5px 0px">
<div slot="header" class="clearfix"> <el-row style="margin-bottom:10px;margin-top: 10px">
<el-row style="margin-bottom:10px"> <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 150px" @change="machineChange">
<el-col style="width:250px">
<span>项目名称:</span>
<el-select v-model="projectValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width:250px">
<span>机床图号:</span>
<el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
<el-option <el-option
v-for="item in machine" v-for="item in machine"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select> </el-select>
</el-col> <el-select v-model="groupValue" placeholder="组号" size="small" style="width: 150px;margin-left: 10px" clearable filterable>
<el-col style="width:250px">
<span>组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
<el-select v-model="groupValue" style="width:150px" placeholder="请选择" size="small" clearable filterable>
<el-option <el-option
v-for="item in group" v-for="item in group"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-col> <el-input v-model="name" placeholder="名称" clearable size="small" style="width:150px;margin-left: 10px" />
<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />
</el-row> </el-row>
<el-row style="margin-bottom:10px"> <el-row style="margin-bottom:10px">
<el-col style="width:250px"> <el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px" />
<span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span>
<el-input v-model="name" clearable size="small" style="width:150px" />
</el-col>
<el-col style="width:250px">
<span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span>
<el-input v-model="spec" clearable size="small" style="width:150px" />
</el-col>
<el-col style="width:250px">
<span>图号或型号:</span>
<el-input v-model="model" clearable size="small" style="width:150px" />
</el-col>
</el-row>
<el-row>
<span>出库时间:</span>
<el-date-picker <el-date-picker
v-model="outTime" v-model="outTime"
type="daterange" type="daterange"
@@ -57,29 +31,30 @@
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="~" range-separator="~"
style="width:250px" style="width:250px;margin-left: 10px"
start-placeholder="" start-placeholder="开始时间"
end-placeholder=""/> end-placeholder="结束时间"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;searchRecord()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
</el-row> </el-row>
</div> </el-card>
<el-table :data="tableData" border stripe size="mini" style="width: 100%;" height="600"> <el-card style="width: 900px">
<el-table-column label="名称" align="center" width="100" show-overflow-tooltip> <el-table :data="tableData" border stripe size="mini" style="width: 100%;" width="100%" height="700">
<el-table-column label="名称" align="center" min-width="160" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" width="120" show-overflow-tooltip> <el-table-column label="图号或型号" align="center" min-width="160" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号或型号 }} {{ scope.row.图号或型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" width="120" show-overflow-tooltip> <el-table-column label="规格" align="center" min-width="160" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出库数量" align="center" width="100" show-overflow-tooltip> <el-table-column label="出库数量" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库数量 }} {{ scope.row.出库数量 }}
</template> </template>
@@ -89,16 +64,16 @@
{{ scope.row.领料人 }} {{ scope.row.领料人 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出库时间" align="center" min-width="100"> <el-table-column label="出库时间" align="center" width="145">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库时间 }} {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin-top: 10px;">
<el-pagination <el-pagination
:current-page="pageCurrent1" :current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize1" :page-size="pageSize1"
:total="total1" :total="total1"
style="display:inline-block;width:50%" style="display:inline-block;width:50%"
@@ -111,7 +86,7 @@
</template> </template>
<script> <script>
import { initProject, searchMachine, searchGroup, searchRecord } from '@/api/Inventory/PurchaseOutRecord' import { initMachineProject, searchGroup, searchRecord } from '@/api/Inventory/PurchaseOutRecord'
export default { export default {
name: 'PurchaseOutRecord', name: 'PurchaseOutRecord',
data() { data() {
@@ -126,27 +101,26 @@ export default {
spec: '', spec: '',
model: '', model: '',
tableData: [], tableData: [],
pageSize1: 10, pageSize1: 100,
pageCurrent1: 1, pageCurrent1: 1,
total1: 0, total1: 0,
outTime: '' // 出库时间 outTime: '' // 出库时间
} }
}, },
created() {
this.fetchData()
},
mounted() { mounted() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
this.searchRecord() this.searchRecord()
}, },
methods: { methods: {
projectChange() { fetchData() {
this.machine = [] initMachineProject().then(response => {
this.machineValue = ''
this.group = []
this.groupValue = ''
searchMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.machine.push({ this.machine.push({
value: response.data[i].机床流水号, label: response.data[i].机床图号,
label: response.data[i].机床图号 name: response.data[i].项目名称,
value: response.data[i].机床流水号
}) })
} }
}) })

32
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -22,7 +22,7 @@
<el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 965px;top:135px; width: 80px;height: 48px;"> <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 963px;top:135px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">电气装配计划完成率：{{ `${data2[0].电气装配}%` }}</div> <div slot="content">电气装配计划完成率：{{ `${data2[0].电气装配}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data2[0].电气装配}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data2[0].电气装配}%` }}</el-button>
@@ -52,85 +52,85 @@
<el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data2[0].成组配套}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data2[0].成组配套}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 380px;top:95px; width: 80px;height: 48px;"> <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 448px;top:92px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">自制质检合格率：{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</div> <div slot="content">自制质检合格率：{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 197px;top:286px; width: 80px;height: 48px;"> <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 367px;top:279px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">采购质检合格率：{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</div> <div slot="content">采购质检合格率：{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检 === 11111111 ? '-' : data2[0].采购质检}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: -10px;top:155px; width: 80px;height: 48px;"> <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 157px;top:153px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">车间加工计划完成率：{{ `${data2[0].车间加工}%` }}</div> <div slot="content">车间加工计划完成率：{{ `${data2[0].车间加工}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data2[0].车间加工}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data2[0].车间加工}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -175px;top:33px; width: 80px;height: 48px;"> <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -6px;top:33px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">外协计划完成率：{{ `${data2[0].外协}%` }}</div> <div slot="content">外协计划完成率：{{ `${data2[0].外协}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data2[0].外协}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data2[0].外协}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -378px;top:94px; width: 80px;height: 48px;"> <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -208px;top:92px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">能力平衡计划完成率：{{ `${data2[0].能力平衡}%` }}</div> <div slot="content">能力平衡计划完成率：{{ `${data2[0].能力平衡}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data2[0].能力平衡}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data2[0].能力平衡}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -560px;top:93px; width: 80px;height: 48px;"> <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -390px;top:92px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">工艺定额计划完成率：{{ `${data2[0].工艺定额}%` }}</div> <div slot="content">工艺定额计划完成率：{{ `${data2[0].工艺定额}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺定额<br>{{ `${data2[0].工艺定额}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺定额<br>{{ `${data2[0].工艺定额}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -766px;top:33px; width: 80px;height: 48px;"> <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -598px;top:33px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">自家备料计划完成率：{{ `${data2[0].自家备料}%` }}</div> <div slot="content">自家备料计划完成率：{{ `${data2[0].自家备料}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data2[0].自家备料}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data2[0].自家备料}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1295px;top:236px; width: 80px;height: 48px;"> <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1125px;top:236px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">回款进度：{{ parseInt(`${data2[0].签订合同}`) + '%' }}</div> <div slot="content">回款进度：{{ parseInt(`${data2[0].签订合同}`) + '%' }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ parseInt(`${data2[0].签订合同}`) + '%' }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ parseInt(`${data2[0].签订合同}`) + '%' }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1280px;top:238px; width: 80px;height: 48px;"> <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1111px;top:236px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">产品设计计划完成率：{{ `${data2[0].产品设计}%` }}</div> <div slot="content">产品设计计划完成率：{{ `${data2[0].产品设计}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data2[0].产品设计}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data2[0].产品设计}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -1020px;top:155px; width: 80px;height: 48px;"> <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -850px;top:155px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">外购备料计划完成率：{{ `${data2[0].外购备料}%` }}</div> <div slot="content">外购备料计划完成率：{{ `${data2[0].外购备料}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data2[0].外购备料}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data2[0].外购备料}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:238px; width: 80px;height: 48px;"> <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1182px;top:236px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">零件分配计划完成率：{{ `${data2[0].零件分配}%` }}</div> <div slot="content">零件分配计划完成率：{{ `${data2[0].零件分配}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data2[0].零件分配}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data2[0].零件分配}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -382px;top:55px; width: 80px;height: 48px;"> <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1142px;top:100px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">自制投产计划完成率：{{ `${data2[0].自制件}%` }}</div> <div slot="content">自制投产计划完成率：{{ `${data2[0].自制件}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制投产<br>{{ `${data2[0].自制件}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制投产<br>{{ `${data2[0].自制件}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -468px;top:190px; width: 80px;height: 48px;"> <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1225px;top:235px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">采购计划完成率：{{ `${data2[0].车间采购}%` }}</div> <div slot="content">采购计划完成率：{{ `${data2[0].车间采购}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -550px;top:282px; width: 80px;height: 48px;"> <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -465px;top:278px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top"> <el-tooltip :open-delay="600" placement="top">
<div slot="content">采购计划完成率：{{ `${data2[0].采购部采购}%` }}</div> <div slot="content">采购计划完成率：{{ `${data2[0].采购部采购}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data2[0].采购部采购}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data2[0].采购部采购}%` }}</el-button>
@@ -4491,7 +4491,7 @@ export default {
width: 1680px; width: 1680px;
height: 400px; height: 400px;
/*border: 1px solid red;*/ /*border: 1px solid red;*/
background: url('../../../assets/img/img27.png') repeat; background: url('../../../assets/img/img28.png') repeat;
background-repeat:no-repeat; background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%; background-size:100% 100%;-moz-background-size:100% 100%;
} }