diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index d9372430..b7efa442 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -9,7 +9,7 @@ export function initSupplier(num) { type: '3', name: `SELECT distinct 供应商流水号,供应商名称 FROM 采购管理_询价单_视图 -where 询价单编号 not in(select 采购合同编号 from 采购管理_采购合同_采购部 where 是否启用 = 1) and 采购员流水号 = ${num}` +where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}` } }) } @@ -62,17 +62,17 @@ export function searchBaseInfo(id) { }) } // 实时保存单价 -export function savePrice(price, num1, num2) { +export function savePrice(price, num1, num2, num3, num4, num5) { return request({ url: '', method: 'post', data: { type: '4', - name: `update 采购管理_询价单明细_视图 set 单价 = ${price} where 物料流水号 = ${num1} and 询价单流水号 = ${num2}` + name: `update 采购管理_询价单明细_视图 set 单价 = ${price} where isnull(物料流水号,0) = isnull('${num1}',0) and 询价单流水号 = ${num2} and isnull(零件名称,'') = '${num3}' and isnull(零件图号,'') = '${num4}' and (isnull(规格,'') = '${num5}' or isnull(物料规格,'') = '${num5}')` } }) } -// 实时保存单价 +// 实时保存合同头 export function saveContractHeader(...params) { return request({ url: '', diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js index 397da60f..ed3c83b8 100644 --- a/src/api/PurchasingCenter/PurchaseContractSearch.js +++ b/src/api/PurchasingCenter/PurchaseContractSearch.js @@ -23,14 +23,14 @@ export function initBuyer() { }) } // 采购合同查询 -export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval) { +export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval, numberCheck, number) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_合同_查询数据_采购部采购', - param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval, + param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 8df97c6b..5e84b952 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -656,7 +656,7 @@ - +
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 11e8494d..1253cf6e 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -5,7 +5,7 @@ - + @@ -165,10 +165,10 @@ 预览合同 - ②确认合同总额： - - 确认 - ③递交审批： + + + + ②递交审批： 递交
@@ -243,7 +243,9 @@ export default { 组件零件基本件流水号组: [], 数量组: [], 单价组: [], - 交货期组: [] + 交货期组: [], + companyAddress: '', + sendAddress: '' } }, computed: { @@ -269,9 +271,17 @@ export default { } }, // 价格实时保存 - priceChange(price, num1, num2, row) { + priceChange(price, num1, num2, row, num3, num4, num5) { this.tableData1.map(v => { - if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号)) { + v.物料流水号 = v.物料流水号 || '' + v.零件名称 = v.零件名称 || '' + v.零件图号 = v.零件图号 || '' + v.规格 = v.规格 || '' + row.物料流水号 = row.物料流水号 || '' + row.零件名称 = row.零件名称 || '' + row.零件图号 = row.零件图号 || '' + row.规格 = row.规格 || '' + if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号) && v.零件名称 === row.零件名称 && v.零件图号 === row.零件图号 && v.规格 === row.规格) { v.含税单价 = row.含税单价 v.未税单价 = row.未税单价 } @@ -280,7 +290,11 @@ export default { this.tableData1 = [] this.tableData1 = group price = price || 0 - savePrice(price, num1, num2).then(res => { + num1 = num1 || '' + num3 = num3 || '' + num4 = num4 || '' + num5 = num5 || '' + savePrice(price, num1, num2, num3, num4, num5).then(res => { if (res.data[0].result === '1') { console.log('单价实时保存成功') } else { @@ -304,6 +318,8 @@ export default { } }) searchBaseInfo(this.id).then(res => { + this.companyAddress = res.data[0] ? res.data[0].公司地址 : '' + this.sendAddress = res.data[0] ? res.data[0].送货地址 : '' this.fax2 = res.data[0] ? res.data[0].传真 : '' this.postCode2 = '224053' this.phone2 = res.data[0] ? res.data[0].手机 + '/' + res.data[0].公司电话 : '' @@ -333,12 +349,16 @@ export default { }) }, submitTotal() { // 确定合同总额 - this.$refs.tinymce.destroyTinymce() + // this.$refs.tinymce.destroyTinymce() + this.$refs.tinymce.initTinymce() document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal) this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML - this.$refs.tinymce.initTinymce() + setTimeout(() => { + this.$refs.tinymce.setContent(this.contentNew) + }, 1000) + // this.$refs.tinymce.initTinymce() }, supplierChange() { let check @@ -398,6 +418,8 @@ export default { this.tableData1.push({ 询价单流水号: response.data[i].询价单流水号, 物料流水号: response.data[i].物料流水号, + 零件名称: response.data[i].零件名称, + 零件图号: response.data[i].零件图号, 询价单明细流水号: response.data[i].询价单明细流水号, 机床图号: response.data[i].机床图号 || response.data[i].基本件机床图号, 组号: response.data[i].组号 || response.data[i].基本件组号, @@ -468,7 +490,7 @@ export default { 地址： - 盐城市开放大道666号 + ${this.companyAddress} 地址： @@ -492,7 +514,7 @@ export default { 交货地点： 地址： - 盐城市亭湖区新兴镇开放大道666号 + ${this.sendAddress} 联系人： @@ -588,7 +610,7 @@ export default { await sleep(0) if (this.contractNumValue) { if (this.demoRadio) { - this.$refs.tinymce.destroyTinymce() + // this.$refs.tinymce.destroyTinymce() document.getElementById('contractName') ? document.getElementById('contractName').innerHTML = this.contractName : '' document.getElementById('contractNum') ? document.getElementById('contractNum').innerHTML = this.contractNum : '' document.getElementById('supplierName') ? document.getElementById('supplierName').innerHTML = this.supplierName : '' @@ -672,8 +694,14 @@ export default { document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : '' document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : '' document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : '' + document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal + document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal + document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal) this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML this.$refs.tinymce.initTinymce() + setTimeout(() => { + this.$refs.tinymce.setContent(this.contentNew) + }, 1000) } else { this.$message.warning('请先选择合同模板，再预览') } diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 4cbe4b4f..f1108e98 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -326,8 +326,8 @@ @@ -1158,7 +1158,7 @@ export default { this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) }) }) - Number(row.离线合同状态) !== 1 ? this.disable = true : this.disable = false // 是否为编辑模式 + this.arrival(row) ? this.disable = true : this.disable = false // 是否为编辑模式 }, getSummaries(param) { // 合计 const { columns, data } = param @@ -1294,47 +1294,55 @@ export default { }) }, doneOfflineContact() { // 生成离线合同 - this.$confirm('确定生成合同?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.totalPrice = 0 - this.partGroup = [] - this.numGroup = [] - this.priceGroup = [] - const dateGroup = [] - const remarkGroup = [] - for (let i = 0; i < this.tableData3.length; i++) { - this.totalPrice += this.tableData3[i].数量 * this.tableData3[i].单价 - this.partGroup.push(this.tableData3[i].离线合同明细流水号) - this.numGroup.push(this.tableData3[i].数量) - this.hasTax === '含税' ? this.priceGroup.push(this.tableData3[i].单价) : this.priceGroup.push(this.tableData3[i].未税单价 * (1 + this.taxRate)) - dateGroup.push(this.tableData3[i].交货期要求) - remarkGroup.push(this.tableData3[i].备注) - } - doneOfflineContact(this.offlineContractNum, this.totalPrice, this.partGroup, this.numGroup, this.priceGroup, dateGroup, remarkGroup, this.taxRate * 100).then(response => { - if (response.data[0].result === '1') { - this.$message.success('离线合同生成成功') - this.searchTable2() - searchMateriel(this.offlineContractNum).then(response => { - this.tableData3 = response.data - this.tableData3.map(v => { - this.$set(v, '未税总额', 0) - this.$set(v, '含税总额', 0) - !v.单价 ? v.单价 = v.参考价格 : v.单价 - this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) - }) - this.disable = true // 是否为编辑模式 - }) - } else { this.$message.error('离线合同生成失败') } - }) - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消操作' - }) + let judge = true + this.tableData3.map(v => { + judge = judge && v.数量 }) + if (judge) { + this.$confirm('确定生成合同?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.totalPrice = 0 + this.partGroup = [] + this.numGroup = [] + this.priceGroup = [] + const dateGroup = [] + const remarkGroup = [] + for (let i = 0; i < this.tableData3.length; i++) { + this.totalPrice += this.tableData3[i].数量 * this.tableData3[i].单价 + this.partGroup.push(this.tableData3[i].离线合同明细流水号) + this.numGroup.push(this.tableData3[i].数量) + this.hasTax === '含税' ? this.priceGroup.push(this.tableData3[i].单价) : this.priceGroup.push(this.tableData3[i].未税单价 * (1 + this.taxRate)) + dateGroup.push(this.tableData3[i].交货期要求) + remarkGroup.push(this.tableData3[i].备注) + } + doneOfflineContact(this.offlineContractNum, this.totalPrice, this.partGroup, this.numGroup, this.priceGroup, dateGroup, remarkGroup, this.taxRate * 100).then(response => { + if (response.data[0].result === '1') { + this.$message.success('离线合同生成成功') + this.searchTable2() + searchMateriel(this.offlineContractNum).then(response => { + this.tableData3 = response.data + this.tableData3.map(v => { + this.$set(v, '未税总额', 0) + this.$set(v, '含税总额', 0) + !v.单价 ? v.单价 = v.参考价格 : v.单价 + this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) + }) + this.disable = true // 是否为编辑模式 + }) + } else { this.$message.error('离线合同生成失败') } + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消操作' + }) + }) + } else { + this.$message.error('数量不正确') + } }, exportExcel(row) { this.$confirm('确定导出该合同?', '提示', { diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index 55f3f5a2..12abc1cf 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -14,16 +14,17 @@ 合同编号: - - -
{{ item.label }}
-
{{ item.name }}
- - + + + + + + + + + + + 供应商: 采购员: @@ -194,6 +195,7 @@ import $ from 'jquery' export default { data() { return { + contractNumber: '', searchView: '', // 图片预览 approval: [{ value: 0, @@ -335,7 +337,9 @@ export default { } else { this.check5 = 1 } - 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 => { + let check + this.contractNumber ? check = 1 : check = 0 + 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, check, this.contractNumber).then(response => { for (let i = 0; i < response.data.rows.length; i++) { response.data.rows[i].审批情况内容 === '未审批' ? this.disable.push(false) : this.disable.push(true) // 删除按钮禁用 } diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue index d4720392..cc37de06 100644 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue @@ -60,6 +60,16 @@ {{ scope.row.物料规格 }} + + + + + + + + + + + + + + + + + +