diff --git a/src/api/srm/srmSupplier.js b/src/api/srm/srmSupplier.js index 1a715ae..c0a8030 100644 --- a/src/api/srm/srmSupplier.js +++ b/src/api/srm/srmSupplier.js @@ -7,3 +7,6 @@ export const getSupplierGroupRequestList = data => createAPI('/srmSupplier/getSu export const createNewSupplierRequest = data => createAPI('/srmSupplier/createNewSupplierRequest', 'POST', data) export const checkSrmSupplierList = data => createAPI('/srmSupplier/checkSrmSupplierList', 'POST', data) export const confirmRequest= (data) => createAPI(`/srmSupplier/confirmRequest`,'post',data) +export const createNewSupplierContract = data => createAPI('/srmSupplier/createNewSupplierContract', 'POST', data) +export const getNewSupplierContract= (data) => createAPI(`/srmSupplier/getNewSupplierContract`,'post',data) +export const deleteSupplierContract= (data) => createAPI(`/srmSupplier/deleteSupplierContract`,'post',data) diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss index 1f3bf35..0108a66 100644 --- a/src/assets/scss/rq.scss +++ b/src/assets/scss/rq.scss @@ -50,3 +50,7 @@ overflow: hidden; float: right; } +.rq .auto /deep/ .el-form-item__content{ + height: auto; + line-height: 1.5; +} diff --git a/src/views/modules/srmSupplier/com_srmSupplier_Contract.vue b/src/views/modules/srmSupplier/com_srmSupplier_Contract.vue new file mode 100644 index 0000000..a3c2214 --- /dev/null +++ b/src/views/modules/srmSupplier/com_srmSupplier_Contract.vue @@ -0,0 +1,579 @@ + + + + + diff --git a/src/views/modules/srmSupplier/supplierGroupRequestList.vue b/src/views/modules/srmSupplier/supplierGroupRequestList.vue index 436fbd7..cd710d0 100644 --- a/src/views/modules/srmSupplier/supplierGroupRequestList.vue +++ b/src/views/modules/srmSupplier/supplierGroupRequestList.vue @@ -603,6 +603,7 @@ export default { formData.append('orderRef2', ''); formData.append('createdBy', this.$store.state.user.name); formData.append('fileRemark', this.ossForm.remark); + formData.append('orderReftype', "SrmSupplierRequest"); this.uploadLoading = true; ossUploadNoSaveOSS(formData).then(({data})=>{ if (data && data.code === 0){ diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue index 4a59b91..cb08899 100644 --- a/src/views/modules/srmSupplier/supplierList.vue +++ b/src/views/modules/srmSupplier/supplierList.vue @@ -113,6 +113,9 @@ + + + @@ -130,6 +133,7 @@ import { } from '@/api/srm/srmSupplier.js' import excel from "@/utils/excel-util.js"; import Chooselist from '@/views/modules/common/Chooselist_eam' +import contract from './com_srmSupplier_Contract' export default { data() { return { @@ -342,7 +346,7 @@ export default { /*组件*/ components: { Chooselist, - + contract, }, mounted() { @@ -432,6 +436,9 @@ export default { } }); } + if(this.activeName==='contract'){ + this.refreshContractTable(); + } }, async exportExcel() { this.searchData.limit = -1 @@ -447,6 +454,15 @@ export default { dropColumns: [],//需要剔除的列，例如dropColumns: ["netWeight"]，即剔除净重列 }); }, + refreshContractTable(){ + let inData={ + site: this.currentRow.site, + supplierNo: this.currentRow.supplierNo, + supplierName: this.currentRow.supplierName, + height:Number(this.height)-20 + } + this.$refs.contract.init(inData) + }, }, created() { //查询报表的类型