|
@@ -373,6 +373,7 @@ export default {
|
|
|
components: {iFrame},
|
|
|
computed: {
|
|
|
...mapGetters([
|
|
|
+ 'name',
|
|
|
'sidebar'
|
|
|
])
|
|
|
},
|
|
@@ -646,14 +647,15 @@ export default {
|
|
|
content = content.replace(/{\$month}/g, nMonth < 10 ? ('0' + nMonth) : nMonth)
|
|
|
content = content.replace(/{\$day}/g, nDay < 10 ? ('0' + nDay) : nDay)
|
|
|
content = content.replace(/{\$matter}/g, this.currMatter.itemName)
|
|
|
- const username = Cookies.get("username");
|
|
|
- content = content.replace(/{\$dealWithUser}/g, username)
|
|
|
+ // const username = Cookies.get("username");
|
|
|
+ content = content.replace(/{\$dealWithUser}/g, this.name)
|
|
|
let approveUser = ''
|
|
|
if (this.dealWithForm.withType == 1) {
|
|
|
approveUser = this.dealWithForm.contacts
|
|
|
} else {
|
|
|
approveUser = this.dealWithForm.enterpriseName
|
|
|
}
|
|
|
+ content = content.replace(/{\$contactPhone}/g, this.dealWithForm.phone)
|
|
|
content = content.replace(/{\$approveUser}/g, approveUser)
|
|
|
content = content.replace(/{\$serialNumber}/g, this.dealWithForm.serialNumber)
|
|
|
return content
|
|
@@ -666,12 +668,21 @@ export default {
|
|
|
* {$materialNum}:材料数量
|
|
|
* {$dealWithUser}:受理人
|
|
|
* {$approveUser}:申请人
|
|
|
+ * {$contactPhone}:申请人联系电话
|
|
|
* {$serialNumber}:受理编号
|
|
|
+ * {$materialConditions}:申请条件
|
|
|
+ * {$materialList}:材料列表
|
|
|
*/
|
|
|
- dealWithPrintInfo(num) {
|
|
|
+ dealWithPrintInfo(objs) {
|
|
|
let printObj = this.currMatter.print ? this.currMatter.print : {}
|
|
|
let pintContent = printObj.content ? printObj.content : ''
|
|
|
- pintContent = pintContent.replace(/{\$materialNum}/g, num)
|
|
|
+ pintContent = pintContent.replace(/{\$materialNum}/g, objs.length)
|
|
|
+ pintContent = pintContent.replace(/{\$materialConditions}/g, this.currMaterial.conditions)
|
|
|
+ let itemHtml = ''
|
|
|
+ objs.forEach((item, index) => {
|
|
|
+ itemHtml += '<p style="padding: 5px;">□ ' + (index + 1) + '. ' + item.listName + '</p>'
|
|
|
+ })
|
|
|
+ pintContent = pintContent.replace(/{\$materialList}/g, itemHtml)
|
|
|
pintContent = this.commDrawLayoutPrint(pintContent)
|
|
|
this.currMatterPrintInfo = pintContent
|
|
|
},
|
|
@@ -971,7 +982,7 @@ export default {
|
|
|
this.$modal.msgError("请选择相关材料")
|
|
|
return
|
|
|
}
|
|
|
- this.dealWithPrintInfo(objs.length)
|
|
|
+ this.dealWithPrintInfo(objs)
|
|
|
document.getElementById(elm).click()
|
|
|
}
|
|
|
if (elm == 'print_fail') {
|