fixed bug

This commit is contained in:
chenjianan
2019-06-15 16:34:02 +08:00
parent e79d5c8de3
commit 60bb86aa3d
2 changed files with 56 additions and 44 deletions

View File

@@ -165,10 +165,10 @@
<!--<el-radio-button label="自定义" disabled/>--> <!--<el-radio-button label="自定义" disabled/>-->
</el-radio-group> </el-radio-group>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button> <el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<span>②确认合同总额</span> <!--<span>②确认合同总额</span>-->
<el-input v-model="actualTotal" size="small" style="width: 100px"/> <!--<el-input v-model="actualTotal" size="small" style="width: 100px"/>-->
<el-button type="primary" size="small" @click="submitTotal()">确认</el-button> <!--<el-button type="primary" size="small" @click="submitTotal()">确认</el-button>-->
<span>递交审批</span> <span>递交审批</span>
<el-button type="success" size="small" @click="generateContract()">递交</el-button> <el-button type="success" size="small" @click="generateContract()">递交</el-button>
<hr> <hr>
<!--html代码--> <!--html代码-->
@@ -350,6 +350,7 @@ export default {
}, },
submitTotal() { // 确定合同总额 submitTotal() { // 确定合同总额
// this.$refs.tinymce.destroyTinymce() // this.$refs.tinymce.destroyTinymce()
this.$refs.tinymce.initTinymce()
document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal) document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
@@ -693,6 +694,9 @@ export default {
document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : '' document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].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.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.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
this.$refs.tinymce.initTinymce() this.$refs.tinymce.initTinymce()
setTimeout(() => { setTimeout(() => {

View File

@@ -1294,6 +1294,11 @@ export default {
}) })
}, },
doneOfflineContact() { // 生成离线合同 doneOfflineContact() { // 生成离线合同
let judge = true
this.tableData3.map(v => {
judge = judge && v.数量
})
if (judge) {
this.$confirm('确定生成合同?', '提示', { this.$confirm('确定生成合同?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@@ -1335,6 +1340,9 @@ export default {
message: '已取消操作' message: '已取消操作'
}) })
}) })
} else {
this.$message.error('数量不正确')
}
}, },
exportExcel(row) { exportExcel(row) {
this.$confirm('确定导出该合同?', '提示', { this.$confirm('确定导出该合同?', '提示', {