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

2023-11-08 设备和质量修改2

java8
杨奉源 2 years ago
parent
7d142c1e8d
commit
f327b067c2
5 changed files with 669 additions and 50 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. 10
      src/views/main-navbar.vue
  2. 225
      src/views/modules/qc/FAIResultEntry.vue
  3. 218
      src/views/modules/qc/FQCResultEntry.vue
  4. 221
      src/views/modules/qc/IPQCResultEntry.vue
  5. 35
      src/views/modules/qc/IQCResultEntry.vue

10
src/views/main-navbar.vue
View File

@ -24,11 +24,11 @@
<!-- <span @click="favoriteFunction()">-->
<!-- <icon-svg :name="this.$store.state.user.favorite?'xiangqufill':'xiangqu'" ></icon-svg>-->
<!-- </span>-->
<!-- <el-menu-item class="site-navbar__avatar" index="1">-->
<!-- <span class="el-dropdown-link" @click="userSetting">-->
<!-- <icon-svg name="editTable" style="width: 25px;height: 25px;margin-top: 5px"></icon-svg>-->
<!-- </span>-->
<!-- </el-menu-item>-->
<el-menu-item class="site-navbar__avatar" index="1">
<span class="el-dropdown-link" @click="userSetting">
<icon-svg name="editTable" style="width: 25px;height: 25px;margin-top: 5px"></icon-svg>
</span>
</el-menu-item>
<!-- <el-menu-item class="site-navbar__avatar" index="2">-->
<!-- <span style=" color: #909399;" @click="helpFileList()">-->
<!-- 帮助-->

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

