diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index a65df82b..68a160f5 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -32,7 +32,7 @@ export function doneContract(...params) {
data: {
type: '2',
name: '采购管理_采购合同_增加数据',
- param: `采购合同编号=${params[0]}&采购合同名称=${params[1]}&交货日期=${params[2]}&支付日期=${params[3]}&支付方式=${params[4]}&开票信息=${params[5]}&其他说明=${params[6]}&合同总额=${params[7]}&采购员=${params[8]}&供应商流水号=${params[9]}&单价是否含税=${params[10]}&组件零件流水号组=${params[11]}&组件零件基本件流水号组=${params[12]}&数量组=${params[13]}&单价组=${params[14]}&交货期组=${params[15]}`
+ param: `采购合同编号=${params[0]}&采购合同名称=${params[1]}&交货日期=${params[2]}&支付日期=${params[3]}&支付方式=${params[4]}&开票信息=${params[5]}&其他说明=${params[6]}&合同总额=${params[7]}&采购员流水号=${params[8]}&供应商流水号=${params[9]}&单价是否含税=${params[10]}&组件零件流水号组=${params[11]}&组件零件基本件流水号组=${params[12]}&数量组=${params[13]}&单价组=${params[14]}&交货期组=${params[15]}&合同内容\\=${params[16]}`
}
})
}
diff --git a/src/api/PurchasingCenter/PurchaseContractApproval.js b/src/api/PurchasingCenter/PurchaseContractApproval.js
index 02f86e2d..faa81e5d 100644
--- a/src/api/PurchasingCenter/PurchaseContractApproval.js
+++ b/src/api/PurchasingCenter/PurchaseContractApproval.js
@@ -55,7 +55,7 @@ export function searchTable2(num) {
method: 'post',
data: {
type: '1',
- name: '采购管理_采购合同明细_查询数据',
+ name: '采购管理_采购合同内容_查询数据',
param: '采购合同流水号=' + num
}
})
@@ -67,7 +67,7 @@ export function submitApproval(num, num1, num2) {
method: 'post',
data: {
type: '2',
- name: '采购管理_合同审批_修改数据',
+ name: '采购管理_合同审批_采购部_修改数据',
param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
}
})
diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js
new file mode 100644
index 00000000..350b076a
--- /dev/null
+++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js
@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+// 初始化合同
+export function initContract() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购请款表_查询数据'
+ }
+ })
+}
+// 查询表1
+export function searchTable1(...params) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购请款表_查询数据',
+ param: '采购合同流水号_check=' + params[2] + '&采购合同流水号=' + params[3] + '&供应商名称_check=' + params[4] + '&供应商名称=' + params[5],
+ Pagination: params[0] + '&' + params[1]
+ }
+ })
+}
+// 查询请款进度
+export function searchCondition(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购请款表_请款进度_查询数据',
+ param: '采购合同流水号=' + num1
+ }
+ })
+}
+// 请款
+export function requestFund(num1, money, time, id) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_采购请款表_增加数据',
+ param: `采购合同流水号=${num1}&请款金额=${money}&请款人=${id}&请款时间=${time}`
+ }
+ })
+}
+// 取消请款
+export function cancelRequestFund(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_采购请款表_删除数据',
+ param: '采购请款流水号=' + num1
+ }
+ })
+}
+// 采购合同内容查询
+export function searchContract(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购合同内容_查询数据',
+ param: '采购合同流水号=' + num
+ }
+ })
+}
diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js
index 787ddd9c..fed900b1 100644
--- a/src/api/PurchasingCenter/PurchaseContractSearch.js
+++ b/src/api/PurchasingCenter/PurchaseContractSearch.js
@@ -48,14 +48,14 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2,
}
})
}
-// 采购合同明细查询
+// 采购合同内容查询
export function searchTable2(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: '采购管理_采购合同明细_查询数据',
+ name: '采购管理_采购合同内容_查询数据',
param: '采购合同流水号=' + num
}
})
diff --git a/src/icons/svg/CreateContract.svg b/src/icons/svg/CreatePurchaseContract.svg
similarity index 100%
rename from src/icons/svg/CreateContract.svg
rename to src/icons/svg/CreatePurchaseContract.svg
diff --git a/src/icons/svg/BuyerRequestFund.svg b/src/icons/svg/PurchaseContractRequestFund.svg
similarity index 100%
rename from src/icons/svg/BuyerRequestFund.svg
rename to src/icons/svg/PurchaseContractRequestFund.svg
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 00e4b564..7366f090 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -804,7 +804,7 @@ export default {
addInquirySheet() { // 追加物料
const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
- if (this.inquirySheetNum === '' || this.inquirySheetNum === null) {
+ if (this.inquirySheetFlowNum === '' || this.inquirySheetFlowNum === null) {
this.$message.error('请选择一个询价单')
} else if (this.groupPartNum.length === 0 && this.groupPartBasicNum.length === 0) {
this.$message.error('请选择待询价物料或零件')
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 3733f117..7e6be6f4 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -158,13 +158,13 @@
+
+
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 481b3af7..d3673da0 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -1,16 +1,16 @@
- 时间段:
-
+
+
+
+
+
+
+
+
+
+
合同号:
-
-
- {{ scope.row.采购合同编号 }}
-
-
-
-
- {{ scope.row.采购合同名称 }}
-
-
-
-
- {{ scope.row.规定到货时间 }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.总金额 }}
-
-
-
-
- {{ scope.row.付款方式内容 }}
-
-
未审批
@@ -106,6 +70,56 @@
不通过审批
+
+
+ {{ scope.row.采购合同编号 }}
+
+
+
+
+ {{ scope.row.采购合同名称 }}
+
+
+
+
+ {{ scope.row.供应商名称 }}
+
+
+
+
+ {{ scope.row.姓名 }}
+
+
+
+
+ {{ scope.row.合同总额 }}
+
+
+
+
+ {{ scope.row.交货日期 }}
+
+
+
+
+ {{ scope.row.支付日期 }}
+
+
+
+
+ {{ scope.row.支付方式 }}
+
+
+
+
+ {{ scope.row.开票信息 }}
+
+
+
+
+ {{ scope.row.其他说明 }}
+
+
{{ scope.row.未通过原因 }}
@@ -124,61 +138,11 @@
@current-change="handleCurrentChange1"/>
-
二维码：
![]()
-
-
-
-
-
- | GAOJING |
- 产品销售合同 |
- |
-
-
- | 需方 |
- 江苏高精机电装备有限公司 |
- 合同编号 |
- {{ contract }} |
-
-
- | 供方 |
- {{ supplier }} |
- 签订地点 |
- 江苏盐城 |
-
-
-
一、 产品名称、型号、数量、单价、品牌：
-
-
-
- | 物料名称 |
- 物料规格 |
- 物料型号 |
- 数量 |
- 单价 |
- 总价 |
-
-
-
-
- | 运费： |
- {{ freight }} |
-
-
- | 总价: (人民币){{ RMB }}(含0.17增值税) |
- {{ TotalAmount }} |
-
-
-
-
-
-
附件图：
@@ -233,7 +197,7 @@ export default {
pageSize1: 10,
tableData1: [],
loading1: false,
- returns: [],
+ returns: '',
tableData01: [],
tableData02: [],
submitDisable: true,
@@ -318,25 +282,10 @@ export default {
}
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.personValue, this.check4, this.supplierName, this.check5, this.approvalValue).then(response => {
this.loading1 = false
- for (let j = 0; j < response.data.rows.length; j++) {
- if (response.data.rows[j].操作日期 !== null) {
- response.data.rows[j].操作日期 = response.data.rows[j].操作日期.substring(0, response.data.rows[j].操作日期.indexOf(' '))
- }
- if (response.data.rows[j].规定到货时间 !== null) {
- response.data.rows[j].规定到货时间 = response.data.rows[j].规定到货时间.substring(0, response.data.rows[j].规定到货时间.indexOf(' '))
- }
- }
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
},
- tableRowClassName({ row, rowIndex }) {
- // if (row.审批情况流水号 === '1') {
- // return 'adopt'
- // } else if (row.审批情况流水号 === '2') {
- // return 'NotThrough'
- // }
- },
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
@@ -348,40 +297,10 @@ export default {
},
searchTable2(row) {
this.useqrcode(row.采购合同流水号)
- this.textarea = row.合同文本
- this.supplier = row.供应商名称
- this.contract = row.采购合同编号
this.searchPic() // 显示图片
- this.freight = parseInt(row.总金额) - parseInt(row.总金额_小计)
- this.RMB = row.总金额_文本
- this.TotalAmount = row.总金额
- document.getElementById('23').innerText = this.textarea
this.contractValue = parseInt(row.采购合同流水号)
searchTable2(this.contractValue).then(response => {
- this.returns = response.data
- const children = document.getElementsByClassName('tableData')
- const parent = document.getElementById('4')
- if (children.length !== 0) {
- for (let i = children.length - 1; i >= 0; i--) {
- parent.removeChild(children[i])
- }
- }
- const tr = []
- for (let i = 0; i < this.returns.length; i++) {
- tr[i] = document.createElement('tr')
- tr[i].setAttribute('class', 'tableData')
- tr[i].innerHTML = ' | ' + ' | ' + ' | ' +
- ' | ' + ' | ' + ' | '
- document.getElementById('tableHead').after(tr[i])
- }
- for (let j = 0; j < this.returns.length; j++) {
- document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
- document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
- document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
- document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
- document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
- document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
- }
+ this.returns = response.data[0].合同内容
})
}
}