diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue
index 4198325..b429be5 100644
--- a/src/views/businessManagement/modules/BusinessManagementModule.vue
+++ b/src/views/businessManagement/modules/BusinessManagementModule.vue
@@ -207,6 +207,7 @@ export default {
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
+ that.confirmLoading = true
values.dataSource = this.dataForm
values.signingUp = this.applyAdd
let httpurl = ''
diff --git a/src/views/businessManagement/modules/ContactManagementModule.vue b/src/views/businessManagement/modules/ContactManagementModule.vue
index 6c977e2..39edd31 100644
--- a/src/views/businessManagement/modules/ContactManagementModule.vue
+++ b/src/views/businessManagement/modules/ContactManagementModule.vue
@@ -8,92 +8,94 @@
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询邮编
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询邮编
+
+
+
+
+
+
+
+
+
+
+
+
@@ -103,11 +105,11 @@ import { httpAction } from '@api/manage'
import CompanySelect from '@comp/company/CompanySelect'
import { postcode, phoneReg, isEmail } from '@/utils/validate'
import { duplicateCheck } from '@api/api'
-import { queryContactByName } from "../../../api/incomePaymentsApi"
+import { queryContactByName } from '../../../api/incomePaymentsApi'
export default {
name: 'ContactManagementModule',
- components: {CompanySelect},
+ components: { CompanySelect },
props: {
// 是否可以选择企业 true--不可选；false--可选
isCompanyDisabled: {
@@ -145,20 +147,20 @@ export default {
form: this.$form.createForm(this),
model: {},
labelCol: {
- xs: {span: 24},
- sm: {span: 6}
+ xs: { span: 24 },
+ sm: { span: 6 }
},
wrapperCol: {
- xs: {span: 24},
- sm: {span: 18}
+ xs: { span: 24 },
+ sm: { span: 18 }
},
remarksLabelCol: {
- xs: {span: 24},
- sm: {span: 3}
+ xs: { span: 24 },
+ sm: { span: 3 }
},
remarksWrapperCol: {
- xs: {span: 24},
- sm: {span: 21}
+ xs: { span: 24 },
+ sm: { span: 21 }
},
url: {
add: '/company/payContactsManagement/add',
@@ -166,31 +168,31 @@ export default {
},
validatorRules: {
company: {
- rules: [{required: true, validator: this.checkCompany}],
+ rules: [{ required: true, validator: this.checkCompany }],
validateTrigger: 'change'
},
name: {
- rules: [{required: true, validator: this.checkName}],
+ rules: [{ required: true, validator: this.checkName }],
validateTrigger: 'blur'
},
phone: {
- rules: [{required: true, validator: this.checkPhone}],
+ rules: [{ required: true, validator: this.checkPhone }],
validateTrigger: 'blur'
},
email: {
- rules: [{required: true, validator: this.checkMail}],
+ rules: [{ required: true, validator: this.checkMail }],
validateTrigger: 'blur'
},
postalCode: {
- rules: [{required: true, validator: this.checkPostcode}],
+ rules: [{ required: true, validator: this.checkPostcode }],
validateTrigger: 'blur'
},
contactAddress: {
- rules: [{required: true, message: '请输入通讯地址'}],
+ rules: [{ required: true, message: '请输入通讯地址' }],
validateTrigger: 'blur'
}
},
- selectedCompanyId: null, // 当前选择企业的id
+ selectedCompanyId: null // 当前选择企业的id
}
},
methods: {
@@ -228,6 +230,7 @@ export default {
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
+ that.confirmLoading = true
// 处理企业名称和id等信息
values.companyName = values.company.companyName
values.companyId = values.company.id
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index dd7f44c..90399d2 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -1,162 +1,165 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 元
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- 合同
-
- 无
- 合同
- 收费通知
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+
+
+
+
+
+
+
+ 合同
+
+ 无
+ 合同
+ 收费通知
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
@@ -192,7 +195,7 @@ export default {
type: Number,
required: false,
default: null
- },
+ }
},
data() {
return {
@@ -327,6 +330,7 @@ export default {
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
+ that.confirmLoading = true
values.chargeCompanyName = values.chargeCompany.companyName
values.chargeCompanyId = values.chargeCompany.id
// 收入合同新建项目手动赋值
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
index de6dd65..e6c01c5 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
@@ -1,61 +1,63 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ :title="title"
+ :width="width"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -107,10 +109,10 @@ export default {
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
+ this.confirmLoading = true
const formData = Object.assign(this.model, values)
console.log('表单提交数据', formData)
formData.ids = this.selectedRowKeys.join(',')
-
postAction(this.url.setCharge, formData).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index b7c743b..aafb3cb 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -8,186 +8,191 @@
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
-
-
-
-
-
- {{ item.workingGroupProject }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 合同
-
- 无
- 合同
- 收费通知
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 元
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ item.workingGroupProject }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+ ref="selectContacts1"
+ @ok="addContactsOneOk">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合同
+
+ 无
+ 合同
+ 收费通知
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -198,6 +203,7 @@ import JUpload from '@comp/jero/JUpload'
import CompanySelect from '@comp/company/CompanySelect'
import SelectContacts from '@comp/company/SelectContacts'
import { getWorkingGroupListByNotCompany } from '../../../api/incomePaymentsApi'
+import { isRepeat } from '../../../utils/util'
export default {
name: 'WorkingGroupMemberUnitModule',
@@ -254,13 +260,17 @@ export default {
validateTrigger: 'change'
},
chargeCompany: {
- rules: [{ required: true, message: '请选择成员单位' }],
+ rules: [{ required: true, validator: this.checkCompany }],
validateTrigger: 'change'
},
contactsIdOne: {
rules: [{ required: true, message: '请选择企业联系人1' }],
validateTrigger: 'blur'
},
+ contactsRepeat: {
+ rules: [{ required: false, validator: this.validateContact }],
+ validateTrigger: 'blur'
+ },
mailContactsId: {
rules: [{ required: true, message: '请选择邮寄联系人' }],
validateTrigger: 'blur'
@@ -379,6 +389,7 @@ export default {
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
+ that.confirmLoading = true
// 收入合同新建项目手动赋值
if (this.defaultChargeWay === 2) {
values.chargeWay = 2
@@ -486,30 +497,48 @@ export default {
callback()
return
}
- callback('请选择企业')
+ callback('请选择成员单位')
},
/**
* 在新增成功后重新获取联系人列表
*/
- addContactsOneOk(){
+ addContactsOneOk() {
this.$refs.selectContacts2.getContactsList()
this.$refs.selectContacts3.getContactsList()
this.$refs.selectMailContacts.getContactsList()
},
- addContactsTwoOk(){
+ addContactsTwoOk() {
this.$refs.selectContacts1.getContactsList()
this.$refs.selectContacts3.getContactsList()
this.$refs.selectMailContacts.getContactsList()
},
- addContactsThreeOk(){
+ addContactsThreeOk() {
this.$refs.selectContacts1.getContactsList()
this.$refs.selectContacts2.getContactsList()
this.$refs.selectMailContacts.getContactsList()
},
- addMailContactsOk(){
+ addMailContactsOk() {
this.$refs.selectContacts1.getContactsList()
this.$refs.selectContacts2.getContactsList()
this.$refs.selectContacts3.getContactsList()
+ },
+ /**
+ * 校验企业联系人是否重复
+ * @param rule
+ * @param value
+ * @param callback
+ */
+ validateContact(rule, value, callback) {
+ const contactObj = this.form.getFieldsValue(['contactsIdOne', 'contactsIdTwo', 'contactsIdThree'])
+ const contactArr = Object.values(contactObj)
+ contactArr.filter(tt => tt !== undefined)
+ console.log(contactArr)
+ if (isRepeat(contactArr)) {
+ callback('请选择不同的企业联系人')
+ } else {
+ callback()
+ }
+ callback()
}
}
}
diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
index 5731fa9..64d6fb4 100644
--- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
@@ -1,169 +1,171 @@
+ :title="title"
+ :width="width"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
+
说明：1.负责人A为该工作组的主负责人，负责人B为该工作组的辅助负责人。
2.设置本年应收款A和本年应收款B是为了区分工作组成员的价格。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 元/人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 元/人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元/人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元/人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
@@ -242,6 +244,7 @@ export default {
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
+ that.confirmLoading = true
let httpurl = ''
let method = 'post'
if (!this.model.id) {