diff --git a/project/shandong10086/apps/shandong/score/AppIntegralAudit/AppIntegralAudit.vue b/packages/conv/creditScore/AppIntegralAudit/AppIntegralAudit.vue similarity index 100% rename from project/shandong10086/apps/shandong/score/AppIntegralAudit/AppIntegralAudit.vue rename to packages/conv/creditScore/AppIntegralAudit/AppIntegralAudit.vue diff --git a/project/shandong10086/apps/shandong/score/AppIntegralAudit/components/Detail.vue b/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue similarity index 100% rename from project/shandong10086/apps/shandong/score/AppIntegralAudit/components/Detail.vue rename to packages/conv/creditScore/AppIntegralAudit/components/Detail.vue diff --git a/project/shandong10086/apps/shandong/score/AppIntegralAudit/components/List.vue b/packages/conv/creditScore/AppIntegralAudit/components/List.vue similarity index 100% rename from project/shandong10086/apps/shandong/score/AppIntegralAudit/components/List.vue rename to packages/conv/creditScore/AppIntegralAudit/components/List.vue diff --git a/packages/conv/creditScore/AppScoreManage/AppScoreManage.vue b/packages/conv/creditScore/AppScoreManage/AppScoreManage.vue new file mode 100644 index 00000000..4f7562e2 --- /dev/null +++ b/packages/conv/creditScore/AppScoreManage/AppScoreManage.vue @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + diff --git a/packages/conv/creditScore/scoreManage/pointsAppeal.vue b/packages/conv/creditScore/AppScoreManage/pointsAppeal.vue similarity index 100% rename from packages/conv/creditScore/scoreManage/pointsAppeal.vue rename to packages/conv/creditScore/AppScoreManage/pointsAppeal.vue diff --git a/packages/conv/creditScore/scoreManage/pointsDeclaration.vue b/packages/conv/creditScore/AppScoreManage/pointsDeclaration.vue similarity index 100% rename from packages/conv/creditScore/scoreManage/pointsDeclaration.vue rename to packages/conv/creditScore/AppScoreManage/pointsDeclaration.vue diff --git a/packages/conv/creditScore/AppScoreManage/pointsDetails.vue b/packages/conv/creditScore/AppScoreManage/pointsDetails.vue new file mode 100644 index 00000000..a7682123 --- /dev/null +++ b/packages/conv/creditScore/AppScoreManage/pointsDetails.vue @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + {{ row.changeIntegral > 0 ? '+' : '' }}{{ row.changeIntegral }} + + + + + + 详情 + + + + + + + + + + + + + + {{ dialogInfo.changeIntegral >= 0 ? '增加' : '减少' }} + 分 + + + + + + + + + + + diff --git a/project/shandong10086/apps/shandong/score/AppScoreManage/scoreChange.vue b/packages/conv/creditScore/AppScoreManage/scoreChange.vue similarity index 68% rename from project/shandong10086/apps/shandong/score/AppScoreManage/scoreChange.vue rename to packages/conv/creditScore/AppScoreManage/scoreChange.vue index 6140059d..15933855 100644 --- a/project/shandong10086/apps/shandong/score/AppScoreManage/scoreChange.vue +++ b/packages/conv/creditScore/AppScoreManage/scoreChange.vue @@ -14,7 +14,7 @@ @@ -40,14 +40,11 @@ - - - - 加分 - 减分 - + + @@ -86,38 +83,19 @@ export default { rules() { return { residentId: [{required: true, message: '请选择人员', trigger: 'blur'},], - description: [{required: true, message: '请输入调整说明', trigger: 'blur'},], - doType: [{required: true, message: '请输入调整说明', trigger: 'change'},], - changeIntegral: [ - { - required: true, validator: (rule, value, callback) => { - if (!/^[1-9]\d*$/.test(value)) { - callback(new Error('请输入正整数')) - } else { - callback(); - } - }, trigger: 'blur' - },], + eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'},], + integralCalcType: [{required: true, message: '请输入调整说明', trigger: 'change'},], + changeIntegral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}], } }, colConfigs() { return [ {prop: "residentName", label: "姓名"}, - {prop: "description", label: "调整说明"}, - { - prop: "changeIntegral", label: "类型", align: "center", - render: (h, {row}) => [< span> {+row.changeIntegral > 0 ? "加分" : '减分' - } < /span>] - }, - { - prop: "changeIntegral", - label: "积分", - align: "center", - render: (h, {row}) => [ - {row.changeIntegral > 0 ? `+${row.changeIntegral}` : `${row.changeIntegral}`}] - }, + {prop: "eventDesc", label: "调整说明"}, + {prop: "integralCalcType", label: "类型", dict: "integralCalcType", align: 'center'}, + {prop: "changeIntegral", label: "积分", align: "center", render: (h, {row}) => h('p', `${row.integralCalcType > 0 ? '+' : '-'}${row.changeIntegral}`)}, {prop: "doTime", label: "操作时间"}, - {prop: "declareObjName", label: "操作人", align: "center"}, + {prop: "createUserName", label: "操作人", align: "center"}, ] } }, @@ -134,10 +112,7 @@ export default { onConfirm() { this.$refs['form'].validate(valid => { if (valid) { - this.instance.post(`/app/appvillagerintegraldetail/changeIntegral`, { - ...this.form, - changeIntegral: this.form.doType == 0 ? `+${this.form.changeIntegral}` : `-${this.form.changeIntegral}` - }).then(res => { + this.instance.post(`/app/appvillagerintegraldetail/changeIntegral`, this.form).then(res => { if (res.code == 0) { this.$message.success("添加成功") this.dialog = false @@ -149,11 +124,7 @@ export default { }, getList() { this.instance.post(`/app/appvillagerintegraldetail/list`, null, { - params: { - ...this.page, - areaId: this.areaId, - doType: 2 - } + params: {...this.page, areaId: this.areaId, type: 0} }).then(res => { if (res?.data) { this.tableData = res.data.records diff --git a/packages/conv/creditScore/scoreFamily/detail.vue b/packages/conv/creditScore/scoreFamily/detail.vue index 43154381..674bab95 100644 --- a/packages/conv/creditScore/scoreFamily/detail.vue +++ b/packages/conv/creditScore/scoreFamily/detail.vue @@ -28,31 +28,20 @@ :instance="instance" url="/app/appvillagerintegraldetail/export" :disabled="!Boolean(tableData.length)" - :params="{familyId:detailInfo.id,bizType:doType}" + :params="{familyId:detailInfo.id,type}" fileName="余额变动明细"> - 导出 + 导出 - - - - - - + + + + + + @@ -62,7 +51,6 @@ - - diff --git a/packages/conv/creditScore/scoreManage/pointsDetails.vue b/packages/conv/creditScore/scoreManage/pointsDetails.vue deleted file mode 100644 index 0495867a..00000000 --- a/packages/conv/creditScore/scoreManage/pointsDetails.vue +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - {{row.changeIntegral > 0 ? '+' : ''}}{{row.changeIntegral}} - - - - - {{ dict.getLabel('integralDetailType', row.bizType) }} - - - - - - 详情 - - - - - - - - - - 户主: - {{dialogInfo.familyName}} - - - 事项: - {{dialogInfo.ruleName}} - - - - 积分: - {{dialogInfo.changeIntegral >= 0 ? '增加' : '减少'}}{{Math.abs(dialogInfo.changeIntegral)}}分 - - - - - - - - - - - diff --git a/packages/conv/creditScore/scoreManage/scoreChange.vue b/packages/conv/creditScore/scoreManage/scoreChange.vue deleted file mode 100644 index abfc0dc2..00000000 --- a/packages/conv/creditScore/scoreManage/scoreChange.vue +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - 添加 - - - - - - - - - - - - - - {{ item.name }} - - - - - - - - - - 加分 - 减分 - - - - - - - - - - - - - diff --git a/packages/conv/creditScore/scorePersonal/detail.vue b/packages/conv/creditScore/scorePersonal/detail.vue index 6835645b..99256230 100644 --- a/packages/conv/creditScore/scorePersonal/detail.vue +++ b/packages/conv/creditScore/scorePersonal/detail.vue @@ -1,7 +1,7 @@ - + @@ -19,37 +19,15 @@ - - - - - - - - - + + + + + + @@ -57,151 +35,124 @@ \ No newline at end of file + + .iconExported { + color: #5088FF; + font-size: 12px; + cursor: pointer; + } + + .info { + padding: 16px 0 16px 0; + } + + .do_type { + height: 56px; + } + + .fs-14 { + ::v-deep .el-table--small { + font-size: 14px !important; + } + } +} + diff --git a/project/shandong10086/apps/shandong/score/AppScoreManage/AppScoreManage.vue b/project/shandong10086/apps/shandong/score/AppScoreManage/AppScoreManage.vue deleted file mode 100644 index 82759bac..00000000 --- a/project/shandong10086/apps/shandong/score/AppScoreManage/AppScoreManage.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/project/shandong10086/apps/shandong/score/AppScoreManage/pointsAppeal.vue b/project/shandong10086/apps/shandong/score/AppScoreManage/pointsAppeal.vue deleted file mode 100644 index 742b7ede..00000000 --- a/project/shandong10086/apps/shandong/score/AppScoreManage/pointsAppeal.vue +++ /dev/null @@ -1,611 +0,0 @@ - - - - - - - 代申诉 - 批量审核 - - - - 申诉时间 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.name }} - - - - - - - - - - - - - - - - - - - - - 申诉人: - {{rowInfo.declareName}} - - - 申诉对象: - {{rowInfo.declareObjName}} - - - 户主: - {{rowInfo.familyName}} - - - - 申诉说明: - {{rowInfo.declareDescription}} - - - 申诉时间: - {{rowInfo.declareTime}} - - - 照片: - - - - - - - - - - 加分 - 扣分 - 拒绝 - - - - - - - - - {{dialogDetail.doType==0? '减少' :'增加'}} - - 分 - - - - - - - {{dict.getLabel('integralDeclareStatus', rowInfo.status)}} - {{rowInfo.ruleName}} - {{rowInfo.doType==0? '减少' :'增加'}}{{Math.abs(rowInfo.doIntegral)}}分 - {{rowInfo.remark||'-'}} - - - - - - - - - - diff --git a/project/shandong10086/apps/shandong/score/AppScoreManage/pointsDeclaration.vue b/project/shandong10086/apps/shandong/score/AppScoreManage/pointsDeclaration.vue deleted file mode 100644 index 42562458..00000000 --- a/project/shandong10086/apps/shandong/score/AppScoreManage/pointsDeclaration.vue +++ /dev/null @@ -1,603 +0,0 @@ - - - - - - - 代申报 - 批量审核 - - - - 申报时间 - - - - - - - - - - - - - - - - - 编辑 - - - 详情 - - - - - - - - - - - - - - {{ item.name }} - - - - - - - - - - - - - - - - - - - - - 申报人: - {{rowInfo.declareName}} - - - 申报对象: - {{rowInfo.declareObjName}} - - - 户主: - {{rowInfo.familyName}} - - - - 申报说明: - {{rowInfo.declareDescription}} - - - 申报时间: - {{rowInfo.declareTime}} - - - 照片: - - - - - - - - - - 加分 - 扣分 - 拒绝 - - - - - - - - - {{dialogDetail.doType==0? '减少' :'增加'}} - - 分 - - - - - - - {{dict.getLabel('integralDeclareStatus', rowInfo.status)}} - {{rowInfo.ruleName}} - {{rowInfo.doType==0? '减少' :'增加'}}{{Math.abs(rowInfo.doIntegral)}}分 - {{rowInfo.remark||'-'}} - - - - - - - - - - diff --git a/project/shandong10086/apps/shandong/score/AppScoreManage/pointsDetails.vue b/project/shandong10086/apps/shandong/score/AppScoreManage/pointsDetails.vue deleted file mode 100644 index 0495867a..00000000 --- a/project/shandong10086/apps/shandong/score/AppScoreManage/pointsDetails.vue +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - - - - - - - - - - - {{row.changeIntegral > 0 ? '+' : ''}}{{row.changeIntegral}} - - - - - {{ dict.getLabel('integralDetailType', row.bizType) }} - - - - - - 详情 - - - - - - - - - - 户主: - {{dialogInfo.familyName}} - - - 事项: - {{dialogInfo.ruleName}} - - - - 积分: - {{dialogInfo.changeIntegral >= 0 ? '增加' : '减少'}}{{Math.abs(dialogInfo.changeIntegral)}}分 - - - - - - - - - - -
申诉时间
申报时间