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

2023-11-06 设备和质量修改

java8
杨奉源 2 years ago
parent
38e1fb138d
commit
91034e61b6
7 changed files with 439 additions and 141 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/qc/qc.js
  2. 30
      src/views/modules/eam/eamAdmin.vue
  3. 91
      src/views/modules/eam/eamWorkOrderForDefect.vue
  4. 130
      src/views/modules/qc/FAIResultEntry.vue
  5. 129
      src/views/modules/qc/FQCResultEntry.vue
  6. 197
      src/views/modules/qc/IPQCResultEntry.vue
  7. 2
      src/views/modules/sys/user.vue

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

@ -134,6 +134,7 @@ export const queryController = data => createAPI(`/pms/qc/queryController`,'post
export const queryTemplateList = data => createAPI(`/pms/qc/queryTemplateList`,'post',data) export const queryTemplateList = data => createAPI(`/pms/qc/queryTemplateList`,'post',data)
export const getPartInformation = data => createAPI(`/pms/qc/getPartInformation`,'post',data) export const getPartInformation = data => createAPI(`/pms/qc/getPartInformation`,'post',data)
export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOperationList`,'post',data) export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOperationList`,'post',data)
export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data)
// ===================================== IQC检验 ===================================== // ===================================== IQC检验 =====================================
export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data) export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data)

30
src/views/modules/eam/eamAdmin.vue
View File

@ -7,10 +7,13 @@
</div> </div>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()"> <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item :label="'机修人员编码'"> <el-form-item :label="'机修人员编码'">
<el-input v-model="searchData.adminID" style="width: 120px"></el-input>
<el-input v-model="searchData.adminID" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'机修人员姓名'"> <el-form-item :label="'机修人员姓名'">
<el-input v-model="searchData.adminName" style="width: 120px"></el-input>
<el-input v-model="searchData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'所属部门'">
<el-input v-model="searchData.departmentName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'在用'"> <el-form-item :label="'在用'">
<el-select filterable v-model="searchData.active" style="width: 130px"> <el-select filterable v-model="searchData.active" style="width: 130px">
@ -172,10 +175,10 @@
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="departmentData"> <el-form :inline="true" label-position="top" :model="departmentData">
<el-form-item :label="'部门编码'"> <el-form-item :label="'部门编码'">
<el-input v-model="departmentData.deptId" style="width: 120px"></el-input>
<el-input v-model="departmentData.deptId" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'部门名称'"> <el-form-item :label="'部门名称'">
<el-input v-model="departmentData.deptName" style="width: 120px"></el-input>
<el-input v-model="departmentData.deptName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="getDepartmentList()">查询</el-button> <el-button type="primary" @click="getDepartmentList()">查询</el-button>
@ -272,6 +275,7 @@
site: this.$store.state.user.site, site: this.$store.state.user.site,
adminID: '', adminID: '',
adminName: '', adminName: '',
departmentName: '',
active: 'Y', active: 'Y',
page: 1, page: 1,
limit: 10, limit: 10,
@ -702,10 +706,10 @@
}, },
//导出excel //导出excel
async createExportData() { async createExportData() {
this.searchData.limit = -1
this.searchData.page = 1
// this.searchData.limit = -1
// this.searchData.page = 1
await eamAdminSearch(this.searchData).then(({data}) => { await eamAdminSearch(this.searchData).then(({data}) => {
this.exportList= data.page.list;
this.exportList= data.rows
}) })
return this.exportList; return this.exportList;
}, },
@ -731,14 +735,14 @@
// 导出 end // 导出 end
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
// this.searchData.limit = this.pageSize
// this.searchData.page = this.pageIndex
eamAdminSearch(this.searchData).then(({data}) => { eamAdminSearch(this.searchData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
this.dataList = data.rows
// this.pageIndex = data.page.currPage
// this.pageSize = data.page.pageSize
// this.totalPage = data.page.totalCount
} }
this.dataListLoading = false this.dataListLoading = false
}) })

91
src/views/modules/eam/eamWorkOrderForDefect.vue
View File

