wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-06-06 

功能优化
java8
fengyuan_yang 2 years ago
parent
72e151fe8c
commit
33abd4a76a
7 changed files with 1784 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/api/qc/qc.js
  2. 10
      src/views/modules/eam/eamWorkOrderForCheck.vue
  3. 8
      src/views/modules/eam/eamWorkOrderForMaintenance.vue
  4. 465
      src/views/modules/qc/FAIResultEntry.vue
  5. 466
      src/views/modules/qc/FQCResultEntry.vue
  6. 466
      src/views/modules/qc/IPQCResultEntry.vue
  7. 469
      src/views/modules/qc/IQCResultEntry.vue

5
src/api/qc/qc.js
View File

@ -162,6 +162,11 @@ export const searchSeqInfo = data => createAPI(`/pms/qc/searchSeqInfo`,'post',da
export const searchPartInfo = data => createAPI(`/pms/qc/searchPartInfo`,'post',data)
// 获取采购类型
export const orderTypeSearch = data => createAPI(`/pms/qc/orderTypeSearch`,'post',data)
export const actionIQCInspection = data => createAPI(`/pms/qc/actionIQCInspection`,'post',data)
export const actionFAIInspection = data => createAPI(`/pms/qc/actionFAIInspection`,'post',data)
export const actionIPQCInspection = data => createAPI(`/pms/qc/actionIPQCInspection`,'post',data)
export const actionFQCInspection = data => createAPI(`/pms/qc/actionFQCInspection`,'post',data)
export const dataAcquisition = data => createAPI(`/pms/qc/dataAcquisition`,'post',data)

10
src/views/modules/eam/eamWorkOrderForCheck.vue
View File

@ -854,6 +854,7 @@
reachDate: '',
actualDate: '',
operator: '',
adminID: ''
},
columnDetailList: [
{
@ -1419,6 +1420,7 @@
reachDate: row.reachDate,
actualDate: row.actualDate,
operator: row.operator,
adminID: row.adminID
}
this.detailModelFlag = true
},
@ -1621,9 +1623,17 @@
// 查询机修人员列表
getOperatorList2 () {
// 拿到选中的人员编号
let tempDataList = (this.saveData.adminID == null ? '' : this.saveData.adminID).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}

8
src/views/modules/eam/eamWorkOrderForMaintenance.vue
View File

@ -1552,9 +1552,17 @@
// 查询机修人员列表
getOperatorList2 () {
// 拿到选中的人员编号
let tempDataList = (this.saveData.adminID == null ? '' : this.saveData.adminID).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}

465
src/views/modules/qc/FAIResultEntry.vue
View File

