diff --git a/src/views/modules/knifemold/tool-oi-record.vue b/src/views/modules/knifemold/tool-oi-record.vue index 0850e6c..957b313 100644 --- a/src/views/modules/knifemold/tool-oi-record.vue +++ b/src/views/modules/knifemold/tool-oi-record.vue @@ -30,10 +30,10 @@ - + - + @@ -164,8 +164,8 @@ toolDescription: '', startDate: '', endDate: '', - transNo:'', - transType:'' + transNo: '', + transType: '' }, pageIndex: 1, pageSize: 100, @@ -332,6 +332,23 @@ fixed: '', columnWidth: 80, }, + { + userId: this.$store.state.user.name, + serialNumber: 'toolOIRecordRemark', + tableId: "toolOIRecord", + tableName: "toolOIRecord", + columnProp: "remark", + headerAlign: "center", + align: "left", + columnLabel: "备注", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 160, + }, { userId: this.$store.state.user.name, serialNumber: 'toolOIRecordUserId', @@ -596,7 +613,7 @@ // --------- 导出 end ---------- }, created() { - this.getTableUserColumn() + // this.getTableUserColumn() this.getFunctionButtonList() } } diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue index 97b19e0..7ec7829 100644 --- a/src/views/modules/purchaseorder/purchaseRequisition.vue +++ b/src/views/modules/purchaseorder/purchaseRequisition.vue @@ -718,6 +718,36 @@ status: true, fixed: false }, + { + userId: this.$store.state.user.name, + tableId: this.$route.meta.menuId + 'PR02', + tableName: "reviewDetails", + columnProp: "userName", + headerAlign: "center", + align: "center", + columnLabel: "步骤审批人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false + }, + { + userId: this.$store.state.user.name, + tableId: this.$route.meta.menuId + 'PR02', + tableName: "reviewDetails", + columnProp: "actAuthorizeDate", + headerAlign: "center", + align: "center", + columnLabel: "审批时间", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: false + }, { userId: this.$store.state.user.name, tableId: this.$route.meta.menuId + 'PR02', diff --git a/src/views/modules/warehouse/location.vue b/src/views/modules/warehouse/location.vue index 09079ca..f8aa807 100644 --- a/src/views/modules/warehouse/location.vue +++ b/src/views/modules/warehouse/location.vue @@ -1,44 +1,13 @@ -