From 7c69a838cf9405289b831423197da83e8fd69ebe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 11:53:15 +0800
Subject: [PATCH] 开发业务接口
---
company/src/api/business/taxes.js | 5 +
company/src/components/business/OperaTaxesWindow.vue | 122 +++++++++++++++++++++++++++++++++++-----
server/service/src/main/java/com/doumee/core/utils/Http.java | 1
company/src/components/business/OperaSettleClaimsWindow.vue | 25 ++++++-
company/.env.development | 4
5 files changed, 134 insertions(+), 23 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 78f3117..2348fd6 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -2,7 +2,7 @@
NODE_ENV = 'development'
# 浼佷笟绔�-浠佸悍
-VUE_APP_API = 'http://192.168.0.134:10025/'
+#VUE_APP_API = 'http://192.168.0.134:10025/'
# 骞冲彴绔�-浠佸悍
# VUE_APP_API = 'http://192.168.0.134:10023/'
@@ -10,5 +10,5 @@
# 骞冲彴绔�-钀嶅
# VUE_APP_API = 'http://192.168.0.102:10023/'
-# VUE_APP_API = 'http://localhost:10023/'
+ VUE_APP_API = 'http://localhost:10023/'
# VUE_APP_API = 'http://localhost:10023/'
diff --git a/company/src/api/business/taxes.js b/company/src/api/business/taxes.js
index d2a2258..f73a0fe 100644
--- a/company/src/api/business/taxes.js
+++ b/company/src/api/business/taxes.js
@@ -15,3 +15,8 @@
trim: true
})
}
+export function backApply(data) {
+ return request.post('/business/taxes/backApply', data, {
+ trim: true
+ })
+}
diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue
index dfb5f0a..cae0b2a 100644
--- a/company/src/components/business/OperaSettleClaimsWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsWindow.vue
@@ -204,7 +204,10 @@
</div>
</div>
</template>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 2)" />
+ <template v-else>
+ <span style=" width:100%;text-align:center;color: #8c939d;font-size: 12px" v-if="model.status ==2 || model.status ==4">鏆傛棤鏁版嵁</span>
+ </template>
+ <upload v-if="model.status !=2 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 2)" />
<!-- <div class="desc_data_list_item">-->
<!-- <UploadFileCommon :uploadData="{ folder: 'settle' }" />-->
<!-- <div class="desc_data_list_item_upload">-->
@@ -242,7 +245,10 @@
</div>
</div>
</template>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 3)" />
+ <template v-else>
+ <span style=" width:100%;text-align:center;color: #8c939d;font-size: 12px" v-if="model.status ==2 || model.status ==4">鏆傛棤鏁版嵁</span>
+ </template>
+ <upload v-if="model.status !=2 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 3)" />
<!-- <div class="desc_data_list_item">-->
<!-- <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
<!-- <i class="el-icon-plus"></i>-->
@@ -272,7 +278,10 @@
</div>
</div>
</template>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 4)" />
+ <template v-else>
+ <span style=" width:100%;text-align:center;color: #8c939d;font-size: 12px" v-if="model.status ==2 || model.status ==4">鏆傛棤鏁版嵁</span>
+ </template>
+ <upload v-if="model.status !=2 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 4)" />
<!-- <div class="desc_data_list_item">-->
<!-- <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
<!-- <i class="el-icon-plus"></i>-->
@@ -302,7 +311,10 @@
</div>
</div>
</template>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 5)" />
+ <template v-else>
+ <span style=" width:100%;text-align:center;color: #8c939d;font-size: 12px" v-if="model.status ==2 || model.status ==4">鏆傛棤鏁版嵁</span>
+ </template>
+ <upload v-if="model.status !=2 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 5)" />
<!-- <div class="desc_data_list_item">-->
<!-- <UploadFileCommon :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />-->
<!--<!– <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
@@ -336,7 +348,10 @@
</div>
</div>
</template>
- <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 6)" />
+ <template v-else>
+ <span style=" width:100%;text-align:center;color: #8c939d;font-size: 12px" v-if="model.status ==2 || model.status ==4">鏆傛棤鏁版嵁</span>
+ </template>
+ <upload v-if="model.status !=2 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 6)" />
<!-- <div class="desc_data_list_item">-->
<!-- <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
<!-- <i class="el-icon-plus"></i>-->
diff --git a/company/src/components/business/OperaTaxesWindow.vue b/company/src/components/business/OperaTaxesWindow.vue
index 4f6ce95..271fc8e 100644
--- a/company/src/components/business/OperaTaxesWindow.vue
+++ b/company/src/components/business/OperaTaxesWindow.vue
@@ -166,13 +166,42 @@
</el-table-column>
</el-table>
</div>
+ <el-dialog
+ title="涓婁紶鍙戠エ"
+ :visible.sync="visible1"
+ width="500px"
+ style="margin-top: 150px"
+ :show-close="false"
+ append-to-body
+ :close-on-click-modal="false"
+ center>
+ <div class="form">
+ <div class="form_item">
+ <div class="form_item_val">
+ <el-form :model="form" ref="form" :rules="rules" style="width: 100%;">
+ <el-form-item label="濉啓閫�鍥炶鏄庯細":inline="true" prop="backInfo">
+ <el-input v-model="form.backInfo" type="textarea" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="visible1 = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="backDo()">鎻� 浜�</el-button>
+ </span>
+ </el-dialog>
+ <template v-slot:footer>
+ <el-button v-if="model.status ==0 && !visible1" type="danger" @click="visible1=true">閫�鍥炵敵璇�</el-button>
+ <el-button @click="visible=false">鍙栨秷</el-button>
+ </template>
</GlobalWindow>
</template>
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import { getDetail } from '@/api/business/taxes'
+import { getDetail,backApply } from '@/api/business/taxes'
export default {
name: 'OperaCompanyWindow',
extends: BaseOpera,
@@ -181,11 +210,16 @@
return {
// 琛ㄥ崟鏁版嵁
model: {},
+ visible1:false,
form: {
- id: null
+ id: null,
+ backInfo:''
},
- // 楠岃瘉瑙勫垯
- rules: {},
+ rules: {
+ backInfo: [
+ { required: true, message: '璇疯緭鍏ラ��鍥炶鏄�' }
+ ],
+ },
tableData: [],
tableData1: [],
tableData2: []
@@ -201,12 +235,33 @@
open (title, target) {
this.title = title
this.visible = true
+ this.visible1 = false
+ this.form.backInfo=''
this.model = {}
this.tableData = []
this.tableData1 = []
this.tableData2 = []
this.model = target
+ this.form.id = target.id
this.getDetails()
+ },
+ backDo(){
+ this.$refs.form.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ this.isWorking = true
+ backApply(this.form)
+ .then(response => {
+ this.visible1 = false
+ this.getDetails()
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ })
},
getDetails () {
getDetail(this.model.id).then(res => {
@@ -257,17 +312,17 @@
color:rgba(249, 86, 1, 0.996078431372549);
}
}
- ::v-deep .el-table__header-wrapper th:first-child .cell{
- color:rgba(249, 86, 1, 0.996078431372549) !important
- }
- ::v-deep table:first-of-type th:first-child .cell{
- //color:rgba(249, 86, 1, 0.996078431372549) !important
- }
- /* ::v-deep .el-table--border th:first-child .cell {
- &:nth-child(2) {
- color:rgba(249, 86, 1, 0.996078431372549);
- }
- }*/
+ /* ::v-deep .el-table__header-wrapper th:first-child .cell{
+ color:rgba(249, 86, 1, 0.996078431372549) !important
+ }
+ ::v-deep table:first-of-type th:first-child .cell{
+ //color:rgba(249, 86, 1, 0.996078431372549) !important
+ }
+ ::v-deep .el-table--border th:first-child .cell {
+ &:nth-child(2) {
+ color:rgba(249, 86, 1, 0.996078431372549);
+ }
+ }*/
.info {
@@ -318,4 +373,41 @@
}
}
}
+
+ .form {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .form_item {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ &:last-child {
+ margin-bottom: 0 !important;
+ }
+ .form_item_label {
+ width: 100px;
+ flex-shrink: 0;
+ font-size: 14px;
+ color: black;
+ }
+ .form_item_val {
+ flex: 1;
+ min-height: 35px;
+ display: flex;
+ align-items: center;
+ input {
+ width: 100%;
+ height: 100%;
+ font-size: 14px;
+ color: black;
+ padding: 5px 10px;
+ outline: none;
+ box-sizing: border-box;
+ border: 1px solid #ececec;
+ }
+ }
+ }
+ }
</style>
diff --git a/server/service/src/main/java/com/doumee/core/utils/Http.java b/server/service/src/main/java/com/doumee/core/utils/Http.java
index 6653164..70d2593 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Http.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Http.java
@@ -20,7 +20,6 @@
*/
@Slf4j
public class Http {
-
/**
* 鑾峰彇Http杩炴帴
* @param url 璇锋眰鍦板潃
--
Gitblit v1.9.3