From 84b74d64ecc519882b89278f1011f7ac7525d190 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 05 三月 2024 19:23:40 +0800
Subject: [PATCH] mrshi
---
company/src/components/enterprise/OperaInsuranceApplyWindow.vue | 41 --
company/src/components/business/OperaInsuranceApplyWindow.vue | 10
company/src/components/business/OperaSettleClaimsCheckWindow.vue | 8
company/src/components/business/OperaInsuranceApplyCheckWindow.vue | 7
company/vue.config.js | 2
company/src/components/business/OperaInsuranceWindow.vue | 3
company/src/components/business/operaverifyPhoneNumberWindew.vue | 101 +++++
company/src/api/business/smsEmail.js | 5
company/src/components/business/OperaApplyChangeCheckWindow.vue | 2
company/src/components/business/OperaCompanyWindow.vue | 2
company/src/components/business/OperaCompanyDescWindow.vue | 2
company/src/components/enterprise/additionSubtractionApplication.vue | 95 ++++-
company/src/components/enterprise/factoryChange.vue | 81 +++-
company/src/api/business/notices.js | 5
company/src/views/business/applyChange.vue | 4
company/.env | 2
company/.env.production | 6
company/src/components/business/OperaSolutionsWindow.vue | 2
company/src/views/business/insuranceApply.vue | 2
company/src/components/business/OperaApplyChangeDetailWindow.vue | 8
company/src/components/business/ApplyChangeUnitDetails1.vue | 258 +++++++++++++++
company/src/components/business/ApplyChangeDetails1.vue | 301 +++++++++++++++++
company/src/views/index.vue | 17
company/src/views/enterprise/insuranceApply.vue | 2
company/src/components/common/UploadFile.vue | 4
company/src/views/login.vue | 2
company/.env.development | 3
27 files changed, 859 insertions(+), 116 deletions(-)
diff --git a/company/.env b/company/.env
index b8c4aaa..ddf662e 100644
--- a/company/.env
+++ b/company/.env
@@ -4,7 +4,7 @@
VUE_APP_ROUTER_MODE = 'hash'
# 椤圭洰涓婁笅鏂囪矾寰�
-VUE_APP_CONTEXT_PATH = '/yyb_web'
+VUE_APP_CONTEXT_PATH = '/yyb_admin'
# 鎺ュ彛鍓嶇紑
VUE_APP_API_PREFIX = '/api'
diff --git a/company/.env.development b/company/.env.development
index 49771e1..288a7da 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -5,7 +5,8 @@
# VUE_APP_API_PREFIX = '/yyb_web_api'
# 浼佷笟绔�-浠佸悍
-VUE_APP_API = 'http://192.168.0.186:10031/'
+# VUE_APP_API = 'http://192.168.0.186:10031/'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
# 骞冲彴绔�-浠佸悍
# VUE_APP_API = 'http://192.168.0.186:10030/'
diff --git a/company/.env.production b/company/.env.production
index 4ad77c8..9cf23b3 100644
--- a/company/.env.production
+++ b/company/.env.production
@@ -1,10 +1,10 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-VUE_APP_API_PREFIX = '/yyb_web_api'
+VUE_APP_API_PREFIX = '/yyb_admin_api'
# 骞冲彴绔�
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# 浼佷笟绔�
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
diff --git a/company/src/api/business/notices.js b/company/src/api/business/notices.js
index f2f2756..5b2f269 100644
--- a/company/src/api/business/notices.js
+++ b/company/src/api/business/notices.js
@@ -16,3 +16,8 @@
export function closeApplyNotice (type) {
return request.get(`/business/notices/closeApplyNotice?type=${type}`)
}
+
+// 鏍规嵁ID鍒犻櫎
+export function deleById (id) {
+ return request.get(`/business/notices/delete/${id}`)
+}
diff --git a/company/src/api/business/smsEmail.js b/company/src/api/business/smsEmail.js
index f1e3564..d24cada 100644
--- a/company/src/api/business/smsEmail.js
+++ b/company/src/api/business/smsEmail.js
@@ -4,3 +4,8 @@
export function sendSms (data) {
return request.post('/business/smsEmail/sendSms', data)
}
+
+// 鐭俊楠岃瘉 - 浼佷笟楠岀
+export function validateCode (params) {
+ return request.get('/business/smsEmail/validateCode', {params})
+}
diff --git a/company/src/components/business/ApplyChangeDetails1.vue b/company/src/components/business/ApplyChangeDetails1.vue
new file mode 100644
index 0000000..93e621b
--- /dev/null
+++ b/company/src/components/business/ApplyChangeDetails1.vue
@@ -0,0 +1,301 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="100%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <div class="box">
+ <div class="top">
+ {{title}}
+ </div>
+ <div class="box_table">
+ <div class="box_table_head">
+ <div class="box_table_head_item">鎶曚繚浼佷笟</div>
+ <div class="box_table_head_item">淇濋櫓鏂规</div>
+ <div class="box_table_head_item">淇濆崟鍙�</div>
+ <div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
+ <div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
+ <div class="box_table_head_item">鍔犱繚浜烘暟</div>
+ <div class="box_table_head_item">鍑忎繚浜烘暟</div>
+ <div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
+ </div>
+ <div class="box_table_content">
+ <div class="box_table_content_item box_table_content_header">{{form.companyName}}</div>
+ <div class="box_table_content_item box_table_content_header">{{form.solutionsName}}</div>
+ <div class="box_table_content_item box_table_content_header">{{form.code}}</div>
+ <div class="box_table_content_item box_table_content_header">{{form.startTime}}</div>
+ <div class="box_table_content_item box_table_content_header">{{form.endTime}}</div>
+ <div class="box_table_content_item box_table_content_header">{{arr1.length}}</div>
+ <div class="box_table_content_item box_table_content_header">{{arr2.length}}</div>
+ <div class="box_table_content_item box_table_content_header">{{form.applyStartTime}}</div>
+ </div>
+ </div>
+ <div class="box_table">
+ <div class="box_table_head">
+ <div class="box_table_head_item1">鍔犱繚鍛樺伐</div>
+ <div class="box_table_head_item1">鍑忎繚鍛樺伐</div>
+ </div>
+ <div style="width: 100%; display: flex;">
+ <div class="box_table_head" style="width: 50%;">
+ <div class="box_table_head_item">搴忓彿</div>
+ <div class="box_table_head_item">鍛樺伐濮撳悕</div>
+ <div class="box_table_head_item">韬唤璇佸彿</div>
+ <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item">娲鹃仯鍗曚綅</div>
+ <div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ </div>
+ <div class="box_table_head" style="width: 50%;">
+ <div class="box_table_head_item">搴忓彿</div>
+ <div class="box_table_head_item">鍛樺伐濮撳悕</div>
+ <div class="box_table_head_item">韬唤璇佸彿</div>
+ <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item">娲鹃仯鍗曚綅</div>
+ <div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ </div>
+ </div>
+ <div style="width: 100%; display: flex;">
+ <div style="width: 50%; border-bottom: 1px solid #b4bbc5;">
+ <div class="box_table_content" style="width: 100%;" v-for="(item, index) in arr1" :key="index">
+ <div class="box_table_content_item">{{index + 1}}</div>
+ <div class="box_table_content_item">{{item.name}}</div>
+ <div class="box_table_content_item">{{item.idCard}}</div>
+ <div class="box_table_content_item">{{item.sex === 0 ? '鐢�' : '濂�'}}</div>
+ <div class="box_table_content_item">{{item.duName}}</div>
+ <div class="box_table_content_item">{{item.workTypeName}}</div>
+ </div>
+ </div>
+ <div style="width: 50%; border-bottom: 1px solid #b4bbc5;">
+ <div class="box_table_content" style="width: 100%;" v-for="(item, index) in arr2" :key="index">
+ <div class="box_table_content_item">{{index + 1}}</div>
+ <div class="box_table_content_item">{{item.name}}</div>
+ <div class="box_table_content_item">{{item.idCard}}</div>
+ <div class="box_table_content_item">{{item.sex === 0 ? '鐢�' : '濂�'}}</div>
+ <div class="box_table_content_item">{{item.duName}}</div>
+ <div class="box_table_content_item">{{item.workTypeName}}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <template v-slot:footer>
+ <el-button type="primary" @click="submit">纭</el-button>
+ <el-button @click="go">杩斿洖</el-button>
+ </template>
+ </GlobalWindow>
+</template>
+
+<script>
+ import BaseOpera from '@/components/base/BaseOpera'
+ import GlobalWindow from '@/components/common/GlobalWindow'
+ export default {
+ name: 'ApplyChangeDetails',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ form: {
+ companyName: '',
+ solutionsName: '',
+ code: '',
+ startTime: '',
+ endTime: '',
+ applyStartTime: ''
+ },
+ arr1: [],
+ arr2: []
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ submit() {
+ this.$emit('success')
+ this.visible = false
+ },
+ go() {
+ this.visible = false
+ },
+ open(title, arr1, arr2, obj){
+ this.title = title
+ this.arr1 = arr1
+ this.arr2 = arr2
+ this.visible = true
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = obj[key]
+ }
+ })
+ },
+ confirm() {
+ this.$emit('success')
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .box {
+ width: 100%;
+ .top{
+ width: 100%;
+ align-items: center;
+ flex-wrap: wrap;
+ border-top: 1px solid #b4bbc5;
+ border-left: 1px solid #b4bbc5;
+ font-size: 14px;
+ font-weight: bold;
+ text-align: center;
+ padding: 15px;
+ box-sizing: border-box;
+ }
+ .box_header {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ border-top: 1px solid #b4bbc5;
+ border-left: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ .box_header_item {
+ width: 50%;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+
+ .box_header_item_label {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ background: #f2f2f2;
+ border-right: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ }
+ .box_header_item_val {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ }
+ }
+ }
+ .box_table {
+ width: 100%;
+ border-top: 1px solid #b4bbc5;
+ border-left: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ .box_table_head {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ .box_table_head_item1 {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ }
+ .box_table_head_item {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(3) {
+ flex: 1.5;;
+ }
+ &:nth-child(9) {
+ flex: 1.5;;
+ }
+ }
+ .box_table_head_item5 {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(2) {
+ flex: 5;
+ }
+ }
+ .box_form_item {
+ flex: 1;
+ height: 50px;
+ background: #ffffff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(1) {
+ //flex: 0.5;
+ }
+ }
+ }
+ .box_table_content {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ border-left: 1px solid #b4bbc5;
+ .box_table_content_header{
+ border-bottom: 0px solid #b4bbc5 !important;
+ }
+ .box_table_content_item {
+ flex: 1;
+ height: 50px;
+ background: #ffffff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(3) {
+ flex: 1.5;
+ }
+ &:nth-child(9) {
+ flex: 1.5;
+ }
+ }
+ }
+ }
+ }
+</style>
diff --git a/company/src/components/business/ApplyChangeUnitDetails1.vue b/company/src/components/business/ApplyChangeUnitDetails1.vue
new file mode 100644
index 0000000..76e5c08
--- /dev/null
+++ b/company/src/components/business/ApplyChangeUnitDetails1.vue
@@ -0,0 +1,258 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="100%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <div class="box">
+ <div class="top">
+ {{title}}
+ </div>
+ <div class="box_table">
+ <div class="box_table_head">
+ <div class="box_table_head_item">鎶曚繚浼佷笟</div>
+ <div class="box_table_head_item">淇濋櫓鏂规</div>
+ <div class="box_table_head_item">淇濆崟鍙�</div>
+ <div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
+ <div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
+ <div class="box_table_head_item">鎹㈠巶浜烘暟</div>
+ <div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
+ </div>
+ <div class="box_table_content " >
+ <div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ apply.solutionsName }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ apply.code }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ apply.startTime }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ apply.endTime }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ detailList.length }}</div>
+ <div class="box_table_content_item box_table_content_header">{{ apply.applyStartTime }}</div>
+ </div>
+ </div>
+ <div class="box_table">
+ <div class="box_table_head">
+ <div class="box_table_head_item">搴忓彿</div>
+ <div class="box_table_head_item">鍛樺伐濮撳悕</div>
+ <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item">韬唤璇佸彿</div>
+ <div class="box_table_head_item">鍘熸淳閬ｅ崟浣�</div>
+ <div class="box_table_head_item">鍘熸墍灞炲伐绉�</div>
+ <div class="box_table_head_item">鎹㈠巶鍚庢淳閬ｅ崟浣�</div>
+ <div class="box_table_head_item">鎹㈠巶鍚庢墍灞炲伐绉�</div>
+ </div>
+ <div class="box_table_content" v-for="(item, index) in detailList" :key="index">
+ <div class="box_table_content_item">{{index + 1}}</div>
+ <div class="box_table_content_item" >{{ item.memberName }}</div>
+ <div class="box_table_content_item">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
+ <div class="box_table_content_item">{{ item.idCard }}</div>
+ <div class="box_table_content_item">{{ item.oldDuName }}</div>
+ <div class="box_table_content_item">{{item.oldWorkTypeName}}</div>
+ <div class="box_table_content_item">{{ item.duName }}</div>
+ <div class="box_table_content_item">{{item.workTypeName}}</div>
+ </div>
+ </div>
+ </div>
+ <template v-slot:footer>
+ <el-button type="primary" @click="submit">纭畾</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'
+ export default {
+ name: 'ApplyChangeUnitDetails1',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ apply: {},
+ detailList:[]
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open(title,target, target1){
+ this.title=title
+ this.detailList = target
+ this.apply = target1
+ this.visible=true
+ },
+ submit() {
+ this.$emit('success')
+ this.visible = false
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .box {
+ width: 100%;
+ .top{
+ width: 100%;
+ align-items: center;
+ flex-wrap: wrap;
+ border-top: 1px solid #b4bbc5;
+ border-left: 1px solid #b4bbc5;
+ font-size: 14px;
+ font-weight: bold;
+ text-align: center;
+ padding: 15px;
+ }
+ .box_header {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ border-top: 1px solid #b4bbc5;
+ border-left: 1px solid #b4bbc5;
+ .box_header_item {
+ width: 50%;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+
+ .box_header_item_label {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ background: #f2f2f2;
+ border-right: 1px solid #b4bbc5;
+ }
+ .box_header_item_val {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ }
+ }
+ }
+ .box_table {
+ width: 100%;
+ border-top: 1px solid #b4bbc5;
+ border-left: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ .box_table_head {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ .box_table_head_item1 {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ }
+ .box_table_head_item {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(4) {
+ flex: 1.5;;
+ }
+ &:nth-child(6) {
+ flex: 1.5;;
+ }
+ &:nth-child(8) {
+ flex: 1.5;;
+ }
+ }
+ .box_table_head_item5 {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(2) {
+ flex: 5;
+ }
+ }
+ .box_form_item {
+ flex: 1;
+ height: 50px;
+ background: #ffffff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(1) {
+ //flex: 0.5;
+ }
+ }
+ }
+ .box_table_content {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ .box_table_content_header{
+ border-bottom: 0px solid #b4bbc5 !important;
+ }
+ .box_table_content_item {
+ flex: 1;
+ height: 50px;
+ background: #ffffff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(4) {
+ flex: 1.5;
+ }
+ &:nth-child(6) {
+ flex: 1.5;
+ }
+ &:nth-child(8) {
+ flex: 1.5;
+ }
+ }
+ }
+ }
+ }
+</style>
diff --git a/company/src/components/business/OperaApplyChangeCheckWindow.vue b/company/src/components/business/OperaApplyChangeCheckWindow.vue
index fbabe10..7450712 100644
--- a/company/src/components/business/OperaApplyChangeCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeCheckWindow.vue
@@ -379,7 +379,7 @@
}
.form_item_label {
flex-shrink: 0;
- width: 150px;
+ /*width: 150px;*/
color: black;
font-size: 14px;
span {
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index c0b2328..3964c18 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -23,8 +23,8 @@
<template v-if="userInfo.type === 1">
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[5, 8].includes(model.status)" type="primary" @click="$refs.reinsurance.open('鍔犲噺淇濈敵璇�', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
- <el-button type="primary" v-if="model.status == 0" @click="goSign">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="[0, 1, 3, 7].includes(model.status)" type="primary" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
+ <el-button type="primary" v-if="model.status == 0" @click="$refs.operaverifyPhoneNumberWindew.open('楠岃瘉鎵嬫満鍙�')">绛剧讲鐢宠鍗�</el-button>
+ <el-button v-if="[0, 1, 3, 7].includes(model.status)" type="danger" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
<el-button v-if="model.status == 5" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="model.status == 2" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if="[5, 8].includes(model.status)" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
@@ -192,6 +192,8 @@
<factoryChange ref="factoryChange" @success="successEvent" />
<!-- 鎶曚繚璇︽儏 -->
<insuranceApplyDetails ref="insuranceApplyDetails" @success="successEvent" />
+ <!-- 楠岃瘉鎵嬫満鍙� -->
+ <operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -216,6 +218,7 @@
} from '@/api/business/insuranceApply'
import { applyChangeOpt } from '@/api/business/applyChange'
import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import { mapState } from 'vuex'
export default {
@@ -229,6 +232,7 @@
OperaInsuranceApply,
reinsurance,
factoryChange,
+ operaverifyPhoneNumberWindew,
insuranceApplyDetails: () => import ('@/components/business/OperaInsuranceApplyWindow')
},
data () {
diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index df59907..c17dd6d 100644
--- a/company/src/components/business/OperaCompanyDescWindow.vue
+++ b/company/src/components/business/OperaCompanyDescWindow.vue
@@ -401,7 +401,7 @@
align-items: start;
margin-bottom: 20px;
.info_list_item_label {
- width: 150px;
+ /*width: 150px;*/
flex-shrink: 0;
}
.info_list_item_val {
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index 04cf3eb..2c6055a 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -16,7 +16,7 @@
<el-form-item label="娉曚汉濮撳悕" prop="legalName">
<el-input v-model="form.legalName" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="缁戝畾鎵嬫満鍙�" prop="phone" v-if="form.type !== 1">
+ <el-form-item label="缁戝畾鎵嬫満鍙�" prop="phone" v-if="!form.id">
<div style="width: 100%; display: flex; align-items: center;">
<el-input v-model="form.phone" maxlength="11" type="number" style="flex: 1;" placeholder="璇疯緭鍏�" v-trim/>
<el-button type="primary" style="flex-shrink: 0; margin-left: 15px;" @click="send" v-if="num === 0">鍙戦�侀獙璇佺爜</el-button>
diff --git a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
index cd00036..340da3e 100644
--- a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
@@ -14,7 +14,7 @@
</el-form>
<el-form v-if="visible2==true" :model="form" ref="form2" :rules="rules2" style="width: 100%;">
<el-form-item label="涓婁紶鎶曚繚鍗曪細" prop="toubaodanFile">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList" @uploadSuccess="toubaoFileUploaded" />
+ <UploadFile @remove="dele2" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList" @uploadSuccess="toubaoFileUploaded" />
</el-form-item>
</el-form>
<!-- 涓婁紶淇濋櫓鍗� -->
@@ -164,6 +164,9 @@
})
},
methods: {
+ dele2() {
+ this.form.toubaodanFile = ''
+ },
open(title,target,flag){
this.visible=true
this.model={}
@@ -415,7 +418,7 @@
}
.form_item_label {
flex-shrink: 0;
- width: 170px;
+ /*width: 170px;*/
color: black;
font-size: 14px;
span {
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index f64ff23..f31a0e6 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -30,12 +30,12 @@
<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>
+<!-- goSign-->
+ <el-button v-if="model.status == 2" type="primary" @click="$refs.operaverifyPhoneNumberWindew.open('楠岃瘉鎵嬫満鍙�')">绛剧讲鎶曚繚鍗�</el-button>
</template>
<template v-else>
<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 == 2" type="primary" @click="goSign">绛剧讲鎶曚繚鍗�</el-button>-->
<el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 10 ||model.status == 2" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 3" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
@@ -421,6 +421,8 @@
<OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" @success="successEvent"/>
<!-- 鎹㈠巶璇︽儏 -->
<OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="successEvent"/>
+ <!-- 楠岃瘉鎵嬫満鍙� -->
+ <operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -434,6 +436,7 @@
import OperaInsuranceApplyCheckWindow from '@/components/business/OperaInsuranceApplyCheckWindow'
import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
import factoryChange from '@/components/enterprise/factoryChange'
+import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
@@ -457,7 +460,8 @@
additionSubtractionApplication,
factoryChange,
OperaApplyChangeDetailWindow,
- OperaApplyChangeUnitDetailWindow
+ OperaApplyChangeUnitDetailWindow,
+ operaverifyPhoneNumberWindew
},
data () {
return {
diff --git a/company/src/components/business/OperaInsuranceWindow.vue b/company/src/components/business/OperaInsuranceWindow.vue
index e3419de..914aec3 100644
--- a/company/src/components/business/OperaInsuranceWindow.vue
+++ b/company/src/components/business/OperaInsuranceWindow.vue
@@ -136,6 +136,9 @@
}
})
})
+ .catch(err => {
+ this.$message.error(err.message)
+ })
.finally(() => {
this.$refs.upload.value = null
})
diff --git a/company/src/components/business/OperaSettleClaimsCheckWindow.vue b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
index 3d3921c..e1b41a1 100644
--- a/company/src/components/business/OperaSettleClaimsCheckWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
@@ -25,16 +25,16 @@
<el-form-item label="缁撴鍐呭锛�" prop="doneInfo">
<el-input type="textarea" v-model="form.doneInfo" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="鍖荤枟鐞嗚禂(鍏�)锛�" prop="ylClaimAccount">{{form.ylClaimAccount}}
+ <el-form-item label="鍖荤枟鐞嗚禂(鍏�)锛�" prop="ylClaimAccount">
<el-input type="number" v-model="form.ylClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="璇伐鐞嗚禂(鍏�)锛�" prop="wgClaimAccount">{{form.wgClaimAccount}}
+ <el-form-item label="璇伐鐞嗚禂(鍏�)锛�" prop="wgClaimAccount">
<el-input type="number" v-model="form.wgClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="浼ゆ畫鐞嗚禂(鍏�)锛�" prop="scClaimAccount">{{form.scClaimAccount}}
+ <el-form-item label="浼ゆ畫鐞嗚禂(鍏�)锛�" prop="scClaimAccount">
<el-input type="number" v-model="form.scClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="姝讳骸鐞嗚禂(鍏�)锛�" prop="swClaimAccount">{{form.swClaimAccount}}
+ <el-form-item label="姝讳骸鐞嗚禂(鍏�)锛�" prop="swClaimAccount">
<el-input type="number" v-model="form.swClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="鎬婚噾棰濓細" >
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index 55ea177..82eca81 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -154,7 +154,7 @@
var validType = (rule, value, callback) => {
if (this.form.validType === 0 && !value) {
return callback(new Error('寤惰繜澶╂暟涓嶈兘涓虹┖'));
- } else if (!/^[0-9]*[1-9][0-9]*$/.test(value)) {
+ } else if (this.form.validType === 0 && !/^[0-9]*[1-9][0-9]*$/.test(value)) {
return callback(new Error('寤惰繜澶╂暟鍙兘涓烘鏁存暟'));
}
callback();
diff --git a/company/src/components/business/operaverifyPhoneNumberWindew.vue b/company/src/components/business/operaverifyPhoneNumberWindew.vue
new file mode 100644
index 0000000..85cd927
--- /dev/null
+++ b/company/src/components/business/operaverifyPhoneNumberWindew.vue
@@ -0,0 +1,101 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="40%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="鎵嬫満鍙�" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏�" disabled v-trim/>
+ </el-form-item>
+ <el-form-item label="楠岃瘉鐮�" prop="code">
+ <div style="width: 100%; display: flex; align-items: center;">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
+ <el-button type="primary" style="margin-left: 15px;" @click="send" v-if="num === 0">鍙戦�侀獙璇佺爜</el-button>
+ <el-button type="primary" style="margin-left: 15px;" v-else>{{num}}</el-button>
+ </div>
+ </el-form-item>
+ </el-form>
+ </GlobalWindow>
+</template>
+
+<script>
+ import BaseOpera from '@/components/base/BaseOpera'
+ import GlobalWindow from '@/components/common/GlobalWindow'
+ import { sendSms, validateCode } from '@/api/business/smsEmail'
+ import { mapState } from 'vuex'
+ export default {
+ name: 'operaverifyPhoneNumberWindew',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ form: {
+ phone: this.$store.state.userInfo.company.phone,
+ code: ''
+ },
+ rules: {
+ code: [
+ { required: true, message: '璇疯緭鍏ラ獙璇佺爜' }
+ ]
+ },
+ num: 0,
+ timer: null
+ }
+ },
+ computed: {
+ ...mapState(['userInfo'])
+ },
+ methods: {
+ open (title) {
+ this.title = title
+ this.num = 0
+ clearInterval(this.timer)
+ this.timer = null
+ this.visible = true
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ })
+ },
+ send () {
+ sendSms({
+ phone: this.form.phone
+ }).then(res => {
+ this.num = 60
+ this.setTime()
+ })
+ },
+ setTime () {
+ this.timer = setInterval(() => {
+ if (this.num === 0) {
+ clearInterval(this.timer)
+ this.timer = null
+ return
+ }
+ this.num = this.num - 1
+ }, 1000)
+ },
+ confirm () {
+ this.$refs.form.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ this.isWorking = true
+ validateCode({
+ code: this.form.code
+ }).then(res => {
+ this.visible = false
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.$emit('success')
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ })
+ }
+ }
+ }
+</script>
diff --git a/company/src/components/common/UploadFile.vue b/company/src/components/common/UploadFile.vue
index 45049cb..03d73b0 100644
--- a/company/src/components/common/UploadFile.vue
+++ b/company/src/components/common/UploadFile.vue
@@ -5,6 +5,7 @@
:accept="uploadData.fileTyp"
:action="uploadImgUrl"
:limit="1"
+ :before-remove="removes"
:on-exceed="handleExceed"
:on-success="handleFileSuccess"
:on-error="uploadError"
@@ -39,6 +40,9 @@
},
methods: {
+ removes() {
+ this.$emit('remove')
+ },
// 涓婁紶鍥剧墖
handleExceed(){},
handleFileSuccess(res, file) {
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index 6295d2b..b6ed940 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -349,47 +349,6 @@
detailList: this.tableData
})
- // let arr = JSON.parse(JSON.stringify(this.tableData))
- // arr.forEach(item => {
- // item.idcardNo = item.idCard
- // })
- // this.isWorking = true
- // if (!this.form.id) {
- // create({
- // applyDetailList: arr,
- // applyStartTime: this.form.applyStartTime,
- // applyEndTime: this.form.applyEndTime,
- // solutionId: this.form.solutionId
- // }).then(() => {
- // this.visible = false
- // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$emit('success')
- // })
- // .catch(e => {
- // this.$tip.apiFailed(e)
- // })
- // .finally(() => {
- // this.isWorking = false
- // })
- // } else {
- // updateData({
- // id: this.form.id,
- // applyDetailList: arr,
- // applyStartTime: this.form.applyStartTime,
- // applyEndTime: this.form.applyEndTime,
- // solutionId: this.form.solutionId
- // }).then(() => {
- // this.visible = false
- // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$emit('success')
- // }).catch(e => {
- // this.$tip.apiFailed(e)
- // })
- // .finally(() => {
- // this.isWorking = false
- // })
- // }
-
}
})
},
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 1702884..d241b4e 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -171,6 +171,8 @@
<importEmployees ref="importEmployees" @result="getValue" />
<!-- 纭宸ョ -->
<confirmJobType ref="confirmJobType" @result="getUser" />
+ <!-- 璇︽儏 -->
+ <ApplyChangeDetails1 ref="ApplyChangeDetails1" @success="success" />
</GlobalWindow>
</template>
@@ -181,14 +183,16 @@
import addEmployee from '@/components/enterprise/addEmployee'
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
+ import ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
import { getDate, compareDates, getTomorrow } from '@/utils/util'
+ import { mapState } from 'vuex'
export default {
name: 'additionSubtractionApplication',
extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType },
+ components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, ApplyChangeDetails1 },
data () {
return {
form: {
@@ -215,6 +219,9 @@
},
list: []
}
+ },
+ computed: {
+ ...mapState(['userInfo'])
},
created () {
this.config({
@@ -356,6 +363,34 @@
})
}
},
+ success() {
+ this.form.addDetailList.forEach(item => {
+ item.idcardNo = item.idCard
+ })
+ this.form.delDetailList.forEach(item => {
+ item.idcardNo = item.idCard
+ })
+ // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
+ // arr.forEach(item => {
+ // item.idcardNo = item.idCard
+ // })
+ this.isWorking = true
+ create({
+ applyId: this.form.id,
+ addDetailList: this.form.addDetailList,
+ delDetailList: this.form.delDetailList,
+ validTime: this.form.applyStartTime,
+ type: 0
+ }).then(() => {
+ this.visible = false
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.$emit('success')
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ },
confirm() {
this.$refs.form.validate((valid) => {
if (valid) {
@@ -375,32 +410,44 @@
return
}
}
- this.form.addDetailList.forEach(item => {
- item.idcardNo = item.idCard
+
+ this.$refs.ApplyChangeDetails1.open('鍔犲噺淇濊鍗�', this.form.addDetailList, this.form.delDetailList, {
+ companyName: this.userInfo.company.name,
+ solutionsName: this.form.solutionsName,
+ code: this.list[0].code,
+ startTime: this.list[0].startTime,
+ endTime: this.list[0].endTime,
+ applyStartTime: this.form.applyStartTime
})
- this.form.delDetailList.forEach(item => {
- item.idcardNo = item.idCard
- })
- // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
- // arr.forEach(item => {
+
+ // return
+
+ // this.form.addDetailList.forEach(item => {
// item.idcardNo = item.idCard
// })
- this.isWorking = true
- create({
- applyId: this.form.id,
- addDetailList: this.form.addDetailList,
- delDetailList: this.form.delDetailList,
- validTime: this.form.applyStartTime,
- type: 0
- }).then(() => {
- this.visible = false
- this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$emit('success')
- }).catch(e => {
- this.$tip.apiFailed(e)
- }).finally(() => {
- this.isWorking = false
- })
+ // this.form.delDetailList.forEach(item => {
+ // item.idcardNo = item.idCard
+ // })
+ // // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
+ // // arr.forEach(item => {
+ // // item.idcardNo = item.idCard
+ // // })
+ // this.isWorking = true
+ // create({
+ // applyId: this.form.id,
+ // addDetailList: this.form.addDetailList,
+ // delDetailList: this.form.delDetailList,
+ // validTime: this.form.applyStartTime,
+ // type: 0
+ // }).then(() => {
+ // this.visible = false
+ // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ // this.$emit('success')
+ // }).catch(e => {
+ // this.$tip.apiFailed(e)
+ // }).finally(() => {
+ // this.isWorking = false
+ // })
}
})
},
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 6335c16..5d0f09c 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -154,6 +154,8 @@
<importEmployees ref="importEmployees" @result="getValue" />
<!-- 纭宸ョ -->
<confirmJobType ref="confirmJobType" @result="getUser" />
+ <!-- 璇﹀崟 -->
+ <ApplyChangeUnitDetails1 ref="ApplyChangeUnitDetails1" @success="success" />
</GlobalWindow>
</template>
@@ -164,13 +166,15 @@
import addEmployee from '@/components/enterprise/addEmployee'
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
+ import ApplyChangeUnitDetails1 from '@/components/business/ApplyChangeUnitDetails1'
import { all } from '@/api/business/solutions'
import { getDetail, findList } from '@/api/business/insuranceApply'
import { create } from '@/api/business/applyChange'
+ import { getDate, compareDates, getTomorrow } from '@/utils/util'
export default {
name: 'factoryChange',
extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType },
+ components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, ApplyChangeUnitDetails1 },
data () {
return {
form: {
@@ -232,6 +236,26 @@
this.visible = true
// this.updatePickerOptions()
},
+ success() {
+ this.form.factory.forEach(item => {
+ item.idcardNo = item.idCard
+ })
+ this.isWorking = true
+ create({
+ applyId: this.form.id,
+ changeDetailList: this.form.factory,
+ validTime: this.form.applyStartTime,
+ type: 1
+ }).then(() => {
+ this.visible = false
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.$emit('success')
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ },
// 鑾峰彇鎶曚繚璇︽儏
getDetails() {
findList({ applyId: this.form.id })
@@ -262,8 +286,22 @@
this.form.solutionsName = res.solutionsName
this.pickerOptions = {
disabledDate(time) {
- // - 8.64e7
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate ? res.lastChangeDate : res.startTime).getTime()
+ // 褰撳墠鏃ユ湡澶т簬绛変簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ if ([1,3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃ユ湡灏忎簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
+ // 鏈�鍚庝竴娆℃搷浣滄椂闂存湁鍊�
+ } else if (res.lastChangeDate) {
+ // 褰撳墠鏃ユ湡澶т簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ if ([1,3].includes(compareDates(getDate(), res.lastChangeDate))) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃堕棿灏忎簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
+ }
+ }
}
};
this.changeSolution1(res.solutionId)
@@ -295,28 +333,29 @@
return
}
}
- this.form.factory.forEach(item => {
- item.idcardNo = item.idCard
- })
+ this.$refs.ApplyChangeUnitDetails1.open('鎹㈠巶璇﹀崟', this.form.factory, {...this.list[0], applyStartTime: this.form.applyStartTime})
+ // this.form.factory.forEach(item => {
+ // item.idcardNo = item.idCard
+ // })
// let arr = JSON.parse(JSON.stringify(this.form.factory))
// arr.forEach(item => {
// item.idcardNo = item.idCard
// })
- this.isWorking = true
- create({
- applyId: this.form.id,
- changeDetailList: this.form.factory,
- validTime: this.form.applyStartTime,
- type: 1
- }).then(() => {
- this.visible = false
- this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$emit('success')
- }).catch(e => {
- this.$tip.apiFailed(e)
- }).finally(() => {
- this.isWorking = false
- })
+ // this.isWorking = true
+ // create({
+ // applyId: this.form.id,
+ // changeDetailList: this.form.factory,
+ // validTime: this.form.applyStartTime,
+ // type: 1
+ // }).then(() => {
+ // this.visible = false
+ // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ // this.$emit('success')
+ // }).catch(e => {
+ // this.$tip.apiFailed(e)
+ // }).finally(() => {
+ // this.isWorking = false
+ // })
}
})
},
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index 3c3421d..90b1b4f 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -14,7 +14,7 @@
<el-option label="宸插叧闂�" value="6"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎶曚繚浼佷笟" prop="companyId">{{searchForm.companyId}}
+ <el-form-item label="鎶曚繚浼佷笟" prop="companyId">
<el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in companyList"
@@ -24,7 +24,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">{{searchForm.baseSolutionsId}}
+ <el-form-item label="淇濋櫓鏂规" prop="baseSolutionsId">
<el-select v-model="searchForm.baseSolutionsId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 361228f..f2788fe 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -6,7 +6,7 @@
<el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
<el-option label="寰呭鏍�" value="0"></el-option>
<el-option label="寰呭嚭鍗�" value="1"></el-option>
- <el-option label="寰呯绔�" value="7"></el-option>
+ <el-option label="寰呯缃�" value="7"></el-option>
<el-option label="淇濋殰涓�" value="2"></el-option>
<el-option label="宸茶繃鏈�" value="3"></el-option>
<el-option label="宸查��鍥�" value="4"></el-option>
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index f2df5a6..99b8b8d 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -6,7 +6,7 @@
<el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @change="search">
<el-option label="寰呭鏍�" value="0"></el-option>
<el-option label="寰呭嚭鍗�" value="1"></el-option>
- <el-option label="寰呯绔�" value="7"></el-option>
+ <el-option label="寰呯缃�" value="7"></el-option>
<el-option label="淇濋殰涓�" value="2"></el-option>
<el-option label="宸茶繃鏈�" value="3"></el-option>
<el-option label="宸查��鍥�" value="4"></el-option>
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 86c30d9..4546dd3 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -128,7 +128,7 @@
import OperaSettleClaimsWindow from '@/components/business/OperaSettleClaimsWindow'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import OperaTaxesWindow from '@/components/business/OperaTaxesWindow'
-import { fetchList as noticeList } from '@/api/business/notices'
+import { fetchList as noticeList, deleById } from '@/api/business/notices'
export default {
components: {
OperaInsuranceApplyWindow,
@@ -231,7 +231,16 @@
} else if (obj.objType === 4) {
this.$refs.OperaTaxesWindow.open('寮�绁ㄧ敵璇疯鎯�', { id: obj.objId })
} else if (obj.objType === 5) {
- this.$refs.operaSettleClaimsWindow.open('鐞嗚禂璇︽儏', { id: obj.objId })
+ deleById(obj.id)
+ .then(res => {
+ this.tableData2.forEach((item, index) => {
+ if (item.id === obj.id) {
+ this.tableData2.splice(index, 1)
+ this.totalPage2 = this.totalPage2 - 1
+ }
+ })
+ this.$refs.operaSettleClaimsWindow.open('鐞嗚禂璇︽儏', { id: obj.objId })
+ })
}
},
setLoadTimer () {
@@ -287,12 +296,12 @@
this.tabs.push({ name: '0', label: '鎶曚繚浠ｅ姙' })
// this.handleCurrentChange0(0);
}
- if (pemissons.includes('business:notice:tax')) {
+ if (pemissons.includes('business:notice:tax') && this.userInfo.type !== 1) {
this.tabs.push({ name: '1', label: '鍙戠エ浠ｅ姙' })
// this.handleCurrentChange1(0);
}
if (pemissons.includes('business:notice:settle')) {
- this.tabs.push({ name: '2', label: '鐞嗚禂浠ｅ姙' })
+ this.tabs.push({ name: '2', label: '鐞嗚禂鎻愰啋' })
// this.handleCurrentChange2(0);
}
/* if (pemissons.includes('business:notice:insurance')) {
diff --git a/company/src/views/login.vue b/company/src/views/login.vue
index b459972..90ed866 100644
--- a/company/src/views/login.vue
+++ b/company/src/views/login.vue
@@ -1,7 +1,7 @@
<template>
<div class="wrap">
<div class="introduce">
- <h2>棰勯�夋竻鍗曟煡璇㈢郴缁�</h2>
+ <h2>浜戞槗淇�</h2>
</div>
<div class="login">
<h1>绯荤粺鐧诲綍 / LOGIN IN</h1>
diff --git a/company/vue.config.js b/company/vue.config.js
index c8c48d1..f283dfd 100644
--- a/company/vue.config.js
+++ b/company/vue.config.js
@@ -3,7 +3,7 @@
// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
module.exports = {
publicPath: './',
- outputDir: 'yyb_web',
+ outputDir: 'yyb_admin',
assetsDir: 'static',
lintOnSave: false,
devServer: {
--
Gitblit v1.9.3