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
2020-06-03 08:46:28 +08:00
parent d30a808bc9
commit cef05b6165
9 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/utils/request.js
View File

@@ -2,8 +2,8 @@ import axios from 'axios'
import { wsuri_config, name_config, name1_config, name3_config, name4_config, readFile_config, readImg_config, upload_config, upload2_config, upload3_config, uploadInvoiceScan_config, uploadInvoiceScan1_config,
download_config, uploadPerson_config, uploadOP_config, url_config, ExcelDownLoad_config, ServerIP_config, uploadFileMachine_config,
downloadFileMachine_config, MESUploadFile_config, MESDownloadFile_config, request_config } from '../../static/config'
// import Cookies from 'js-cookie'
// import store from '@/store'
import Cookies from 'js-cookie'
import store from '@/store'
export const wsuri = wsuri_config
export const name = name_config
@@ -36,16 +36,17 @@ const service = axios.create({
// && config.data.name !== '菜单系统模块_通知信息_查询数据' && config.data.name !== '菜单系统模块_首页信息_查询数据1' && config.data.name !== '菜单系统模块_首页信息_查询数据2'
service.interceptors.request.use(config => {
// if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') {
// getSession_id().then(res => {
// if (res === 0) {
// store.dispatch('FedLogOut').then(() => {
// location.reload() // 为了重新实例化vue-router对象 避免bug
// alert('此账号已异地登录，请查重新登录')
// })
// }
// })
// }
if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') {
const id = Cookies.get('id')
if (id) {
console.log(id, 123)
} else {
store.dispatch('FedLogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
alert('此账号登录失效，请重新登录')
})
}
}
return config
}, error => {
Promise.reject(error)

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

@@ -58,7 +58,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 v-positive="'loading'" type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
<el-button v-positive="'loading'" type="success" 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>

20
src/views/Inventory/MaterialReturn/index.vue
View File

@@ -130,20 +130,20 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="补投" center width="300px">
<el-dialog :visible.sync="dialogFormVisible" title="退料" center width="300px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="80px" class="demo-ruleForm">
<div>
<ei-row>
<span>{{ nameOrNumber }}</span>
</ei-row>
<el-row>
<span>出库数量:{{ outNumber }}</span>
<el-row style="margin-bottom: 7px">
<span style="font-size: 14px;font-weight: 700">{{ nameOrNumber }}</span>
</el-row>
<el-row>
<span>领料人:{{ people }}</span>
<el-row style="margin-bottom: 7px">
<span style="font-size: 14px;font-weight: 700">出库数量:{{ outNumber }}</span>
</el-row>
<el-row>
<span>出库时间:{{ time }}</span>
<el-row style="margin-bottom: 7px">
<span style="font-size: 14px;font-weight: 700">领料人:{{ people }}</span>
</el-row>
<el-row style="margin-bottom: 7px">
<span style="font-size: 14px;font-weight: 700">出库时间:{{ time }}</span>
</el-row>
</div>
<el-form-item label="退料数量" prop="退料数量">

4
src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
View File

@@ -14,9 +14,9 @@
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-select>142
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
<el-button v-positive="'loading'" :disabled="false" size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" size="small" type="success" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row show-summary border style="width: 1510px;" size="mini" height="700">

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

@@ -45,14 +45,14 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="投产数" width="70px">
<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="70px">
<el-table-column align="center" label="质检数" width="70px">
<template slot-scope="scope">
{{ scope.row.加工数 }}
{{ scope.row.质检数 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70px">

46
src/views/ManufacturingCenter/MaterialAllocation/index.vue
View File

@@ -63,6 +63,7 @@
label="机床图号"
align="center"
prop="机床图号"
show-overflow-tooltip=""
min-width="100px">
<template slot-scope="scope">{{ scope.row.机床图号 }}</template>
</el-table-column>
@@ -74,13 +75,34 @@
<template slot-scope="scope">{{ scope.row.组号 }}</template>
</el-table-column>
<el-table-column
label="零件图号"
label="名称"
align="center"
prop="零件图号"
min-width="140px">
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
prop="名称"
min-width="60px">
<template slot-scope="scope">{{ scope.row.名称 }}</template>
</el-table-column>
<el-table-column
label="图号或型号"
align="center"
prop="图号或型号"
min-width="140px">
<template slot-scope="scope">{{ scope.row.图号或型号 }}</template>
</el-table-column>
<el-table-column
label="规格"
prop="规格"
align="center"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.规格 }}</template>
</el-table-column>
<el-table-column
label="材料"
prop="材料"
align="center"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.材料 }}</template>
</el-table-column>
<!-- <el-table-column
label="零件名称"
align="center"
prop="零件名称"
@@ -95,7 +117,7 @@
min-width="140px"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.物料名称 }}</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="零件数量"
width="80"
@@ -112,20 +134,6 @@
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column
label="材料"
prop="材料"
align="center"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.材料 }}</template>
</el-table-column>
<el-table-column
label="规格"
prop="规格"
align="center"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.规格 }}</template>
</el-table-column>
<!-- <el-table-column
label="备注"
align="center">

