From e9ddb77168078c1a130b3b01732a5b1376e0cfe6 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Fri, 15 Dec 2023 11:25:32 +0800
Subject: [PATCH] =?UTF-8?q?12.15=20=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E5=92=8C?=
=?UTF-8?q?=E6=8A=BD=E6=A0=B7=E6=96=B9=E6=A1=88=E7=AE=A1=E7=90=86=E5=8A=A8?=
=?UTF-8?q?=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/qc/qcItem.vue | 172 ++++++++++
src/views/modules/qc/qcMethod.vue | 119 +++++++
src/views/modules/qc/qcPartAttribute.vue | 322 +++++++++++++++---
.../modules/qc/qcSamplingInspectionLevel.vue | 119 +++++++
.../modules/qc/qcSamplingInspectionPlan.vue | 149 ++++++++
.../qc/qcSamplingInspectionProgramme.vue | 163 +++++++++
.../modules/qc/qcSamplingInspectionQty.vue | 125 +++++++
.../qc/qcSamplingInspectionQtyRank.vue | 131 +++++++
src/views/modules/qc/qcTemplate.vue | 172 ++++++++++
9 files changed, 1428 insertions(+), 44 deletions(-)
diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue
index 56df51b..a58f051 100644
--- a/src/views/modules/qc/qcItem.vue
+++ b/src/views/modules/qc/qcItem.vue
@@ -239,6 +239,10 @@
inspectionTypeSearch, // 查询检验类型
queryMethodList // 查询检验方法
} from "@/api/qc/qc.js"
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcUpload from "./qc_upload";
@@ -315,6 +319,12 @@
// 检验项目展示标头
columnList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableItemNo',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 99,
columnProp: 'itemNo',
headerAlign: 'center',
align: "center",
@@ -327,6 +337,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableItemDesc',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'itemDesc',
headerAlign: 'center',
align: "center",
@@ -339,6 +355,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableMethodName',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'methodName',
headerAlign: 'center',
align: "center",
@@ -351,6 +373,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableMethodRemark',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'methodRemark',
headerAlign: 'center',
align: "center",
@@ -363,6 +391,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableValueType',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'valueType',
headerAlign: 'center',
align: "center",
@@ -375,6 +409,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableInspectionTypeName',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'inspectionTypeName',
headerAlign: 'center',
align: "center",
@@ -387,6 +427,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableDefaultValue',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'defaultValue',
headerAlign: 'center',
align: "right",
@@ -399,6 +445,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableMaxValue',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'maxValue',
headerAlign: 'center',
align: "right",
@@ -411,6 +463,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableMinValue',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'minValue',
headerAlign: 'center',
align: "right",
@@ -423,6 +481,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableSamplingProgrammeDesc',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'samplingProgrammeDesc',
headerAlign: 'center',
align: "center",
@@ -435,6 +499,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableSamplingLevelDesco',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'samplingLevelDesc',
headerAlign: 'center',
align: "center",
@@ -447,6 +517,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableItemSamplingQuantity',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'itemSamplingQuantity',
headerAlign: 'center',
align: "right",
@@ -459,6 +535,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableDefaultSamplingProportion',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'defaultSamplingProportion',
headerAlign: 'center',
align: "right",
@@ -471,6 +553,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableCreatedDate',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'createdDate',
headerAlign: 'center',
align: "center",
@@ -483,6 +571,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableCreatedBy',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'createdBy',
headerAlign: 'center',
align: "center",
@@ -495,6 +589,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableUpdateDate',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'updateDate',
headerAlign: 'center',
align: "center",
@@ -507,6 +607,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301002,
+ serialNumber: '301002TableUpdateBy',
+ tableId: "301002Table",
+ tableName: "检验项目维护表",
+ columnWidth: 85,
columnProp: 'updateBy',
headerAlign: 'center',
align: "center",
@@ -615,6 +721,8 @@
this.getDataList()
this.favoriteIsOk()
this.inspectionTypeSearch()
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table',1)
},
methods: {
/**
@@ -959,7 +1067,71 @@
this.$refs.qcUpload.init(currentData);
})
},
+ // 动态列开始 获取 用户保存的 格式列
+ 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = data.rows
+ // break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+ },
+ //动态列结束
}
}
diff --git a/src/views/modules/qc/qcMethod.vue b/src/views/modules/qc/qcMethod.vue
index 98c6742..4fca463 100644
--- a/src/views/modules/qc/qcMethod.vue
+++ b/src/views/modules/qc/qcMethod.vue
@@ -149,6 +149,10 @@
qcMethodDelete, // 检验方法删除
inspectionTypeSearch, // 搜索所有检验类型
} from "@/api/qc/qc.js"
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
data () {
@@ -197,6 +201,12 @@
// 标头展示
columnList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301001,
+ serialNumber: '301001TableMethodNo',
+ tableId: "301001Table",
+ tableName: "检验方法维护表",
+ columnWidth: 185,
columnProp: 'methodNo',
headerAlign: 'center',
align: "center",
@@ -209,6 +219,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301001,
+ serialNumber: '301001TableMethodName',
+ tableId: "301001Table",
+ tableName: "检验方法维护表",
+ columnWidth: 182,
columnProp: 'methodName',
headerAlign: 'center',
align: "center",
@@ -221,6 +237,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301001,
+ serialNumber: '301001TableMethodRemark',
+ tableId: "301001Table",
+ tableName: "检验方法维护表",
+ columnWidth: 182,
columnProp: 'methodRemark',
headerAlign: 'center',
align: "center",
@@ -233,6 +255,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301001,
+ serialNumber: '301001TableInspectionTypeName',
+ tableId: "301001Table",
+ tableName: "检验方法维护表",
+ columnWidth: 182,
columnProp: 'inspectionTypeName',
headerAlign: 'center',
align: "center",
@@ -245,6 +273,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301001,
+ serialNumber: '301001TableCreateDate',
+ tableId: "301001Table",
+ tableName: "检验方法维护表",
+ columnWidth: 182,
columnProp: 'createDate',
headerAlign: 'center',
align: "center",
@@ -257,6 +291,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301001,
+ serialNumber: '301001TableCreateBy',
+ tableId: "301001Table",
+ tableName: "检验方法维护表",
+ columnWidth: 182,
columnProp: 'createBy',
headerAlign: 'center',
align: "center",
@@ -269,6 +309,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301001,
+ serialNumber: '301001TableUpdateDate',
+ tableId: "301001Table",
+ tableName: "检验方法维护表",
+ columnWidth: 182,
columnProp: 'updateDate',
headerAlign: 'center',
align: "center",
@@ -281,6 +327,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301001,
+ serialNumber: '301001TableUpdateBy',
+ tableId: "301001Table",
+ tableName: "检验方法维护表",
+ columnWidth: 182,
columnProp: 'updateBy',
headerAlign: 'center',
align: "center",
@@ -321,6 +373,8 @@
this.getDataList()
this.favoriteIsOk()
this.inspectionTypeSearch()
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table',1)
},
methods: {
/**
@@ -557,6 +611,71 @@
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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = data.rows
+ // break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+
+ },
+ //动态列结束
}
}
diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue
index a15c551..5b54975 100644
--- a/src/views/modules/qc/qcPartAttribute.vue
+++ b/src/views/modules/qc/qcPartAttribute.vue
@@ -134,19 +134,19 @@
border
v-loading="dataListLoading"
style="width: 100%;">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ if (data.rows.length > 0) {
+ //this.columnList1 = []
+ switch (columnId) {
+ case 1:
+ this.columnList = data.rows
+ break;
+ case 2:
+ this.columnDetailList = 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.columnList = data.rows
+ break;
+ case 2:
+ this.columnDetailList = data.rows
+ break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+
+ },
+ //动态列结束
}
}
diff --git a/src/views/modules/qc/qcSamplingInspectionLevel.vue b/src/views/modules/qc/qcSamplingInspectionLevel.vue
index bc19d2d..98a8e1c 100644
--- a/src/views/modules/qc/qcSamplingInspectionLevel.vue
+++ b/src/views/modules/qc/qcSamplingInspectionLevel.vue
@@ -145,6 +145,10 @@
samplingLevelUpdate, // 修改检验等级
samplingLevelDelete, // 删除检验等级
} from "@/api/qc/qc.js"
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
watch: {
@@ -185,6 +189,12 @@
// 标头展示
columnList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301011,
+ serialNumber: '301011TableSamplingLevelNo',
+ tableId: "301011Table",
+ tableName: "检验水平表",
+ columnWidth: 185,
columnProp: 'samplingLevelNo',
headerAlign: 'center',
align: "center",
@@ -197,6 +207,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301011,
+ serialNumber: '301011TableSamplingLevelDesc',
+ tableId: "301011Table",
+ tableName: "检验水平表",
+ columnWidth: 182,
columnProp: 'samplingLevelDesc',
headerAlign: 'center',
align: "center",
@@ -209,6 +225,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301011,
+ serialNumber: '301011TableSamplingLevelRemark',
+ tableId: "301011Table",
+ tableName: "检验水平表",
+ columnWidth: 182,
columnProp: 'samplingLevelRemark',
headerAlign: 'center',
align: "center",
@@ -221,6 +243,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301011,
+ serialNumber: '301011TableSamplingLevelActive',
+ tableId: "301011Table",
+ tableName: "检验水平表",
+ columnWidth: 182,
columnProp: 'samplingLevelActive',
headerAlign: 'center',
align: "center",
@@ -233,6 +261,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301011,
+ serialNumber: '301011TableCreateDate',
+ tableId: "301011Table",
+ tableName: "检验水平表",
+ columnWidth: 182,
columnProp: 'createDate',
headerAlign: 'center',
align: "center",
@@ -245,6 +279,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301011,
+ serialNumber: '301011TableCreateBy',
+ tableId: "301011Table",
+ tableName: "检验水平表",
+ columnWidth: 182,
columnProp: 'createBy',
headerAlign: 'center',
align: "center",
@@ -257,6 +297,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301011,
+ serialNumber: '301011TableUpdateDate',
+ tableId: "301011Table",
+ tableName: "检验水平表",
+ columnWidth: 182,
columnProp: 'updateDate',
headerAlign: 'center',
align: "center",
@@ -269,6 +315,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301011,
+ serialNumber: '301011TableUpdateBy',
+ tableId: "301011Table",
+ tableName: "检验水平表",
+ columnWidth: 182,
columnProp: 'updateBy',
headerAlign: 'center',
align: "center",
@@ -307,6 +359,8 @@
created () {
this.getDataList()
this.favoriteIsOk()
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table',1)
},
methods: {
/**
@@ -526,6 +580,71 @@
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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = data.rows
+ // break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+
+ },
+ //动态列结束
}
}
diff --git a/src/views/modules/qc/qcSamplingInspectionPlan.vue b/src/views/modules/qc/qcSamplingInspectionPlan.vue
index f8ba35d..803d0e4 100644
--- a/src/views/modules/qc/qcSamplingInspectionPlan.vue
+++ b/src/views/modules/qc/qcSamplingInspectionPlan.vue
@@ -208,6 +208,10 @@
samplingInspectionPlanUpdate, // 修改矩阵
samplingInspectionPlanDelete, // 删除矩阵
} from "@/api/qc/qc.js"
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
@@ -285,6 +289,12 @@
// 展示标头
columnList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableSamplingPlanNo',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 122,
columnProp: 'samplingPlanNo',
headerAlign: 'center',
align: "center",
@@ -297,6 +307,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableSamplingPlanDesc',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'samplingPlanDesc',
headerAlign: 'center',
align: "center",
@@ -309,6 +325,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableSamplingQtyDesc',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'samplingQtyDesc',
headerAlign: 'center',
align: "center",
@@ -321,6 +343,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableSamplingQty',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'samplingQty',
headerAlign: 'center',
align: "right",
@@ -333,6 +361,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableSamplingQtyRankDesc',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'samplingQtyRankDesc',
headerAlign: 'center',
align: "center",
@@ -345,6 +379,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableMinQty',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'minQty',
headerAlign: 'center',
align: "right",
@@ -357,6 +397,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableMaxQty',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'maxQty',
headerAlign: 'center',
align: "right",
@@ -369,6 +415,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableSamplingLevelDesc',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'samplingLevelDesc',
headerAlign: 'center',
align: "center",
@@ -381,6 +433,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableSamplingPlanActive',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'samplingPlanActive',
headerAlign: 'center',
align: "center",
@@ -393,6 +451,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableCreateDate',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'createDate',
headerAlign: 'center',
align: "center",
@@ -405,6 +469,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableCreateBy',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'createBy',
headerAlign: 'center',
align: "center",
@@ -417,6 +487,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableUpdateDate',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'updateDate',
headerAlign: 'center',
align: "center",
@@ -429,6 +505,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301012,
+ serialNumber: '301012TableUpdateBy',
+ tableId: "301012Table",
+ tableName: "样本量字码矩阵表",
+ columnWidth: 110,
columnProp: 'updateBy',
headerAlign: 'center',
align: "center",
@@ -509,6 +591,8 @@
created () {
this.getDataList()
this.favoriteIsOk()
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table',1)
},
methods: {
/**
@@ -810,6 +894,71 @@
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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = data.rows
+ // break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+
+ },
+ //动态列结束
}
}
diff --git a/src/views/modules/qc/qcSamplingInspectionProgramme.vue b/src/views/modules/qc/qcSamplingInspectionProgramme.vue
index 0389a05..739fab8 100644
--- a/src/views/modules/qc/qcSamplingInspectionProgramme.vue
+++ b/src/views/modules/qc/qcSamplingInspectionProgramme.vue
@@ -279,6 +279,10 @@
saveSamplingProgrammeDetails, // 新增抽样方案中的矩阵
deleteSamplingProgrammeDetails, // 删除抽样方案中的矩阵
} from "@/api/qc/qc.js"
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
@@ -334,6 +338,12 @@
},
columnList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table1SamplingProgrammeNo',
+ tableId: "301013Table1",
+ tableName: "抽样方案表",
+ columnWidth: 211,
columnProp: 'samplingProgrammeNo',
headerAlign: "center",
align: "center",
@@ -346,6 +356,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table1SamplingProgrammeDesc',
+ tableId: "301013Table1",
+ tableName: "抽样方案表",
+ columnWidth: 208,
columnProp: 'samplingProgrammeDesc',
headerAlign: "center",
align: "center",
@@ -358,6 +374,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table1SamplingProgrammeCode',
+ tableId: "301013Table1",
+ tableName: "抽样方案表",
+ columnWidth: 208,
columnProp: 'samplingProgrammeCode',
headerAlign: "center",
align: "center",
@@ -370,6 +392,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table1CreateTime',
+ tableId: "301013Table1",
+ tableName: "抽样方案表",
+ columnWidth: 208,
columnProp: 'createTime',
headerAlign: "center",
align: "center",
@@ -382,6 +410,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table1CreateBy',
+ tableId: "301013Table1",
+ tableName: "抽样方案表",
+ columnWidth: 208,
columnProp: 'createBy',
headerAlign: "center",
align: "center",
@@ -394,6 +428,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table1UpdateDate',
+ tableId: "301013Table1",
+ tableName: "抽样方案表",
+ columnWidth: 208,
columnProp: 'updateDate',
headerAlign: "center",
align: "center",
@@ -406,6 +446,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table1UpdateBy',
+ tableId: "301013Table1",
+ tableName: "抽样方案表",
+ columnWidth: 208,
columnProp: 'updateBy',
headerAlign: "center",
align: "center",
@@ -432,6 +478,12 @@
// 展示列集
columnDetailList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table2SamplingPlanNo',
+ tableId: "301013Table2",
+ tableName: "矩阵详情表",
+ columnWidth: 181,
columnProp: 'samplingPlanNo',
headerAlign: "center",
align: "center",
@@ -444,6 +496,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table2SamplingPlanDesc',
+ tableId: "301013Table2",
+ tableName: "矩阵详情表",
+ columnWidth: 174,
columnProp: 'samplingPlanDesc',
headerAlign: "center",
align: "center",
@@ -456,6 +514,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table2SamplingQtyDesc',
+ tableId: "301013Table2",
+ tableName: "矩阵详情表",
+ columnWidth: 174,
columnProp: 'samplingQtyDesc',
headerAlign: "center",
align: "center",
@@ -468,6 +532,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table2SamplingQty',
+ tableId: "301013Table2",
+ tableName: "矩阵详情表",
+ columnWidth: 174,
columnProp: 'samplingQty',
headerAlign: "center",
align: "center",
@@ -480,6 +550,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table2SamplingQtyRankDesc',
+ tableId: "301013Table2",
+ tableName: "矩阵详情表",
+ columnWidth: 174,
columnProp: 'samplingQtyRankDesc',
headerAlign: "center",
align: "center",
@@ -492,6 +568,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table2MinQty',
+ tableId: "301013Table2",
+ tableName: "矩阵详情表",
+ columnWidth: 174,
columnProp: 'minQty',
headerAlign: "center",
align: "center",
@@ -504,6 +586,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table2MaxQty',
+ tableId: "301013Table2",
+ tableName: "矩阵详情表",
+ columnWidth: 174,
columnProp: 'maxQty',
headerAlign: "center",
align: "center",
@@ -516,6 +604,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301013,
+ serialNumber: '301013Table2SamplingLevelDesc',
+ tableId: "301013Table2",
+ tableName: "矩阵详情表",
+ columnWidth: 174,
columnProp: 'samplingLevelDesc',
headerAlign: "center",
align: "center",
@@ -565,6 +659,9 @@
created () {
this.getDataList();
this.favoriteIsOk()
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+ this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
},
methods: {
/**
@@ -930,6 +1027,72 @@
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.columnList = data.rows
+ break;
+ case 2:
+ this.columnDetailList = 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.columnList = data.rows
+ break;
+ case 2:
+ this.columnDetailList = data.rows
+ break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+
+ },
+ //动态列结束
}
}
diff --git a/src/views/modules/qc/qcSamplingInspectionQty.vue b/src/views/modules/qc/qcSamplingInspectionQty.vue
index 7fb4080..8b6757d 100644
--- a/src/views/modules/qc/qcSamplingInspectionQty.vue
+++ b/src/views/modules/qc/qcSamplingInspectionQty.vue
@@ -154,6 +154,10 @@
samplingQtyUpdate, // 修改样本量
samplingQtyDelete, // 删除样本量
} from "@/api/qc/qc.js"
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
watch: {
@@ -209,6 +213,12 @@
// 标头展示
columnList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableSamplingQtyNo',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 163,
columnProp: 'samplingQtyNo',
headerAlign: 'center',
align: "center",
@@ -221,6 +231,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableSamplingQtyDesc',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 162,
columnProp: 'samplingQtyDesc',
headerAlign: 'center',
align: "center",
@@ -233,6 +249,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableSamplingQty',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 162,
columnProp: 'samplingQty',
headerAlign: 'center',
align: "right",
@@ -245,6 +267,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableSamplingQtyRemark',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 162,
columnProp: 'samplingQtyRemark',
headerAlign: 'center',
align: "center",
@@ -257,6 +285,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableSamplingQtyActive',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 162,
columnProp: 'samplingQtyActive',
headerAlign: 'center',
align: "center",
@@ -269,6 +303,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableCreateDate',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 162,
columnProp: 'createDate',
headerAlign: 'center',
align: "center",
@@ -281,6 +321,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableCreateBy',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 162,
columnProp: 'createBy',
headerAlign: 'center',
align: "center",
@@ -293,6 +339,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableUpdateDate',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 162,
columnProp: 'updateDate',
headerAlign: 'center',
align: "center",
@@ -305,6 +357,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301009,
+ serialNumber: '301009TableUpdateBy',
+ tableId: "301009Table",
+ tableName: "样本大小表",
+ columnWidth: 162,
columnProp: 'updateBy',
headerAlign: 'center',
align: "center",
@@ -350,6 +408,8 @@
created () {
this.getDataList()
this.favoriteIsOk()
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table',1)
},
methods: {
// // 清空搜索栏
@@ -543,6 +603,71 @@
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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = data.rows
+ // break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+
+ },
+ //动态列结束
}
}
diff --git a/src/views/modules/qc/qcSamplingInspectionQtyRank.vue b/src/views/modules/qc/qcSamplingInspectionQtyRank.vue
index 5d0cfcc..2138f32 100644
--- a/src/views/modules/qc/qcSamplingInspectionQtyRank.vue
+++ b/src/views/modules/qc/qcSamplingInspectionQtyRank.vue
@@ -167,6 +167,10 @@
samplingQtyRankUpdate, // 修改批量级次
samplingQtyRankDelete, // 删除批量级次
} from "@/api/qc/qc.js"
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
watch: {
@@ -209,6 +213,12 @@
// 标头展示
columnList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableSamplingQtyRankNo',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 154,
columnProp: 'samplingQtyRankNo',
headerAlign: 'center',
align: "center",
@@ -221,6 +231,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableSamplingQtyRankDesc',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'samplingQtyRankDesc',
headerAlign: 'center',
align: "center",
@@ -233,6 +249,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableMinQty',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'minQty',
headerAlign: 'center',
align: "right",
@@ -245,6 +267,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableMaxQty',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'maxQty',
headerAlign: 'center',
align: "right",
@@ -257,6 +285,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableSamplingQtyRankRemark',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'samplingQtyRankRemark',
headerAlign: 'center',
align: "center",
@@ -269,6 +303,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableSamplingQtyRankActive',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'samplingQtyRankActive',
headerAlign: 'center',
align: "center",
@@ -281,6 +321,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableCreateDate',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'createDate',
headerAlign: 'center',
align: "center",
@@ -293,6 +339,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableCreateBy',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'createBy',
headerAlign: 'center',
align: "center",
@@ -305,6 +357,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableUpdateDate',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'updateDate',
headerAlign: 'center',
align: "center",
@@ -317,6 +375,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301010,
+ serialNumber: '301010TableUpdateBy',
+ tableId: "301010Table",
+ tableName: "批量级次表",
+ columnWidth: 145,
columnProp: 'updateBy',
headerAlign: 'center',
align: "center",
@@ -369,6 +433,8 @@
created () {
this.getDataList()
this.favoriteIsOk()
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table',1)
},
methods: {
/**
@@ -600,6 +666,71 @@
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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = data.rows
+ // break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+
+ },
+ //动态列结束
}
}
diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue
index 823b218..06477bd 100644
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@@ -428,6 +428,10 @@
saveItemDetailed, // 新增项目明细的最大最小值
getItem, // 查询检验项目
} from "@/api/qc/qc.js"
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcUpload from "./qc_upload";
@@ -514,6 +518,12 @@
},
columnList: [
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 98,
columnProp: 'templateId',
headerAlign: "center",
align: "center",
@@ -526,6 +536,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'templateName',
headerAlign: "center",
align: "center",
@@ -538,6 +554,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'samplingProgrammeDesc',
headerAlign: "center",
align: "center",
@@ -550,6 +572,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'samplingLevelDesc',
headerAlign: "center",
align: "center",
@@ -562,6 +590,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'inspectionCycle',
headerAlign: "center",
align: "center",
@@ -574,6 +608,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'defaultSamplingQuantity',
headerAlign: "center",
align: "center",
@@ -586,6 +626,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'defaultSamplingProportion',
headerAlign: "center",
align: "center",
@@ -598,6 +644,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'aql',
headerAlign: "center",
align: "center",
@@ -610,6 +662,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'ac',
headerAlign: "center",
align: "center",
@@ -622,6 +680,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 're',
headerAlign: "center",
align: "center",
@@ -634,6 +698,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'inspectionTypeName',
headerAlign: "center",
align: "center",
@@ -646,6 +716,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'templateRemark',
headerAlign: "center",
align: "center",
@@ -658,6 +734,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'templateVersion',
headerAlign: "center",
align: "center",
@@ -670,6 +752,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'createTime',
headerAlign: "center",
align: "center",
@@ -682,6 +770,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'createBy',
headerAlign: "center",
align: "center",
@@ -694,6 +788,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'updateDate',
headerAlign: 'center',
align: 'center',
@@ -706,6 +806,12 @@
fixed: '',
},
{
+ userId: this.$store.state.user.name,
+ functionId: 301008,
+ serialNumber: '301008TableItemNo',
+ tableId: "301008Table",
+ tableName: "检验模板维护表",
+ columnWidth: 84,
columnProp: 'updateBy',
headerAlign: 'center',
align: 'center',
@@ -803,6 +909,8 @@
this.getDataList()
this.inspectionTypeSearch()
this.favoriteIsOk()
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table',1)
},
methods: {
/**
@@ -1320,7 +1428,71 @@
this.$refs.qcUpload.init(currentData);
})
},
+ // 动态列开始 获取 用户保存的 格式列
+ 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = 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.columnList = data.rows
+ break;
+ // case 2:
+ // this.columnDetailList = data.rows
+ // break;
+ // case 3:
+ // this.columnList2 = data.rows
+ // break;
+ // case 4:
+ // this.columnList3 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+ },
+ //动态列结束
}
}