diff --git a/src/api/oss/oss.js b/src/api/oss/oss.js
index bf855cc..9d69998 100644
--- a/src/api/oss/oss.js
+++ b/src/api/oss/oss.js
@@ -23,3 +23,8 @@ export const previewOssFileById2 = (data) => createAPI(`/oss/2/${data.id}`,'post
export const ossUploadNoSaveOSS = (data) => createAPI(`/oss/ossUploadNoSaveOSS`,'post',data)
+export const uploadWithTtpe = data => createAPI(`/oss/uploadWithTtpe`,'post',data)
+
+
+export const queryOssFilePlus = data => createAPI(`/oss/queryOssFilePlus`,'post',data)
+
diff --git a/src/api/srm/srmDocument.js b/src/api/srm/srmDocument.js
index a375fcc..06bd901 100644
--- a/src/api/srm/srmDocument.js
+++ b/src/api/srm/srmDocument.js
@@ -6,7 +6,7 @@ export const querySrmDocumentType= data => createAPI(`/srmDocument/querySrmDocum
export const srmDocumentTypeSave= data => createAPI(`/srmDocument/srmDocumentTypeSave`,'post',data)
export const srmDocumentTypeEdit= data => createAPI(`/srmDocument/srmDocumentTypeEdit`,'post',data)
export const srmDocumentTypeDelete= data => createAPI(`/srmDocument/srmDocumentTypeDelete`,'post',data)
-//---------------供应商文档清单定义-------------------
+//---------------供应商供应商文档-------------------
export const srmSupplierDocumentSearch= data => createAPI(`/srmDocument/srmSupplierDocumentSearch`,'post',data)
export const querySrmSupplierDocument= data => createAPI(`/srmDocument/querySrmSupplierDocument`,'post',data)
export const srmSupplierDocumentSave= data => createAPI(`/srmDocument/srmSupplierDocumentSave`,'post',data)
@@ -14,3 +14,9 @@ export const srmSupplierDocumentEdit= data => createAPI(`/srmDocument/srmSupplie
export const srmSupplierDocumentDelete= data => createAPI(`/srmDocument/srmSupplierDocumentDelete`,'post',data)
//获取用户bu
export const getSiteAndBuByUserName= data => createAPI(`/pms/eam/getSiteAndBuByUserName`,'post',data)
+
+ // 获取供应商文档清单
+export const getDocumentListDefinition= data => createAPI(`/srmDocument/getDocumentListDefinition`,'post',data)
+export const searchDocumentTypeListOther= data => createAPI(`/srmDocument/searchDocumentTypeListOther`,'post',data)
+export const saveSelectionDocumentTypeManual= data => createAPI(`/srmDocument/saveSelectionDocumentTypeManual`,'post',data)
+export const deleteObjectDocumentType= data => createAPI(`/srmDocument/deleteObjectDocumentType`,'post',data)
diff --git a/src/views/modules/srmSupplier/com_srmSupplier_DocumentDefinition.vue b/src/views/modules/srmSupplier/com_srmSupplier_DocumentDefinition.vue
index d3eb06a..2607d78 100644
--- a/src/views/modules/srmSupplier/com_srmSupplier_DocumentDefinition.vue
+++ b/src/views/modules/srmSupplier/com_srmSupplier_DocumentDefinition.vue
@@ -2,7 +2,7 @@
- 新增
+ 编辑文档清单
- Renew |
- Edit |
- Delete
+ View
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ 删除
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传文档
+
+
+
+
+
+
+
+
+
+
+ View |
+ delete
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+
+
+
+
+
+
+
+
+
+
+
+
@@ -247,6 +751,9 @@ export default {
height: auto;
line-height: 1.5;
}
-
+.auto /deep/ .el-form-item__content{
+ height: auto;
+ line-height: 1.5;
+}
diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue
index ff9e9e9..bdcaebe 100644
--- a/src/views/modules/srmSupplier/supplierList.vue
+++ b/src/views/modules/srmSupplier/supplierList.vue
@@ -116,6 +116,9 @@
+
+
+
@@ -134,6 +137,7 @@ import {
import excel from "@/utils/excel-util.js";
import Chooselist from '@/views/modules/common/Chooselist_eam'
import contract from './com_srmSupplier_Contract'
+import documents from './com_srmSupplier_DocumentDefinition'
export default {
data() {
return {
@@ -653,6 +657,7 @@ export default {
components: {
Chooselist,
contract,
+ documents,
},
mounted() {
@@ -745,6 +750,9 @@ export default {
if(this.activeName==='contract'){
this.refreshContractTable();
}
+ if(this.activeName==='documents'){
+ this.refreshDocumentsTable();
+ }
},
async exportExcel() {
this.searchData.limit = -1
@@ -769,6 +777,18 @@ export default {
}
this.$refs.contract.init(inData)
},
+ refreshDocumentsTable(){
+ let inData={
+ site: this.currentRow.site,
+ objectNo: this.currentRow.supplierNo,
+ supplierNo: this.currentRow.supplierNo,
+ supplierName: this.currentRow.supplierName,
+ supplierDocType: this.currentRow.supplierDocType,
+ objectType: 'supplier',
+ height:Number(this.height)-20
+ }
+ this.$refs.documents.init(inData)
+ }
},
created() {
//查询报表的类型