@ -48,6 +48,7 @@
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.state" clearable style="width: 80px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
<el-option label="已完成" value="已完成"></el-option>
@ -156,7 +157,8 @@
width="130"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" v-if="!authDetail" @click="detailModal(scope.row)">检验单</el-link>
<el-link style="cursor: pointer" v-if="!authDetail && scope.row.state === '未开始'" @click="actionModal(scope.row)">开始检验</el-link>
<el-link style="cursor: pointer" v-if="!authDetail && scope.row.state !== '未开始'" @click="detailModal(scope.row)">检验单</el-link>
<el-link style="cursor: pointer" v-if="!authFile" @click="getFileContentData(scope.row)">工作文件</el-link>
</template>
</el-table-column>
@ -336,6 +338,9 @@
<el-form-item :label="'单位'">
<el-input v-model="detailData.umName" readonly style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<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" @keyup.enter.native = "getDataList">
<el-form-item :label="'不合格项目数量'">
@ -356,28 +361,6 @@
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
</el-form-item>
<el-form-item v-if="detailData.inspectionResult === '不合格'" :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
<el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="detailData.inspectionResult === '不合格'" :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="检验员">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
<el-option
@ -396,11 +379,45 @@
</el-option>
</el-select>
</el-form-item>
<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: 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: 173px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
</el-form-item>
</el-form>
<el-form v-show="detailData.inspectionResult === '不合格'" :inline="true" label-position="top">
<el-form-item :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
<el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 280px"></el-input>
</el-form-item>
</el-form>
<!-- 展示列表 -->
<div class="rq ">
<el-table
@ -754,6 +771,67 @@
</el-table>
</el-dialog>
<!-- 机修人员清单 -->
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'用户编码'">
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'用户姓名'">
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="300"
:data="operatorList"
ref="operatorTable"
@row-click="operatorClickRow"
@selection-change="selectionChangeHandle2"
border
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
v-for="(item,index) in operatorDetailList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</div>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="confirmOperator">确认</el-button>
<el-button type="primary" @click="operatorModelFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- chooseList模态框 -->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
@ -794,11 +872,17 @@
umSearch, // 查询单位列表
getSiteAndBuByUserName,
searchSeqInfo, // 派工单号查询
actionFAIInspection, // 开始检验
dataAcquisition, // 数据采集
} from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
import {deleteObjectFile} from '@/api/eam/eam.js'
import {
deleteObjectFile,
getUserRoleList, // 获取用户角色列表
getOperatorList
} from '@/api/eam/eam.js'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
@ -827,6 +911,7 @@
},
data () {
return {
loadFlag: false,
inspectionNo: '',
fileFlag: false,
fileContentList: [],
@ -1307,6 +1392,24 @@
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1ActionDate',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'actionDate',
headerAlign: "center",
align: "center",
columnLabel: '开始检验时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
@ -1384,7 +1487,11 @@
sku: '',
spec: '',
umId: '',
umName: ''
umName: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: ''
},
detailInformationFlag: false,
detailList: [],
@ -1402,6 +1509,11 @@
unqualifiedQty: '',
partNo: '',
partDesc: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: []
},
detailColumnList: [
{
@ -2081,6 +2193,70 @@
authDetail: false,
authFile: false,
menuId: this.$route.meta.menuId,
roleList: [],
operatorList: [],
operatorData: {
flag: '',
site: '',
bu: '',
adminID: '',
adminName: '',
roleName: '',
roleId: '',
},
operatorModelFlag: false,
dataListSelections2: [],
operatorDetailList: [
{
columnProp: 'adminID',
headerAlign: "center",
align: "center",
columnLabel: '用户账号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'adminName',
headerAlign: "center",
align: "center",
columnLabel: '用户名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'email',
headerAlign: "center",
align: "center",
columnLabel: '邮箱',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'phone',
headerAlign: "center",
align: "center",
columnLabel: '手机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
],
acquisitionList: []
}
},
@ -2113,9 +2289,207 @@
// 获取数据列表
this.getDataList()
}
// 获取用户角色
this.getUserRoleList()
},
methods: {
// 数据采集
dataAcquisition () {
this.loadFlag = true
let tempDate = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
}
dataAcquisition(tempDate).then(({data}) => {
if (data.code === 0) {
this.acquisitionList = data.rows
if (this.acquisitionList.length > 0) {
this.$message({
message: '数据采集成功',
type: 'success',
duration: 1500
})
} else {
this.$message({
message: '未采集到数据信息!',
type: 'warning',
duration: 1500
})
}
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
this.loadFlag = false
})
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
}
})
},
// 获取协同人员列表
getOperatorList () {
this.operatorData.flag = '1'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 获取责任人员列表
getResponsiblePersonList () {
this.operatorData.flag = '2'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '系统管理员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 查询机修人员列表
getOperatorList2 () {
if (this.operatorData.flag === '1') {
// 拿到选中的人员编号
let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}
})
} else {
// 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}
})
}
},
// 点击行选中复选框
operatorClickRow (row) {
this.$refs.operatorTable.toggleRowSelection(row)
},
// 多选
selectionChangeHandle2 (val) {
this.dataListSelections2 = val
},
// 确认多选协同人员
confirmOperator () {
if (this.dataListSelections2.length === 0) {
this.$message.warning('请勾选人员！')
return
}
if (this.operatorData.flag === '1') {
for (let i = 0; i < this.dataListSelections2.length; i++) {
this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName
this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID
}
this.detailData.operator = this.detailData.operator.substring(1)
this.detailData.operatorName = this.detailData.operatorName.substring(1)
} else {
for (let i = 0; i < this.dataListSelections2.length; i++) {
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
}
this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1)
}
this.operatorData = {
flag: '',
site: '',
bu: '',
adminID: '',
adminName: '',
roleName: '',
roleId: '',
}
this.operatorModelFlag = false
},
// bu内容改变事件
buChange () {
if (this.modalData.specialTaskFlag !== 'Y') { // 正常检验
@ -2130,7 +2504,6 @@
this.modalData.templateId = ''
this.modalData.templateName = ''
}
},
// 获取用户的bu
@ -2901,7 +3274,10 @@
this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
this.saveInformationData.partNo = this.detailData.partNo
this.saveInformationData.partDesc = this.detailData.partDesc
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.subDetailList = this.acquisitionList
saveFAIDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@ -2920,6 +3296,38 @@
})
},
// 开始检验
actionModal (row) {
this.$confirm(`确认开始检验?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let tempData = {
site: row.site,
buNo: row.buNo,
inspectionNo: row.inspectionNo,
actionBy: this.$store.state.user.name,
state: '待检验'
}
actionFAIInspection(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
// 明细记录信息查询
detailModal (row) {
this.detailData.site = row.site
@ -2943,8 +3351,13 @@
this.detailData.spec = row.spec
this.detailData.umId = row.umId
this.detailData.umName = row.umName
this.detailData.operator = row.operator
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.getInspectionFormData()
this.inspectorSearch()
this.acquisitionList = []
this.detailInformationFlag = true
},

466
src/views/modules/qc/FQCResultEntry.vue
View File

@ -50,6 +50,7 @@
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.state" clearable style="width: 80px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
<el-option label="已完成" value="已完成"></el-option>
@ -158,7 +159,8 @@
width="130"
label="操作">
<template slot-scope="scope">
<el-link v-if="!authDetail" style="cursor: pointer" @click="detailModal(scope.row)">检验单</el-link>
<el-link style="cursor: pointer" v-if="!authDetail && scope.row.state === '未开始'" @click="actionModal(scope.row)">开始检验</el-link>
<el-link style="cursor: pointer" v-if="!authDetail && scope.row.state !== '未开始'" @click="detailModal(scope.row)">检验单</el-link>
<el-link v-if="!authFile" style="cursor: pointer" @click="getFileContentData(scope.row)">工作文件</el-link>
</template>
</el-table-column>
@ -322,6 +324,9 @@
<el-form-item :label="'单位'">
<el-input v-model="detailData.umName" readonly style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<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" @keyup.enter.native = "getDataList">
<el-form-item :label="'不合格项目数量'">
@ -342,28 +347,6 @@
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
</el-form-item>
<el-form-item v-if="detailData.inspectionResult === '不合格'" :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
<el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="detailData.inspectionResult === '不合格'" :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="检验员">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
<el-option
@ -382,11 +365,45 @@
</el-option>
</el-select>
</el-form-item>
<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: 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: 173px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
</el-form-item>
</el-form>
<el-form v-show="detailData.inspectionResult === '不合格'" :inline="true" label-position="top">
<el-form-item :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
<el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 280px"></el-input>
</el-form-item>
</el-form>
<!-- 展示列表 -->
<div class="rq ">
<el-table
@ -730,6 +747,68 @@
</el-footer>
</el-dialog>
<!-- 机修人员清单 -->
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'用户编码'">
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'用户姓名'">
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="300"
:data="operatorList"
ref="operatorTable"
@row-click="operatorClickRow"
@selection-change="selectionChangeHandle2"
border
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
v-for="(item,index) in operatorDetailList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</div>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="confirmOperator">确认</el-button>
<el-button type="primary" @click="operatorModelFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- chooseList模态框 -->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
@ -771,11 +850,17 @@
umSearch, // 查询单位列表
getSiteAndBuByUserName,
searchSeqInfo, // 查询派工单号
actionFQCInspection, // 开始检验
dataAcquisition, // 数据采集
} from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
import {deleteObjectFile} from '@/api/eam/eam.js'
import {
deleteObjectFile,
getUserRoleList, // 获取用户角色列表
getOperatorList
} from '@/api/eam/eam.js'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
@ -804,6 +889,7 @@
},
data () {
return {
loadFlag: false,
inspectionNo: '',
fileFlag: false,
fileContentList: [],
@ -1282,6 +1368,24 @@
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1ActionDate',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'actionDate',
headerAlign: "center",
align: "center",
columnLabel: '开始检验时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
@ -1359,7 +1463,11 @@
sku: '',
spec: '',
umId: '',
umName: ''
umName: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: ''
},
detailInformationFlag: false,
detailList: [],
@ -1377,6 +1485,11 @@
unqualifiedQty: '',
partNo: '',
partDesc: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: []
},
detailColumnList: [
{
@ -2056,6 +2169,70 @@
authDetail: false,
authFile: false,
menuId: this.$route.meta.menuId,
roleList: [],
operatorList: [],
operatorData: {
flag: '',
site: '',
bu: '',
adminID: '',
adminName: '',
roleName: '',
roleId: '',
},
operatorModelFlag: false,
dataListSelections2: [],
operatorDetailList: [
{
columnProp: 'adminID',
headerAlign: "center",
align: "center",
columnLabel: '用户账号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'adminName',
headerAlign: "center",
align: "center",
columnLabel: '用户名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'email',
headerAlign: "center",
align: "center",
columnLabel: '邮箱',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'phone',
headerAlign: "center",
align: "center",
columnLabel: '手机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
],
acquisitionList: []
}
},
@ -2088,9 +2265,207 @@
// 获取数据列表
this.getDataList()
}
// 获取用户角色
this.getUserRoleList()
},
methods: {
// 数据采集
dataAcquisition () {
this.loadFlag = true
let tempDate = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
}
dataAcquisition(tempDate).then(({data}) => {
if (data.code === 0) {
this.acquisitionList = data.rows
if (this.acquisitionList.length > 0) {
this.$message({
message: '数据采集成功',
type: 'success',
duration: 1500
})
} else {
this.$message({
message: '未采集到数据信息!',
type: 'warning',
duration: 1500
})
}
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
this.loadFlag = false
})
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
}
})
},
// 获取协同人员列表
getOperatorList () {
this.operatorData.flag = '1'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 获取责任人员列表
getResponsiblePersonList () {
this.operatorData.flag = '2'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '系统管理员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 查询机修人员列表
getOperatorList2 () {
if (this.operatorData.flag === '1') {
// 拿到选中的人员编号
let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}
})
} else {
// 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}
})
}
},
// 点击行选中复选框
operatorClickRow (row) {
this.$refs.operatorTable.toggleRowSelection(row)
},
// 多选
selectionChangeHandle2 (val) {
this.dataListSelections2 = val
},
// 确认多选协同人员
confirmOperator () {
if (this.dataListSelections2.length === 0) {
this.$message.warning('请勾选人员！')
return
}
if (this.operatorData.flag === '1') {
for (let i = 0; i < this.dataListSelections2.length; i++) {
this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName
this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID
}
this.detailData.operator = this.detailData.operator.substring(1)
this.detailData.operatorName = this.detailData.operatorName.substring(1)
} else {
for (let i = 0; i < this.dataListSelections2.length; i++) {
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
}
this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1)
}
this.operatorData = {
flag: '',
site: '',
bu: '',
adminID: '',
adminName: '',
roleName: '',
roleId: '',
}
this.operatorModelFlag = false
},
// bu内容改变事件
buChange () {
if (this.modalData.specialTaskFlag !== 'Y') { // 正常检验
@ -2105,7 +2480,6 @@
this.modalData.templateId = ''
this.modalData.templateName = ''
}
},
// 获取用户的bu
@ -2875,7 +3249,10 @@
this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
this.saveInformationData.partNo = this.detailData.partNo
this.saveInformationData.partDesc = this.detailData.partDesc
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.subDetailList = this.acquisitionList
saveFQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@ -2894,6 +3271,38 @@
})
},
// 开始检验
actionModal (row) {
this.$confirm(`确认开始检验?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let tempData = {
site: row.site,
buNo: row.buNo,
inspectionNo: row.inspectionNo,
actionBy: this.$store.state.user.name,
state: '待检验'
}
actionFQCInspection(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
// 明细记录信息查询
detailModal (row) {
this.detailData.site = row.site
@ -2917,8 +3326,13 @@
this.detailData.spec = row.spec
this.detailData.umId = row.umId
this.detailData.umName = row.umName
this.detailData.operator = row.operator
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.getInspectionFormData()
this.inspectorSearch()
this.acquisitionList = []
this.detailInformationFlag = true
},

466
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -48,6 +48,7 @@
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.state" clearable style="width: 80px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
<el-option label="已完成" value="已完成"></el-option>
@ -160,7 +161,8 @@
width="130"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" v-if="!authDetail" @click="detailModal(scope.row)">检验单</el-link>
<el-link style="cursor: pointer" v-if="!authDetail && scope.row.state === '未开始'" @click="actionModal(scope.row)">开始检验</el-link>
<el-link style="cursor: pointer" v-if="!authDetail && scope.row.state !== '未开始'" @click="detailModal(scope.row)">检验单</el-link>
<el-link style="cursor: pointer" v-if="!authFile" @click="getFileContentData(scope.row)">工作文件</el-link>
</template>
</el-table-column>
@ -334,6 +336,9 @@
<el-form-item :label="'单位'">
<el-input v-model="detailData.umName" readonly style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<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" @keyup.enter.native = "getDataList">
<el-form-item :label="'不合格项目数量'">
@ -354,28 +359,6 @@
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
</el-form-item>
<el-form-item v-if="detailData.inspectionResult === '不合格'" :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
<el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="detailData.inspectionResult === '不合格'" :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="检验员">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
<el-option
@ -394,11 +377,45 @@
</el-option>
</el-select>
</el-form-item>
<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: 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: 173px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
</el-form-item>
</el-form>
<el-form v-show="detailData.inspectionResult === '不合格'" :inline="true" label-position="top">
<el-form-item :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
<el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 280px"></el-input>
</el-form-item>
</el-form>
<!-- 展示列表 -->
<div class="rq ">
<el-table
@ -752,6 +769,67 @@
</el-table>
</el-dialog>
<!-- 机修人员清单 -->
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'用户编码'">
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'用户姓名'">
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="300"
:data="operatorList"
ref="operatorTable"
@row-click="operatorClickRow"
@selection-change="selectionChangeHandle2"
border
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
v-for="(item,index) in operatorDetailList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</div>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="confirmOperator">确认</el-button>
<el-button type="primary" @click="operatorModelFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 上传文件的modal -->
@ -791,11 +869,17 @@
umSearch, // 查询单位列表
getSiteAndBuByUserName,
searchSeqInfo, // 派工单号查询
actionIPQCInspection, // 开始检验
dataAcquisition, // 数据采集
} from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
import {deleteObjectFile} from '@/api/eam/eam.js'
import {
deleteObjectFile,
getUserRoleList, // 获取用户角色列表
getOperatorList
} from '@/api/eam/eam.js'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
@ -824,6 +908,7 @@
},
data () {
return {
loadFlag: false,
inspectionNo: '',
fileFlag: false,
fileContentList: [],
@ -1327,6 +1412,24 @@
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1ActionDate',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'actionDate',
headerAlign: "center",
align: "center",
columnLabel: '开始检验时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
@ -1404,7 +1507,11 @@
sku: '',
spec: '',
umId: '',
umName: ''
umName: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: ''
},
detailInformationFlag: false,
detailList: [],
@ -1422,6 +1529,11 @@
unqualifiedQty: '',
partNo: '',
partDesc: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: []
},
detailColumnList: [
{
@ -2110,6 +2222,70 @@
authDetail: false,
authFile: false,
menuId: this.$route.meta.menuId,
roleList: [],
operatorList: [],
operatorData: {
flag: '',
site: '',
bu: '',
adminID: '',
adminName: '',
roleName: '',
roleId: '',
},
operatorModelFlag: false,
dataListSelections2: [],
operatorDetailList: [
{
columnProp: 'adminID',
headerAlign: "center",
align: "center",
columnLabel: '用户账号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'adminName',
headerAlign: "center",
align: "center",
columnLabel: '用户名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'email',
headerAlign: "center",
align: "center",
columnLabel: '邮箱',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'phone',
headerAlign: "center",
align: "center",
columnLabel: '手机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
],
acquisitionList: []
}
},
@ -2142,9 +2318,207 @@
// 获取数据列表
this.getDataList()
}
// 获取用户角色
this.getUserRoleList()
},
methods: {
// 数据采集
dataAcquisition () {
this.loadFlag = true
let tempDate = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
}
dataAcquisition(tempDate).then(({data}) => {
if (data.code === 0) {
this.acquisitionList = data.rows
if (this.acquisitionList.length > 0) {
this.$message({
message: '数据采集成功',
type: 'success',
duration: 1500
})
} else {
this.$message({
message: '未采集到数据信息!',
type: 'warning',
duration: 1500
})
}
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
this.loadFlag = false
})
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
}
})
},
// 获取协同人员列表
getOperatorList () {
this.operatorData.flag = '1'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 获取责任人员列表
getResponsiblePersonList () {
this.operatorData.flag = '2'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '系统管理员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 查询机修人员列表
getOperatorList2 () {
if (this.operatorData.flag === '1') {
// 拿到选中的人员编号
let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}
})
} else {
// 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}
})
}
},
// 点击行选中复选框
operatorClickRow (row) {
this.$refs.operatorTable.toggleRowSelection(row)
},
// 多选
selectionChangeHandle2 (val) {
this.dataListSelections2 = val
},
// 确认多选协同人员
confirmOperator () {
if (this.dataListSelections2.length === 0) {
this.$message.warning('请勾选人员！')
return
}
if (this.operatorData.flag === '1') {
for (let i = 0; i < this.dataListSelections2.length; i++) {
this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName
this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID
}
this.detailData.operator = this.detailData.operator.substring(1)
this.detailData.operatorName = this.detailData.operatorName.substring(1)
} else {
for (let i = 0; i < this.dataListSelections2.length; i++) {
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
}
this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1)
}
this.operatorData = {
flag: '',
site: '',
bu: '',
adminID: '',
adminName: '',
roleName: '',
roleId: '',
}
this.operatorModelFlag = false
},
// bu内容改变事件
buChange () {
if (this.modalData.specialTaskFlag !== 'Y') { // 正常检验
@ -2159,7 +2533,6 @@
this.modalData.templateId = ''
this.modalData.templateName = ''
}
},
// 获取用户的bu
@ -2939,7 +3312,10 @@
this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
this.saveInformationData.partNo = this.detailData.partNo
this.saveInformationData.partDesc = this.detailData.partDesc
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.subDetailList = this.acquisitionList
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@ -2958,6 +3334,39 @@
})
},
// 开始检验
actionModal (row) {
this.$confirm(`确认开始检验?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let tempData = {
site: row.site,
buNo: row.buNo,
inspectionNo: row.inspectionNo,
actionBy: this.$store.state.user.name,
state: '待检验'
}
actionIPQCInspection(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
// 明细记录信息查询
detailModal (row) {
this.detailData.site = row.site
@ -2982,8 +3391,13 @@
this.detailData.spec = row.spec
this.detailData.umId = row.umId
this.detailData.umName = row.umName
this.detailData.operator = row.operator
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.getInspectionFormData()
this.inspectorSearch()
this.acquisitionList = []
this.detailInformationFlag = true
},

469
src/views/modules/qc/IQCResultEntry.vue
View File

@ -51,6 +51,7 @@
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.state" clearable style="width: 80px">
<el-option label="未开始" value="未开始"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="待审核" value="待审核"></el-option>
<el-option label="已完成" value="已完成"></el-option>
@ -166,7 +167,8 @@
width="130"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" v-if="!authDetail" @click="detailModal(scope.row)">检验单</el-link>
<el-link style="cursor: pointer" v-if="!authDetail && scope.row.state === '未开始'" @click="actionModal(scope.row)">开始检验</el-link>
<el-link style="cursor: pointer" v-if="!authDetail && scope.row.state !== '未开始'" @click="detailModal(scope.row)">检验单</el-link>
<el-link style="cursor: pointer" v-if="!authFile" @click="getFileContentData(scope.row)">工作文件</el-link>
<!-- <a type="text" size="small" @click="submitResult(scope.row)">审核</a>-->
<!-- <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>-->
@ -210,6 +212,9 @@
<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="' '" style="margin-left: 38px">
<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="'检验结论'">
@ -226,28 +231,6 @@
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
</el-form-item>
<el-form-item v-if="detailData.inspectionResult === '不合格'" :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
<el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="detailData.inspectionResult === '不合格'" :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="检验员">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
<el-option
@ -266,11 +249,45 @@
</el-option>
</el-select>
</el-form-item>
<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-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-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
</el-form-item>
</el-form>
<el-form v-show="detailData.inspectionResult === '不合格'" :inline="true" label-position="top">
<el-form-item :label="'处置措施'">
<el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
<el-select v-else clearable v-model="detailData.disposalMeasures" style="width: 100px">
<el-option
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置说明'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-else v-model="detailData.disposalRemark" style="width: 280px"></el-input>
</el-form-item>
</el-form>
<!-- 展示列表 -->
<div class="rq ">
<el-table
@ -468,6 +485,67 @@
</el-footer>
</el-dialog>
<!-- 机修人员清单 -->
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'用户编码'">
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'用户姓名'">
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="300"
:data="operatorList"
ref="operatorTable"
@row-click="operatorClickRow"
@selection-change="selectionChangeHandle2"
border
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
v-for="(item,index) in operatorDetailList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</div>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="confirmOperator">确认</el-button>
<el-button type="primary" @click="operatorModelFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 上传文件的modal -->
@ -498,11 +576,17 @@
iqcRecordOverLoad, // 重载检验单
getSiteAndBuByUserName,
orderTypeSearch, // 获取采购类型
actionIQCInspection, // 开始检验
dataAcquisition, // 数据采集
} from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
import {deleteObjectFile} from '@/api/eam/eam.js'
import {
deleteObjectFile,
getUserRoleList, // 获取用户角色列表
getOperatorList
} from '@/api/eam/eam.js'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
@ -530,6 +614,7 @@
},
data () {
return {
loadFlag: false,
// 是否收藏
favorite: false,
// 导出 start
@ -984,6 +1069,24 @@
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1ActionDate',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'actionDate',
headerAlign: "center",
align: "center",
columnLabel: '开始检验时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
@ -1347,7 +1450,11 @@
umId: '',
rollCount: '',
poOrderNo: '',
poItemNo: ''
poItemNo: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: ''
},
detailInformationFlag: false,
detailList: [],
@ -1368,7 +1475,12 @@
poItemNo: '',
partNo: '',
partDesc: '',
sku: ''
sku: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: []
},
// 子明细数据对象
tableData: [],
@ -1406,6 +1518,70 @@
authDetail: false,
authFile: false,
menuId: this.$route.meta.menuId,
roleList: [],
operatorList: [],
operatorData: {
flag: '',
site: '',
bu: '',
adminID: '',
adminName: '',
roleName: '',
roleId: '',
},
operatorModelFlag: false,
dataListSelections2: [],
operatorDetailList: [
{
columnProp: 'adminID',
headerAlign: "center",
align: "center",
columnLabel: '用户账号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'adminName',
headerAlign: "center",
align: "center",
columnLabel: '用户名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'email',
headerAlign: "center",
align: "center",
columnLabel: '邮箱',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'phone',
headerAlign: "center",
align: "center",
columnLabel: '手机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
],
acquisitionList: []
}
},
@ -1430,9 +1606,208 @@
// 获取数据列表
this.getDataList()
}
// 获取用户角色
this.getUserRoleList()
},
methods: {
// 数据采集
dataAcquisition () {
this.loadFlag = true
let tempDate = {
site: this.detailData.site,
buNo: this.detailData.buNo,
inspectionNo: this.detailData.inspectionNo,
}
dataAcquisition(tempDate).then(({data}) => {
if (data.code === 0) {
this.acquisitionList = data.rows
if (this.acquisitionList.length > 0) {
this.$message({
message: '数据采集成功',
type: 'success',
duration: 1500
})
} else {
this.$message({
message: '未采集到数据信息!',
type: 'warning',
duration: 1500
})
}
console.log(this.acquisitionList)
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
this.loadFlag = false
})
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
}
})
},
// 获取协同人员列表
getOperatorList () {
this.operatorData.flag = '1'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 获取责任人员列表
getResponsiblePersonList () {
this.operatorData.flag = '2'
this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '系统管理员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// 查询机修人员列表
getOperatorList2 () {
if (this.operatorData.flag === '1') {
// 拿到选中的人员编号
let tempDataList = (this.detailData.operator == null ? '' : this.detailData.operator).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}
})
} else {
// 拿到选中的人员编号
let tempDataList = (this.detailData.responsiblePerson == null ? '' : this.detailData.responsiblePerson).split(';')
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorList.forEach(val => {
// 回显选中的部门
if (tempDataList.includes(val.adminID)) {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
} else {
this.operatorList = []
}
})
}
},
// 点击行选中复选框
operatorClickRow (row) {
this.$refs.operatorTable.toggleRowSelection(row)
},
// 多选
selectionChangeHandle2 (val) {
this.dataListSelections2 = val
},
// 确认多选协同人员
confirmOperator () {
if (this.dataListSelections2.length === 0) {
this.$message.warning('请勾选人员！')
return
}
if (this.operatorData.flag === '1') {
for (let i = 0; i < this.dataListSelections2.length; i++) {
this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName
this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID
}
this.detailData.operator = this.detailData.operator.substring(1)
this.detailData.operatorName = this.detailData.operatorName.substring(1)
} else {
for (let i = 0; i < this.dataListSelections2.length; i++) {
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
}
this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
this.detailData.responsiblePersonName = this.detailData.responsiblePersonName.substring(1)
}
this.operatorData = {
flag: '',
site: '',
bu: '',
adminID: '',
adminName: '',
roleName: '',
roleId: '',
}
this.operatorModelFlag = false
},
// // 实测值内容改变事件
// changeValue (row) {
@ -1745,7 +2120,10 @@
this.saveInformationData.partNo = this.detailData.partNo
this.saveInformationData.partDesc = this.detailData.partDesc
this.saveInformationData.sku = this.detailData.sku
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.subDetailList = this.acquisitionList
saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@ -1764,6 +2142,38 @@
})
},
// 开始检验
actionModal (row) {
this.$confirm(`确认开始检验?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let tempData = {
site: row.site,
buNo: row.buNo,
inspectionNo: row.inspectionNo,
actionBy: this.$store.state.user.name,
state: '待检验'
}
actionIQCInspection(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
// 明细记录信息查询
detailModal (row) {
this.detailData.site = row.site
@ -1787,8 +2197,13 @@
this.detailData.rollCount = row.rollCount
this.detailData.poOrderNo = row.poOrderNo
this.detailData.poItemNo = row.poItemNo
this.detailData.operator = row.operator
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.getInspectionFormData()
this.inspectorSearch()
this.acquisitionList = []
this.detailInformationFlag = true
},
@ -1864,7 +2279,7 @@
this.$message.warning('请勾选要重载的检验单！')
return
}
if (this.IQCSelections.every(val => val.state === '待检验')) {
if (this.IQCSelections.every(val => val.state === '待检验' || val.state === '未开始')) {
this.$confirm(`是否重载该 `+ this.IQCSelections.length +` 条检验单?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

Write Preview
Loading…
Cancel
Save