From 2b0a139f88adbbb67bc6feed69dc1ee9ff158cb9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 五月 2025 13:34:17 +0800
Subject: [PATCH] 提交一把订单
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 11 +++
company/src/components/business/acceptance.vue | 154 +++++++++++++++++++++++++-------------------------
3 files changed, 89 insertions(+), 78 deletions(-)
diff --git a/company/src/components/business/acceptance.vue b/company/src/components/business/acceptance.vue
index dac1c75..2dd40b4 100644
--- a/company/src/components/business/acceptance.vue
+++ b/company/src/components/business/acceptance.vue
@@ -2,7 +2,7 @@
<GlobalWindow
:title="title"
width="500px"
- text="鍚屾剰鍙楃悊"
+ text="鎻愪氦"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
@@ -33,83 +33,83 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- import { acceptance, getDiscussProblemType } from '@/api/business/settleRisk'
- export default {
- name: 'acceptance',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- form: {
- id: null,
- status: 0,
- describe: '',
- syProblemOpts: '',
- problem: []
- },
- problemList: [],
- rules: {
- problem: [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ]
- },
- rules1: {
- problem: [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- describe: [
- { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
- ]
- }
- }
- },
- methods: {
- open(title, id) {
- this.title = title
- this.form.id = id
- getDiscussProblemType()
- .then(res => {
- console.log(res)
- this.problemList = res
- })
- this.visible = true
- },
- changeStatus() {
- this.$nextTick(() => {
- this.$refs.form.clearValidate();
- })
- },
- changeProblem(e) {
- if (!e || e.length === 0) {
- this.form.syProblemOpts = ''
- } else {
- this.form.syProblemOpts = e.join(',')
- }
- },
- confirm() {
- this.$refs.form.validate((valid) => {
- if (!valid) {
- return
- }
- this.isWorking = true
- acceptance(this.form)
- .then(() => {
- this.visible = false
- this.$tip.apiSuccess('鍙楃悊鎴愬姛')
- this.$emit('success')
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking = false
- })
- })
- }
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { acceptance, getDiscussProblemType } from '@/api/business/settleRisk'
+export default {
+ name: 'acceptance',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ form: {
+ id: null,
+ status: 0,
+ describe: '',
+ syProblemOpts: '',
+ problem: []
+ },
+ problemList: [],
+ rules: {
+ problem: [
+ { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
+ ]
+ },
+ rules1: {
+ problem: [
+ { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
+ describe: [
+ { required: true, message: '涓嶈兘涓虹┖', trigger: 'blur' }
+ ]
+ }
}
+ },
+ methods: {
+ open (title, id) {
+ this.title = title
+ this.form.id = id
+ getDiscussProblemType()
+ .then(res => {
+ console.log(res)
+ this.problemList = res
+ })
+ this.visible = true
+ },
+ changeStatus () {
+ this.$nextTick(() => {
+ this.$refs.form.clearValidate()
+ })
+ },
+ changeProblem (e) {
+ if (!e || e.length === 0) {
+ this.form.syProblemOpts = ''
+ } else {
+ this.form.syProblemOpts = e.join(',')
+ }
+ },
+ confirm () {
+ this.$refs.form.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ this.isWorking = true
+ acceptance(this.form)
+ .then(() => {
+ this.visible = false
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.$emit('success')
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ })
+ }
+ }
+}
</script>
<style lang="scss" scoped>
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 73cf562..e5bf7e3 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1693,7 +1693,7 @@
ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","寰呭鏍�","寰呯缃�","寰呯缃�"),
ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸查��鍥�","",""),
- TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","","宸茬珛妗�","",""),
+ TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","","寰呭彈鐞�","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","","宸插彈鐞嗭紝闇�瑕佽ˉ鍏呮潗鏂�","",""),
FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉嫆缁�","",""),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","鍟嗚寰呴瀵煎鎵�","",""),
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 81a7198..c7a167c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -2152,6 +2152,17 @@
Constants.SettleClaimsLogType.PLATFORM_WAIT_DISCUSS,
dto.getDescribe(),Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT);
}
+
+ if( Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.ACCEPTANCE.getKey()) ||
+ Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.WAIT_DISCUSS_AUDIT.getKey())){
+ //-濡傛灉鏄緟绔嬫鎴栬�呭凡绔嬫寰呭鏍革紝鍙戝緟鍔為�氱煡-------------
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SETTLE_CLAIMS;
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,settleClaims.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,settleClaims.getId(),getNoticeConttent(settleClaims),
+ settleClaims.getCompanyId(),
+ Constants.equalsInteger(settleClaims.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())?Constants.NoticeType.ZERO:Constants.NoticeType.TWO);
+ noticesMapper.insert(notices);
+ }
}
--
Gitblit v1.9.3