diff --git a/src/views/modules/changeManagement/approvalInformation.vue b/src/views/modules/changeManagement/approvalInformation.vue
index c7df8b4..8d036d0 100644
--- a/src/views/modules/changeManagement/approvalInformation.vue
+++ b/src/views/modules/changeManagement/approvalInformation.vue
@@ -9,7 +9,7 @@ export default {
default: () => [],
},
height: {
- type: Number,
+ type: [String,Number],
default: 300
},
},
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 6c00cc5..868624a 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -1163,6 +1163,7 @@ export default {
},
data() {
return {
+ approvalList: [],
selectionDelegateAccess: [],
selectionDelegateAccess2: [],
delegateAccessVisible: false,
@@ -2801,6 +2802,7 @@ export default {
// this.$refs.proofingTable.toggleRowSelection(row)
this.proofingCurrentRow = JSON.parse(JSON.stringify(row))
this.proofingDetailData = JSON.parse(JSON.stringify(row))
+ this.getApprovalList()
},
/**
* 复选报价信息
@@ -3723,7 +3725,22 @@ export default {
}).catch((error)=>{
this.$message.error(error)
})
- }
+ },
+ // 查询审批信息
+ getApprovalList () {
+ let tempData = {
+ site: this.$store.state.user.site,
+ menuId: this.$route.meta.menuId,
+ documentNo: this.proofingCurrentRow.proofingNo,
+ }
+ getApprovalList(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.approvalList = data.rows
+ } else {
+ this.approvalList = []
+ }
+ })
+ },
}
}
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 9689617..c0878d4 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -853,6 +853,11 @@
+
+
+
+
+
@@ -905,6 +910,8 @@ import {queryCustomer} from "../../../api/customer/customerInformation";
import {queryProjectByCustomer} from "../../../api/project/project";
import OssComponents from "../oss/ossComponents.vue";
import BuSelect from "../base/BuSelect.vue";
+import ApprovalInformation from "../changeManagement/approvalInformation.vue";
+import {getApprovalList} from "../../../api/changeManagement/changeManagement";
export default {
computed: {
@@ -925,6 +932,7 @@ export default {
},
},
components: {
+ ApprovalInformation,
BuSelect,
OssComponents,
InquiryQuoteDetail,
@@ -960,6 +968,7 @@ export default {
quotationCurrentRow(newVal,oldVal){
this.getPriceCheckDetailList()
this.getPriceCheckProperties();
+ this.getApprovalList();
},
'modalData.customerNo'(newV, oldV) {
if (oldV) {
@@ -988,6 +997,7 @@ export default {
},
data() {
return {
+ approvalList:[],
copyPriceCheckDetail:{},
priceCheckRule: {
associatedPartNo:[{required: true, message: ' ', trigger: 'change'},],
@@ -3456,6 +3466,21 @@ export default {
this.$message.error(error)
})
},
+ // 查询审批信息
+ getApprovalList () {
+ let tempData = {
+ site: this.$store.state.user.site,
+ menuId: this.$route.meta.menuId,
+ documentNo: this.quotationCurrentRow.quotationBatchNo,
+ }
+ getApprovalList(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.approvalList = data.rows
+ } else {
+ this.approvalList = []
+ }
+ })
+ },
}
}
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index 201f591..9742375 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -840,6 +840,12 @@
+
+
+
+
+
+
@@ -956,6 +962,7 @@
import {queryProjectByCustomer, queryProjectPart} from "../../../api/project/project";
import OssComponents from "../oss/ossComponents.vue";
import BuSelect from "../base/BuSelect.vue";
+ import {getApprovalList} from "../../../api/changeManagement/changeManagement";
export default {
computed: {
testInformationFlag () {
@@ -982,7 +989,8 @@
TestTable,
DictDataSelect,
ChooseList,
- TestUploadFile
+ TestUploadFile,
+ ApprovalInformation
},
watch: {
searchData: {
@@ -1035,6 +1043,7 @@
},
data () {
return {
+ approvalList:[],
detailFlag: false,
partItemList1:[],
partItemList2:[],
@@ -2715,6 +2724,7 @@
this.getTestProperties();
this.getFileContentList()
}
+ this.getApprovalList()
},
/**
* 复选报价信息
@@ -3515,7 +3525,23 @@
handleDetail(row){
this.detailFlag = true
this.updateModal(row)
- }
+ },
+
+ // 查询审批信息
+ getApprovalList () {
+ let tempData = {
+ site: this.$store.state.user.site,
+ menuId: this.$route.meta.menuId,
+ documentNo: this.testCurrentRow.testNo,
+ }
+ getApprovalList(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.approvalList = data.rows
+ } else {
+ this.approvalList = []
+ }
+ })
+ },
},
}