From 3db567c3f22fd2513f6eeac314e509b4abcd6c8b Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 30 一月 2024 20:14:13 +0800
Subject: [PATCH] Mr.Shi

---
 company/src/components/enterprise/additionSubtractionApplication.vue |  565 ++++++++++++++++++++++
 company/src/components/enterprise/factoryChange.vue                  |  477 +++++++++++++++++++
 company/src/api/business/applyChange.js                              |   10 
 company/src/components/enterprise/OperaInsuranceApplyWindow.vue      |    7 
 company/src/components/business/OperaInsuranceApplyWindow.vue        |   26 
 company/src/components/enterprise/selectEmployees.vue                |   26 
 company/src/views/enterprise/myPolicy.vue                            |  186 +++++++
 company/src/components/enterprise/dispatchUnitDetails.vue            |   10 
 company/src/views/enterprise/dispatchUnit.vue                        |   12 
 company/src/views/enterprise/add_subtract.vue                        |    5 
 company/src/components/enterprise/selectEmployeesCopy.vue            |  140 +++++
 11 files changed, 1,445 insertions(+), 19 deletions(-)

diff --git a/company/src/api/business/applyChange.js b/company/src/api/business/applyChange.js
index f1decd8..2b43541 100644
--- a/company/src/api/business/applyChange.js
+++ b/company/src/api/business/applyChange.js
@@ -11,3 +11,13 @@
 export function updateById (data) {
     return request.post('/business/applyChange/updateById', data)
 }
+
+// 鏂板缓
+export function create (data) {
+    return request.post('/business/applyChange/create', data)
+}
+
+// 鏂板缓
+export function getChangeCountCyclePriceVO (data) {
+    return request.post('/business/applyChange/getChangeCountCyclePriceVO', data)
+}
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index c71c349..2277006 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -8,6 +8,14 @@
     >
         <div class="desc">
             <div class="desc_item">
+                <div class="desc_item_label" v-if="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" @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>
+                </div>
                 <div class="desc_item_label">
                     <div class="desc_item_label_left">
                         <span>鎶曚繚浼佷笟锛歿{ model.companyName }}</span>
@@ -34,8 +42,6 @@
                             <el-button v-if="model.status != 5 && model.status != 4 && model.status != 1" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
                             <el-button v-if="model.status == 5" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
                         </template>
-
-
                   </div>
                 </div>
                 <div class="desc_item_from">
@@ -231,6 +237,10 @@
         <applyReturn ref="applyReturn" @success="successEvent" />
         <!--    鏂板鎶曚繚    -->
         <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
+        <!--    鍔犲噺淇濈敵璇�    -->
+        <additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
+        <!--    鎹㈠巶鐢宠    -->
+        <factoryChange ref="factoryChange" @success="successEvent" />
     </GlobalWindow>
 </template>
 
@@ -239,6 +249,8 @@
 import GlobalWindow from '@/components/common/GlobalWindow'
 import InsuranceDetails from '@/components/business/InsuranceDetails'
 import OperaInsuranceApplyCheckWindow from '@/components/business/OperaInsuranceApplyCheckWindow'
+import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
+import factoryChange from '@/components/enterprise/factoryChange'
 
 import applyReturn from '@/components/enterprise/applyReturn'
 import { getDetail, getSignLink, applyDetailPage, applyChagneDetailPage, exportExcel, applyChagneDetailExcel } from "@/api/business/insuranceApply";