4
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -170,10 +170,10 @@
<el-form-item v-show="flag != 2" label="项目名称" prop="项目名称">
<el-input v-model="form1.项目名称" size="small" style="width:200px"/>
</el-form-item>
<el-form-item label="设备型号" prop="设备型号">
<el-form-item label="机床图号" prop="机床图号">
<el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
</el-form-item>
<el-form-item label="设备名称" prop="设备名称">
<el-form-item label="机床名称" prop="机床名称">
<el-input v-model="form1.设备名称" size="small" placeholder="请输入设备名称" style="width:200px"/>
</el-form-item>
<el-form-item label="机床数量" prop="机床数量">

5
src/views/Outsourcing/OutsourcingPartsQuery/index.vue
View File

@@ -26,11 +26,6 @@
<el-tag v-if="Number(scope.row.外协状态)==3 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" width="115px">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}

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

@@ -18,7 +18,7 @@
<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-button v-positive="'loading'" type="success" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
</el-card>
<el-card>
@@ -38,7 +38,7 @@
</div>
</el-card>
<el-card>
<div style="font-size: 22px;font-weight: bold;margin-top: 5px">自制件</div>
<div style="font-size: 18px;margin-top: 5px">自制件</div>
<el-table
v-loading="loading"
:data="tableData"
@@ -60,7 +60,7 @@
align="center"
prop="机床图号"
fixed="left"
min-width="150px">
width="130px">
<template slot-scope="scope">{{ scope.row.机床图号 }}</template>
</el-table-column>
<el-table-column
@@ -68,7 +68,7 @@
align="center"
prop="组号"
fixed="left"
min-width="80px">
width="80px">
<template slot-scope="scope">{{ scope.row.组号 }}</template>
</el-table-column>
<el-table-column
@@ -76,7 +76,7 @@
align="center"
prop="零件图号"
fixed="left"
min-width="200px">
width="150px">
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
</el-table-column>
<el-table-column
@@ -128,6 +128,16 @@
align="center">
<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">
<template slot-scope="scope">
{{ scope.row.操作日期 | formatTime }}
</template>
</el-table-column>
<el-table-column align="center" label="分类码" width="150">
<template slot-scope="scope">
{{ scope.row.分类码 }}
@@ -143,16 +153,6 @@
{{ 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.操作日期 | formatTime }}
</template>
</el-table-column>
<!--<el-table-column label="操作" fixed="right" align="center" width="100">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
@@ -176,10 +176,10 @@
</div>
</el-card>
<el-card>
<div style="font-size: 22px;font-weight: bold;margin-top: 5px">
<div style="font-size: 18px;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-button v-positive="'loading'" type="success" 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>
@@ -234,16 +234,6 @@
{{ scope.row.标记 }}
</template>
</el-table-column>
<el-table-column align="center" label="分类码" width="150">
<template slot-scope="scope">
{{ scope.row.分类码 }}
</template>
</el-table-column>
<el-table-column align="center" label="整改类型" width="150">
<template slot-scope="scope">
{{ scope.row.整改类型 }}
</template>
</el-table-column>
<el-table-column align="center" label="导入人" width="100">
<template slot-scope="scope">
{{ scope.row.导入人员 }}
@@ -254,6 +244,16 @@
{{ scope.row.操作日期 | formatTime }}
</template>
</el-table-column>
<el-table-column align="center" label="分类码" width="150">
<template slot-scope="scope">
{{ scope.row.分类码 }}
</template>
</el-table-column>
<el-table-column align="center" label="整改类型" width="150">
<template slot-scope="scope">
{{ scope.row.整改类型 }}
</template>
</el-table-column>
<!--<el-table-column label="操作" fixed="right" align="center" width="150">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->