diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index 49e98f8..a3e61e5 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -246,7 +246,7 @@
- 保存
+ 提交
取消
@@ -442,39 +442,46 @@ export default {
if (this.confirmLoading) {
return
}
- this.confirmLoading = true
this.form.validateFields((err, values) => {
if (!err) {
- if (this.installmentList && this.installmentList.length > 0) {
- let formData = {}
- formData.installment = this.installmentList
- formData.contract = Object.assign(this.model, values)
- console.log('表单提交数据', formData)
- let url = ''
- if (!this.model.id) {
- url = this.url.add
- } else {
- url = this.url.edit
- }
- postAction(url, formData).then(res => {
- if (res.success) {
- this.contractId = res.result.id
- this.$message.success(res.message)
- // 跳转至支出合同list页面
- this.$router.push({
- path: '/contractManagement/ExpenditureContract'
+ const that = this
+ this.$confirm({
+ title: '确认提交?',
+ content: '提交后将给存档人发送提醒消息',
+ onOk: function () {
+ that.confirmLoading = true
+ if (that.installmentList && that.installmentList.length > 0) {
+ let formData = {}
+ formData.installment = that.installmentList
+ formData.contract = Object.assign(that.model, values)
+ console.log('表单提交数据', formData)
+ let url = ''
+ if (!that.model.id) {
+ url = that.url.add
+ } else {
+ url = that.url.edit
+ }
+ postAction(url, formData).then(res => {
+ if (res.success) {
+ that.contractId = res.result.id
+ that.$message.success(res.message)
+ // 跳转至支出合同list页面
+ that.$router.push({
+ path: '/contractManagement/ExpenditureContract'
+ })
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ setTimeout(() => {
+ that.confirmLoading = false
+ }, 1000)
})
} else {
- this.$message.warning(res.message)
+ that.confirmLoading = false
}
- }).finally(() => {
- setTimeout(() => {
- this.confirmLoading = false
- }, 1000)
- })
- } else {
- this.confirmLoading = false
- }
+ }
+ })
} else {
this.confirmLoading = false
}
diff --git a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
index 8e526dd..3046159 100644
--- a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
+++ b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
@@ -192,22 +192,29 @@ export default {
this.$message.warn('请至少关联一个项目')
return
}
- this.confirmLoading = true
- this.associatedProjectLoading = true
- const param = {
- id: this.contractId,
- status: 3
- }
- submitAudit(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.$router.go(-1)
- } else {
- this.$message.warn(res.message)
+ const that = this
+ this.$confirm({
+ title: '确认提交?',
+ content: '提交后将给存档人发送提醒消息',
+ onOk: function () {
+ that.confirmLoading = true
+ that.associatedProjectLoading = true
+ const param = {
+ id: that.contractId,
+ status: 3
+ }
+ submitAudit(param).then(res => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$router.go(-1)
+ } else {
+ that.$message.warn(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.associatedProjectLoading = false
+ })
}
- }).finally(() => {
- this.confirmLoading = false
- this.associatedProjectLoading = false
})
}
}
diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
index e819e71..03bced7 100644
--- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
+++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
@@ -147,7 +147,7 @@ export default {
title: '操作',
dataIndex: 'operation',
align: 'center',
- width: 300,
+ width: 520,
scopedSlots: { customRender: 'operation' }
}
],
@@ -176,6 +176,7 @@ export default {
title: '职务',
align: 'center',
dataIndex: 'post',
+ width: 220,
scopedSlots: { customRender: 'textRow' }
}, {
title: '手机号',
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 5a7aa82..334c52e 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -116,7 +116,7 @@
审核
-
+