@ -165,7 +165,7 @@
</el-dialog> </el-dialog>
<el-dialog title="执行结果" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="540px"> <el-dialog title="执行结果" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="540px">
<el-form :inline="true" label-position="top" >
<el-form :inline="true" label-position="top">
<el-form-item label="故障编码:"> <el-form-item label="故障编码:">
<el-input v-model="detailData.defectID" disabled style="width: 120px"></el-input> <el-input v-model="detailData.defectID" disabled style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -194,6 +194,17 @@
<el-button type="primary" @click="checkSparPartImageModal()">备件图片</el-button> <el-button type="primary" @click="checkSparPartImageModal()">备件图片</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top">
<el-form-item :label="'设备编码'">
<el-input v-model="detailData.objectID" readonly style="width: 159px"></el-input>
</el-form-item>
<el-form-item :label="'设备名称'">
<el-input v-model="detailData.objectDesc" readonly style="width: 159px"></el-input>
</el-form-item>
<el-form-item :label="'机台'">
<el-input v-model="detailData.resourceDesc" readonly style="width: 159px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top"> <el-form :inline="true" label-position="top">
<el-form-item :label="'计划执行日期'"> <el-form-item :label="'计划执行日期'">
<el-date-picker style="width: 159px" v-model="detailData.planDate" type="datetime" readonly value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker> <el-date-picker style="width: 159px" v-model="detailData.planDate" type="datetime" readonly value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>
@ -406,6 +417,42 @@
fixed: '', fixed: '',
columnWidth: 90, columnWidth: 90,
}, },
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableResult',
tableId: "101014Table",
tableName: "common",
columnProp: 'result',
headerAlign: "center",
align: "center",
columnLabel: '维修结论',
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableResult',
tableId: "101014Table",
tableName: "common",
columnProp: 'disposalMeasures',
headerAlign: "center",
align: "center",
columnLabel: '处置措施',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 101018, functionId: 101018,
@ -586,42 +633,6 @@
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
}, },
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableResult',
tableId: "101014Table",
tableName: "common",
columnProp: 'result',
headerAlign: "center",
align: "center",
columnLabel: '维修结果',
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 101014,
serialNumber: '101014TableResult',
tableId: "101014Table",
tableName: "common",
columnProp: 'disposalMeasures',
headerAlign: "center",
align: "center",
columnLabel: '处置措施',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 101018, functionId: 101018,
@ -1186,6 +1197,7 @@
orderNo: row.orderNo, orderNo: row.orderNo,
planID: row.planID, planID: row.planID,
objectID: row.objectID, objectID: row.objectID,
objectDesc: row.objectDesc,
status: row.status, status: row.status,
remark: row.remark, remark: row.remark,
workTime: row.workTime, workTime: row.workTime,
@ -1199,9 +1211,10 @@
planDesc: row.planDesc, planDesc: row.planDesc,
disposalMeasures: row.disposalMeasures, disposalMeasures: row.disposalMeasures,
handlingMethod: row.handlingMethod, handlingMethod: row.handlingMethod,
functionType: row.functionType
functionType: row.functionType,
resourceDesc: row.resourceDesc
} }
this.detailModelFlag = true;
this.detailModelFlag = true
}, },
updateResult () { updateResult () {

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

@ -134,6 +134,18 @@
<!-- 新增检验记录 --> <!-- 新增检验记录 -->
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号">
<el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" prop="orderNo" :rules="rules.seqNoType"> <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" prop="orderNo" :rules="rules.seqNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span> <span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
@ -159,7 +171,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType"> <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
<el-select v-model="modalData.resourceId" placeholder="请选择" style="width: 221px">
<el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
<el-option <el-option
v-for = "i in resourceList" v-for = "i in resourceList"
:key = "i.resourceId" :key = "i.resourceId"
@ -572,7 +584,6 @@
saveFAISubDetailed, // 新增子明细信息 saveFAISubDetailed, // 新增子明细信息
selectFAISubDetailedRecord, // 子明细记录信息查询 selectFAISubDetailedRecord, // 子明细记录信息查询
checkFAIIsSubmit, // 检查是否已提交 checkFAIIsSubmit, // 检查是否已提交
checkFAISubDetailValue, // 检查子明细中的实测值是否在规定范围
getResourceList, // 查询机台列表 getResourceList, // 查询机台列表
getOperationList, // 查询工序列表 getOperationList, // 查询工序列表
getPartList, // 查询物料列表 getPartList, // 查询物料列表
@ -582,7 +593,8 @@
getPartInformation, // 获取物料信息 getPartInformation, // 获取物料信息
getSpecialOperationList, // 获取特殊工序列表 getSpecialOperationList, // 获取特殊工序列表
InspectionTypeSearch, // 搜索所有检验类型 InspectionTypeSearch, // 搜索所有检验类型
disposalMeasuresSearch // 获取处置措施列表
disposalMeasuresSearch, // 获取处置措施列表
getRollNo, // 模糊查询标签号
} from "@/api/qc/qc.js"; } from "@/api/qc/qc.js";
import Chooselist from '@/views/modules/common/Chooselist_eam'; import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@ -659,7 +671,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
}, },
// 展示列集 // 展示列集
columnList: [ columnList: [
@ -674,6 +688,33 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
},
{
columnProp: 'batchRollNo',
headerAlign: "center",
align: "center",
columnLabel: '老卷号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'rollNo',
headerAlign: "center",
align: "center",
columnLabel: '标签条码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'inspectionResult', columnProp: 'inspectionResult',
@ -686,6 +727,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'disposalMeasures', columnProp: 'disposalMeasures',
@ -698,6 +740,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'taskDate', columnProp: 'taskDate',
@ -710,11 +753,12 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectionCycle', columnProp: 'inspectionCycle',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '检验周期(h)', columnLabel: '检验周期(h)',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -722,6 +766,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'orderNo', columnProp: 'orderNo',
@ -734,6 +779,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'seqNo', columnProp: 'seqNo',
@ -746,6 +792,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'operationDesc', columnProp: 'operationDesc',
@ -758,6 +805,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'resourceDesc', columnProp: 'resourceDesc',
@ -770,6 +818,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'partNo', columnProp: 'partNo',
@ -782,6 +831,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'spec', columnProp: 'spec',
@ -794,6 +844,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'cinvSourceCode', columnProp: 'cinvSourceCode',
@ -806,6 +857,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'sku', columnProp: 'sku',
@ -818,6 +870,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'partDesc', columnProp: 'partDesc',
@ -830,6 +883,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'rollQty', columnProp: 'rollQty',
@ -842,6 +896,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'samplingQty', columnProp: 'samplingQty',
@ -854,6 +909,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'inspectionRemark', columnProp: 'inspectionRemark',
@ -866,6 +922,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'disposalRemark', columnProp: 'disposalRemark',
@ -878,6 +935,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectorDate', columnProp: 'inspectorDate',
@ -890,6 +948,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectorNo', columnProp: 'inspectorNo',
@ -902,6 +961,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'specialRequirements', columnProp: 'specialRequirements',
@ -914,6 +974,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
], ],
//项目清单 //项目清单
@ -1245,7 +1306,8 @@
], ],
checked: false, checked: false,
typeOptions: [], typeOptions: [],
disposalMeasuresOptions: []
disposalMeasuresOptions: [],
timeout: null
} }
}, },
mounted () { mounted () {
@ -1260,6 +1322,49 @@
this.disposalMeasuresSearch() this.disposalMeasuresSearch()
}, },
methods: { methods: {
querySearchAsync (queryString, cb) {
clearTimeout(this.timeout)
let results = []
if (queryString == '') {
cb(results)
} else {
// 掉接口需要的参数
let find = {
rollNo: queryString, //上面输入框绑定的数据
site: this.$store.state.user.site,
}
// 这里去调后端的接口.根据自己接口的情况进行赋值
getRollNo(find).then(({data}) => {
if (data.code === 0) {
let result = data.rows
// 循环放到一个远程搜索需要的数组
for (let i = 0; i < result.length; i++) {
const element = result[i]
results.push({
value: element.rollNo,
seqNo: element.seqNo,
orderNo: element.orderNo
})
}
cb(results)
} else {
results = []
cb(results)
}
})
}
},
//点击出现搜索后点击的每一项
handleSelect (item) {
this.modalData.rollNo = item.value
this.modalData.seqNo = item.seqNo
this.modalData.orderNo = item.orderNo
this.getOperationList()
this.getPartList()
},
// 获取处置措施列表 // 获取处置措施列表
disposalMeasuresSearch(){ disposalMeasuresSearch(){
let tempData = { let tempData = {
@ -1346,6 +1451,9 @@
getResourceList(this.modalData).then(({data}) => { getResourceList(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.resourceList = data.rows this.resourceList = data.rows
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1360,6 +1468,8 @@
getOperationList(this.modalData).then(({data}) => { getOperationList(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operationList = data.rows this.operationList = data.rows
this.modalData.operationDesc = data.rows[0].operationDesc
this.getResourceList()
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1412,7 +1522,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
} }
// 获取选中框 // 获取选中框
let obj = document.getElementsByName('specialTask') let obj = document.getElementsByName('specialTask')
@ -1539,7 +1651,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
} }
this.operationList = [] this.operationList = []
this.resourceList = [] this.resourceList = []

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

@ -132,6 +132,18 @@
<!-- 新增检验记录 --> <!-- 新增检验记录 -->
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号">
<el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" prop="orderNo" :rules="rules.seqNoType"> <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" prop="orderNo" :rules="rules.seqNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span> <span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
@ -157,7 +169,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType"> <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
<el-select v-model="modalData.resourceId" placeholder="请选择" style="width: 221px">
<el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
<el-option <el-option
v-for = "i in resourceList" v-for = "i in resourceList"
:key = "i.resourceId" :key = "i.resourceId"
@ -570,7 +582,6 @@
saveFQCSubDetailed, // 新增子明细信息 saveFQCSubDetailed, // 新增子明细信息
selectFQCSubDetailedRecord, // 子明细记录信息查询 selectFQCSubDetailedRecord, // 子明细记录信息查询
checkFQCIsSubmit, // 检查是否已提交 checkFQCIsSubmit, // 检查是否已提交
checkFQCSubDetailValue, // 检查子明细中的实测值是否在规定范围
getResourceList, // 查询机台列表 getResourceList, // 查询机台列表
getOperationList, // 查询工序列表 getOperationList, // 查询工序列表
getPartList, // 查询物料列表 getPartList, // 查询物料列表
@ -580,7 +591,8 @@
getPartInformation, // 获取物料信息 getPartInformation, // 获取物料信息
getSpecialOperationList, // 获取特殊工序列表 getSpecialOperationList, // 获取特殊工序列表
InspectionTypeSearch, // 搜索所有检验类型 InspectionTypeSearch, // 搜索所有检验类型
disposalMeasuresSearch // 获取处置措施列表
disposalMeasuresSearch, // 获取处置措施列表
getRollNo, // 模糊查询标签号
} from "@/api/qc/qc.js"; } from "@/api/qc/qc.js";
import Chooselist from '@/views/modules/common/Chooselist_eam'; import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@ -657,7 +669,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
}, },
// 展示列集 // 展示列集
columnList: [ columnList: [
@ -672,6 +686,33 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
},
{
columnProp: 'batchRollNo',
headerAlign: "center",
align: "center",
columnLabel: '老卷号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'rollNo',
headerAlign: "center",
align: "center",
columnLabel: '标签条码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'inspectionResult', columnProp: 'inspectionResult',
@ -684,6 +725,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'disposalMeasures', columnProp: 'disposalMeasures',
@ -696,6 +738,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'taskDate', columnProp: 'taskDate',
@ -708,11 +751,12 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectionCycle', columnProp: 'inspectionCycle',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '检验周期(h)', columnLabel: '检验周期(h)',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -720,6 +764,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'orderNo', columnProp: 'orderNo',
@ -732,6 +777,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'seqNo', columnProp: 'seqNo',
@ -744,6 +790,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'operationDesc', columnProp: 'operationDesc',
@ -756,6 +803,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'resourceDesc', columnProp: 'resourceDesc',
@ -768,6 +816,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'partNo', columnProp: 'partNo',
@ -780,6 +829,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'spec', columnProp: 'spec',
@ -792,6 +842,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'cinvSourceCode', columnProp: 'cinvSourceCode',
@ -804,6 +855,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'sku', columnProp: 'sku',
@ -816,6 +868,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'partDesc', columnProp: 'partDesc',
@ -828,6 +881,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'rollQty', columnProp: 'rollQty',
@ -840,6 +894,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'samplingQty', columnProp: 'samplingQty',
@ -852,6 +907,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'inspectionRemark', columnProp: 'inspectionRemark',
@ -864,6 +920,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'disposalRemark', columnProp: 'disposalRemark',
@ -876,6 +933,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectorDate', columnProp: 'inspectorDate',
@ -888,6 +946,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectorNo', columnProp: 'inspectorNo',
@ -900,6 +959,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'specialRequirements', columnProp: 'specialRequirements',
@ -912,6 +972,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
], ],
//项目清单 //项目清单
@ -1243,7 +1304,8 @@
], ],
checked: false, checked: false,
typeOptions: [], typeOptions: [],
disposalMeasuresOptions: []
disposalMeasuresOptions: [],
timeout: null
} }
}, },
mounted () { mounted () {
@ -1258,6 +1320,48 @@
this.disposalMeasuresSearch() this.disposalMeasuresSearch()
}, },
methods: { methods: {
querySearchAsync (queryString, cb) {
clearTimeout(this.timeout)
let results = []
if (queryString == '') {
cb(results)
} else {
// 掉接口需要的参数
let find = {
rollNo: queryString, //上面输入框绑定的数据
site: this.$store.state.user.site,
}
// 这里去调后端的接口.根据自己接口的情况进行赋值
getRollNo(find).then(({data}) => {
if (data.code === 0) {
let result = data.rows
// 循环放到一个远程搜索需要的数组
for (let i = 0; i < result.length; i++) {
const element = result[i]
results.push({
value: element.rollNo,
seqNo: element.seqNo,
orderNo: element.orderNo
})
}
cb(results)
} else {
results = []
cb(results)
}
})
}
},
//点击出现搜索后点击的每一项
handleSelect (item) {
this.modalData.rollNo = item.value
this.modalData.seqNo = item.seqNo
this.modalData.orderNo = item.orderNo
this.getOperationList()
this.getPartList()
},
// 获取处置措施列表 // 获取处置措施列表
disposalMeasuresSearch(){ disposalMeasuresSearch(){
let tempData = { let tempData = {
@ -1344,6 +1448,9 @@
getResourceList(this.modalData).then(({data}) => { getResourceList(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.resourceList = data.rows this.resourceList = data.rows
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1358,6 +1465,8 @@
getOperationList(this.modalData).then(({data}) => { getOperationList(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operationList = data.rows this.operationList = data.rows
this.modalData.operationDesc = data.rows[0].operationDesc
this.getResourceList()
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1410,7 +1519,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
} }
// 获取选中框 // 获取选中框
let obj = document.getElementsByName('specialTask') let obj = document.getElementsByName('specialTask')
@ -1537,7 +1648,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
} }
this.operationList = [] this.operationList = []
this.resourceList = [] this.resourceList = []

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

@ -142,6 +142,18 @@
<!-- 新增巡检记录 --> <!-- 新增巡检记录 -->
<el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号">
<el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" prop="orderNo" :rules="rules.seqNoType"> <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" prop="orderNo" :rules="rules.seqNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span> <span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
@ -167,7 +179,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType"> <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="机台" prop="resourceId" :rules="rules.resourceIdType">
<el-select v-model="modalData.resourceId" placeholder="请选择" style="width: 221px">
<el-select v-model="modalData.resourceDesc" placeholder="请选择" style="width: 221px">
<el-option <el-option
v-for = "i in resourceList" v-for = "i in resourceList"
:key = "i.resourceId" :key = "i.resourceId"
@ -647,6 +659,7 @@
getSpecialOperationList, // 获取特殊工序列表 getSpecialOperationList, // 获取特殊工序列表
InspectionTypeSearch, // 搜索所有检验类型 InspectionTypeSearch, // 搜索所有检验类型
disposalMeasuresSearch, // 获取处置措施列表 disposalMeasuresSearch, // 获取处置措施列表
getRollNo, // 模糊查询标签号
getOrderNoList // 查询工单列表 getOrderNoList // 查询工单列表
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -654,7 +667,7 @@
import {deleteObjectFile} from '@/api/eam/eam.js' import {deleteObjectFile} from '@/api/eam/eam.js'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file" import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file";
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
/*上传文件的組件*/ /*上传文件的組件*/
export default { export default {
components: { components: {
@ -735,7 +748,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
}, },
// 展示列集 // 展示列集
columnList: [ columnList: [
@ -750,6 +765,33 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
},
{
columnProp: 'batchRollNo',
headerAlign: "center",
align: "center",
columnLabel: '老卷号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'rollNo',
headerAlign: "center",
align: "center",
columnLabel: '标签条码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'inspectionResult', columnProp: 'inspectionResult',
@ -762,6 +804,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'disposalMeasures', columnProp: 'disposalMeasures',
@ -774,6 +817,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'inspectionTypeName', columnProp: 'inspectionTypeName',
@ -786,6 +830,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'taskDate', columnProp: 'taskDate',
@ -798,11 +843,12 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectionCycle', columnProp: 'inspectionCycle',
headerAlign: "center", headerAlign: "center",
align: "center",
align: "right",
columnLabel: '检验周期(h)', columnLabel: '检验周期(h)',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -810,6 +856,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'orderNo', columnProp: 'orderNo',
@ -822,6 +869,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'seqNo', columnProp: 'seqNo',
@ -834,6 +882,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'operationDesc', columnProp: 'operationDesc',
@ -846,6 +895,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'resourceDesc', columnProp: 'resourceDesc',
@ -858,6 +908,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'partNo', columnProp: 'partNo',
@ -870,6 +921,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'spec', columnProp: 'spec',
@ -882,6 +934,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'cinvSourceCode', columnProp: 'cinvSourceCode',
@ -894,6 +947,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'sku', columnProp: 'sku',
@ -906,6 +960,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'partDesc', columnProp: 'partDesc',
@ -918,6 +973,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150,
}, },
{ {
columnProp: 'rollQty', columnProp: 'rollQty',
@ -930,6 +986,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'samplingQty', columnProp: 'samplingQty',
@ -942,6 +999,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80,
}, },
{ {
columnProp: 'inspectionRemark', columnProp: 'inspectionRemark',
@ -954,6 +1012,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'disposalRemark', columnProp: 'disposalRemark',
@ -966,6 +1025,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectorDate', columnProp: 'inspectorDate',
@ -978,6 +1038,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
{ {
columnProp: 'inspectorNo', columnProp: 'inspectorNo',
@ -990,6 +1051,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100,
}, },
{ {
columnProp: 'specialRequirements', columnProp: 'specialRequirements',
@ -1002,6 +1064,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 120,
}, },
], ],
//项目清单 //项目清单
@ -1341,7 +1404,8 @@
], ],
checked: false, checked: false,
typeOptions: [], typeOptions: [],
disposalMeasuresOptions: []
disposalMeasuresOptions: [],
timeout: null
// orderNoData:{ // orderNoData:{
// limit: 10, // limit: 10,
// page: 1, // page: 1,
@ -1365,6 +1429,49 @@
this.disposalMeasuresSearch() this.disposalMeasuresSearch()
}, },
methods: { methods: {
querySearchAsync (queryString, cb) {
clearTimeout(this.timeout)
let results = []
if (queryString == '') {
cb(results)
} else {
// 掉接口需要的参数
let find = {
rollNo: queryString, //上面输入框绑定的数据
site: this.$store.state.user.site,
}
// 这里去调后端的接口.根据自己接口的情况进行赋值
getRollNo(find).then(({data}) => {
if (data.code === 0) {
let result = data.rows
// 循环放到一个远程搜索需要的数组
for (let i = 0; i < result.length; i++) {
const element = result[i]
results.push({
value: element.rollNo,
seqNo: element.seqNo,
orderNo: element.orderNo
})
}
cb(results)
} else {
results = []
cb(results)
}
})
}
},
//点击出现搜索后点击的每一项
handleSelect (item) {
this.modalData.rollNo = item.value
this.modalData.seqNo = item.seqNo
this.modalData.orderNo = item.orderNo
this.getOperationList()
this.getPartList()
},
// 获取处置措施列表 // 获取处置措施列表
disposalMeasuresSearch(){ disposalMeasuresSearch(){
let tempData = { let tempData = {
@ -1567,72 +1674,13 @@
}) })
}, },
// // 工单号改变事件
// orderNoChange () {
// this.getOperationList()
// this.getPartList()
// },
//
// // 获取工单列表
// getOrderNoList(){
// // this.orderNoData.limit = this.pageSize2
// // this.orderNoData.page = this.pageIndex2
// getOrderNoList(this.orderNoData).then(({data}) => {
// if (data && data.code === 0) {
// this.orderNoList = data.rows
// // this.pageIndex2 = data.page.currPage
// // this.pageSize2 = data.page.pageSize
// // this.totalPage2 = data.page.totalCount
// this.orderNoModelFlag = true
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
// // 条件查询获取工单列表
// getOrderNoList2(){
// // this.orderNoData.limit = this.pageSize2
// // this.orderNoData.page = this.pageIndex2
// getOrderNoList(this.orderNoData).then(({data}) => {
// if (data && data.code === 0) {
// this.orderNoList = data.rows
// // this.pageIndex2 = data.page.currPage
// // this.pageSize2 = data.page.pageSize
// // this.totalPage2 = data.page.totalCount
// this.orderNoCurrent = -1
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
// // 点击行选中机台复选框
// orderNoClickRow (row) {
// this.$refs.orderNoTable.toggleRowSelection(row);
// },
// // 单选工单
// selectionOrderNoChangeHandle (val) {
// this.modalData.orderNo = val[0].orderNo
// if (val) {
// this.orderNoCurrent = val.index;
// }
// },
// orderNoRowClassName ({row, rowIndex}) {
// row.index = rowIndex; // 在原有的数据上加一个index
// },
// // 确认选择工单
// confirmOrderNo () {
// this.orderNoModelFlag = false
// },
// 获取工序列表 // 获取工序列表
getOperationList(){
getOperationList () {
getOperationList(this.modalData).then(({data}) => { getOperationList(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operationList = data.rows this.operationList = data.rows
this.modalData.operationDesc = data.rows[0].operationDesc
this.getResourceList()
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1650,6 +1698,9 @@
getResourceList(this.modalData).then(({data}) => { getResourceList(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.resourceList = data.rows this.resourceList = data.rows
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1720,7 +1771,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
} }
this.operationList = [] this.operationList = []
this.resourceList = [] this.resourceList = []
@ -1779,7 +1832,9 @@
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
specialTaskFlag: ''
specialTaskFlag: '',
workCenterNo: '',
rollNo: ''
} }
// 获取选中框 // 获取选中框
let obj = document.getElementsByName('specialTask') let obj = document.getElementsByName('specialTask')
@ -1853,8 +1908,7 @@
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
duration: 1500, duration: 1500,
onClose: () => {
}
onClose: () => {}
}) })
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
@ -2258,7 +2312,6 @@
userId: this.$store.state.user.id, userId: this.$store.state.user.id,
languageCode: this.$i18n.locale languageCode: this.$i18n.locale
} }
console.log(this.$route.meta.menuId)
userFavoriteList(userFavorite).then(({data}) => { userFavoriteList(userFavorite).then(({data}) => {
for (let i = 0; i < data.list.length; i++) { for (let i = 0; i < data.list.length; i++) {
if(this.$route.meta.menuId==data.list[i].menuId){ if(this.$route.meta.menuId==data.list[i].menuId){

2
src/views/modules/sys/user.vue
View File

@ -10,7 +10,7 @@
<el-input v-model="dataForm.userName" placeholder="用户账号" clearable></el-input> <el-input v-model="dataForm.userName" placeholder="用户账号" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="test()" type="primary">{{ buttons.search || '查询' }}</el-button>
<el-button @click="getDataList" type="primary">{{ buttons.search || '查询' }}</el-button>
<el-button v-if="isAuth('sys:user:save')" type="primary" @click="addOrUpdateHandle()"> <el-button v-if="isAuth('sys:user:save')" type="primary" @click="addOrUpdateHandle()">
{{ buttons.add || '新增' }} {{ buttons.add || '新增' }}
</el-button> </el-button>

Write Preview
Loading…
Cancel
Save