@@ -250,7 +262,15 @@
 export default {
   name: 'OperaInsuranceApplyWindow',
   extends: BaseOpera,
-  components: { GlobalWindow, InsuranceDetails ,OperaInsuranceApplyCheckWindow, applyReturn, OperaInsuranceApply },
+  components: {
+      GlobalWindow,
+      InsuranceDetails,
+      OperaInsuranceApplyCheckWindow,
+      applyReturn,
+      OperaInsuranceApply,
+      additionSubtractionApplication,
+      factoryChange
+  },
   data () {
     return {
       // 琛ㄥ崟鏁版嵁
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index d31b415..e54e7a8 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -189,8 +189,11 @@
           this.form.applyStartTime = ''
           this.form.applyEndTime = ''
           if (target && target.id) {
-              this.form.id = target.id
-              this.getDetails()
+              this.$nextTick(() => {
+                  this.$refs.form.resetFields()
+                  this.form.id = target.id
+                  this.getDetails()
+              })
           } else {
               this.$nextTick(() => {
                   this.$refs.form.resetFields()
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
new file mode 100644
index 0000000..6db50bd
--- /dev/null
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -0,0 +1,565 @@
+<template>
+    <GlobalWindow
+        :title="title"
+        width="100%"
+        text="鎶曚繚鐢宠"
+        :visible.sync="visible"
+        :confirm-working="isWorking"
+        @confirm="confirm"
+    >
+        <div class="list">
+            <el-form :inline="true" ref="form" :model="form" :rules="rules" class="demo-form-inline">
+                <el-form-item label="淇濋櫓鏂规">
+                    <span>{{form.solutionsName}}</span>
+                </el-form-item>
+                <el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="applyStartTime">
+                    <div style="display: flex; flex-direction: column;">
+                        <el-date-picker
+                            @change="changeApplyStartTime"
+                            v-model="form.applyStartTime"
+                            type="date"
+                            :picker-options="pickerOptions"
+                            value-format="yyyy-MM-dd"
+                            format="yyyy 骞� MM 鏈� dd 鏃�"
+                            placeholder="閫夋嫨鏃ユ湡">
+                        </el-date-picker>
+                        <span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
+                    </div>
+                </el-form-item>
+                <el-form-item label="鎶曚繚骞撮緞" v-if="item">
+                    <span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
+                </el-form-item>
+                <el-form-item label="璐圭敤" v-if="item">
+                    <span>{{item.price}}鍏�</span>
+                    <span v-if="item.timeUnit === 0">/澶�</span>
+                    <span v-if="item.timeUnit === 1">/鍗婃湀</span>
+                    <span v-if="item.timeUnit === 2">/鏈�</span>
+                    <span v-if="item.timeUnit === 3">/骞�</span>
+                    <span>/浜�</span>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="desc_item_from">
+            <el-table
+                :data="list"
+                border
+                style="width: 100%">
+                <el-table-column
+                    prop="code"
+                    align="center"
+                    label="鍏宠仈淇濆崟鍙�">
+                </el-table-column>
+                <el-table-column
+                    prop="solutionsName"
+                    label="淇濋櫓鏂规"
+                    align="center"
+                    width="180">
+                </el-table-column>
+                <el-table-column
+                    prop="startTime"
+                    align="center"
+                    label="淇濋櫓鐢熸晥璧锋湡">
+                </el-table-column>
+                <el-table-column
+                    prop="endTime"
+                    align="center"
+                    label="淇濋櫓鐢熸晥姝㈡湡">
+                </el-table-column>
+                <el-table-column
+                    prop="insureNum"
+                    align="center"
+                    label="鎶曚繚浜烘暟">
+                </el-table-column>
+                <el-table-column
+                    prop="serviceDays"
+                    align="center"
+                    label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�">
+                </el-table-column>
+                <el-table-column
+                    prop="currentFee"
+                    align="center"
+                    label="褰撳墠璐圭敤(鍏�)">
+                </el-table-column>
+                <el-table-column
+                    prop="fee"
+                    align="center"
+                    label="鎬昏垂鐢�(鍏�)">
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class="desc_item_cate">
+            <el-tabs v-model="activeName" @tab-click="handleClick">
+                <el-tab-pane label="鍔犱繚鍛樺伐" name="0"></el-tab-pane>
+                <el-tab-pane label="鍑忎繚鍛樺伐" name="1"></el-tab-pane>
+            </el-tabs>
+        </div>
+        <div class="btns">
+            <div class="btns_item">
+                <el-button type="primary" @click="seleUser">閫夊彇鍛樺伐</el-button>
+                <el-button type="primary" @click="uploadUser" v-if="activeName !== '1'">瀵煎叆鍛樺伐</el-button>
+                <el-button type="primary" @click="addUser" v-if="activeName !== '1'">娣诲姞鍛樺伐</el-button>
+                <el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
+            </div>
+            <div class="btns_item" v-if="activeName !== '1'">
+                <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>
+            </div>
+        </div>
+        <el-table
+            :data="activeName === '0' ? form.addDetailList : form.delDetailList"
+            border
+            show-summary
+            :summary-method="getSummaries"
+            ref="multipleTable"
+            @selection-change="handleSelectionChange"
+            style="width: 100%;margin-bottom: 15px;">
+            <el-table-column
+                type="selection"
+                width="55">
+            </el-table-column>
+            <el-table-column label="搴忓彿" width="80px">
+                <template slot-scope="scope">
+                    <span>{{scope.$index + 1}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="memberName"
+                label="濮撳悕">
+            </el-table-column>
+            <el-table-column
+                prop="idCard"
+                label="韬唤璇佸彿">
+            </el-table-column>
+            <el-table-column
+                label="骞撮緞">
+                <template slot-scope="{row}">
+                    <span style="color: red;" v-if="(getAgeByIdCard(row.idCard) < item.minAge) || (getAgeByIdCard(row.idCard) > item.maxAge)">{{getAgeByIdCard(row.idCard)}}</span>
+                    <span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="duName"
+                label="娲鹃仯鍗曚綅">
+            </el-table-column>
+            <el-table-column
+                prop="workTypeName"
+                label="鎵�灞炲伐绉�">
+            </el-table-column>
+            <el-table-column
+                label="璐圭敤">
+                <template slot-scope="{row}">
+                    <span v-if="activeName === '0'">{{row.fee}}</span>
+                    <span v-else>-{{row.fee}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="鎿嶄綔">
+                <template slot-scope="scope">
+                    <el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="info" v-if="item">
+            <span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
+            <span v-if="item.specialInfo">{{item.specialInfo}}</span>
+            <span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
+        </div>
+        <!--    閫夋嫨鍛樺伐    -->
+        <selectEmployees ref="selectEmployees" @result="getValue" />
+        <!--    娣诲姞鍛樺伐    -->
+        <addEmployee ref="addEmployee" @result="getValue" />
+        <!--    瀵煎叆鍚嶅崟    -->
+        <importEmployees ref="importEmployees" @result="getValue" />
+        <!--    纭宸ョ    -->
+        <confirmJobType ref="confirmJobType" @result="getUser" />
+    </GlobalWindow>
+</template>
+
+<script>
+    import BaseOpera from '@/components/base/BaseOpera'
+    import GlobalWindow from '@/components/common/GlobalWindow'
+    import selectEmployees from '@/components/enterprise/selectEmployees'
+    import addEmployee from '@/components/enterprise/addEmployee'
+    import importEmployees from '@/components/enterprise/importEmployees'
+    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'
+    export default {
+        name: 'additionSubtractionApplication',
+        extends: BaseOpera,
+        components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType },
+        data () {
+            return {
+                form: {
+                    id: null,
+                    solutionId: '',
+                    solutionsName: '',
+                    applyStartTime: '',
+                    applyEndTime: '',
+                    addDetailList: [],
+                    delDetailList: [],
+                },
+                activeName: '0',
+                pickerOptions: {},
+                price: '',
+                endTime: '',    // 	瀹為檯淇濋櫓鐢熸晥姝㈡湡
+                company: [],
+                seleData: [],
+                item: null,
+                // 楠岃瘉瑙勫垯
+                rules: {
+                    applyStartTime: [
+                        { required: true, message: '璇烽�夋嫨鎵瑰崟鐢熸晥璧锋湡' }
+                    ]
+                },
+                list: []
+            }
+        },
+        created () {
+            this.config({
+                api: '/business/insuranceApply',
+                'field.id': 'id'
+            })
+        },
+        methods: {
+            open (title, target) {
+                this.title = title
+                this.form.addDetailList = []
+                this.form.delDetailList = []
+                this.list = []
+                this.form.id = null
+                this.item = null
+                this.form.solutionId = ''
+                this.form.solutionsName = ''
+                this.form.applyStartTime = ''
+                this.form.applyEndTime = ''
+                if (target && target.id) {
+                    this.$nextTick(() => {
+                        this.$refs.form.resetFields()
+                        this.form.id = target.id
+                        this.getDetails()
+                    })
+                } else {
+                    this.$nextTick(() => {
+                        this.$refs.form.resetFields()
+                        this.form[this.configData['field.id']] = null
+                    })
+                }
+                this.getCompany()
+                this.visible = true
+                // this.updatePickerOptions()
+            },
+            changeApplyStartTime(e) {
+                getChangeCountCyclePriceVO({
+                    applyId: this.form.id,
+                    validTime: e
+                }).then(res => {
+                    this.price = res.cyclePrice
+                    this.form.addDetailList.forEach(item => {
+                        item.fee = res.cyclePrice
+                    })
+                    this.form.delDetailList.forEach(item => {
+                        item.fee = res.cyclePrice
+                    })
+                })
+            },
+            handleClick(e) {
+                this.activeName = e.index
+            },
+            // 鑾峰彇鎶曚繚璇︽儏
+            getDetails() {
+                // findList({ applyId: this.form.id })
+                //     .then(res => {
+                //         res.forEach(item => {
+                //             item.idCard = item.idcardNo
+                //             item.fee = ''
+                //         })
+                //         this.tableData = res
+                //     })
+                getDetail(this.form.id)
+                    .then(res => {
+                        this.list.push(res)
+                        this.endTime = res.endTime
+                        this.form.solutionId = res.solutionId
+                        this.form.solutionsName = res.solutionsName
+                        this.pickerOptions = {
+                            disabledDate(time) {
+                                // - 8.64e7
+                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
+                            }
+                        };
+                        this.changeSolution1(res.solutionId)
+                    })
+            },
+            getSummaries(param) {
+                const { columns, data } = param
+                const sums = []
+                columns.forEach((column, index) => {
+                    if (index === 0) {
+                        sums[index] = '鎬讳环'
+                        return
+                    } else if (index === 7) {
+                        let total = 0
+                        if (this.activeName === '0') {
+                            this.form.addDetailList.forEach(item => {
+                                total += item.fee
+                            })
+                        } else {
+                            this.form.delDetailList.forEach(item => {
+                                total += item.fee
+                            })
+                        }
+                        sums[index] = '-' + total
+                        return
+                    }
+                })
+                return sums
+            },
+            deleItem() {
+                if (this.seleData.length === 0) {
+                    this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+                    return
+                }
+                if (this.activeName === '0') {
+                    this.seleData.forEach(item => {
+                        this.form.addDetailList.forEach((row, index) => {
+                            if (item === row.name) {
+                                this.form.addDetailList.splice(index, 1)
+                            }
+                        })
+                    })
+                } else {
+                    this.seleData.forEach(item => {
+                        this.form.delDetailList.forEach((row, index) => {
+                            if (item === row.name) {
+                                this.form.delDetailList.splice(index, 1)
+                            }
+                        })
+                    })
+                }
+            },
+            confirm() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        // if (this.form.addDetailList.length === 0) {
+                        //     this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
+                        //     return
+                        // }
+                        for (let i = 0; i < this.form.addDetailList.length; i++) {
+                            if (!this.form.addDetailList[i].worktypeId || !this.form.addDetailList[i].duId) {
+                                this.$message.warning('璇峰畬鍠勫姞淇濇淳閬e崟浣嶅拰宸ョ淇℃伅')
+                                return
+                            }
+                        }
+                        for (let i = 0; i < this.form.delDetailList.length; i++) {
+                            if (!this.form.delDetailList[i].worktypeId || !this.form.delDetailList[i].duId) {
+                                this.$message.warning('璇峰畬鍠勫噺淇濇淳閬e崟浣嶅拰宸ョ淇℃伅')
+                                return
+                            }
+                        }
+                        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
+                        })
+                    }
+                })
+            },
+            seleUser() {
+                if (!this.form.solutionId) {
+                    this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+                    return
+                }
+                if (this.activeName === '0') {
+                    this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id })
+                } else {
+                    this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id })
+                }
+            },
+            addUser() {
+                if (!this.form.solutionId) {
+                    this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+                    return
+                }
+                if (this.activeName === '0') {
+                    this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.addDetailList, price: this.price })
+                } else {
+                    this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.delDetailList, price: this.price })
+                }
+            },
+            uploadUser() {
+                if (!this.form.solutionId) {
+                    this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+                    return
+                }
+                if (this.activeName === '0') {
+                    this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.addDetailList, price: this.price })
+                } else {
+                    this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.delDetailList, price: this.price })
+                }
+            },
+            // 鍒囨崲鏂规
+            changeSolution1(e) {
+                this.company.forEach(item => {
+                    if (item.id === e) {
+                        this.item = item
+                    }
+                })
+                // this.tableData.forEach(item => {
+                //     item.fee = this.price
+                // })
+            },
+            dele(index) {
+                if (this.activeName === '0') {
+                    this.form.addDetailList.splice(index, 1)
+                } else {
+                    this.form.delDetailList.splice(index, 1)
+                }
+            },
+            getUser(obj) {
+                this.seleData.forEach(item => {
+                    if (this.activeName === '0') {
+                        this.form.addDetailList.forEach(row => {
+                            if (item === row.name) {
+                                row.workTypeName = obj.workTypeName
+                                row.worktypeId = obj.worktypeId
+                                row.duName = obj.duName
+                                row.duId = obj.duId
+                            }
+                        })
+                    } else {
+                        this.form.delDetailList.forEach(row => {
+                            if (item === row.name) {
+                                row.workTypeName = obj.workTypeName
+                                row.worktypeId = obj.worktypeId
+                                row.duName = obj.duName
+                                row.duId = obj.duId
+                            }
+                        })
+                    }
+                })
+                this.seleData = []
+                this.$refs.multipleTable.clearSelection();
+            },
+            // 閫夋嫨鍛樺伐
+            sele() {
+                if (!this.form.solutionId) {
+                    this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
+                    return
+                }
+                if (this.seleData.length === 0) {
+                    this.$message.warning('璇烽�夋嫨鍛樺伐')
+                    return
+                }
+                this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+            },
+            // 鏌ヨ鍏ㄩ儴鏂规
+            getCompany() {
+                all({})
+                    .then(res => {
+                        this.company = res
+                    })
+            },
+            getAgeByIdCard(idCard){
+                const sexAndAge = {}
+                //鑾峰彇鐢ㄦ埛韬唤璇佸彿鐮�
+                const userCard = idCard
+                //濡傛灉鐢ㄦ埛韬唤璇佸彿鐮佷负undefined鍒欒繑鍥炵┖
+                if (!userCard) {
+                    return sexAndAge
+                }
+                // 鑾峰彇鍑虹敓鏃ユ湡
+                const yearBirth = userCard.substring(6, 10)
+                const monthBirth = userCard.substring(10, 12)
+                const dayBirth = userCard.substring(12, 14)
+                // 鑾峰彇褰撳墠骞存湀鏃ュ苟璁$畻骞撮緞
+                const myDate = new Date()
+                const monthNow = myDate.getMonth() + 1
+                const dayNow = myDate.getDate()
+                let age = myDate.getFullYear() - yearBirth
+                if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+                    age--
+                }
+                // 寰楀埌骞撮緞
+                sexAndAge.age = age
+                return sexAndAge.age
+            },
+            handleSelectionChange (e) {
+                this.seleData = e.map(item => item.name)
+            },
+            getValue(list) {
+                console.log(list)
+                if (this.activeName === '0') {
+                    this.form.addDetailList.push(...list)
+                } else {
+                    this.form.delDetailList.push(...list)
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .list {
+        width: 100%;
+    }
+    .btns {
+        width: 100%;
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .btns_item {
+            display: flex;
+            align-items: center;
+        }
+    }
+    .submit {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-bottom: 15px;
+    }
+    .desc_item_from {
+        width: 100%;
+        margin-bottom: 10px;
+        .desc_item_from_page {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: end;
+            margin-top: 10px;
+        }
+    }
+    .desc_item_cate {
+        width: 100%;
+        margin-bottom: 10px;
+    }
+    .info {
+        width: 100%;
+        font-size: 14px;
+        color: black;
+    }
+</style>
diff --git a/company/src/components/enterprise/dispatchUnitDetails.vue b/company/src/components/enterprise/dispatchUnitDetails.vue
index 33c07bd..da04967 100644
--- a/company/src/components/enterprise/dispatchUnitDetails.vue
+++ b/company/src/components/enterprise/dispatchUnitDetails.vue
@@ -18,9 +18,13 @@
                 </div>
                 <div class="info_list_item">
                     <div class="info_list_item_label">娲鹃仯鍗曚綅鐘舵�侊細</div>
-                    <div class="info_list_item_val" v-if="form.unitStatus === 0">寰呭鏍�</div>
-                    <div class="info_list_item_val" style="color: green;" v-if="form.unitStatus === 1">瀹℃牳閫氳繃</div>
-                    <div class="info_list_item_val" style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
+                    <div class="info_list_item_val" style="color:#2E68EC;" v-if="form.unitStatus === 0">寰呭鏍�</div>
+                    <div class="info_list_item_val"   v-if="form.unitStatus === 1">
+                        <span style="color:#2E68EC;" v-if="form.worktypeStatus  ==null||form.worktypeStatus === 0">宸ョ寰呭</span>
+                        <span style="color: green" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+                        <span style="color: red;" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+                    </div>
+                    <div class="info_list_item_val"  style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
                 </div>
                 <div class="info_list_item">
                     <div class="info_list_item_label">娲鹃仯鍗曚綅璇﹁堪锛�</div>
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
new file mode 100644
index 0000000..5d9284f
--- /dev/null
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -0,0 +1,477 @@
+<template>
+    <GlobalWindow
+        :title="title"
+        width="100%"
+        text="鎶曚繚鐢宠"
+        :visible.sync="visible"
+        :confirm-working="isWorking"
+        @confirm="confirm"
+    >
+        <div class="list">
+            <el-form :inline="true" ref="form" :model="form" :rules="rules" class="demo-form-inline">
+                <el-form-item label="淇濋櫓鏂规">
+                    <span>{{form.solutionsName}}</span>
+                </el-form-item>
+                <el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="applyStartTime">
+                    <div style="display: flex; flex-direction: column;">
+                        <el-date-picker
+                            v-model="form.applyStartTime"
+                            type="date"
+                            :picker-options="pickerOptions"
+                            value-format="yyyy-MM-dd"
+                            format="yyyy 骞� MM 鏈� dd 鏃�"
+                            placeholder="閫夋嫨鏃ユ湡">
+                        </el-date-picker>
+                        <span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
+                    </div>
+                </el-form-item>
+                <el-form-item label="鎶曚繚骞撮緞" v-if="item">
+                    <span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
+                </el-form-item>
+                <el-form-item label="璐圭敤" v-if="item">
+                    <span>{{item.price}}鍏�</span>
+                    <span v-if="item.timeUnit === 0">/澶�</span>
+                    <span v-if="item.timeUnit === 1">/鍗婃湀</span>
+                    <span v-if="item.timeUnit === 2">/鏈�</span>
+                    <span v-if="item.timeUnit === 3">/骞�</span>
+                    <span>/浜�</span>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="desc_item_from">
+            <el-table
+                :data="list"
+                border
+                style="width: 100%">
+                <el-table-column
+                    prop="code"
+                    align="center"
+                    label="鍏宠仈淇濆崟鍙�">
+                </el-table-column>
+                <el-table-column
+                    prop="solutionsName"
+                    label="淇濋櫓鏂规"
+                    align="center"
+                    width="180">
+                </el-table-column>
+                <el-table-column
+                    prop="startTime"
+                    align="center"
+                    label="淇濋櫓鐢熸晥璧锋湡">
+                </el-table-column>
+                <el-table-column
+                    prop="endTime"
+                    align="center"
+                    label="淇濋櫓鐢熸晥姝㈡湡">
+                </el-table-column>
+                <el-table-column
+                    prop="insureNum"
+                    align="center"
+                    label="鎶曚繚浜烘暟">
+                </el-table-column>
+                <el-table-column
+                    prop="serviceDays"
+                    align="center"
+                    label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�">
+                </el-table-column>
+                <el-table-column
+                    prop="currentFee"
+                    align="center"
+                    label="褰撳墠璐圭敤(鍏�)">
+                </el-table-column>
+                <el-table-column
+                    prop="fee"
+                    align="center"
+                    label="鎬昏垂鐢�(鍏�)">
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class="btns">
+            <div class="btns_item">
+                <el-button type="primary" @click="seleUser">閫夊彇鍛樺伐</el-button>
+                <el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
+            </div>
+            <div class="btns_item">
+                <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>
+            </div>
+        </div>
+        <el-table
+            :data="form.factory"
+            border
+            ref="multipleTable"
+            @selection-change="handleSelectionChange"
+            style="width: 100%;margin-bottom: 15px;">
+            <el-table-column
+                type="selection"
+                width="55">
+            </el-table-column>
+            <el-table-column label="搴忓彿" width="80px">
+                <template slot-scope="scope">
+                    <span>{{scope.$index + 1}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                prop="memberName"
+                label="濮撳悕">
+            </el-table-column>
+            <el-table-column
+                prop="idCard"
+                label="韬唤璇佸彿">
+            </el-table-column>
+            <el-table-column
+                prop="oldDuName"
+                label="鍘熸淳閬e崟浣�">
+            </el-table-column>
+            <el-table-column
+                prop="oldWorkTypeName"
+                label="鍘熸墍灞炲伐绉�">
+            </el-table-column>
+            <el-table-column
+                prop="duName"
+                label="鍙樻洿鍚庢淳閬e崟浣�">
+            </el-table-column>
+            <el-table-column
+                prop="workTypeName"
+                label="鍙樻洿鍚庢墍灞炲伐绉�">
+            </el-table-column>
+            <el-table-column
+                label="鎿嶄綔">
+                <template slot-scope="scope">
+                    <el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="info" v-if="item">
+            <span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
+            <span v-if="item.specialInfo">{{item.specialInfo}}</span>
+            <span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
+        </div>
+        <!--    閫夋嫨鍛樺伐    -->
+        <selectEmployees ref="selectEmployees" @result="getValue" />
+        <!--    娣诲姞鍛樺伐    -->
+        <addEmployee ref="addEmployee" @result="getValue" />
+        <!--    瀵煎叆鍚嶅崟    -->
+        <importEmployees ref="importEmployees" @result="getValue" />
+        <!--    纭宸ョ    -->
+        <confirmJobType ref="confirmJobType" @result="getUser" />
+    </GlobalWindow>
+</template>
+
+<script>
+    import BaseOpera from '@/components/base/BaseOpera'
+    import GlobalWindow from '@/components/common/GlobalWindow'
+    import selectEmployees from '@/components/enterprise/selectEmployees'
+    import addEmployee from '@/components/enterprise/addEmployee'
+    import importEmployees from '@/components/enterprise/importEmployees'
+    import confirmJobType from '@/components/enterprise/confirmJobType'
+    import { all } from '@/api/business/solutions'
+    import { getDetail, findList } from '@/api/business/insuranceApply'
+    import { create } from '@/api/business/applyChange'
+    export default {
+        name: 'factoryChange',
+        extends: BaseOpera,
+        components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType },
+        data () {
+            return {
+                form: {
+                    id: null,
+                    solutionId: '',
+                    solutionsName: '',
+                    applyStartTime: '',
+                    applyEndTime: '',
+                    factory: []
+                },
+                pickerOptions: {},
+                price: '',
+                endTime: '',    // 	瀹為檯淇濋櫓鐢熸晥姝㈡湡
+                company: [],
+                seleData: [],
+                item: null,
+                // 楠岃瘉瑙勫垯
+                rules: {
+                    applyStartTime: [
+                        { required: true, message: '璇烽�夋嫨鎵瑰崟鐢熸晥璧锋湡' }
+                    ]
+                },
+                list: []
+            }
+        },
+        created () {
+            this.config({
+                api: '/business/insuranceApply',
+                'field.id': 'id'
+            })
+        },
+        methods: {
+            open (title, target) {
+                this.title = title
+                this.form.addDetailList = []
+                this.form.delDetailList = []
+                this.list = []
+                this.form.id = null
+                this.item = null
+                this.form.solutionId = ''
+                this.form.solutionsName = ''
+                this.form.applyStartTime = ''
+                this.form.applyEndTime = ''
+                if (target && target.id) {
+                    this.$nextTick(() => {
+                        this.$refs.form.resetFields()
+                        this.form.id = target.id
+                        this.getDetails()
+                    })
+                } else {
+                    this.$nextTick(() => {
+                        this.$refs.form.resetFields()
+                        this.form[this.configData['field.id']] = null
+                    })
+                }
+                this.getCompany()
+                this.visible = true
+                // this.updatePickerOptions()
+            },
+            // 鑾峰彇鎶曚繚璇︽儏
+            getDetails() {
+                findList({ applyId: this.form.id })
+                    .then(res => {
+                        res.forEach(item => {
+                            item.idCard = item.idcardNo
+                            item.fee = ''
+                        })
+                        res.forEach(item => {
+                            item.oldDuId = item.duId
+                            item.oldDuName = item.duName
+                            item.oldWorkTypeName = item.workTypeName
+                            item.oldWorktypeId = item.worktypeId
+                            item.workTypeName = ''
+                            item.worktypeId = ''
+                            item.duId = ''
+                            item.duName = ''
+                        })
+                        // this.form.factory = res
+                    })
+                getDetail(this.form.id)
+                    .then(res => {
+                        this.list.push(res)
+                        this.endTime = res.endTime
+                        this.form.solutionId = res.solutionId
+                        this.form.solutionsName = res.solutionsName
+                        this.pickerOptions = {
+                            disabledDate(time) {
+                                // - 8.64e7
+                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
+                            }
+                        };
+                        this.changeSolution1(res.solutionId)
+                    })
+            },
+            deleItem() {
+                if (this.seleData.length === 0) {
+                    this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+                    return
+                }
+                this.seleData.forEach(item => {
+                    this.form.factory.forEach((row, index) => {
+                        if (item === row.memberName) {
+                            this.form.factory.splice(index, 1)
+                        }
+                    })
+                })
+            },
+            confirm() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        // if (this.form.addDetailList.length === 0) {
+                        //     this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
+                        //     return
+                        // }
+                        for (let i = 0; i < this.form.factory.length; i++) {
+                            if (!this.form.factory[i].worktypeId || !this.form.factory[i].duId) {
+                                this.$message.warning('璇峰畬鍠勬淳閬e崟浣嶅拰宸ョ淇℃伅')
+                                return
+                            }
+                        }
+                        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
+                        })
+                    }
+                })
+            },
+            seleUser() {
+                if (!this.form.solutionId) {
+                    this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+                    return
+                }
+                this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id })
+            },
+            addUser() {
+                if (!this.form.solutionId) {
+                    this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+                    return
+                }
+                this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.factory, price: this.price })
+            },
+            uploadUser() {
+                if (!this.form.solutionId) {
+                    this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+                    return
+                }
+                this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.factory, price: this.price })
+            },
+            // 鍒囨崲鏂规
+            changeSolution1(e) {
+                this.company.forEach(item => {
+                    if (item.id === e) {
+                        this.item = item
+                    }
+                })
+                // this.tableData.forEach(item => {
+                //     item.fee = this.price
+                // })
+            },
+            dele(index) {
+                this.form.factory.splice(index, 1)
+            },
+            getUser(obj) {
+                console.log(obj)
+                this.seleData.forEach(item => {
+                    this.form.factory.forEach(row => {
+                        if (item === row.memberName) {
+                            row.workTypeName = obj.workTypeName
+                            row.worktypeId = obj.worktypeId
+                            row.duName = obj.duName
+                            row.duId = obj.duId
+                        }
+                    })
+                })
+                this.seleData = []
+                this.$refs.multipleTable.clearSelection();
+            },
+            // 閫夋嫨鍛樺伐
+            sele() {
+                if (!this.form.solutionId) {
+                    this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
+                    return
+                }
+                if (this.seleData.length === 0) {
+                    this.$message.warning('璇烽�夋嫨鍛樺伐')
+                    return
+                }
+                this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+            },
+            // 鏌ヨ鍏ㄩ儴鏂规
+            getCompany() {
+                all({})
+                    .then(res => {
+                        this.company = res
+                    })
+            },
+            getAgeByIdCard(idCard){
+                const sexAndAge = {}
+                //鑾峰彇鐢ㄦ埛韬唤璇佸彿鐮�
+                const userCard = idCard
+                //濡傛灉鐢ㄦ埛韬唤璇佸彿鐮佷负undefined鍒欒繑鍥炵┖
+                if (!userCard) {
+                    return sexAndAge
+                }
+                // 鑾峰彇鍑虹敓鏃ユ湡
+                const yearBirth = userCard.substring(6, 10)
+                const monthBirth = userCard.substring(10, 12)
+                const dayBirth = userCard.substring(12, 14)
+                // 鑾峰彇褰撳墠骞存湀鏃ュ苟璁$畻骞撮緞
+                const myDate = new Date()
+                const monthNow = myDate.getMonth() + 1
+                const dayNow = myDate.getDate()
+                let age = myDate.getFullYear() - yearBirth
+                if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+                    age--
+                }
+                // 寰楀埌骞撮緞
+                sexAndAge.age = age
+                return sexAndAge.age
+            },
+            handleSelectionChange (e) {
+                this.seleData = e.map(item => item.memberName)
+            },
+            getValue(list) {
+                let arr = JSON.parse(JSON.stringify(list))
+                
+                arr.forEach(item => {
+                    item.oldDuId = item.duId
+                    item.oldDuName = item.duName
+                    item.oldWorkTypeName = item.workTypeName
+                    item.oldWorktypeId = item.worktypeId
+
+                    item.duId = ''
+                    item.duName = ''
+                    item.workTypeName = ''
+                    item.worktypeId = ''
+                })
+                this.form.factory.push(...arr)
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .list {
+        width: 100%;
+    }
+    .btns {
+        width: 100%;
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .btns_item {
+            display: flex;
+            align-items: center;
+        }
+    }
+    .submit {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-bottom: 15px;
+    }
+    .desc_item_from {
+        width: 100%;
+        margin-bottom: 10px;
+        .desc_item_from_page {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: end;
+            margin-top: 10px;
+        }
+    }
+    .desc_item_cate {
+        width: 100%;
+        margin-bottom: 10px;
+    }
+    .info {
+        width: 100%;
+        font-size: 14px;
+        color: black;
+    }
+</style>
diff --git a/company/src/components/enterprise/selectEmployees.vue b/company/src/components/enterprise/selectEmployees.vue
index d2cb3da..365c51c 100644
--- a/company/src/components/enterprise/selectEmployees.vue
+++ b/company/src/components/enterprise/selectEmployees.vue
@@ -54,6 +54,8 @@
                 val: '',
                 list: [],
                 price: '',
+                insuranceApplyId: '',
+                notInInsuranceApplyId: '',
                 seleData: [],
                 oldList: []
             }
