From 5f7f074ac063ddfae2134f8d84841927f5685394 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 01 二月 2024 14:50:17 +0800
Subject: [PATCH] Mr.Shi
---
company/src/components/enterprise/additionSubtractionApplication.vue | 7 ++
company/src/api/business/applyChange.js | 10 +++
company/src/components/business/OperaApplyChangeDetailWindow.vue | 29 ++++++++-
company/src/components/business/OperaInsuranceApplyWindow.vue | 11 ++-
company/src/components/business/ApplyChangeDetails.vue | 3 +
company/src/views/enterprise/add_subtract.vue | 15 +---
company/src/views/enterprise/switchCourt.vue | 56 ++++++++----------
company/.env.development | 7 +-
8 files changed, 84 insertions(+), 54 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index d59afcd..78f3117 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -2,12 +2,13 @@
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/'
+# 骞冲彴绔�-钀嶅
+# 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/applyChange.js b/company/src/api/business/applyChange.js
index c179688..7f34754 100644
--- a/company/src/api/business/applyChange.js
+++ b/company/src/api/business/applyChange.js
@@ -26,3 +26,13 @@
export function findList (data) {
return request.post('/business/applyDetail/findList', data)
}
+
+// 涓氬姟澶勭悊
+export function applyChangeOpt (data) {
+ return request.post('/business/applyChange/applyChangeOpt', data)
+}
+
+// 鍒楄〃鏌ヨ
+export function applyChagneDetailList (data) {
+ return request.post('/business/applyChagneDetail/list', data)
+}
diff --git a/company/src/components/business/ApplyChangeDetails.vue b/company/src/components/business/ApplyChangeDetails.vue
index 29ec8d2..412569e 100644
--- a/company/src/components/business/ApplyChangeDetails.vue
+++ b/company/src/components/business/ApplyChangeDetails.vue
@@ -220,6 +220,7 @@
font-weight: bold;
text-align: center;
padding: 15px;
+ box-sizing: border-box;
}
.box_header {
width: 100%;
@@ -228,6 +229,7 @@
flex-wrap: wrap;
border-top: 1px solid #b4bbc5;
border-left: 1px solid #b4bbc5;
+ box-sizing: border-box;
.box_header_item {
width: 50%;
height: 50px;
@@ -247,6 +249,7 @@
color: black;
background: #f2f2f2;
border-right: 1px solid #b4bbc5;
+ box-sizing: border-box;
}
.box_header_item_val {
flex: 1;
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 221bfa8..a1b5c61 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -15,19 +15,19 @@
<span v-if="model.status === 1">淇濆崟鐘舵�侊細宸茬绔�</span>
<span v-if="model.status === 2">淇濆崟鐘舵�侊細宸蹭笂浼犳壒鍗�</span>
<span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細閫�鍥炵敵璇�</span>
- <span v-if="model.status ===5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
+ <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
<span v-if="model.status ===7">淇濆崟鐘舵�侊細宸插叧闂�</span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model)">瀵煎嚭璇﹀崟</el-button>
- <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
- <el-button type="primary" v-if="model.status == 0" @click="goSign">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鐢宠閫�鍥�</el-button>
+ <el-button v-if="[5, 8].includes(model.status)" type="primary" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', {id: dataId})">鍐嶆鎶曚繚</el-button>
+ <el-button type="primary" v-if="model.status == 0" @click="goSign">绛剧讲鐢宠鍗�</el-button>
+ <el-button v-if="[2, 3, 7].includes(model.status)" type="primary">鐢宠閫�鍥�</el-button>
<el-button v-if="model.status == 5" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="model.status == 5" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
- <el-button v-if="model.status == 2" type="primary" @click="closeApply">鍏抽棴璁㈠崟</el-button>
+ <el-button v-if="[5, 8].includes(model.status)" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
<template v-else>
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model)">瀵煎嚭璇﹀崟</el-button>
@@ -204,6 +204,7 @@
applyChagneDetailPage,
getJiajianBaoSignLink
} from '@/api/business/insuranceApply'
+import { applyChangeOpt } from '@/api/business/applyChange'
import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
import { mapState } from 'vuex'
@@ -271,6 +272,24 @@
resetting() {
this.search()
},
+ closeOrder() {
+ this.$confirm('纭鍏抽棴娆′繚鍗曞悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ applyChangeOpt({
+ optType: 6,
+ applyId: this.model.id
+ }).then(res => {
+ this.getDetail()
+ }).catch(e => {
+ this.$message.error(e)
+ })
+ }).catch(() => {
+
+ });
+ },
search() {
this.currentPage = 1
this.getList()
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 856a4ec..5e08c61 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -11,7 +11,7 @@
<div class="desc_item_label" v-if="userInfo.type === 1 &&(model.statusCollect === 2 || model.statusCollect === 3)">
<div class="desc_item_label_left">
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
- <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', { id: dataId })">鍦ㄧ嚎绛剧讲</el-button>
+ <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', { id: dataId })">涓�閿画淇�</el-button>
<el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
<el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.factoryChange.open('鎹㈠巶鐢宠', { id: dataId })">鎹㈠巶鐢宠</el-button>
</div>
@@ -24,10 +24,11 @@
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
- <el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鐢宠閫�鍥�</el-button>
- <el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鍐嶆鎶曚繚</el-button>
- <el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鍏抽棴璁㈠崟</el-button>
+ <el-button v-if="[0, 2, 3, 10].includes(model.status)" type="danger" @click="$refs.applyReturn.open('鐢宠閫�鍥�', {id: dataId})">鐢宠閫�鍥�</el-button>
+ <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
+ <el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
+ <el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+ <el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 2" type="primary" @click="goSign">绛剧讲鎶曚繚鍗�</el-button>
</template>
<template v-else>
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 6db50bd..2d369a8 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -183,7 +183,7 @@
import confirmJobType from '@/components/enterprise/confirmJobType'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
- import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
+ import { create, getChangeCountCyclePriceVO, applyChagneDetailList } from '@/api/business/applyChange'
export default {
name: 'additionSubtractionApplication',
extends: BaseOpera,
@@ -266,6 +266,11 @@
handleClick(e) {
this.activeName = e.index
},
+ getApplyChagneDetailList() {
+ applyChagneDetailList({
+
+ })
+ },
// 鑾峰彇鎶曚繚璇︽儏
getDetails() {
// findList({ applyId: this.form.id })
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 9f45503..80bf584 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -42,12 +42,6 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
-<<<<<<< HEAD
-=======
- <ul class="toolbar" v-permissions="['business:applychange:create']">
- <li><el-button type="primary" @click="$refs.operaApplyChangeWindow.open('鏂板缓')" v-permissions="['business:applychange:create']">鏂板缓</el-button></li>
- </ul>
->>>>>>> 48eb5dc61ac07d232632b13d040006128ed5cceb
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -66,7 +60,6 @@
<span v-if="row.status === 3">閫�鍥炵敵璇�</span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
<el-table-column prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="addNum" label="鍔犱繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
@@ -79,7 +72,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaApplyChangeWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -91,7 +84,7 @@
</pagination>
</template>
<!-- 璇︽儏 -->
- <add_subtractDetails ref="add_subtractDetails" @success="handlePageChange"/>
+ <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -100,11 +93,13 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import add_subtractDetails from '@/components/enterprise/add_subtractDetails'
+ import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import {all as solutionAll, all} from '@/api/business/solutions'
+ import { mapState } from 'vuex'
export default {
name: 'add_subtract',
extends: BaseTable,
- components: { TableLayout, Pagination, add_subtractDetails },
+ components: { TableLayout, Pagination, add_subtractDetails, OperaApplyChangeDetailWindow },
data () {
return {
// 鎼滅储
diff --git a/company/src/views/enterprise/switchCourt.vue b/company/src/views/enterprise/switchCourt.vue
index b270fca..6ca0b5a 100644
--- a/company/src/views/enterprise/switchCourt.vue
+++ b/company/src/views/enterprise/switchCourt.vue
@@ -13,47 +13,43 @@
<el-form-item label="鎶曚繚浼佷笟" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鎻愪氦鏃ユ湡" prop="status">
<el-date-picker
- v-model="searchForm.status"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ v-model="searchForm.status"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
- <el-button @click="$refs.add_subtractDetails.open('鍔犲噺淇濊鎯�')">鏌ョ湅璇︽儏</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:applychange:create']">
- <li><el-button type="primary" @click="$refs.operaApplyChangeWindow.open('鏂板缓')" v-permissions="['business:applychange:create']">鏂板缓</el-button></li>
- </ul>
<el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
>
<el-table-column label="搴忓彿" width="80px">
<template slot-scope="scope">
@@ -76,24 +72,24 @@
<el-table-column prop="code" label="璐圭敤鍙樻洿" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaApplyChangeWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('鎹㈠巶璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
<pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
>
</pagination>
</template>
<!-- 璇︽儏 -->
- <add_subtractDetails ref="add_subtractDetails" @success="handlePageChange"/>
+ <OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -101,13 +97,13 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
- import add_subtractDetails from '@/components/enterprise/add_subtractDetails'
+ import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import {all as solutionAll} from "@/api/business/solutions";
import {pageAll as companyAll} from "@/api/business/company";
export default {
name: 'switchCourt',
extends: BaseTable,
- components: { TableLayout, Pagination, add_subtractDetails },
+ components: { TableLayout, Pagination, OperaApplyChangeUnitDetailWindow },
data () {
return {
// 鎼滅储
--
Gitblit v1.9.3