diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue index 49f8aa6..5c0ae1e 100644 --- a/src/views/contract/components/paymentRegistration.vue +++ b/src/views/contract/components/paymentRegistration.vue @@ -1628,7 +1628,42 @@ export default { if (fenInput) { fenInput.value = fenTotal===0?'0':fenTotal } - // console.log('fenTotal', wanTotal, qianTotal, baiTotal, shiTotal, yuanTotal, jiaoTotal, fenTotal) + + // 进位处理 + if (fenTotal >= 10) { + jiaoTotal += Math.floor(fenTotal / 10); + fenTotal = fenTotal % 10; + } + if (jiaoTotal >= 10) { + yuanTotal += Math.floor(jiaoTotal / 10); + jiaoTotal = jiaoTotal % 10; + } + if (yuanTotal >= 10) { + shiTotal += Math.floor(yuanTotal / 10); + yuanTotal = yuanTotal % 10; + } + if (shiTotal >= 10) { + baiTotal += Math.floor(shiTotal / 10); + shiTotal = shiTotal % 10; + } + if (baiTotal >= 10) { + qianTotal += Math.floor(baiTotal / 10); + baiTotal = baiTotal % 10; + } + if (qianTotal >= 10) { + wanTotal += Math.floor(qianTotal / 10); + qianTotal = qianTotal % 10; + } + + // 进位后同步更新input显示 + if (wanInput) wanInput.value = wanTotal === 0 ? '0' : wanTotal; + if (qianInput) qianInput.value = qianTotal === 0 ? '0' : qianTotal; + if (baiInput) baiInput.value = baiTotal === 0 ? '0' : baiTotal; + if (shiInput) shiInput.value = shiTotal === 0 ? '0' : shiTotal; + if (yuanInput) yuanInput.value = yuanTotal === 0 ? '0' : yuanTotal; + if (jiaoInput) jiaoInput.value = jiaoTotal === 0 ? '0' : jiaoTotal; + if (fenInput) fenInput.value = fenTotal === 0 ? '0' : fenTotal; + this.otherTotal = wanTotal * 10000 + qianTotal * 1000 + baiTotal * 100 + shiTotal * 10 + yuanTotal + jiaoTotal * 0.1 + fenTotal * 0.01 this.otherTotal = this.otherTotal.toFixed(2) // console.log('this.otherTotal', this.otherTotal) diff --git a/src/views/contract/components/printPaymentForm.vue b/src/views/contract/components/printPaymentForm.vue index f3e4203..d694635 100644 --- a/src/views/contract/components/printPaymentForm.vue +++ b/src/views/contract/components/printPaymentForm.vue @@ -354,7 +354,7 @@ export default { } // 初始计算一次 - // this.calculateTotal() + this.calculateTotal() }, caculateRoadDay() { const sdateInput = this.$refs.printtable.querySelector('input[data-field^="sdate"]') @@ -460,6 +460,41 @@ export default { fenInput.value = fenTotal===0?'0':fenTotal } + // 统计各位后，进行进位处理 + if (fenTotal >= 10) { + jiaoTotal += Math.floor(fenTotal / 10); + fenTotal = fenTotal % 10; + } + if (jiaoTotal >= 10) { + yuanTotal += Math.floor(jiaoTotal / 10); + jiaoTotal = jiaoTotal % 10; + } + if (yuanTotal >= 10) { + shiTotal += Math.floor(yuanTotal / 10); + yuanTotal = yuanTotal % 10; + } + if (shiTotal >= 10) { + baiTotal += Math.floor(shiTotal / 10); + shiTotal = shiTotal % 10; + } + if (baiTotal >= 10) { + qianTotal += Math.floor(baiTotal / 10); + baiTotal = baiTotal % 10; + } + if (qianTotal >= 10) { + wanTotal += Math.floor(qianTotal / 10); + qianTotal = qianTotal % 10; + } + + // 进位后同步更新input显示 + if (wanInput) wanInput.value = wanTotal === 0 ? '0' : wanTotal; + if (qianInput) qianInput.value = qianTotal === 0 ? '0' : qianTotal; + if (baiInput) baiInput.value = baiTotal === 0 ? '0' : baiTotal; + if (shiInput) shiInput.value = shiTotal === 0 ? '0' : shiTotal; + if (yuanInput) yuanInput.value = yuanTotal === 0 ? '0' : yuanTotal; + if (jiaoInput) jiaoInput.value = jiaoTotal === 0 ? '0' : jiaoTotal; + if (fenInput) fenInput.value = fenTotal === 0 ? '0' : fenTotal; + let otherTotal = wanTotal * 10000 + qianTotal * 1000 + baiTotal * 100 + shiTotal * 10 + yuanTotal + jiaoTotal * 0.1 + fenTotal * 0.01 let total = 0 @@ -535,6 +570,7 @@ export default { } span.textContent = displayText const style = window.getComputedStyle(input) + // 先复制所有样式 span.style.cssText = style.cssText ;[ 'width', @@ -553,11 +589,15 @@ export default { ].forEach(key => { span.style[key] = style[key] }) + // 确保width和height与Input控件保持一致 + span.style.width = '100%' + span.style.height = style.height span.style.whiteSpace = 'normal' span.style.wordBreak = 'break-all' span.style.overflowWrap = 'break-word' span.style.display = 'block' - span.style.width = '100%' + span.style.textAlign = 'center' + span.style.verticalAlign = 'middle' input.parentNode.replaceChild(span, input) }) @@ -566,6 +606,7 @@ export default { const span = document.createElement('span') span.textContent = select.options[select.selectedIndex]?.text || '' const style = window.getComputedStyle(select) + // 先复制所有样式 span.style.cssText = style.cssText ;[ 'width', @@ -584,7 +625,9 @@ export default { ].forEach(key => { span.style[key] = style[key] }) - span.style.width = '100%' + // 确保width和height与select控件保持一致 + span.style.width = style.width + span.style.height = style.height span.style.display = 'block' span.style.textAlign = 'center' span.style.whiteSpace = 'pre-line' // 关键：自动换行 @@ -596,6 +639,7 @@ export default { const span = document.createElement('span') span.textContent = textarea.value || '' const style = window.getComputedStyle(textarea) + // 先复制所有样式 span.style.cssText = style.cssText ;[ 'width', @@ -614,7 +658,9 @@ export default { ].forEach(key => { span.style[key] = style[key] }) - span.style.width = '100%' + // 确保width和height与textarea控件保持一致 + span.style.width = style.width + span.style.height = style.height span.style.display = 'block' span.style.textAlign = 'center' span.style.whiteSpace = 'pre-line' // 关键：自动换行 @@ -699,6 +745,7 @@ export default { // 替换控件为纯文本（保留样式） this.replaceControls(printNode) + console.log('printNode', printNode.innerHTML) // 计算并更新总金额 const amountInputs = printNode.querySelectorAll('input[data-field^="amount"]') @@ -756,8 +803,9 @@ export default { padding: 0; } .form-container { width: 100% !important; margin: 0 auto; } - table { width: 100%; border-collapse: collapse; } - td { border: 1px solid #000; padding: 8px; } + table { width: 100%; border-collapse: collapse;table-layout: fixed; text-align: center; margin: 0 auto; } + td { border: 1px solid #000; padding: 8px; min-width: 100px; word-break: break-all; text-align: center; vertical-align: middle; } + th { text-align: center; vertical-align: middle; } @media print { body { width: ${pageWidth}mm; diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index 0fb8017..ee0cec0 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -24,23 +24,23 @@
+
关键字
- +
供应商/付款对象
- +
预算计划 -
+
签订年份 @@ -65,126 +66,116 @@ />
+
- 创建日期 - - - -
- -
- - 项目类型 - - -
- -
- - 业务科室 - - - - -
- -
- - 采购形式 - - -
- -
- - 采购方式 - - -
- -
- - 预算金额 - + 预算金额 -
- +
- - 合同状态 - - +
- -
- - 招标流程状态 - - - -
-
- - 采购流程状态 - - - -
-
- - 合同会签状态 - - - -
-
- - 请示流程状态 - - -
- + + + -
@@ -1018,6 +1008,7 @@ export default { end_plan_price: undefined }, + showMoreSearch: false, type: [{ label: '服务', value: 1 @@ -1580,7 +1571,7 @@ export default { }) this.getPurchaseType() this.getContracts() - this.getDepartment() + this.getDepartment(-1) this.getPurchaseWay() this.getMoneyWay() @@ -1981,8 +1972,12 @@ export default { this.getBudgets() }, // 获取科室 - async getDepartment() { - this.departments = await listdeptNoAuth() + async getDepartment(status) { + const params = { show_tree: 1,sort_name:'sortnumber',sort_type:'asc' } + if (status !== undefined) { + params.status = status + } + this.departments = await listdeptNoAuth(params) }, // 获取购买形式列表 async getPurchaseType() { @@ -3476,9 +3471,11 @@ export default { // 添加按分类新增合同的方法 async handleAddContractByCategory(type) { this.formType = type - this.loading = true - try { - // 1. 获取当前用户所在部门id + this.loading = true + try { + // 0. 先获取最新执行部门信息 + await this.getDepartment() + // 1. 获取当前用户所在部门id const userDeptId = this.$store.state.user.info.department_id // 2. 显示弹窗、初始化表单 this.isShowAdd = true