@@ -66,8 +68,17 @@
         },
         methods: {
             open (title, obj) {
+                this.insuranceApplyId = ''
+                this.notInInsuranceApplyId = ''
                 this.price = obj.price
                 this.oldList = obj.arr
+                this.list = []
+                if (obj.insuranceApplyId) {
+                    this.insuranceApplyId = obj.insuranceApplyId
+                }
+                if (obj.notInInsuranceApplyId) {
+                    this.notInInsuranceApplyId = obj.notInInsuranceApplyId
+                }
                 this.title = title
                 this.visible = true
                 this.getList()
@@ -88,10 +99,13 @@
                 this.seleData.forEach(item => {
                     item.idCard = item.idcardNo
                     item.memberName = item.name
-                    item.workTypeName = ''
-                    item.worktypeId = ''
-                    item.duId = ''
-                    item.duName = ''
+                    item.memberId = item.id
+                    if (this.notInInsuranceApplyId) {
+                        item.workTypeName = ''
+                        item.worktypeId = ''
+                        item.duId = ''
+                        item.duName = ''
+                    }
                     item.fee = this.price
                 })
                 this.$emit('result', this.seleData)
@@ -102,7 +116,9 @@
             },
             getList() {
                 findListByDTO({
-                    name: this.val
+                    name: this.val,
+                    insuranceApplyId: this.insuranceApplyId,
+                    notInInsuranceApplyId: this.notInInsuranceApplyId
                 }).then(res => {
                     res.forEach(item => {
                         item.fee = ''
diff --git a/company/src/components/enterprise/selectEmployeesCopy.vue b/company/src/components/enterprise/selectEmployeesCopy.vue
new file mode 100644
index 0000000..8d0362e
--- /dev/null
+++ b/company/src/components/enterprise/selectEmployeesCopy.vue
@@ -0,0 +1,140 @@
+<template>
+    <GlobalWindow
+            :title="title"
+            width="100%"
+            :visible.sync="visible"
+            :confirm-working="isWorking"
+            @confirm="confirm"
+    >
+        <el-input v-model="val" placeholder="鏌ヨ鍛樺伐濮撳悕" @keypress.enter.native="getList" style="margin-bottom: 15px;"></el-input>
+        <el-table
+                :data="list"
+                border
+                @selection-change="handleSelectionChange"
+                style="width: 100%">
+            <el-table-column
+                    type="selection"
+                    width="55">
+            </el-table-column>
+            <el-table-column label="搴忓彿" width="80px">
+                <template slot-scope="scope">
+                    <span>{{scope.$index + 1}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                    prop="name"
+                    label="濮撳悕">
+            </el-table-column>
+            <el-table-column
+                    prop="idcardNo"
+                    label="韬唤璇佸彿">
+            </el-table-column>
+            <el-table-column
+                    prop="duName"
+                    label="娲鹃仯鍗曚綅">
+            </el-table-column>
+            <el-table-column
+                    prop="workTypeName"
+                    label="鎵�灞炲伐绉�">
+            </el-table-column>
+        </el-table>
+    </GlobalWindow>
+</template>
+
+<script>
+    import BaseOpera from '@/components/base/BaseOpera'
+    import GlobalWindow from '@/components/common/GlobalWindow'
+    import { findListByDTO } from '@/api/business/member'
+    export default {
+        name: 'selectEmployeesCopy',
+        extends: BaseOpera,
+        components: { GlobalWindow },
+        data () {
+            return {
+                val: '',
+                list: [],
+                price: '',
+                insuranceApplyId: '',
+                notInInsuranceApplyId: '',
+                seleData: [],
+                oldList: []
+            }
+        },
+        created () {
+            this.config({
+                api: '/business/dispatchUnit',
+                'field.id': 'id'
+            })
+        },
+        methods: {
+            open (title, obj) {
+                this.insuranceApplyId = ''
+                this.notInInsuranceApplyId = ''
+                this.price = obj.price
+                this.oldList = obj.arr
+                this.list = []
+                if (obj.insuranceApplyId) {
+                    this.insuranceApplyId = obj.insuranceApplyId
+                }
+                if (obj.notInInsuranceApplyId) {
+                    this.notInInsuranceApplyId = obj.notInInsuranceApplyId
+                }
+                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++) {
+                        if (this.seleData[i].name === this.oldList[a].memberName || 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
+
+                    item.oldDuId = JSON.parse(JSON.stringify(item.duId))
+                    item.oldDuName = JSON.parse(JSON.stringify(item.duName))
+                    item.oldWorkTypeName = JSON.parse(JSON.stringify(item.workTypeName))
+                    item.oldWorktypeId = JSON.parse(JSON.stringify(item.worktypeId))
+
+                    item.duId = ''
+                    item.duName = ''
+                    item.workTypeName = ''
+                    item.worktypeId = ''
+
+                    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
+                }).then(res => {
+                    res.forEach(item => {
+                        item.fee = ''
+                    })
+                    this.list = res
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 8a89ddc..1c4ad1a 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -9,8 +9,9 @@
                     <el-option label="寰呭鏍�" value="1"></el-option>
                     <el-option label="宸茬敓鏁�" value="2"></el-option>
                     <el-option label="鐢宠閫�鍥�" value="3"></el-option>
-                    <el-option label="宸查��鍥�" value="2"></el-option>
-                    <el-option label="宸插叧闂�" value="3"></el-option>
+<!--                    3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
+                    <el-option label="宸查��鍥�" value="5"></el-option>
+                    <el-option label="宸插叧闂�" value="6"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="淇濋櫓鏂规" prop="solutionsId">
diff --git a/company/src/views/enterprise/dispatchUnit.vue b/company/src/views/enterprise/dispatchUnit.vue
index 5d7a04b..2c8f05b 100644
--- a/company/src/views/enterprise/dispatchUnit.vue
+++ b/company/src/views/enterprise/dispatchUnit.vue
@@ -26,11 +26,15 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="娲鹃仯鍗曚綅"></el-table-column>
-                <el-table-column label="浼佷笟鐘舵��">
+                <el-table-column label="娲鹃仯鍗曚綅鐘舵��" min-width="100px">
                     <template slot-scope="{row}">
-                        <span v-if="row.unitStatus === 0">寰呭鏍�</span>
-                        <span v-if="row.unitStatus === 1" style="color: green;">瀹℃牳閫氳繃</span>
-                        <span v-if="row.unitStatus === 2" style="color: red;">瀹℃牳涓嶉�氳繃</span>
+                        <span style="color: #2E68EC" v-if="row.unitStatus === 0">寰呭鏍�</span>
+                        <span v-if="row.unitStatus === 1">
+                            <span style="color:#2E68EC" v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">宸ョ寰呭</span>
+                            <span style="color: green" v-else-if="row.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+                            <span style="color: red"  v-else-if="row.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+                        </span>
+                        <span style="color: red" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
                     </template>
                 </el-table-column>
                 <el-table-column prop="createDate" label="娣诲姞鏃ユ湡"></el-table-column>
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
new file mode 100644
index 0000000..2dbd1b9
--- /dev/null
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -0,0 +1,186 @@
+<template>
+    <TableLayout :permissions="['business:insuranceapply:query']">
+        <!-- 鎼滅储琛ㄥ崟 -->
+        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+            <el-form-item label="淇濆崟鍙�" prop="code">
+                <el-input v-model="searchForm.code" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
+                <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
+                    <el-option
+                        v-for="item in solutionList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="鐘舵��" prop="statusCollect">
+                <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="2"></el-option>
+                    <el-option label="宸茶繃鏈�" value="3"></el-option>
+                    <el-option label="宸查��鍥�" value="4"></el-option>
+                    <el-option label="閫�鍥炵敵璇蜂腑" value="5"></el-option>
+                    <el-option label="宸插叧闂�" value="6"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="淇濋櫓鐢熸晥璧锋湡" prop="time1">
+                <el-date-picker
+                    v-model="time1"
+                    @change="changeS"
+                    type="daterange"
+                    range-separator="鑷�"
+                    value-format="yyyy-MM-dd"
+                    start-placeholder="寮�濮嬫棩鏈�"
+                    end-placeholder="缁撴潫鏃ユ湡">
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="淇濋櫓鐢熸晥姝㈡湡" prop="time2">
+                <el-date-picker
+                    v-model="time2"
+                    @change="changeE"
+                    type="daterange"
+                    range-separator="鑷�"
+                    value-format="yyyy-MM-dd"
+                    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>
+            </section>
+        </el-form>
+        <!-- 琛ㄦ牸鍜屽垎椤� -->
+        <template v-slot:table-wrap>
+            <ul class="toolbar" v-permissions="['business:dispatchunit:create']">
+                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠')">鎶曚繚鐢宠</el-button></li>
+            </ul>
+            <el-table
+                v-loading="isWorking.search"
+                :data="tableData.list"
+                stripe
+            >
+                <el-table-column label="搴忓彿" width="80px">
+                    <template slot-scope="scope">
+                        <span>{{scope.$index + 1}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="statusInfo" label="鐘舵��"></el-table-column>
+                <el-table-column prop="solutionsName" label="淇濋櫓鏂规"></el-table-column>
+                <el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
+                <el-table-column prop="serviceDays" label="鎶曚繚鏃堕暱锛堝ぉ锛�"></el-table-column>
+                <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
+                <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
+                <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
+                <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
+                <el-table-column
+                    v-if="containPermissions(['business:insuranceapply:update', 'business:insuranceapply:delete'])"
+                    label="鎿嶄綔"
+                    min-width="150"
+                    fixed="right"
+                >
+                    <template slot-scope="{row}">
+                        <el-button type="text" @click="$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.id })" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
+                        <el-button type="text" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: row.id })">鍔犲噺淇濈敵璇�</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <pagination
+                @size-change="handleSizeChange"
+                @current-change="handlePageChange"
+                :pagination="tableData.pagination"
+            >
+            </pagination>
+        </template>
+        <!--    鏂板鎶曚繚    -->
+        <OperaInsuranceApplyWindow ref="OperaInsuranceApplyWindow" @success="handlePageChange" />
+        <!--    鎶曚繚璇︽儏    -->
+        <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
+        <!--    鍔犲噺淇濈敵璇�    -->
+        <additionSubtractionApplication ref="additionSubtractionApplication" @success="handlePageChange" />
+    </TableLayout>
+</template>
+
+<script>
+    import BaseTable from '@/components/base/BaseTable'
+    import TableLayout from '@/layouts/TableLayout'
+    import Pagination from '@/components/common/Pagination'
+    import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
+    import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+    import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
+
+    import { all as solutionAll} from '@/api/business/solutions'
+    export default {
+        name: 'myPolicy',
+        extends: BaseTable,
+        components: { TableLayout, Pagination, OperaInsuranceApplyWindow, OperaInsuranceApplyDetails, additionSubtractionApplication },
+        data () {
+            return {
+                // 鎼滅储
+                searchForm: {
+                    code: '',
+                    endTimeE: '',
+                    endTimeS: '',
+                    startTimeE: '',
+                    startTimeS: '',
+                    baseSolutionId: '',
+                    statusCollect: '2'
+                },
+                time1: [],
+                time2: [],
+                solutionList:[]
+            }
+        },
+        created () {
+            this.config({
+                module: '鎶曚繚鐢宠淇℃伅琛�',
+                api: '/business/insuranceApply',
+                'field.id': 'id',
+                'field.main': 'id'
+            })
+            this.search()
+            this.loadSelectList()
+        },
+        methods:{
+            reset() {
+                this.time1 = []
+                this.time2 = []
+                this.searchForm.endTimeE = ''
+                this.searchForm.endTimeS = ''
+                this.searchForm.startTimeE = ''
+                this.searchForm.startTimeS = ''
+                this.$refs.searchForm.resetFields()
+                this.search()
+            },
+            changeE(e) {
+                if (e.length > 0) {
+                    this.searchForm.endTimeS = e[0]
+                    this.searchForm.endTimeE = e[1]
+                } else {
+                    this.searchForm.endTimeS = ''
+                    this.searchForm.endTimeE = ''
+                }
+                this.search()
+            },
+            changeS(e) {
+                if (e.length > 0) {
+                    this.searchForm.startTimeS = e[0]
+                    this.searchForm.startTimeE = e[1]
+                } else {
+                    this.searchForm.startTimeS = ''
+                    this.searchForm.startTimeE = ''
+                }
+                this.search()
+            },
+            loadSelectList() {
+                solutionAll({ dataType: 0 }).then(res => {
+                    this.solutionList = res
+                })
+            }
+        }
+    }
+</script>

--
Gitblit v1.9.3