From c55ab804149e9b52b0766b5862cd4de08bc837ba Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Tue, 31 Aug 2021 16:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86=E6=88=90?= =?UTF-8?q?=E5=91=98=E7=BB=B4=E6=8A=A4=E7=BC=96=E8=BE=91=E3=80=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/error.png | Bin 0 -> 690 bytes src/assets/imgs/finished.png | Bin 0 -> 801 bytes src/assets/imgs/half.png | Bin 0 -> 689 bytes src/assets/imgs/zero.png | Bin 0 -> 457 bytes src/components/company/SelectContacts.vue | 8 ++++- src/components/tools/StatusSlot.vue | 29 ++++++++++++++++++ .../memberManage/SafeguardMemberList.vue | 29 +++++++++++++----- .../modules/SafeguardMemberModal.vue | 13 +++++++- 8 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 src/assets/imgs/error.png create mode 100644 src/assets/imgs/finished.png create mode 100644 src/assets/imgs/half.png create mode 100644 src/assets/imgs/zero.png create mode 100644 src/components/tools/StatusSlot.vue diff --git a/src/assets/imgs/error.png b/src/assets/imgs/error.png new file mode 100644 index 0000000000000000000000000000000000000000..b3fc7cf4252396e94928f946a20c8377e6d8fbb8 GIT binary patch literal 690 zcmV;j0!{siP)Px%Y)M2xR5(wilub*NQ5462=TXC4I6^Xly3jzWBw9$61!@V8yM|z}gX%p|&;gMBK$X>iJdj3p3e6`d6c%NAdb3zVNfl1OTt} z(Eq9`$QR%(A|puQi6oO>tt5WkKngO5C&Q?=mF^M0ynPJE9n~5M(kiKH+|{)3^_!QRq4ZWA|aG zhm$?&D2$?kz`SrW%8W07M7i>>20N)8`P6JMU_0wnK0~ z<_u^ZsQWw6Gl-A>0qD2VF2IQ%NTuN0W~DS^RoNOQEs_E`Txs?I^!CBbjALOTT)GIo zr(kv#CMF#-*Ra-{@6GJnAXm5JZ-=2PkWRyd#s9Gwf1~rPtE(9QLMi?=R7XWap@T^E zgNlZ1ZH49K-5av039?zp<#sgWe~pM_pm4(0Tt?*jKMt+Q${;!d++!-aRvz!- z1_Px%+et)0R5(wCl;3LfUDJ&(ijV}7+KOnY3G(S|37}P``Og72xCOh}Yo!v>(B*l5T zF!!9#{ho8b=ZY#Kg5th=*PHw|9XS(4#}GZDuoo2%ahnP#gRe9oE9`2cRV?5lN9Uz1ABrU>`n)aFD7~m>Cfc}#N+hCe|S+TlQPDoJ(YBE)ZIdh3vTv2@?n;_ zYL(f_%DN^8$z?(YI`edgSuQ`BkM0BNM|O?;FAe%&c9^M)(z;cU6t}WC{o2YhQnTDxHaGC$p$5f+fkl5Mc<>G5}~C*$HAIY9tX2KWBK>%E82tNtqk1lr(mm*?VA(o)G%`Q~u|l9yKag8gmxMZiM|0 z#D&d*T&g^u`@KH2g+iFlq`nrBGr))M8Px%Ye_^wR5(wKlut+$aTLeDZ-$xOrLt%ZmNgZUu(A#wEH;VSAoL;xBDcAp@MPXKtF zl8ocdVmL$*0}H>gkW#JRiV)*^GOl&P=Svv^t*G`s{|RR5-X%*#w=1jA>@I~Q2#6#S zI5#?i&r6F|5E!fhxS__~l$sgYBCxM0zZY?T$U*mz>?pRHlPA1S49L8vLDF!UuJ5-H} zyUW)d{uz&<>C2})Ab^=$$sXuxcS_QQ@X319leJL@2;dOe0{+P}E_cPt>cbnB9!|v3 zn71|4E7brg*Y@nSwNzGZ2%0cj3l8I3Y8hw#^}km`WxJ zVlbeQu3u5M>}>zPw7s2|nS_S~$c0dtpfS*rTGsA!qfc1{VX(s?N2LZKgL@#9<%jVc zfLqFr^lKdTCCy(^P6D%FALuFPbml6+4Iq>f$d=u7QVBfAME%TolyYqU0k1c0Y7F`d Xz%nBLy)&4?00000NkvXXu0mjfiU>QF literal 0 HcmV?d00001 diff --git a/src/assets/imgs/zero.png b/src/assets/imgs/zero.png new file mode 100644 index 0000000000000000000000000000000000000000..adb371a68c3b44bca0c4b3ad092896065a9e60f0 GIT binary patch literal 457 zcmV;)0XF`LP)Px$gGod|R5(wql)+BIKoExiza=po^bHII52#O|oVejhue3xDKA4FL-E!2E-aLVC zpohW%-ar%50NF9STC!G*C{D7?wzK{6&&lT0-06W+Ki~-oe7KY)c-ZY>$qZ`F2`xt9C00000NkvXXu0mjf^9jab literal 0 HcmV?d00001 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)