From a0811da1bea414f87f74d8f06f903a86fbbb92f2 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 11 Oct 2021 11:18:53 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E7=9A=84=E9=BB=98=E8=AE=A4=E5=B9=B4=E4=BB=BD=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkingGroupMemberUnitMaintenance.vue | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index bef1399..acbf850 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -316,12 +316,12 @@ export default { chargeNoticeList: [], // 收费通知号选项 importParam: {}, // 给定当年作为来款年份默认查询条件 - queryParam: { - paymentDate: new Date().getFullYear().toString() - }, - lastQueryParam: { - paymentDate: new Date().getFullYear().toString() - }, + // queryParam: { + // paymentDate: new Date().getFullYear().toString() + // }, + // lastQueryParam: { + // paymentDate: new Date().getFullYear().toString() + // }, canOperate: true, // 是否可操作（负责人B不可操作） } }, @@ -468,15 +468,16 @@ export default { window.open(url) } }, - searchReset() { - this.lastQueryParam = { - paymentDate: new Date().getFullYear().toString() - } - this.queryParam = { - paymentDate: new Date().getFullYear().toString() - } - this.loadData(1) - }, + // 2021 10 11 沟通后去掉了这个功能 + // searchReset() { + // this.lastQueryParam = { + // paymentDate: new Date().getFullYear().toString() + // } + // this.queryParam = { + // paymentDate: new Date().getFullYear().toString() + // } + // this.loadData(1) + // }, } } From fc1cad057a7b45d8b2e26c29268c1b393c3e46b0 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 11 Oct 2021 12:00:03 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=8A=B6=E6=80=81=E7=9A=84=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 6f94fd0..03ee5ff 100644 --- a/public/index.html +++ b/public/index.html @@ -140,7 +140,7 @@ top: 0; width: 51%; height: 100%; - background: #49a9ee; + background: #069F99; /* Old browsers */ z-index: 1000; -webkit-transform: translateX(0); From f376ec9b822d527374532914b0d6c87ffb819055 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 11 Oct 2021 13:48:34 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=82=AC=E6=AC=BEbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/SystemDept.vue | 51 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/src/views/system/SystemDept.vue b/src/views/system/SystemDept.vue index 4a0b8e5..c929bb8 100644 --- a/src/views/system/SystemDept.vue +++ b/src/views/system/SystemDept.vue @@ -25,27 +25,29 @@
- - - - - + + + + + + + + + + + +
@@ -85,7 +87,7 @@ export default { rules: [{ required: true, message: '请选择频率' }], validateTrigger: 'change' }, - deptTime: { + time: { rules: [{ required: true, message: '请选择催款时间' }], validateTrigger: 'change' }, @@ -293,11 +295,6 @@ export default { width: 60%; } -.select-month { - margin-right: 16px; - width: calc(50% - 8px); -} - .btn-form { display: flex; justify-content: center; From 3898e59446299faa86ab959b53aeb68900781e2e Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 11 Oct 2021 13:53:26 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=B8=BA=E5=90=A6=E5=8F=AF=E4=BB=A5=E5=85=B3=E8=81=94=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../revenueContract/modules/ProjectTypeSelection.vue | 10 +++++----- .../modules/RevenueContractModule.vue | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/ProjectTypeSelection.vue b/src/views/contractManagement/revenueContract/modules/ProjectTypeSelection.vue index 1ee9235..7b21a39 100644 --- a/src/views/contractManagement/revenueContract/modules/ProjectTypeSelection.vue +++ b/src/views/contractManagement/revenueContract/modules/ProjectTypeSelection.vue @@ -75,11 +75,11 @@ export default { } }, watch: { - isPack(value) { - if (value) { - this.projectType.splice(2, 1) - } - } + // isPack(value) { + // if (value) { + // this.projectType.splice(2, 1) + // } + // } }, methods: { open() { diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index a2ac18e..13d1f07 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -799,13 +799,13 @@ export default { break // 会议项目 case 3: + // 传入合同信息 + this.$refs.selectMeetingProjectModule.open(this.newFormData) // 打包为是不能选择关联会议项目 - if (this.newFormData.pack === 1) { - this.$message.warn('打包不可选择会议项目') - } else { - // 传入合同信息 - this.$refs.selectMeetingProjectModule.open(this.newFormData) - } + // if (this.newFormData.pack === 1) { + // this.$message.warn('打包不可选择会议项目') + // } else { + // } break // 会员项目 case 4: From 624d9c9bee71367b8738396999257278b6df02b0 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 11 Oct 2021 14:06:33 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E4=B8=8E=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/DictList.vue | 2 +- src/views/system/PermissionList.vue | 42 ++++++++++---------- src/views/system/modules/DictModal.vue | 6 +-- src/views/system/modules/PermissionModal.vue | 14 +++---- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue index 852cb8b..d5eb932 100644 --- a/src/views/system/DictList.vue +++ b/src/views/system/DictList.vue @@ -59,7 +59,7 @@ - 删除 + + + + + + + @@ -199,13 +209,13 @@ export default { title: '开票', align: 'center', dataIndex: 'makeInvoice', - scopedSlots: {customRender: 'status'} + scopedSlots: {customRender: 'status-bill'} }, { title: '邮寄', align: 'center', dataIndex: 'mail', - scopedSlots: {customRender: 'status'} + scopedSlots: {customRender: 'status-mail'} }, { title: '操作', From e6422d10099ab4ae02b795c748f5f4a318af19b3 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 11 Oct 2021 14:36:54 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E3=80=81=E5=BC=80=E7=A5=A8=E9=82=AE=E5=AF=84=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E7=B2=98=E8=B4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tools/StatusSlot.vue | 69 +++--- src/components/tools/UserPassword.vue | 228 ++++++++++-------- .../ArriveAndInvoivingList.vue | 5 +- src/views/system/modules/UserModal.vue | 6 + src/views/user/Login.vue | 5 + src/views/user/alteration/Alteration.vue | 9 +- 6 files changed, 186 insertions(+), 136 deletions(-) diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue index 0191007..72ed18b 100644 --- a/src/components/tools/StatusSlot.vue +++ b/src/components/tools/StatusSlot.vue @@ -7,8 +7,7 @@ :title="currentTitle" arrow-point-at-center :mouse-enter-delay="0.1" - @visibleChange="visibleChange" - > + @visibleChange="visibleChange"> @@ -32,7 +31,7 @@ export default { data() { return { currentTitle: ' ', // 气泡中显示的文字,必须有内容，否则dom选择时不会解析 - hasInfo: false, // 是否有详情信息可以显示，即是否通过接口请求过数据 + hasInfo: false // 是否有详情信息可以显示，即是否通过接口请求过数据 } }, props: { @@ -50,7 +49,7 @@ export default { statusType: { type: Boolean, required: false, - default:false + default: false }, /* * 具体的状态值 @@ -60,8 +59,8 @@ export default { required: false }, // 当前需要转换key的属性, 悬浮显示实际具体内容信息时需要 - // paymentRecord 来款 mail -- 邮寄 bill--邮寄 - statusKey:{ + // paymentRecord 来款 mail -- 邮寄 bill--开票 + statusKey: { type: String, required: false, default: 'paymentRecord' @@ -76,32 +75,37 @@ export default { computed: { // eslint-disable-next-line vue/return-in-computed-property status() { - if (this.statuObj.amountReceivable === '0.00' || this.statuObj.receivableAmount === '0.00' ) { - if(this.statusType){ + if (this.statuObj.amountReceivable === '0.00' || this.statuObj.receivableAmount === '0.00') { + if (this.statusType) { // 应收金额为0 未到账 未邮寄 未开票的状态 return zero - }else { + } else { // 应收金额为0 打包 与需要开票的状态 - if(this.statusNo === 0 ){ + if (this.statusNo === 0) { return error - }else if(this.statusNo === 1){ + } else if (this.statusNo === 1) { return finished - }else if(this.statusNo === 2){ + } else if (this.statusNo === 2) { return half } } - }else { + } else { // 应收金额不为0 都正常判断 - if(this.statusNo === 0 ){ - return error - }else if(this.statusNo === 1){ + if (this.statusNo === 0) { + // 开票或邮寄时，不需要发票 + if ((this.statusKey === 'bill' || this.statusKey === 'mail') && this.statuObj.needInvoice === 0) { + return zero + } else { + return error + } + } else if (this.statusNo === 1) { return finished - }else if(this.statusNo === 2){ + } else if (this.statusNo === 2) { // 如果不是打包和需要发票 - if(this.statusType){ + if (this.statusType) { return half - }else { + } else { return finished } } @@ -110,11 +114,14 @@ export default { // 操作返回数据的key值，此处是根据业务逻辑处理的 opeStatusKey() { let result = this.statusKey - if(this.statusKey === 'mail' || this.statusKey === 'bill') { + if (this.statusKey === 'mail' || this.statusKey === 'bill') { result = 'mailBill' } return result } + }, + created() { + }, methods: { s() { @@ -123,9 +130,9 @@ export default { visibleChange(visible) { // 到账、开票、邮寄 的时候，请求接口获得相应的数据 // 判断条件 tooltip显示、 有不同的统计状态，统计状态值不为0 没有请求过详情数据 - if(visible && this.statusType && this.statusNo && !this.hasInfo) { - this.getInfoFunc({id: this.statuObj.id}).then(res =>{ - if(res.success) { + if (visible && this.statusType && this.statusNo && !this.hasInfo) { + this.getInfoFunc({ id: this.statuObj.id }).then(res => { + if (res.success) { let arr = res.result[this.opeStatusKey] || [] let result = [] arr.map(tt => { @@ -147,12 +154,12 @@ export default { let result = '' console.log(item) // 来款 - if(this.statusKey === 'paymentRecord') { - result = `${item.paymentDate}到账${item.amountReceived}` - } else if(this.statusKey === 'bill') { - result = `${item.billDate}新增发票，发票单号：${item.billNo}` - } else if(this.statusKey === 'mail') { - result = `${item.sendDate}新增邮寄信息，邮寄单号：${item.postNo}` + if (this.statusKey === 'paymentRecord') { + result = `${ item.paymentDate }到账${ item.amountReceived }` + } else if (this.statusKey === 'bill') { + result = `${ item.billDate }新增发票，发票单号：${ item.billNo }` + } else if (this.statusKey === 'mail') { + result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }` } return result } @@ -165,7 +172,7 @@ export default { diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue index 4bb0ea1..05252c5 100644 --- a/src/components/tools/UserPassword.vue +++ b/src/components/tools/UserPassword.vue @@ -14,22 +14,35 @@ - + - + - + @@ -39,116 +52,125 @@