diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index ff83b2c..12edf59 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -89,6 +89,9 @@ const getAllRevenueContract = (param) => getAction('/contract/payIncomeContract/
// 打印获取邮寄联系人信息接口,传票据邮寄列表id
const getPrintPostContactByMailId = (param) => getAction('/mail/payMailBill/print', param)
+// 全所统计--通过部门code查所有人员
+const getUserByDepartCode = (param) => getAction('/statistics/allProjectStatistics/listForUserByOrgCode', param)
+
export {
getWorkingGroupById,
getChargeNotice,
@@ -133,5 +136,6 @@ export {
aduitExpenditureContract,
archiveExpenditureContract,
getAllRevenueContract,
- getPrintPostContactByMailId
+ getPrintPostContactByMailId,
+ getUserByDepartCode
}
diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
index bd20d33..81e752b 100644
--- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
+++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
@@ -59,10 +59,11 @@
- 资料维护
- 会议维护
- 新增成员
- 编辑
+ 在研项目
+ 其他分发资料
+ 分标委会议
+ 新增委员
+ 基本信息维护
删除
@@ -146,7 +147,7 @@ export default {
title: '操作',
dataIndex: 'operation',
align: 'center',
- width: 400,
+ width: 300,
scopedSlots: { customRender: 'operation' }
}
],
@@ -180,13 +181,13 @@ export default {
title: '手机号',
align: 'center',
dataIndex: 'phone',
- width: 200,
+ width: 220,
scopedSlots: { customRender: 'textRow' }
}, {
title: '操作',
dataIndex: 'action',
align: 'center',
- width: 199,
+ width: 79,
scopedSlots: { customRender: 'action' }
}
],
@@ -268,6 +269,10 @@ export default {
this.$refs.memberModalForm.title = '新增成员'
this.$refs.memberModalForm.disableSubmit = false
},
+ /**
+ * 删除成员
+ * @param id
+ */
handleDeleteMember(id) {
console.log(id)
if (!this.url.deleteMember) {
@@ -313,6 +318,13 @@ export default {
meetingType: '5'
}
})
+ },
+ /**
+ * 前往在研项目
+ * @param record
+ */
+ toUnderStudyProject(record) {
+ console.log('在研项目', record)
}
}
}
diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue
index a1b76b8..9ce1bcd 100644
--- a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue
+++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue
@@ -1,17 +1,17 @@
+ :title="title"
+ :width="width"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
-
-
+
+
{e.target.value = (e.target.value + '').trim()}">
+
+
+
+
SC
+
e.target.value = (e.target.value.replace(/[^0-9]/g, '')).trim()">
+
+
+
-
+
{e.target.value = (e.target.value + '').trim()}"/>
+ placeholder="请输入目标简述"
+ v-decorator="['remarks',validatorRules.remarks]"
+ :auto-size="{ minRows: 3, maxRows: 6 }"
+ :maxLength='200'
+ @change="e => {e.target.value = (e.target.value + '').trim()}"/>
@@ -53,9 +64,17 @@ export default {
model: {},
labelCol: {
xs: { span: 24 },
- sm: { span: 3 }
+ sm: { span: 6 }
},
wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 18 }
+ },
+ remarksLabelCol: {
+ xs: { span: 24 },
+ sm: { span: 3 }
+ },
+ remarksWrapperCol: {
xs: { span: 24 },
sm: { span: 21 }
},
@@ -63,6 +82,14 @@ export default {
name: {
rules: [{ required: true, message: '请输入分标委名称' }],
validateTrigger: 'blur'
+ },
+ abbreviation: {
+ rules: [{ required: true, message: '请输入分标委简称' }],
+ validateTrigger: 'blur'
+ },
+ remarks: {
+ rules: [{ required: true, message: '请输入目标简述' }],
+ validateTrigger: 'blur'
}
},
url: {
@@ -80,7 +107,7 @@ export default {
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'name', 'remarks'))
+ this.form.setFieldsValue(pick(this.model, 'name', 'abbreviation', 'remarks'))
})
},
close() {
@@ -103,8 +130,9 @@ export default {
} else {
httpurl += this.url.edit
}
- console.log(values, '============')
const formData = Object.assign(this.model, values)
+ // 把list的数据删掉
+ delete formData.list
console.log('表单提交数据', formData)
httpAction(httpurl, formData, method).then((res) => {
if (res.success) {
@@ -130,13 +158,21 @@ export default {
// 下拉框的搜索
filterOption(input, option) {
return (
- option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
)
- },
+ }
}
}
-
\ No newline at end of file
diff --git a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
index 7543d25..c14bcf5 100644
--- a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
+++ b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
@@ -1,16 +1,276 @@
- 理事会维护 --列表页
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceMemberModal.vue b/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceMemberModal.vue
new file mode 100644
index 0000000..7ea2e2c
--- /dev/null
+++ b/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceMemberModal.vue
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
+ {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
+
+
+ {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
+ {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceModal.vue b/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceModal.vue
new file mode 100644
index 0000000..083c0a8
--- /dev/null
+++ b/src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceModal.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+ {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
+
+
+ {e.target.value = (e.target.value + '').trim()}"/>
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue
index 4f7cb59..439b26a 100644
--- a/src/views/projectManagement/WorkingGroupProjectManagement.vue
+++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue
@@ -92,12 +92,12 @@
- 文件维护
- 会议维护
+ 其他分发资料
+ 工作组会议
复制
编辑
+ v-if="record.checkoutOperation === 1">基本信息维护
删除
@@ -160,7 +160,7 @@ export default {
align: 'center',
dataIndex: 'principalNameA'
}, {
- title: '进度',
+ title: '收款进度',
align: 'center',
dataIndex: 'obj',
width: 250,
@@ -170,7 +170,7 @@ export default {
dataIndex: 'action',
align: 'center',
fixed: 'right',
- width: 300,
+ width: 420,
scopedSlots: { customRender: 'action' }
}
],
diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
index 51e9883..1e1ae83 100644
--- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue
+++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
@@ -174,7 +174,7 @@
import IconImg from '@/assets/imgs/icon/icon_statistical_report.png'
import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
import { JeroListMixin } from '../../mixins/JeroListMixin'
-import { getAllDepartTreeList, queryUserByDepartId } from '../../api/incomePaymentsApi'
+import { getAllDepartTreeList, getUserByDepartCode } from '../../api/incomePaymentsApi'
import JYearDate from '../../components/jero/JYearDate'
import { getAction } from '../../api/manage'
import ProjectDetailModal from '../../components/ProjectDetailModal'
@@ -392,7 +392,7 @@ export default {
let param = {
departCode: departCode
}
- queryUserByDepartId(param).then(res => {
+ getUserByDepartCode(param).then(res => {
if (res.success) {
this.userList = res.result
} else {