确定
取消
@@ -137,6 +134,7 @@ import { judgeInternalEnterprise } from '../../../api/incomePaymentsApi'
import {httpAction} from '@api/manage'
import pick from 'lodash.pick'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import { queryCompanyInfoById } from '../../../api/api'
export default {
name: 'SignUpInfoEdit',
@@ -291,13 +289,28 @@ export default {
},
},
methods: {
+ // 通过企业的id获取企业管理中的基本信息，用于发票回显
+ queryCompanyInfoById(id) {
+ return new Promise(resolve => {
+ let result = {}
+ queryCompanyInfoById({id}).then(res => {
+ if(res.success) {
+ result = res.result || {}
+ result = pick(res.result, 'companyName', 'dutyCode', 'companyAddress', 'companyPhone', 'openingBank', 'bankAccount', 'linkBankNumber')
+ }
+ }).finally(() => {
+ resolve(result)
+ })
+ })
+
+ },
addContactsOk() {
this.$refs.selectContacts.getContactsList()
},
/*
* 编辑
* */
- edit(record){
+ async edit(record){
this.isInternalEnterprise = false
this.form.resetFields()
this.model = Object.assign({},record)
@@ -310,10 +323,30 @@ export default {
// 参会单位回显
this.model.companyId = {
id:this.model.companyId,
- companyName:this.model.companyName
+ companyName:this.model.companyName,
}
// 参会人回显
- this.selectedCompany = this.model.companyId
+ // this.selectedCompany = this.model.companyId
+ // 如果当前的参会人信息中发票信息不全 则从企业管理中获取一下
+ // if(!this.model.dutyCode && !this.model.companyAddress)
+ // 从企业管理中获取全部的会议信息
+ let companyInfo = await this.queryCompanyInfoById(this.model.companyId.id)
+ // 判断当前数据中企业信息是否完整 将有数据的赋值到数据中
+ // 写入发票的信息，因为需要回显
+ // dutyCode:this.model.dutyCode, // 信用代码
+ // companyAddress:this.model.companyAddress, // 公司地址
+ // companyPhone:this.model.companyPhone, // 公司电话
+ // openingBank:this.model.openingBank, // 开户行
+ // bankAccount:this.model.bankAccount, // 银行账号
+ // linkBankNumber:this.model.linkBankNumber // 联行号
+ let invoiceKeys = ['dutyCode', 'companyAddress', 'companyPhone', 'openingBank', 'bankAccount', 'linkBankNumber']
+ let invoiceInfo = {}
+ invoiceKeys.map(key => {
+ if(this.model[key]) {
+ invoiceInfo[key] = this.model[key]
+ }
+ })
+ this.selectedCompany = Object.assign({}, companyInfo, this.model.companyId, invoiceInfo)
this.selectPerson = {
id:this.model.companyContactTemporaryId,
name:this.model.companyContactName
@@ -354,7 +387,8 @@ export default {
'email',
'post',
'identity',
- 'guestType'
+ 'guestType',
+ 'remark'
))
})
},
@@ -382,6 +416,10 @@ export default {
if (!err) {
this.confirmLoading = true
let submitData = Object.assign({},values,this.formData)
+ // 去掉所有的未审核字段，有中文的 有英文的
+ if(submitData.companyName) {
+ submitData.companyName = (submitData.companyName || '').replaceAll(' (未审核)','').replaceAll(' （未审核）','')
+ }
submitData.companyId = values.companyId.id
// 会议id
submitData.meetingId = this.$route.query.meetingId
@@ -438,7 +476,7 @@ export default {
this.guestType = null
}
this.$nextTick( ()=> {
- this.$refs.formother.setFormVal(this.model)
+ this.$refs.formother.setFormVal(Object.assign({}, this.model, { identify: this.identifyType}))
})
},
/*
@@ -450,8 +488,9 @@ export default {
/*
* 选择参会企业
* */
- changeCompany(value) {
- this.selectedCompany = value
+ changeCompany(value, otherParams) {
+ // this.selectedCompany = value
+ this.selectedCompany = otherParams
// 去掉未审核 去判断的企业是否是标协会企业
let companyName = this.selectedCompany.companyName.replaceAll('（未审核）','')
@@ -480,10 +519,13 @@ export default {
this.form.resetFields(['companyContactId','phone'])
if(this.$refs.formother ){
this.$refs.formother.clearFormItem()
+ // 设置发票的相关信息
+ this.$refs.formother.setInvoiceFormItem()
}
// 判断当前企业是否是内部企业
console.log('-----this.selectedCompany-----', this.selectedCompany)
this.judgeInternalEnterprise(this.selectedCompany.id)
+
},
/*
* 选择联系人获取信息
diff --git a/src/views/incomePayments/meetManage/modules/SetGuessUploadFlagModal.vue b/src/views/incomePayments/meetManage/modules/SetGuessUploadFlagModal.vue
new file mode 100644
index 0000000..c49185a
--- /dev/null
+++ b/src/views/incomePayments/meetManage/modules/SetGuessUploadFlagModal.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index ac1be89..64a9d3c 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -12,12 +12,12 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ text }}
+ {{ text }}
+
+
+
+ 下载
+ 查看
+ 删除
+
+
+
@@ -36,7 +72,38 @@
-
diff --git a/src/views/modules/message/modules/SystemNotificationsModal.vue b/src/views/modules/message/modules/SystemNotificationsModal.vue
index 67b45a2..914ac91 100644
--- a/src/views/modules/message/modules/SystemNotificationsModal.vue
+++ b/src/views/modules/message/modules/SystemNotificationsModal.vue
@@ -24,6 +24,16 @@
:maxLength='200'
@change="e => {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
@@ -44,11 +54,11 @@ export default {
model: {},
labelCol: {
xs: { span: 24 },
- sm: { span: 4 }
+ sm: { span: 5 }
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 20 }
+ sm: { span: 19 }
},
url: '/send/message/sendAllUserMessage',
validatorRules: {
@@ -59,6 +69,10 @@ export default {
content: {
rules: [{ required: true, message: '请输入通知内容' }],
validateTrigger: 'blur'
+ },
+ deadline: {
+ rules: [{ required: true, message: '请选择消息提醒截止时间' }],
+ validateTrigger: 'change'
}
}
}
diff --git a/src/views/modules/notice/SysNoticeList.vue b/src/views/modules/notice/SysNoticeList.vue
new file mode 100644
index 0000000..74845ba
--- /dev/null
+++ b/src/views/modules/notice/SysNoticeList.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/notice/modules/SysNoticeModal.vue b/src/views/modules/notice/modules/SysNoticeModal.vue
new file mode 100644
index 0000000..0d5416e
--- /dev/null
+++ b/src/views/modules/notice/modules/SysNoticeModal.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index 02be8ff..32c0ecb 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -132,7 +132,7 @@
来款
- 取消打包
+ 取消打包
开票
确认收入
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 8b2e884..86e9d5f 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -65,6 +65,11 @@
/>
+
+
+
+
+
@@ -103,6 +108,7 @@
催款提醒
+ 设置标签
@@ -170,6 +176,8 @@
@ok="modalFormOk">