Browse Source

2024-07-30

邮件登录
java8
fengyuan_yang 2 years ago
parent
commit
ff4c446c15
  1. 1
      src/api/qc/qc.js
  2. 1
      src/router/index.js
  3. 242
      src/views/common/login-token.vue
  4. 78
      src/views/modules/qc/FAIResultEntry.vue
  5. 78
      src/views/modules/qc/FQCResultEntry.vue
  6. 78
      src/views/modules/qc/IPQCResultEntry.vue
  7. 86
      src/views/modules/qc/IQCResultEntry.vue
  8. 82
      src/views/modules/report/FAI_report.vue
  9. 82
      src/views/modules/report/FQC_report.vue
  10. 80
      src/views/modules/report/IPQC_report.vue
  11. 46
      src/views/modules/report/IQC_report.vue

1
src/api/qc/qc.js

@ -182,3 +182,4 @@ export const getIPQCItemObjectList = data => createAPI(`/pms/qc/getIPQCItemObjec
export const getInspectionStandards = data => createAPI(`/pms/qc/getInspectionStandards`,'post',data)
export const saveInspectionStandard = data => createAPI(`/pms/qc/saveInspectionStandard`,'post',data)
export const dataAcquisitionByItem = data => createAPI(`/pms/qc/dataAcquisitionByItem`,'post',data)
export const getSiteAndBuByUserName2 = data => createAPI(`/pms/qc/getSiteAndBuByUserName2`,'post',data)

1
src/router/index.js

@ -20,6 +20,7 @@ const _import = require('./import-' + process.env.NODE_ENV)
const globalRoutes = [
{ path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } },
{ path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } },
{ path: '/login-token', component: _import('common/login-token'), name: 'login', meta: { title: '登录' } },
]
// 主入口路由(需嵌套上左右整体布局)

242
src/views/common/login-token.vue

@ -0,0 +1,242 @@
<template>
<div style="width: 100vw;height: 100vh" v-loading="true" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
</div>
</template>
<script>
import { getUUID } from '@/utils'
import {getConfigParams} from '@/api/sysConfig.js'
import {
getSiteData,
} from "@/api/base/site.js"
import router from "../../router";
export default {
data () {
return {
src: 'http://192.168.1.83/upload/ifs.png',
dataForm: {
userName: '',
password: '',
uuid: '',
captcha: '',
site:''
},
siteList: [],
dataRule: {
userName: [
{ required: true, message: '帐号不能为空', trigger: 'blur' }
],
password: [
{ required: true, message: '密码不能为空', trigger: 'blur' }
]
},
captchaPath: '',
urlParam: {}
}
},
computed: {
multiLanguage: {
get() {
return this.$store.state.user.multiLanguage
},
set(val) {
this.$store.commit('user/updateMultiLanguage', val)
}
},
authControl: {
get() {
return this.$store.state.user.authControl
},
set(val) {
this.$store.commit('user/updateAuthControl', val)
}
}
},
created () {
// this.userName()
// this.getSiteData()
this.getUrlParams()
},
methods: {
// url
getUrlParams() {
let url = window.location.href
// ?
let urlStr = url.split('?')[1]
//
let obj = {};
// &
let paramsArr = urlStr.split('&')
for(let i = 0,len = paramsArr.length;i < len;i++){
// = key:value
let arr = paramsArr[i].split('=')
obj[arr[0]] = arr[1];
}
this.urlParam = obj
this.dataFormSubmit()
},
getSiteData () {
let data = {}
getSiteData(data).then(({data}) => {
this.siteList = data.rows
if (this.siteList.length > 0) {
this.dataForm.site = this.siteList[0].siteID
}
})
},
//
userName () {
this.dataForm.userName = localStorage.getItem('userName')
},
//
dataFormSubmit () {
this.$http({
url: this.$http.adornUrl('/sys/loginToken'),
method: 'post',
data: this.$http.adornData({
'username': this.urlParam.dca,
'site': this.urlParam.site
})
}).then(({data}) => {
if (data && data.code === 0) {
this.$cookie.set('token', data.token)
this.$router.replace({
name: this.urlParam.path,
params: {
site: this.urlParam.site,
buNo: this.urlParam.buNo,
docNo: this.urlParam.docNo,
type: "tokenLogin",
}
})
this.$i18n.locale = data.language
localStorage.setItem('locale', data.language)
localStorage.setItem('refresh', "0")
localStorage.setItem('userName', data.userName)
localStorage.setItem('accessSite', this.urlParam.site)
this.getConfigParams()
} else {
this.$message.error(data.msg)
}
})
},
//
getConfigParams() {
getConfigParams().then(({data}) => {
if (data && data.code == 0) {
localStorage.setItem('configParams', JSON.stringify(data.data))
// this.multiLanguage = JSON.parse(localStorage.getItem('configParams')).multiLanguage
// this.authControl = JSON.parse(localStorage.getItem('configParams')).authControl
}
})
}
}
}
</script>
<style lang="scss" scoped>
.site-wrapper.site-page--login {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background-color: rgba(38, 50, 56, 0);
overflow: hidden;
&:before {
position: fixed;
top: 0;
left: 0;
z-index: -1;
width: 80%;
height: 100%;
content: "";
background-image: url(~@/assets/img/login_bg.jpg);
background-size: cover;
}
.site-content__wrapper {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
padding: 0;
margin: 0;
overflow-x: hidden;
overflow-y: auto;
background-color: transparent;
}
.site-content {
min-height: 100%;
padding: 15% 500px 30px 30px;
}
.brand-info {
margin: 220px 100px 0 90px;
color: #fff;
}
.brand-info__text {
margin: 0 0 22px 0;
font-size: 48px;
font-weight: 400;
text-transform : uppercase;
}
.brand-info__intro {
margin: 10px 0;
font-size: 16px;
line-height: 1.58;
opacity: .6;
}
.login-main {
position: absolute;
top: 0;
right: 0;
padding: 15% 60px 180px;
width: 350px;
min-height: 100%;
background-color: transparent;
}
.login-main-2 {
position: absolute;
top: 0;
right: 0;
padding: 15% 60px 180px;
width: 350px;
min-height: 100%;
background-color: transparent;
}
.login-title {
font-size: 30px;
}
.login-captcha {
overflow: hidden;
> img {
width: 100%;
cursor: pointer;
}
}
.login-btn-submit {
width: 100%;
}
.login-main .el-input__inner{
margin-top: 10px;
height: 45px;
}
.el-button--medium {
margin-top: 0px;
padding: 5px 11px;
font-size: 16px;
border-radius: 4px;
}
.el-form-item {
margin-bottom: 5px;
}
}
</style>

78
src/views/modules/qc/FAIResultEntry.vue

@ -11,12 +11,12 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 75px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 75px">
<el-option
v-for = "i in userBuList"
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buDesc">
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
@ -264,7 +264,7 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="物料类别">
<el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
<el-input v-model="modalData.invdefinetype" readonly style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
@ -319,7 +319,7 @@
<el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料类别'">
<el-input v-model="detailData.spec" readonly style="width: 200px"></el-input>
<el-input v-model="detailData.invdefinetype" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
@ -328,7 +328,7 @@
<el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'">
<el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
<el-input v-model="detailData.partDesc" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'送检数量'">
<el-input class="numInput" v-model="detailData.rollQty" type="number" style="width: 80px"></el-input>
@ -940,6 +940,7 @@
queryPartList, //
umSearch, //
getSiteAndBuByUserName,
getSiteAndBuByUserName2,
searchSeqInfo, //
actionFAIInspection, //
dataAcquisition, //
@ -1028,7 +1029,7 @@
inspectionResult: '',
orderNo: '',
operationDesc: '',
buDesc: '',
buNo: '',
startDate: '',
endDate: '',
startDate2: '',
@ -1066,7 +1067,7 @@
submit_flag: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
orderNo: '',
sku: '',
cinvSourceCode: '',
@ -1322,31 +1323,31 @@
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1Spec',
serialNumber: '301007Table1PartDesc',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'spec',
columnProp: 'partDesc',
headerAlign: "center",
align: "left",
columnLabel: '物料类别',
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200,
columnWidth: 300,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1CinvSourceCode',
serialNumber: '301007Table1Sku',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'cinvSourceCode',
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1358,13 +1359,13 @@
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1Sku',
serialNumber: '301007Table1CinvSourceCode',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'sku',
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1376,20 +1377,20 @@
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1PartDesc',
serialNumber: '301007Table1Invdefinetype',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'partDesc',
columnProp: 'invdefinetype',
headerAlign: "center",
align: "left",
columnLabel: '物料名称',
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 300,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@ -1574,7 +1575,7 @@
submitFlag: '',
cinvSourceCode: '',
sku: '',
spec: '',
invdefinetype: '',
umId: '',
umName: '',
operator: '',
@ -2278,6 +2279,7 @@
partModelFlag: false,
umList: [],
userBuList: [],
buList: [],
authSearch: false,
authSave: false,
authCheck: false,
@ -2393,6 +2395,8 @@
this.getButtonAuthData()
// site bu
this.getSiteAndBuByUserName()
// site bu
this.getSiteAndBuByUserName2()
//
this.favoriteIsOk()
//
@ -2417,6 +2421,18 @@
methods: {
// bu
getSiteAndBuByUserName2 () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName2(tempData).then(({data}) => {
if (data.code === 0) {
this.buList = data.rows
}
})
},
//
printList () {
if (this.FAISelections.length === 0) {
@ -2660,7 +2676,7 @@
} else { //
this.modalData.partNo = ''
this.modalData.partDesc = ''
this.modalData.spec = ''
this.modalData.invdefinetype = ''
this.modalData.sku = ''
this.modalData.cinvSourceCode = ''
this.modalData.templateId = ''
@ -2739,7 +2755,7 @@
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.invdefinetype = data.rows[0].invdefinetype
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else {
@ -2911,7 +2927,7 @@
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.invdefinetype = data.rows[0].invdefinetype
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
this.modalData.operationDesc = data.rows[0].operationDesc
@ -2932,7 +2948,7 @@
this.partList = data.rows
this.modalData.partNo = this.partList[0].partNo
this.modalData.partDesc = this.partList[0].partDesc
this.modalData.spec = this.partList[0].spec
this.modalData.invdefinetype = this.partList[0].invdefinetype
this.modalData.sku = this.partList[0].sku
this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
} else {
@ -2966,7 +2982,7 @@
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
sku: '',
cinvSourceCode: '',
specialRequirements: '',
@ -3106,7 +3122,7 @@
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
sku: '',
cinvSourceCode: '',
specialRequirements: '',
@ -3192,7 +3208,7 @@
this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.spec = row.spec
this.modalData.invdefinetype = row.invdefinetype
this.partData = {
site: '',
bu: '',
@ -3551,7 +3567,7 @@
this.detailData.inspectionRemark = row.inspectionRemark
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
this.detailData.spec = row.spec
this.detailData.invdefinetype = row.invdefinetype
this.detailData.umId = row.umId
this.detailData.umName = row.umName
this.detailData.operator = row.operator

78
src/views/modules/qc/FQCResultEntry.vue

@ -11,12 +11,12 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 75px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 75px">
<el-option
v-for = "i in userBuList"
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buDesc">
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
@ -248,7 +248,7 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="物料类别">
<el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
<el-input v-model="modalData.invdefinetype" readonly style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
@ -303,7 +303,7 @@
<el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料类别'">
<el-input v-model="detailData.spec" readonly style="width: 200px"></el-input>
<el-input v-model="detailData.invdefinetype" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
@ -312,7 +312,7 @@
<el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'">
<el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
<el-input v-model="detailData.partDesc" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'送检数量'">
<el-input class="numInput" v-model="detailData.rollQty" type="number" style="width: 80px"></el-input>
@ -916,6 +916,7 @@
queryPartList, //
umSearch, //
getSiteAndBuByUserName,
getSiteAndBuByUserName2,
searchSeqInfo, //
actionFQCInspection, //
dataAcquisition, //
@ -1004,7 +1005,7 @@
inspectionResult: '',
orderNo: '',
operationDesc: '',
buDesc: '',
buNo: '',
startDate: '',
endDate: '',
partNo: '',
@ -1042,7 +1043,7 @@
submit_flag: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
sku: '',
qtyrequired: '',
lotsize:'',
@ -1296,31 +1297,31 @@
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1Spec',
serialNumber: '301015Table1PartDesc',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'spec',
columnProp: 'partDesc',
headerAlign: "center",
align: "left",
columnLabel: '物料类别',
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200,
columnWidth: 300,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1CinvSourceCode',
serialNumber: '301015Table1Sku',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'cinvSourceCode',
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1332,13 +1333,13 @@
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1Sku',
serialNumber: '301015Table1CinvSourceCode',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'sku',
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1350,20 +1351,20 @@
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1PartDesc',
serialNumber: '301015Table1Invdefinetype',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'partDesc',
columnProp: 'invdefinetype',
headerAlign: "center",
align: "left",
columnLabel: '物料名称',
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 300,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@ -1548,7 +1549,7 @@
submitFlag: '',
cinvSourceCode: '',
sku: '',
spec: '',
invdefinetype: '',
umId: '',
umName: '',
operator: '',
@ -2252,6 +2253,7 @@
partModelFlag: false,
umList: [],
userBuList: [],
buList: [],
authSearch: false,
authSave: false,
authCheck: false,
@ -2367,6 +2369,8 @@
this.getButtonAuthData()
// site bu
this.getSiteAndBuByUserName()
// site bu
this.getSiteAndBuByUserName2()
//
this.favoriteIsOk()
//
@ -2391,6 +2395,18 @@
methods: {
// bu
getSiteAndBuByUserName2 () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName2(tempData).then(({data}) => {
if (data.code === 0) {
this.buList = data.rows
}
})
},
//
printList () {
if (this.FAISelections.length === 0) {
@ -2634,7 +2650,7 @@
} else { //
this.modalData.partNo = ''
this.modalData.partDesc = ''
this.modalData.spec = ''
this.modalData.invdefinetype = ''
this.modalData.sku = ''
this.modalData.cinvSourceCode = ''
this.modalData.templateId = ''
@ -2713,7 +2729,7 @@
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.invdefinetype = data.rows[0].invdefinetype
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else {
@ -2885,7 +2901,7 @@
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.invdefinetype = data.rows[0].invdefinetype
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
this.modalData.operationDesc = data.rows[0].operationDesc
@ -2906,7 +2922,7 @@
this.partList = data.rows
this.modalData.partNo = this.partList[0].partNo
this.modalData.partDesc = this.partList[0].partDesc
this.modalData.spec = this.partList[0].spec
this.modalData.invdefinetype = this.partList[0].invdefinetype
this.modalData.sku = this.partList[0].sku
this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
} else {
@ -2940,7 +2956,7 @@
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
sku: '',
cinvSourceCode: '',
specialRequirements: '',
@ -3080,7 +3096,7 @@
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
sku: '',
cinvSourceCode: '',
specialRequirements: '',
@ -3165,7 +3181,7 @@
this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.spec = row.spec
this.modalData.invdefinetype = row.invdefinetype
this.partData = {
site: '',
bu: '',
@ -3524,7 +3540,7 @@
this.detailData.inspectionRemark = row.inspectionRemark
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
this.detailData.spec = row.spec
this.detailData.invdefinetype = row.invdefinetype
this.detailData.umId = row.umId
this.detailData.umName = row.umName
this.detailData.operator = row.operator

78
src/views/modules/qc/IPQCResultEntry.vue

@ -11,12 +11,12 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 75px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 75px">
<el-option
v-for = "i in userBuList"
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buDesc">
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
@ -252,7 +252,7 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="物料类别">
<el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
<el-input v-model="modalData.invdefinetype" readonly style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
@ -317,7 +317,7 @@
<el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料类别'">
<el-input v-model="detailData.spec" readonly style="width: 200px"></el-input>
<el-input v-model="detailData.invdefinetype" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
@ -326,7 +326,7 @@
<el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'">
<el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
<el-input v-model="detailData.partDesc" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'送检数量'">
<el-input class="numInput" v-model="detailData.rollQty" type="number" style="width: 80px"></el-input>
@ -943,6 +943,7 @@
queryPartList, //
umSearch, //
getSiteAndBuByUserName,
getSiteAndBuByUserName2,
searchSeqInfo, //
actionIPQCInspection, //
dataAcquisition, //
@ -1031,7 +1032,7 @@
inspectionResult: '',
orderNo: '',
operationDesc: '',
buDesc: '',
buNo: '',
startDate: '',
endDate: '',
startDate2: '',
@ -1076,7 +1077,7 @@
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
sku: '',
cinvSourceCode: '',
qtyrequired: '',
@ -1348,31 +1349,31 @@
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1Spec',
serialNumber: '301014Table1PartDesc',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'spec',
columnProp: 'partDesc',
headerAlign: "center",
align: "left",
columnLabel: '物料类别',
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200,
columnWidth: 300,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1cinvSourceCode',
serialNumber: '301014Table1Sku',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'cinvSourceCode',
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1384,13 +1385,13 @@
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1Sku',
serialNumber: '301014Table1cinvSourceCode',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'sku',
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1402,20 +1403,20 @@
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1PartDesc',
serialNumber: '301014Table1Invdefinetype',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'partDesc',
columnProp: 'invdefinetype',
headerAlign: "center",
align: "left",
columnLabel: '物料名称',
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 300,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@ -1600,7 +1601,7 @@
submitFlag: '',
cinvSourceCode: '',
sku: '',
spec: '',
invdefinetype: '',
umId: '',
umName: '',
operator: '',
@ -2331,6 +2332,7 @@
partModelFlag: false,
umList: [],
userBuList: [],
buList: [],
authSearch: false,
authSave: false,
authCheck: false,
@ -2446,6 +2448,8 @@
this.getButtonAuthData()
// site bu
this.getSiteAndBuByUserName()
// site bu
this.getSiteAndBuByUserName2()
//
this.favoriteIsOk()
//
@ -2470,6 +2474,18 @@
methods: {
// bu
getSiteAndBuByUserName2 () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName2(tempData).then(({data}) => {
if (data.code === 0) {
this.buList = data.rows
}
})
},
//
printList () {
if (this.IPQCSelections.length === 0) {
@ -2713,7 +2729,7 @@
} else { //
this.modalData.partNo = ''
this.modalData.partDesc = ''
this.modalData.spec = ''
this.modalData.invdefinetype = ''
this.modalData.sku = ''
this.modalData.cinvSourceCode = ''
this.modalData.templateId = ''
@ -2792,7 +2808,7 @@
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.invdefinetype = data.rows[0].invdefinetype
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else {
@ -3070,7 +3086,7 @@
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.invdefinetype = data.rows[0].invdefinetype
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
this.modalData.operationDesc = data.rows[0].operationDesc
@ -3112,7 +3128,7 @@
this.partList = data.rows
this.modalData.partNo = this.partList[0].partNo
this.modalData.partDesc = this.partList[0].partDesc
this.modalData.spec = this.partList[0].spec
this.modalData.invdefinetype = this.partList[0].invdefinetype
this.modalData.sku = this.partList[0].sku
this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
} else {
@ -3161,7 +3177,7 @@
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
sku: '',
cinvSourceCode: '',
specialRequirements: '',
@ -3248,7 +3264,7 @@
this.modalData.partNo = row.partNo
this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku
this.modalData.spec = row.spec
this.modalData.invdefinetype = row.invdefinetype
this.modalData.cinvSourceCode = row.cinvSourceCode
this.partData = {
site: '',
@ -3284,7 +3300,7 @@
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
invdefinetype: '',
sku: '',
cinvSourceCode: '',
specialRequirements: '',
@ -3612,7 +3628,7 @@
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.spec = row.spec
this.detailData.invdefinetype = row.invdefinetype
this.detailData.umId = row.umId
this.detailData.umName = row.umName
this.detailData.operator = row.operator

86
src/views/modules/qc/IQCResultEntry.vue

@ -11,12 +11,12 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 75px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 75px">
<el-option
v-for = "i in userBuList"
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buDesc">
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
@ -199,32 +199,41 @@
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'物料编码'">
<el-input v-model="detailData.partNo" disabled style="width: 120px"></el-input>
<el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'">
<el-input v-model="detailData.partDesc" disabled style="width: 220px"></el-input>
<el-form-item :label="'物料类别'">
<el-input v-model="detailData.invdefinetype" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'计量单位'">
<el-input v-model="detailData.umId" disabled style="width: 120px"></el-input>
<el-form-item :label="'SKU'">
<el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'">
<el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
</el-form-item>
<el-form-item :label="'到货数量'">
<el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 120px"></el-input>
<el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'送检数量'">
<el-input class="numInput" v-model="detailData.rollCount" type="number" style="width: 120px"></el-input>
<el-input class="numInput" v-model="detailData.rollCount" type="number" style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'抽样数量'">
<el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 120px"></el-input>
<el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'不合格项目数量'">
<el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
<el-form-item :label="'单位'">
<el-input v-model="detailData.umId" disabled style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="' '" style="margin-left: 38px">
<el-form-item :label="' '" style="margin-left: 0px">
<el-button v-if="detailData.submitFlag !== 'Y'" type="primary" :loading="loadFlag" @click="dataAcquisition">数据采集</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top">
<el-form-item :label="'不合格项目数量'">
<el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'检验结论'">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
<el-option label="合格" value="合格"></el-option>
@ -260,12 +269,12 @@
<el-form-item>
<span v-if="detailData.submitFlag === 'Y'" slot="label">协同人员</span>
<span v-else style="cursor: pointer" slot="label" @click="getOperatorList"><a>协同人员</a></span>
<el-input v-model="detailData.operatorName" readonly style="width: 224px"></el-input>
<el-input v-model="detailData.operatorName" readonly style="width: 173px"></el-input>
</el-form-item>
<el-form-item>
<span v-if="detailData.submitFlag === 'Y'" slot="label">责任人</span>
<span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>
<el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>
<el-input v-model="detailData.responsiblePersonName" readonly style="width: 173px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
@ -649,6 +658,7 @@
disposalMeasuresSearch, //
iqcRecordOverLoad, //
getSiteAndBuByUserName,
getSiteAndBuByUserName2,
orderTypeSearch, //
actionIQCInspection, //
dataAcquisition, //
@ -729,7 +739,7 @@
inspectionNo: '',
inspectionTypeNo:'105',
isQualified: '',
buDesc: '',
buNo: '',
startDate: '',
endDate: '',
startDate2: '',
@ -781,7 +791,8 @@
inspectorNo:'',
inspectorName:'',
isQualified:'',
isQualifiedChinese:''
isQualifiedChinese:'',
invdefinetype: '',
},
//
// columnList1: [],
@ -966,6 +977,24 @@
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1Invdefinetype',
tableId: "301006Table1",
tableName: "IPQC检验记录表",
columnProp: 'invdefinetype',
headerAlign: "center",
align: "left",
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
@ -1585,7 +1614,8 @@
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: ''
responsiblePersonName: '',
invdefinetype: '',
},
detailInformationFlag: false,
detailList: [],
@ -1645,6 +1675,7 @@
disposalMeasuresOptions: [],
orderTypeList: [],
userBuList: [],
buList: [],
authSearch: false,
authCheck: false,
authOverLoad: false,
@ -1758,6 +1789,8 @@
this.getButtonAuthData()
// site bu
this.getSiteAndBuByUserName()
// site bu
this.getSiteAndBuByUserName2()
this.favoriteIsOk()
this.disposalMeasuresSearch()
this.orderTypeSearch()
@ -1774,6 +1807,18 @@
methods: {
// bu
getSiteAndBuByUserName2 () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName2(tempData).then(({data}) => {
if (data.code === 0) {
this.buList = data.rows
}
})
},
//
printList () {
if (this.IQCSelections.length === 0) {
@ -2450,6 +2495,7 @@
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.invdefinetype = row.invdefinetype
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []

82
src/views/modules/report/FAI_report.vue

@ -11,12 +11,12 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 75px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 75px">
<el-option
v-for = "i in userBuList"
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buDesc">
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
@ -193,7 +193,7 @@
getFAIReport, // FAI
} from "@/api/qc/qc_report.js"
import {
getSiteAndBuByUserName, // site bu
getSiteAndBuByUserName2, // site bu
selectFAISubDetailedRecord, //
disposalMeasuresSearch, //
} from "@/api/qc/qc.js"
@ -229,7 +229,7 @@
inspectionResult: '',
orderNo: '',
operationDesc: '',
buDesc: '',
buNo: '',
startDate: '',
endDate: '',
startDate2: '',
@ -491,20 +491,20 @@
{
userId: this.$store.state.user.name,
functionId: 107001003,
serialNumber: '107001003Table1cinvSourceCode',
serialNumber: '107001003Table1PartDesc',
tableId: "107001003Table1",
tableName: "FAI报表",
columnProp: 'cinvSourceCode',
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
align: "left",
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
columnWidth: 350,
},
{
userId: this.$store.state.user.name,
@ -527,20 +527,38 @@
{
userId: this.$store.state.user.name,
functionId: 107001003,
serialNumber: '107001003Table1PartDesc',
serialNumber: '107001003Table1cinvSourceCode',
tableId: "107001003Table1",
tableName: "FAI报表",
columnProp: 'partDesc',
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "left",
columnLabel: '物料名称',
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 350,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 107001003,
serialNumber: '107001003Table1Invdefinetype',
tableId: "107001003Table1",
tableName: "FAI报表",
columnProp: 'invdefinetype',
headerAlign: "center",
align: "center",
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@ -906,7 +924,7 @@
},
],
options: [],
userBuList: [],
buList: [],
authSearch: false,
menuId: this.$route.meta.menuId,
subDetailModalFlag: false,
@ -922,11 +940,19 @@
})
},
activated () {
if (this.$route.params.type === 'tokenLogin') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.inspectionNo = this.$route.params.docNo
}
this.getDataList()
},
created () {
//
this.getButtonAuthData()
// site bu
this.getSiteAndBuByUserName()
this.getSiteAndBuByUserName2()
//
this.disposalMeasuresSearch()
//
@ -941,22 +967,6 @@
methods: {
exportAllIQCRecord () {
// exportAllIQCRecord(this.searchData).then(({data}) => {
// if (data && data.code === 0) {
// this.$message({
// message: '',
// type: 'success',
// duration: 1500
// })
// } else {
// this.$alert(data.msg, '', {
// confirmButtonText: ''
// })
// }
// })
},
//
FAIClickRow (row) {
this.currentRow = JSON.parse(JSON.stringify(row))
@ -969,13 +979,13 @@
},
// bu
getSiteAndBuByUserName () {
getSiteAndBuByUserName2 () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName(tempData).then(({data}) => {
getSiteAndBuByUserName2(tempData).then(({data}) => {
if (data.code === 0) {
this.userBuList = data.rows
this.buList = data.rows
}
})
},

82
src/views/modules/report/FQC_report.vue

@ -11,12 +11,12 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 75px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 75px">
<el-option
v-for = "i in userBuList"
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buDesc">
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
@ -193,7 +193,7 @@
getFQCReport, // IPQC
} from "@/api/qc/qc_report.js"
import {
getSiteAndBuByUserName, // site bu
getSiteAndBuByUserName2, // site bu
selectFQCSubDetailedRecord, //
disposalMeasuresSearch, //
} from "@/api/qc/qc.js"
@ -229,7 +229,7 @@
inspectionResult: '',
orderNo: '',
operationDesc: '',
buDesc: '',
buNo: '',
startDate: '',
endDate: '',
partNo: '',
@ -491,20 +491,20 @@
{
userId: this.$store.state.user.name,
functionId: 107001004,
serialNumber: '107001004Table1cinvSourceCode',
serialNumber: '107001004Table1PartDesc',
tableId: "107001004Table1",
tableName: "FQC报表",
columnProp: 'cinvSourceCode',
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
align: "left",
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
columnWidth: 350,
},
{
userId: this.$store.state.user.name,
@ -527,20 +527,38 @@
{
userId: this.$store.state.user.name,
functionId: 107001004,
serialNumber: '107001004Table1PartDesc',
serialNumber: '107001004Table1cinvSourceCode',
tableId: "107001004Table1",
tableName: "FQC报表",
columnProp: 'partDesc',
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "left",
columnLabel: '物料名称',
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 350,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 107001004,
serialNumber: '107001004Table1Invdefinetype',
tableId: "107001004Table1",
tableName: "FQC报表",
columnProp: 'invdefinetype',
headerAlign: "center",
align: "center",
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@ -906,7 +924,7 @@
},
],
options: [],
userBuList: [],
buList: [],
authSearch: false,
menuId: this.$route.meta.menuId,
subDetailModalFlag: false,
@ -922,11 +940,19 @@
})
},
activated () {
if (this.$route.params.type === 'tokenLogin') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.inspectionNo = this.$route.params.docNo
}
this.getDataList()
},
created () {
//
this.getButtonAuthData()
// site bu
this.getSiteAndBuByUserName()
this.getSiteAndBuByUserName2()
//
this.disposalMeasuresSearch()
//
@ -941,22 +967,6 @@
methods: {
exportAllIQCRecord () {
// exportAllIQCRecord(this.searchData).then(({data}) => {
// if (data && data.code === 0) {
// this.$message({
// message: '',
// type: 'success',
// duration: 1500
// })
// } else {
// this.$alert(data.msg, '', {
// confirmButtonText: ''
// })
// }
// })
},
//
FQCClickRow (row) {
this.currentRow = JSON.parse(JSON.stringify(row))
@ -969,13 +979,13 @@
},
// bu
getSiteAndBuByUserName () {
getSiteAndBuByUserName2 () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName(tempData).then(({data}) => {
getSiteAndBuByUserName2(tempData).then(({data}) => {
if (data.code === 0) {
this.userBuList = data.rows
this.buList = data.rows
}
})
},

80
src/views/modules/report/IPQC_report.vue

@ -11,12 +11,12 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 75px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 75px">
<el-option
v-for = "i in userBuList"
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buDesc">
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
@ -197,7 +197,7 @@
getIPQCReport, // IPQC
} from "@/api/qc/qc_report.js"
import {
getSiteAndBuByUserName, // site bu
getSiteAndBuByUserName2, // site bu
selectIPQCSubDetailedRecord, //
disposalMeasuresSearch, //
} from "@/api/qc/qc.js"
@ -233,7 +233,7 @@
inspectionResult: '',
orderNo: '',
operationDesc: '',
buDesc: '',
buNo: '',
startDate: '',
endDate: '',
startDate2: '',
@ -514,20 +514,20 @@
{
userId: this.$store.state.user.name,
functionId: 107001002,
serialNumber: '107001002Table1cinvSourceCode',
serialNumber: '107001002Table1PartDesc',
tableId: "107001002Table1",
tableName: "IPQC报表",
columnProp: 'cinvSourceCode',
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
align: "left",
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
columnWidth: 350,
},
{
userId: this.$store.state.user.name,
@ -550,20 +550,38 @@
{
userId: this.$store.state.user.name,
functionId: 107001002,
serialNumber: '107001002Table1PartDesc',
serialNumber: '107001002Table1cinvSourceCode',
tableId: "107001002Table1",
tableName: "IPQC报表",
columnProp: 'partDesc',
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "left",
columnLabel: '物料名称',
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 350,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 107001002,
serialNumber: '107001002Table1Invdefinetype',
tableId: "107001002Table1",
tableName: "IPQC报表",
columnProp: 'invdefinetype',
headerAlign: "center",
align: "center",
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@ -929,7 +947,7 @@
},
],
options: [],
userBuList: [],
buList: [],
authSearch: false,
menuId: this.$route.meta.menuId,
subDetailModalFlag: false,
@ -945,11 +963,19 @@
})
},
activated () {
if (this.$route.params.type === 'tokenLogin') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.inspectionNo = this.$route.params.docNo
}
this.getDataList()
},
created () {
//
this.getButtonAuthData()
// site bu
this.getSiteAndBuByUserName()
this.getSiteAndBuByUserName2()
//
this.disposalMeasuresSearch()
//
@ -964,22 +990,6 @@
methods: {
exportAllIQCRecord () {
// exportAllIQCRecord(this.searchData).then(({data}) => {
// if (data && data.code === 0) {
// this.$message({
// message: '',
// type: 'success',
// duration: 1500
// })
// } else {
// this.$alert(data.msg, '', {
// confirmButtonText: ''
// })
// }
// })
},
//
IPQCClickRow (row) {
this.currentRow = JSON.parse(JSON.stringify(row))
@ -992,11 +1002,11 @@
},
// bu
getSiteAndBuByUserName () {
getSiteAndBuByUserName2 () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName(tempData).then(({data}) => {
getSiteAndBuByUserName2(tempData).then(({data}) => {
if (data.code === 0) {
this.userBuList = data.rows
}

46
src/views/modules/report/IQC_report.vue

@ -11,12 +11,12 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'BU'">
<el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 75px">
<el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 75px">
<el-option
v-for = "i in userBuList"
v-for = "i in buList"
:key = "i.buNo"
:label = "i.buDesc"
:value = "i.buDesc">
:value = "i.buNo">
</el-option>
</el-select>
</el-form-item>
@ -212,7 +212,7 @@
getIQCReport, // IQC
} from "@/api/qc/qc_report.js"
import {
getSiteAndBuByUserName, // site bu
getSiteAndBuByUserName2, // site bu
selectIQCSubDetailedRecord, //
disposalMeasuresSearch, //
orderTypeSearch, //
@ -251,7 +251,7 @@
inspectionNo: '',
inspectionTypeNo:'105',
isQualified: '',
buDesc: '',
buNo: '',
startDate: '',
endDate: '',
startDate2: '',
@ -481,6 +481,24 @@
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 107001001,
serialNumber: '107001001Table1Invdefinetype',
tableId: "107001001Table1",
tableName: "IQC报表",
columnProp: 'invdefinetype',
headerAlign: "center",
align: "left",
columnLabel: '物料类别',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 107001001,
@ -971,7 +989,7 @@
},
],
options: [],
userBuList: [],
buList: [],
authSearch: false,
menuId: this.$route.meta.menuId,
subDetailModalFlag: false,
@ -988,11 +1006,19 @@
})
},
activated () {
if (this.$route.params.type === 'tokenLogin') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.inspectionNo = this.$route.params.docNo
}
this.getDataList()
},
created () {
//
this.getButtonAuthData()
// site bu
this.getSiteAndBuByUserName()
this.getSiteAndBuByUserName2()
//
this.disposalMeasuresSearch()
this.orderTypeSearch()
@ -1033,13 +1059,13 @@
},
// bu
getSiteAndBuByUserName () {
getSiteAndBuByUserName2 () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName(tempData).then(({data}) => {
getSiteAndBuByUserName2(tempData).then(({data}) => {
if (data.code === 0) {
this.userBuList = data.rows
this.buList = data.rows
}
})
},

Loading…
Cancel
Save