diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue
index fa0f6b2..b065d39 100644
--- a/src/views/modules/qc/FQASResultEntry.vue
+++ b/src/views/modules/qc/FQASResultEntry.vue
@@ -27,7 +27,7 @@
-
+
@@ -42,6 +42,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -59,15 +74,17 @@
+
+
-
+
-
-
+
-
+
-
-
+
查询
@@ -647,6 +664,11 @@
page: 1,
limit: 10,
states: ['未开始','待检验'],
+ orderRef1: '',
+ orderRef2: '',
+ orderRef3: '',
+ orderRef4: '',
+ orderRef5: '',
},
pageIndex: 1,
pageSize: 20,
@@ -913,6 +935,96 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301016,
+ serialNumber: '301016Table1OrderRef1',
+ tableId: "301016Table1",
+ tableName: "FQAS检验记录表",
+ columnProp: 'orderRef1',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '关联单号1',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 130,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301016,
+ serialNumber: '301016Table1OrderRef2',
+ tableId: "301016Table1",
+ tableName: "FQAS检验记录表",
+ columnProp: 'orderRef2',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '关联单号2',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 130,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301016,
+ serialNumber: '301016Table1OrderRef3',
+ tableId: "301016Table1",
+ tableName: "FQAS检验记录表",
+ columnProp: 'orderRef3',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '关联单号3',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 130,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301016,
+ serialNumber: '301016Table1OrderRef4',
+ tableId: "301016Table1",
+ tableName: "FQAS检验记录表",
+ columnProp: 'orderRef4',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '关联单号4',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 130,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301016,
+ serialNumber: '301016Table1OrderRef5',
+ tableId: "301016Table1",
+ tableName: "FQAS检验记录表",
+ columnProp: 'orderRef5',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '关联单号5',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 130,
+ },
{
userId: this.$store.state.user.name,
functionId: 301016,
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index a8ece47..73ba332 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -36,6 +36,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -678,7 +701,14 @@
poItemNo: '',
orderType: '',
states: ['未开始','待检验'],
- warehouseName: ''
+ warehouseName: '',
+ receiptNo: '',
+ receiptItemNo: '',
+ refInfo1: '',
+ refInfo2: '',
+ refInfo3: '',
+ refInfo4: '',
+ refInfo5: '',
},
pageIndex: 1,
pageSize: 20,
@@ -963,6 +993,42 @@
fixed: '',
columnWidth: 130,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301006,
+ serialNumber: '301006Table1ReceiptNo',
+ tableId: "301006Table1",
+ tableName: "IQC检验记录表",
+ columnProp: 'receiptNo',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '通知单号',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 130,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301006,
+ serialNumber: '301006Table1ReceiptItemNo',
+ tableId: "301006Table1",
+ tableName: "IQC检验记录表",
+ columnProp: 'receiptItemNo',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '通知单序号',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
{
userId: this.$store.state.user.name,
functionId: 301006,
@@ -1035,6 +1101,24 @@
fixed: '',
columnWidth: 130,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301006,
+ serialNumber: '301006Table1RefInfo5',
+ tableId: "301006Table1",
+ tableName: "IQC检验记录表",
+ columnProp: 'refInfo5',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '关联单号5',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 130,
+ },
{
userId: this.$store.state.user.name,
functionId: 301006,
@@ -1700,6 +1784,8 @@
}
// 获取用户角色
this.getUserRoleList()
+ // 获取仓库类别
+
},
methods: {
diff --git a/static/config/index-prod.js b/static/config/index-prod.js
index 47a13e2..8fc2976 100644
--- a/static/config/index-prod.js
+++ b/static/config/index-prod.js
@@ -5,7 +5,7 @@
window.SITE_CONFIG = {};
// api接口请求地址
- window.SITE_CONFIG['baseUrl'] = 'http://172.26.68.17:9002';
+ window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.222:9004';
// cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名