@ -92,7 +92,7 @@
</template>
</el-table-column>
<el-table-column
v-for="(item,index) in columnList" :key="index"
v-for="(item,index) in columnList1" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
@ -667,6 +667,10 @@
queryPartList, // 查询物料集合
umSearch // 查询单位列表
} 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';
@ -749,8 +753,13 @@
umName: ''
},
// 展示列集
columnList: [
columnList1: [
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1InspectionNo',
tableId: "301007Table1",
tableName: "FAI检验记录表",
columnProp: 'inspectionNo',
headerAlign: "center",
align: "center",
@ -764,6 +773,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1BatchRollNo',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'batchRollNo',
headerAlign: "center",
align: "center",
@ -777,6 +791,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1RollNo',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'rollNo',
headerAlign: "center",
align: "center",
@ -790,6 +809,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1InspectionResult',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectionResult',
headerAlign: "center",
align: "center",
@ -803,6 +827,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1DisposalMeasures',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'disposalMeasures',
headerAlign: "center",
align: "center",
@ -816,6 +845,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1TaskDate',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'taskDate',
headerAlign: "center",
align: "center",
@ -829,6 +863,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1InspectionCycle',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectionCycle',
headerAlign: "center",
align: "right",
@ -842,6 +881,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1OrderNo',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'orderNo',
headerAlign: "center",
align: "center",
@ -855,6 +899,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1SeqNo',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'seqNo',
headerAlign: "center",
align: "center",
@ -868,6 +917,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1OperationDesc',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'operationDesc',
headerAlign: "center",
align: "center",
@ -881,6 +935,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1ResourceDesc',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'resourceDesc',
headerAlign: "center",
align: "center",
@ -894,6 +953,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1PartNo',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'partNo',
headerAlign: "center",
align: "center",
@ -907,6 +971,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1Spec',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'spec',
headerAlign: "center",
align: "center",
@ -920,6 +989,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1CinvSourceCode',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
@ -933,6 +1007,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1Sku',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'sku',
headerAlign: "center",
align: "center",
@ -946,6 +1025,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1PartDesc',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
@ -959,6 +1043,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1RollQty',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'rollQty',
headerAlign: "center",
align: "right",
@ -972,6 +1061,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1SamplingQty',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'samplingQty',
headerAlign: "center",
align: "right",
@ -985,6 +1079,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1UmName',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'umName',
headerAlign: "center",
align: "center",
@ -998,6 +1097,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1InspectionRemark',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectionRemark',
headerAlign: "center",
align: "center",
@ -1011,6 +1115,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1DisposalRemark',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'disposalRemark',
headerAlign: "center",
align: "center",
@ -1024,6 +1133,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1InspectorDate',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectorDate',
headerAlign: "center",
align: "center",
@ -1037,6 +1151,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1InspectorName',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectorName',
headerAlign: "center",
align: "center",
@ -1050,6 +1169,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301007,
serialNumber: '301007Table1SpecialRequirements',
tableId: "301007Table1",
tableName: "FQC检验记录表",
columnProp: 'specialRequirements',
headerAlign: "center",
align: "center",
@ -1478,6 +1602,8 @@
this.umSearch()
// 查看 质量任务生成规则控制 动控是否开启
this.queryController()
// 动态列
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
},
methods: {
@ -1764,7 +1890,6 @@
// 新增FAI巡检记录
saveData(){
console.log(this.modalData)
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) {
this.$message.warning('请选择派工单！')
return
@ -2448,16 +2573,12 @@
userId: this.$store.state.user.id,
languageCode: this.$i18n.locale
}
console.log(this.$route.meta.menuId)
userFavoriteList(userFavorite).then(({data}) => {
for (let i = 0; i < data.list.length; i++) {
// let flag=false;
if(this.$route.meta.menuId==data.list[i].menuId){
this.favorite = true
// flag=true;
}
}
})
},
@ -2468,17 +2589,10 @@
functionId: this.$route.meta.menuId,
}
if (this.favorite) {
// 取消收藏
// this.$confirm(`确定取消收藏`, '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
removeUserFavorite(userFavorite).then(({data}) => {
this.$message.success(data.msg)
this.favorite = false
})
// })
} else {
// 收藏
saveUserFavorite(userFavorite).then(({data}) => {
@ -2495,23 +2609,17 @@
await qcFAIInspectionSearch(this.searchData).then(({data}) => {
this.exportList= data.page.list;
})
return this.exportList;
},
startDownload() {
// this.exportData = this.dataList
},
startDownload() {},
finishDownload() {
},
finishDownload() {},
fields() {
let json = "{"
this.columnList.forEach((item, index) => {
if (index == this.columnList.length - 1) {
this.columnList1.forEach((item, index) => {
if (index == this.columnList1.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
@ -2522,7 +2630,74 @@
return s
},
// 导出 end
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn(tableId, columnId) {
let queryTableUser = {
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: tableId,
status: true,
languageCode: this.$i18n.locale
}
await getTableUserListLanguage(queryTableUser).then(({data}) => {
if (data.rows.length > 0) {
//this.columnList1 = []
switch (columnId) {
case 1:
this.columnList1 = data.rows
break;
// case 2:
// this.columnList1 = data.rows
// break;
// case 3:
// this.columnList2 = data.rows
// break;
// case 4:
// this.columnList3 = data.rows
// break;
}
} else {
this.getColumnList(tableId, columnId)
}
})
},
// 获取 tableDefault 列
async getColumnList(tableId, columnId) {
this.queryTable.tableId = tableId
let queryTable= {
functionId: this.$route.meta.menuId,
tableId: tableId,
languageCode: this.$i18n.locale
}
await getTableDefaultListLanguage(queryTable).then(({data}) => {
if (!data.rows.length == 0) {
switch (columnId) {
case 1:
this.columnList1 = data.rows
break;
// case 2:
// this.columnList1 = data.rows
// break;
// case 3:
// this.columnList2 = data.rows
// break;
// case 4:
// this.columnList3 = data.rows
// break;
}
} else {
// this.showDefault = true.
}
})
},
//动态列结束
}
}
</script>

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

@ -92,7 +92,7 @@
</template>
</el-table-column>
<el-table-column
v-for="(item,index) in columnList" :key="index"
v-for="(item,index) in columnList1" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
@ -250,7 +250,7 @@
</el-dialog>
<!-- 检验单详情页 -->
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1100px">
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
<el-form-item :label="'物料编码'">
<el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
@ -353,7 +353,7 @@
prop=""
header-align="center"
align="center"
min-width="40"
min-width="60"
label="操作">
<template slot-scope="scope">
<el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
@ -665,6 +665,10 @@
queryPartList, // 查询物料集合
umSearch // 查询单位列表
} 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';
@ -747,8 +751,13 @@
umName: ''
},
// 展示列集
columnList: [
columnList1: [
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1InspectionNo',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectionNo',
headerAlign: "center",
align: "center",
@ -762,6 +771,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1BatchRollNo',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'batchRollNo',
headerAlign: "center",
align: "center",
@ -775,6 +789,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1RollNo',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'rollNo',
headerAlign: "center",
align: "center",
@ -788,6 +807,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1InspectionResult',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectionResult',
headerAlign: "center",
align: "center",
@ -801,6 +825,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1DisposalMeasures',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'disposalMeasures',
headerAlign: "center",
align: "center",
@ -814,6 +843,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1TaskDate',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'taskDate',
headerAlign: "center",
align: "center",
@ -827,6 +861,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1InspectionCycle',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectionCycle',
headerAlign: "center",
align: "right",
@ -840,6 +879,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1OrderNo',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'orderNo',
headerAlign: "center",
align: "center",
@ -853,6 +897,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1SeqNo',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'seqNo',
headerAlign: "center",
align: "center",
@ -866,6 +915,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1OperationDesc',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'operationDesc',
headerAlign: "center",
align: "center",
@ -879,6 +933,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1ResourceDesc',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'resourceDesc',
headerAlign: "center",
align: "center",
@ -892,6 +951,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1PartNo',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'partNo',
headerAlign: "center",
align: "center",
@ -905,6 +969,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1Spec',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'spec',
headerAlign: "center",
align: "center",
@ -918,6 +987,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1CinvSourceCode',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
@ -931,6 +1005,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1Sku',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'sku',
headerAlign: "center",
align: "center",
@ -944,6 +1023,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1PartDesc',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
@ -957,6 +1041,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1RollQty',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'rollQty',
headerAlign: "center",
align: "right",
@ -970,6 +1059,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1SamplingQty',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'samplingQty',
headerAlign: "center",
align: "right",
@ -983,6 +1077,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1UmName',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'umName',
headerAlign: "center",
align: "center",
@ -996,6 +1095,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1InspectionRemark',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectionRemark',
headerAlign: "center",
align: "center",
@ -1009,6 +1113,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1DisposalRemark',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'disposalRemark',
headerAlign: "center",
align: "center",
@ -1022,6 +1131,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1InspectorDate',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectorDate',
headerAlign: "center",
align: "center",
@ -1035,6 +1149,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1InspectorName',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'inspectorName',
headerAlign: "center",
align: "center",
@ -1048,6 +1167,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1SpecialRequirements',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'specialRequirements',
headerAlign: "center",
align: "center",
@ -1109,6 +1233,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'samplingLevelDesc',
@ -1121,6 +1246,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'samplingProgrammeDesc',
@ -1133,6 +1259,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'objectDesc',
@ -1145,6 +1272,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'aql',
@ -1157,6 +1285,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'ac',
@ -1169,6 +1298,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 're',
@ -1181,6 +1311,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'defaultValue',
@ -1193,6 +1324,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'maxValue',
@ -1205,6 +1337,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'minValue',
@ -1217,6 +1350,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'valueType',
@ -1229,6 +1363,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
],
fileColumnList: [
@ -1476,6 +1611,8 @@
this.umSearch()
// 查看 质量任务生成规则控制 动控是否开启
this.queryController()
// 动态列
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
},
methods: {
@ -2495,8 +2632,8 @@
fields() {
let json = "{"
this.columnList.forEach((item, index) => {
if (index == this.columnList.length - 1) {
this.columnList1.forEach((item, index) => {
if (index == this.columnList1.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
@ -2506,6 +2643,75 @@
let s = eval("(" + json + ")")
return s
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn(tableId, columnId) {
let queryTableUser = {
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: tableId,
status: true,
languageCode: this.$i18n.locale
}
await getTableUserListLanguage(queryTableUser).then(({data}) => {
if (data.rows.length > 0) {
//this.columnList1 = []
switch (columnId) {
case 1:
this.columnList1 = data.rows
break;
// case 2:
// this.columnList1 = data.rows
// break;
// case 3:
// this.columnList2 = data.rows
// break;
// case 4:
// this.columnList3 = data.rows
// break;
}
} else {
this.getColumnList(tableId, columnId)
}
})
},
// 获取 tableDefault 列
async getColumnList(tableId, columnId) {
this.queryTable.tableId = tableId
let queryTable= {
functionId: this.$route.meta.menuId,
tableId: tableId,
languageCode: this.$i18n.locale
}
await getTableDefaultListLanguage(queryTable).then(({data}) => {
if (!data.rows.length == 0) {
switch (columnId) {
case 1:
this.columnList1 = data.rows
break;
// case 2:
// this.columnList1 = data.rows
// break;
// case 3:
// this.columnList2 = data.rows
// break;
// case 4:
// this.columnList3 = data.rows
// break;
}
} else {
// this.showDefault = true.
}
})
},
//动态列结束
}
}
</script>

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

@ -102,7 +102,7 @@
</template>
</el-table-column>
<el-table-column
v-for="(item,index) in columnList" :key="index"
v-for="(item,index) in columnList1" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
@ -271,7 +271,7 @@
</el-dialog>
<!-- 检验单详情页 -->
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1100px">
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
<el-form-item :label="'物料编码'">
<el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
@ -374,7 +374,7 @@
prop=""
header-align="center"
align="center"
min-width="40"
min-width="60"
label="操作">
<template slot-scope="scope">
<el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
@ -683,6 +683,10 @@
queryPartList, // 查询物料集合
umSearch // 查询单位列表
} 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'
@ -773,8 +777,13 @@
umName: ''
},
// 展示列集
columnList: [
columnList1: [
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1InspectionNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'inspectionNo',
headerAlign: "center",
align: "center",
@ -788,6 +797,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1BatchRollNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'batchRollNo',
headerAlign: "center",
align: "center",
@ -801,6 +815,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1RollNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'rollNo',
headerAlign: "center",
align: "center",
@ -814,6 +833,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1InspectionResult',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'inspectionResult',
headerAlign: "center",
align: "center",
@ -827,6 +851,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1DisposalMeasures',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'disposalMeasures',
headerAlign: "center",
align: "center",
@ -840,6 +869,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1InspectionTypeNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'inspectionTypeNo',
headerAlign: "center",
align: "center",
@ -853,6 +887,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1TaskDate',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'taskDate',
headerAlign: "center",
align: "center",
@ -866,6 +905,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1InspectionCycle',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'inspectionCycle',
headerAlign: "center",
align: "right",
@ -879,6 +923,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1OrderNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'orderNo',
headerAlign: "center",
align: "center",
@ -892,6 +941,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1SeqNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'seqNo',
headerAlign: "center",
align: "center",
@ -905,6 +959,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1OperationDesc',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'operationDesc',
headerAlign: "center",
align: "center",
@ -918,6 +977,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1ResourceDesc',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'resourceDesc',
headerAlign: "center",
align: "center",
@ -931,6 +995,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1PartNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'partNo',
headerAlign: "center",
align: "center",
@ -944,6 +1013,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1Spec',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'spec',
headerAlign: "center",
align: "center",
@ -957,6 +1031,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1cinvSourceCode',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
@ -970,6 +1049,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1Sku',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'sku',
headerAlign: "center",
align: "center",
@ -983,6 +1067,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1PartDesc',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
@ -996,6 +1085,11 @@
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1RollQty',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'rollQty',
headerAlign: "center",
align: "right",
@ -1009,6 +1103,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1SamplingQty',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'samplingQty',
headerAlign: "center",
align: "right",
@ -1022,6 +1121,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1UmName',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'umName',
headerAlign: "center",
align: "center",
@ -1035,6 +1139,11 @@
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1InspectionRemark',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'inspectionRemark',
headerAlign: "center",
align: "center",
@ -1048,6 +1157,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1DisposalRemark',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'disposalRemark',
headerAlign: "center",
align: "center",
@ -1061,6 +1175,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1InspectorDate',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'inspectorDate',
headerAlign: "center",
align: "center",
@ -1074,6 +1193,11 @@
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1InspectorName',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'inspectorName',
headerAlign: "center",
align: "center",
@ -1087,6 +1211,11 @@
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1SpecialRequirements',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'specialRequirements',
headerAlign: "center",
align: "center",
@ -1148,6 +1277,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'samplingLevelDesc',
@ -1160,6 +1290,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'samplingProgrammeDesc',
@ -1172,6 +1303,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'objectDesc',
@ -1184,6 +1316,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'aql',
@ -1196,6 +1329,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'ac',
@ -1208,6 +1342,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 're',
@ -1220,6 +1355,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'defaultValue',
@ -1232,6 +1368,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'maxValue',
@ -1244,6 +1381,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'minValue',
@ -1256,6 +1394,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'valueType',
@ -1268,6 +1407,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
],
fileColumnList: [
@ -1523,6 +1663,7 @@
this.umSearch()
// 查看 质量任务生成规则控制 动控是否开启
this.queryController()
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
},
methods: {
// 查询单位
@ -2538,8 +2679,8 @@
fields() {
let json = "{"
this.columnList.forEach((item, index) => {
if (index == this.columnList.length - 1) {
this.columnList1.forEach((item, index) => {
if (index == this.columnList1.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
@ -2549,6 +2690,74 @@
let s = eval("(" + json + ")")
return s
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn(tableId, columnId) {
let queryTableUser = {
userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId,
tableId: tableId,
status: true,
languageCode: this.$i18n.locale
}
await getTableUserListLanguage(queryTableUser).then(({data}) => {
if (data.rows.length > 0) {
//this.columnList1 = []
switch (columnId) {
case 1:
this.columnList1 = data.rows
break;
// case 2:
// this.columnList1 = data.rows
// break;
// case 3:
// this.columnList2 = data.rows
// break;
// case 4:
// this.columnList3 = data.rows
// break;
}
} else {
this.getColumnList(tableId, columnId)
}
})
},
// 获取 tableDefault 列
async getColumnList(tableId, columnId) {
this.queryTable.tableId = tableId
let queryTable= {
functionId: this.$route.meta.menuId,
tableId: tableId,
languageCode: this.$i18n.locale
}
await getTableDefaultListLanguage(queryTable).then(({data}) => {
if (!data.rows.length == 0) {
switch (columnId) {
case 1:
this.columnList1 = data.rows
break;
// case 2:
// this.columnList1 = data.rows
// break;
// case 3:
// this.columnList2 = data.rows
// break;
// case 4:
// this.columnList3 = data.rows
// break;
}
} else {
// this.showDefault = true.
}
})
},
//动态列结束
}
}
</script>

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

@ -128,7 +128,7 @@
</el-pagination>
<!-- 检验单详情页 -->
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1000px">
<el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
<el-form-item :label="'物料编码'">
<el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
@ -222,7 +222,7 @@
prop=""
header-align="center"
align="center"
min-width="40"
min-width="60"
label="操作">
<template slot-scope="scope">
<el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
@ -500,6 +500,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'inspectionResult',
@ -512,6 +513,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'taskDate',
@ -524,6 +526,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'inspectionCycle',
@ -536,6 +539,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'rollNo',
@ -548,6 +552,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'partNo',
@ -560,6 +565,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'partDesc',
@ -572,6 +578,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
columnProp: 'umid',
@ -584,6 +591,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'rollQty',
@ -596,6 +604,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'samplingQty',
@ -608,11 +617,12 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'poOrderNo',
headerAlign: "center",
align: "right",
align: "center",
columnLabel: '单据号',
columnHidden: false,
columnImage: false,
@ -620,6 +630,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
columnProp: 'poItemNo',
@ -632,6 +643,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'supplierDesc',
@ -644,6 +656,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
columnProp: 'inspectionRemark',
@ -656,6 +669,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
columnProp: 'disposalMeasures',
@ -668,6 +682,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'disposalRemark',
@ -680,6 +695,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
columnProp: 'inspectorDate',
@ -692,6 +708,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
columnProp: 'inspectorNo',
@ -704,6 +721,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
],
detailColumnList: [
@ -718,6 +736,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'samplingLevelDesc',
@ -730,6 +749,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'samplingProgrammeDesc',
@ -742,6 +762,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'objectDesc',
@ -754,6 +775,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
columnProp: 'aql',
@ -766,6 +788,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'ac',
@ -778,6 +801,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 're',
@ -790,6 +814,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
columnProp: 'defaultValue',
@ -802,6 +827,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'maxValue',
@ -814,6 +840,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'minValue',
@ -826,6 +853,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
columnProp: 'valueType',
@ -838,6 +866,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
],
fileColumnList: [

Write Preview
Loading…
Cancel
Save