diff --git a/src/assets/imgs/error.png b/src/assets/imgs/error.png new file mode 100644 index 0000000..b3fc7cf Binary files /dev/null and b/src/assets/imgs/error.png differ diff --git a/src/assets/imgs/finished.png b/src/assets/imgs/finished.png new file mode 100644 index 0000000..55e5a33 Binary files /dev/null and b/src/assets/imgs/finished.png differ diff --git a/src/assets/imgs/half.png b/src/assets/imgs/half.png new file mode 100644 index 0000000..63ead38 Binary files /dev/null and b/src/assets/imgs/half.png differ diff --git a/src/assets/imgs/zero.png b/src/assets/imgs/zero.png new file mode 100644 index 0000000..adb371a Binary files /dev/null and b/src/assets/imgs/zero.png differ diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue index eafe10d..bc06f1d 100644 --- a/src/components/company/SelectContacts.vue +++ b/src/components/company/SelectContacts.vue @@ -51,6 +51,12 @@ export default { contactsList: [], // 该企业下联系人列表 } }, + created() { + // 编辑 第一次不回显的问题 + if(this.selectedCompany.hasOwnProperty('id')){ + this.getContactsList() + } + }, watch: { /** * 选中企业发生变化时重新获取数据 @@ -107,4 +113,4 @@ export default { padding-top: 1px; padding-left: 8px; } - \ No newline at end of file + diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue new file mode 100644 index 0000000..88620c5 --- /dev/null +++ b/src/components/tools/StatusSlot.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue index c00d160..d2c874b 100644 --- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue @@ -1,10 +1,8 @@ + + + 编辑 删除 @@ -108,6 +111,7 @@ import {JeroListMixin} from '@/mixins/JeroListMixin' import JYearDate from "@comp/jero/JYearDate"; import SafeguardMemberModal from "@views/incomePayments/memberManage/modules/SafeguardMemberModal"; import ProjectDetailModal from "@comp/ProjectDetailModal"; +import StatusSlot from "@comp/tools/StatusSlot"; import {getAction} from "@api/manage"; import {getFileInfo} from "@api/api"; @@ -117,7 +121,8 @@ export default { components: { JYearDate, SafeguardMemberModal, - ProjectDetailModal + ProjectDetailModal, + StatusSlot }, data() { return { @@ -158,26 +163,31 @@ export default { title: '打包', align: "center", dataIndex: 'pack', + scopedSlots: {customRender: 'status'} }, { title: '需要发票', align: "center", dataIndex: 'needInvoice', + scopedSlots: {customRender: 'status'} }, { title: '到账', align: "center", dataIndex: 'inAccount', + scopedSlots: {customRender: 'status'} }, { title: '开票', align: "center", dataIndex: 'makeInvoice', + scopedSlots: {customRender: 'status'} }, { title: '邮寄', align: "center", dataIndex: 'mail', + scopedSlots: {customRender: 'status'} }, { title: '操作', @@ -195,6 +205,7 @@ export default { deleteBatch: "/jero/memberProjectSubitem/deleteBatch", exportXlsUrl: "/jero/memberProjectSubitem/exportXls", importExcelUrl: "jero/memberProjectSubitem/importExcel", + downTemplateUrl:"jero/memberProjectSubitem/exportTemplate" }, } }, @@ -284,7 +295,11 @@ export default { line-height: 2; } } - +.project-base-info-title{ + height: 50px; + line-height: 50px; + border-bottom: 1px solid #ccc; +} .color_blue { color: #069f99; cursor: pointer; diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue index e51ac83..ffcd055 100644 --- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue +++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue @@ -224,12 +224,23 @@ export default { },100) } this.model = Object.assign({}, record) + // 编辑状态下的企业与联系人的回显 + if(record.companyId){ + this.model.companyId ={ + id:record.companyId, + companyName: record.companyName + } + this.selectedCompany = Object.assign({},this.model.companyId) + // 修改来款方式 控制dom对应显示隐藏 + this.incomePaysType = record.paymentMethod + } this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'companyId', 'companyContactId', 'postContactId', 'amountReceivable', 'needInvoice', 'paymentMethod', 'contractNo', ' chargeNoticeNo', 'chargeNoticeFileId', 'remark')) + this.form.setFieldsValue(pick(this.model, 'companyId', 'companyContactId', 'postContactId', 'amountReceivable', 'needInvoice', 'paymentMethod', 'contractNo', 'chargeNoticeNo', 'chargeNoticeFileId', 'remark')) }) }, close() { + this.incomePaysType = 3 this.$emit('close') this.visible = false clearTimeout(this.timer)