diff --git a/src/api/auth/auth.js b/src/api/auth/auth.js
index 16d1cb3..928b90a 100644
--- a/src/api/auth/auth.js
+++ b/src/api/auth/auth.js
@@ -35,3 +35,7 @@ export const authRuleStepDelete = data => createAPI(`auth/authRuleStepDelete`,'p
export const authRuleStepEdit = data => createAPI(`auth/authRuleStepEdit`,'post',data)
export const getBusinessTypeList = data => createAPI(`auth/getBusinessTypeList`,'post',data)
+
+export const updateAuthHist = data => createAPI(`auth/updateAuthHist`,'post',data)
+
+export const searchAuthInfo = data => createAPI(`auth/searchAuthInfo`,'post',data)
diff --git a/src/api/inquiry/inquiryApplication.js b/src/api/inquiry/inquiryApplication.js
index 0752772..485be09 100644
--- a/src/api/inquiry/inquiryApplication.js
+++ b/src/api/inquiry/inquiryApplication.js
@@ -10,4 +10,4 @@ export const deleteInquiryApplicationInfo = data => createAPI("/inquiry/inquiryA
export const searchUserAuthInquiryApplicationInfo = data => createAPI("/inquiry/inquiryApplication/searchUserAuthInquiryApplicationInfo", "post", data);
-export const searchInquiryUserAuthInfo = data => createAPI("/inquiry/inquiryApplication/searchInquiryUserAuthInfo", "post", data);
+export const searchAllInquiryQuoteInfo = data => createAPI("/inquiry/inquiryApplication/searchAllInquiryQuoteInfo", "post", data);
diff --git a/src/api/quote/quote.js b/src/api/quote/quote.js
index 1d250ac..1d6dda9 100644
--- a/src/api/quote/quote.js
+++ b/src/api/quote/quote.js
@@ -14,3 +14,5 @@ export const queryQuoteRoleUser = (data) => createAPI(`/quote/user`,'post',data)
export const batchSaveQuote = (data) => createAPI(`/quote/inside/batch/save`,'post',data)
export const updateQuoteStatus = (data) => createAPI(`/quote/update/status`,'post',data)
+
+export const searchUserAuthQuoteApplicationInfo = data => createAPI("/quote/searchUserAuthQuoteApplicationInfo", "post", data);
diff --git a/src/views/modules/auth/authInfo.vue b/src/views/modules/auth/authInfo.vue
new file mode 100644
index 0000000..829b1d8
--- /dev/null
+++ b/src/views/modules/auth/authInfo.vue
@@ -0,0 +1,968 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 客户编码
+
+
+
+
+
+
+
+
+
+ 报价专员
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row[item.columnProp] }}
+
![]()
+
+
+
+ 草稿
+ 已下达
+ 已报价
+ {{ scope.row.status }}
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/auth/authInquiry.vue b/src/views/modules/auth/authInquiry.vue
index 8f16683..d8c7f60 100644
--- a/src/views/modules/auth/authInquiry.vue
+++ b/src/views/modules/auth/authInquiry.vue
@@ -150,6 +150,16 @@
+
+
+ 审批
+
+
@@ -163,6 +173,46 @@
layout="total, sizes, prev, pager, next, jumper">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'同意'}}
+
+ {{'不同意'}}
+
+
+
+
+
+
+
@@ -172,7 +222,7 @@
+
+
+
diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue
index f5cfb10..2ce707a 100644
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@@ -1186,7 +1186,7 @@
}
});
},
- getProofDocument() {
+ async getProofDocument() {
let tempData = {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
@@ -1204,7 +1204,7 @@
page: 1,
limit: 1000
}
- getProofDocument(tempData).then(({data}) => {
+ return getProofDocument(tempData).then(({data}) => {
if (data && data.code === 0) {
this.proofDocumentList = data.page.list
for (let i = 0; i < this.proofDocumentList.length; i++) {
@@ -1405,7 +1405,8 @@
updateBy: this.$store.state.user.name,
proofingStatus: '进行中',
proofingResultStatus: row.proofingResultStatus,
- remark: row.remark
+ remark: row.remark,
+ type: 1
}
} else {
if (this.modalData.cProjectTypeDb === '' || this.modalData.cProjectTypeDb === null || this.modalData.cProjectTypeDb === undefined) {
@@ -1527,7 +1528,6 @@
testPartNo: row.testPartNo,
proofingId: row.proofingId,
proofingNo: row.proofingNo,
- proofDocumentDataList: this.proofDocumentList,
createBy: row.createBy,
}
if (tempData.createBy !== tempData.username) {
diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue
index 890ed21..bcc1cd2 100644
--- a/src/views/modules/eam/eamProjectInfo.vue
+++ b/src/views/modules/eam/eamProjectInfo.vue
@@ -3676,7 +3676,7 @@ import {searchBusinessInfo7} from "../../../api/factory/site";
site: this.projectPartCurrentRow.site,
buNo: this.projectPartCurrentRow.buNo,
userName: this.$store.state.user.name,
- limit: 10,
+ limit: -1,
page: 1
}
eamProjectPartSearch(queryProjectPart).then(({data}) => {
diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index ec94a82..9daf071 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -222,6 +222,11 @@
转正式料号
转量产
+