From c0ba1a5cc234d127c59bfa56b759f6c960741b67 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 11 五月 2024 18:22:22 +0800
Subject: [PATCH] 提交一把
---
company/src/components/enterprise/additionSubtractionApplication.vue | 10 +-
company/src/components/business/OperaInsuranceApplyWindow.vue | 2
company/src/components/enterprise/selectEmployees.vue | 193 ++++++++++++++++++++++++------------------------
company/src/components/business/OperaSolutionsWindow.vue | 2
4 files changed, 104 insertions(+), 103 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 0d27dd0..3b4c51c 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -29,7 +29,7 @@
<!-- $refs.operaverifyPhoneNumberWindew.open('楠岃瘉鎵嬫満鍙�')-->
<el-button v-if="model.status == 2" type="primary" :disabled="loading" :loading="loading" @click="goSign()">绛剧讲鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
- <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
+ <el-button v-if="model.status == 4" type="primary" @click="$refs.OperaInsuranceApplyAddWindow.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</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="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index f3f609b..4af3557 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -81,7 +81,7 @@
<el-input style="margin-left: 20px;" type="number" v-model="form.validTypeNum" placeholder="璇疯緭鍏ュ欢杩熷ぉ鏁�" v-if="form.validType === 0"></el-input>
</div>
</el-form-item>
- <el-form-item label="鎵规敼鏀寔" prop="addValidDays">
+ <el-form-item label="鎵规敼鏀寔">
<div style="width: 100%; display: flex; align-items: center;">
<el-checkbox :true-label="1" :false-label="0" v-model="form.canAdd">鍔犱繚</el-checkbox>
<el-checkbox :true-label="1" :false-label="0" v-model="form.canReduce">鍑忎繚</el-checkbox>
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 4e49a6e..25e43f9 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -148,7 +148,7 @@
label="璐圭敤">
<template slot-scope="{row}">
<span v-if="activeName === '0'">{{row.fee}}</span>
- <span v-else>{{row.fee ? '-' + row.fee : ''}}</span>
+ <span v-else>{{row.reducePrice ? row.reducePrice : '0'}}</span>
</template>
</el-table-column>
<el-table-column
@@ -279,12 +279,12 @@
validTime: e
}).then(res => {
this.price = res.cyclePrice
- this.reducePrice=res.reducePrice
+ this.reducePrice= 0
this.form.addDetailList.forEach(item => {
item.fee = res.cyclePrice
})
this.form.delDetailList.forEach(item => {
- item.fee = res.reducePrice
+ // item.fee = item.reducePrice
})
}).catch(e => {
this.$tip.apiFailed(e)
@@ -350,9 +350,9 @@
sums[index] = total.toFixed(2)
} else {
this.form.delDetailList.forEach(item => {
- total += item.fee
+ total += item.reducePrice
})
- sums[index] = '-' + total.toFixed(2)
+ sums[index] = total.toFixed(2)
}
}
})
diff --git a/company/src/components/enterprise/selectEmployees.vue b/company/src/components/enterprise/selectEmployees.vue
index 1e7e5b3..b5b98a9 100644
--- a/company/src/components/enterprise/selectEmployees.vue
+++ b/company/src/components/enterprise/selectEmployees.vue
@@ -42,103 +42,104 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- import { findListByDTO } from '@/api/business/member'
- export default {
- name: 'selectEmployees',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- type: '',
- val: '',
- list: [],
- price: '',
- insuranceApplyId: '',
- notInInsuranceApplyId: '',
- validTime: '',
- seleData: [],
- oldList: []
- }
- },
- created () {
- this.config({
- api: '/business/dispatchUnit',
- 'field.id': 'id'
- })
- },
- methods: {
- open (title, obj) {
- this.insuranceApplyId = ''
- this.notInInsuranceApplyId = ''
- this.val = ''
- this.price = obj.price
- this.oldList = obj.arr
- if (obj.type) {
- this.type = obj.type
- }
- this.list = []
- if (obj.insuranceApplyId) {
- this.insuranceApplyId = obj.insuranceApplyId
- }
- if (obj.notInInsuranceApplyId) {
- this.notInInsuranceApplyId = obj.notInInsuranceApplyId
- }
- if (obj.validTime) {
- this.validTime = obj.validTime
- }
- this.title = title
- this.visible = true
- this.getList()
- },
- confirm() {
- if (this.seleData.length === 0) {
- this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
- return
- }
- for (let i = 0; i < this.seleData.length; i++) {
- for (let a = 0; a < this.oldList.length; a++) {
- // this.seleData[i].name === this.oldList[a].memberName ||
- if (this.seleData[i].idCard === this.oldList[a].idcardNo) {
- this.$message.warning(`[${this.seleData[i].name}]鍛樺伐閲嶅`)
- return
- }
- }
- }
- this.seleData.forEach(item => {
- item.idCard = item.idcardNo
- item.memberName = item.name
- item.memberId = item.id
- if (this.notInInsuranceApplyId || this.type == 1) {
- item.workTypeName = ''
- item.worktypeId = ''
- item.duId = ''
- item.duName = ''
- }
- item.fee = this.price
- })
- this.$emit('result', this.seleData)
- this.visible = false
- },
- handleSelectionChange (e) {
- this.seleData = e
- },
- getList() {
- findListByDTO({
- name: this.val,
- insuranceApplyId: this.insuranceApplyId,
- notInInsuranceApplyId: this.notInInsuranceApplyId,
- validTime: this.validTime
- }).then(res => {
- res.forEach(item => {
- item.fee = ''
- })
- this.list = res
- })
- }
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { findListByDTO } from '@/api/business/member'
+export default {
+ name: 'selectEmployees',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ type: '',
+ val: '',
+ list: [],
+ price: '',
+ insuranceApplyId: '',
+ notInInsuranceApplyId: '',
+ validTime: '',
+ seleData: [],
+ oldList: []
}
+ },
+ created () {
+ this.config({
+ api: '/business/dispatchUnit',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, obj) {
+ this.insuranceApplyId = ''
+ this.notInInsuranceApplyId = ''
+ this.val = ''
+ this.price = obj.price
+ this.oldList = obj.arr
+ if (obj.type) {
+ this.type = obj.type
+ }
+ this.list = []
+ if (obj.insuranceApplyId) {
+ this.insuranceApplyId = obj.insuranceApplyId
+ }
+ if (obj.notInInsuranceApplyId) {
+ this.notInInsuranceApplyId = obj.notInInsuranceApplyId
+ }
+ if (obj.validTime) {
+ this.validTime = obj.validTime
+ }
+ this.title = title
+ this.visible = true
+ this.getList()
+ },
+ confirm () {
+ if (this.seleData.length === 0) {
+ this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ return
+ }
+ for (let i = 0; i < this.seleData.length; i++) {
+ for (let a = 0; a < this.oldList.length; a++) {
+ // this.seleData[i].name === this.oldList[a].memberName ||
+ if (this.seleData[i].idCard === this.oldList[a].idcardNo) {
+ this.$message.warning(`[${this.seleData[i].name}]鍛樺伐閲嶅`)
+ return
+ }
+ }
+ }
+ this.seleData.forEach(item => {
+ item.idCard = item.idcardNo
+ item.memberName = item.name
+ item.memberId = item.id
+ if (this.notInInsuranceApplyId || this.type == 1) {
+ item.workTypeName = ''
+ item.worktypeId = ''
+ item.duId = ''
+ item.duName = ''
+ }
+ item.fee = this.price
+ })
+ this.$emit('result', this.seleData)
+ this.visible = false
+ },
+ handleSelectionChange (e) {
+ this.seleData = e
+ },
+ getList () {
+ findListByDTO({
+ name: this.val,
+ insuranceApplyId: this.insuranceApplyId,
+ notInInsuranceApplyId: this.notInInsuranceApplyId,
+ validTime: this.validTime
+ }).then(res => {
+ res.forEach(item => {
+ item.reducePrice = item.fee
+ item.fee = ''
+ })
+ this.list = res
+ })
+ }
+ }
+}
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3