From 90e8215dddc36944c2300a47e8f106791214fe7b Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 26 二月 2024 09:33:32 +0800
Subject: [PATCH] mrshi

---
 company/src/components/enterprise/importEmployees.vue              |    4 
 company/src/components/enterprise/onlineReporting.vue              |    5 +
 company/src/components/enterprise/OperaInsuranceApplyWindow.vue    |   17 +++
 company/src/components/business/OperaInsuranceApplyWindow.vue      |    2 
 company/src/components/enterprise/selectEmployees.vue              |    3 
 company/src/views/enterprise/myPolicy.vue                          |   16 ++--
 company/src/components/business/OperaInsuranceApplyCheckWindow.vue |   64 ++++++++--------
 company/.env                                                       |    2 
 company/src/views/business/settleClaims.vue                        |    4 
 company/src/components/enterprise/renewalInsurance.vue             |   58 +++++++++++++
 company/.env.production                                            |    6 
 company/vue.config.js                                              |    2 
 company/src/components/enterprise/selectSolutions.vue              |    2 
 company/src/views/business/member.vue                              |   10 +-
 company/src/components/business/OperaApplyChangeDetailWindow.vue   |    4 
 company/src/components/enterprise/commissionDetails.vue            |    2 
 company/src/views/enterprise/insuranceApply.vue                    |    2 
 17 files changed, 135 insertions(+), 68 deletions(-)

diff --git a/company/.env b/company/.env
index 524371a..4f8ad0a 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.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/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 47b2647..fd3d992 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -11,8 +11,8 @@
                 <div class="desc_item_label">
                     <div class="desc_item_label_left">
                         <span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
-                        <span v-if="model.status === 1">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >寰呯缃�</span></span>
-                        <span v-if="model.status === 0">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >寰呭鏍�</span></span>
+                        <span v-if="model.status === 0">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >寰呯缃�</span></span>
+                        <span v-if="model.status === 1">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >寰呭鏍�</span></span>
                         <span v-if="model.status === 2">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
                         <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >閫�鍥炵敵璇�</span></span>
                         <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細<span  :class="'change-status'+model.status" >宸查��鍥�</span></span>
diff --git a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
index 9822410..cd00036 100644
--- a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
@@ -18,34 +18,34 @@
           </el-form-item>
         </el-form>
         <!--    涓婁紶淇濋櫓鍗�    -->
-              <el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
-                <el-form-item label="瀹㈡埛鏈熸湜淇濋櫓鐢熸晥璧锋湡锛�">
-                  {{ model.applyStartTime }}
-                </el-form-item>
-                <el-form-item label="" >
-                  <el-radio-group v-model="form.selectRadio" @change="selectChange">
-                    <el-radio :label="0" >涓庝繚鍗曚竴鑷�</el-radio>
-                    <el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-                <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�" prop="startTime" >
-                  <el-date-picker
-                      v-model="form.startTime"
-                      type="date"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      placeholder="閫夋嫨鏃ユ湡">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�">
-                  {{ form.startTime }}
-                </el-form-item>
-                <el-form-item label="淇濆崟鍙凤細" prop="code">
-                  <el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
-                </el-form-item>
-                <el-form-item label="涓婁紶淇濋櫓鍗曪細" prop="baoxianFile">
-                  <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
-                </el-form-item>
-              </el-form>
+      <el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
+        <el-form-item label="瀹㈡埛鏈熸湜淇濋櫓鐢熸晥璧锋湡锛�">
+          {{ model.applyStartTime }}
+        </el-form-item>
+        <el-form-item label="" >
+          <el-radio-group v-model="form.selectRadio" @change="selectChange">
+            <el-radio :label="0" >涓庝繚鍗曚竴鑷�</el-radio>
+            <el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�" prop="startTime" v-if="form.selectRadio === 1">
+          <el-date-picker
+              v-model="form.startTime"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="閫夋嫨鏃ユ湡">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�">
+          {{ form.startTime }}
+        </el-form-item>
+        <el-form-item label="淇濆崟鍙凤細" prop="code">
+          <el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
+        </el-form-item>
+        <el-form-item label="涓婁紶淇濋櫓鍗曪細" prop="baoxianFile">
+          <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
+        </el-form-item>
+      </el-form>
         <!--    淇敼淇濋櫓鍗�    -->
       <el-form v-if="visible4==true" :model="form" ref="form4" :rules="rules4" style="width: 100%;">
         <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�">
@@ -184,9 +184,9 @@
          fileList2: [],
          selectRadio:0
        },
-       this.model=target
-       this.form.startTime=this.model.startTime
-       this.title=title
+       this.model = target
+       this.form.startTime = target.startTime
+       this.title = title
        this.flag = flag
        this.visible1 = false
        this.visible2 = false
@@ -271,7 +271,7 @@
        if(this.form.selectRadio == 0){
          this.form.startTime = this.model.startTime
        }else{
-
+         this.form.startTime = ''
        }
     },
     toubaoFileUploaded(data){
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index b5210c1..795023e 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -11,7 +11,7 @@
                 <div class="desc_item_label" v-if="userInfo.type === 1 &&(model.statusCollect === 2 || model.statusCollect === 3)">
                     <div class="desc_item_label_left">
                         <span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
-                        <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId })">涓�閿画淇�</el-button>
+                        <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</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>
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index ab34c40..9dbd1e4 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -163,6 +163,7 @@
           applyStartTime: '',
           applyEndTime: ''
       },
+      type: '',
       pickerOptions: {}, // 瀛樻斁picker options鐨勫彉閲�
       price: '',
       company: [],
@@ -192,6 +193,9 @@
           this.tableData = []
           this.form.id = null
           this.item = null
+          if (target.type) {
+              this.type = target.type
+          }
           this.form.solutionId = ''
           this.form.applyStartTime = ''
           this.form.applyEndTime = ''
@@ -216,8 +220,15 @@
             findList({ applyId: this.form.id })
                 .then(res => {
                     res.forEach(item => {
+                        console.log(item)
                         item.idCard = item.idcardNo
                         item.fee = ''
+                        if (this.type === 1) {
+                            item.duName = ''
+                            item.duId = ''
+                            item.worktypeId = ''
+                            item.workTypeName = ''
+                        }
                     })
                     this.tableData = res
                 })
@@ -252,7 +263,7 @@
             }
             this.seleData.forEach(item => {
                 this.tableData.forEach((row, index) => {
-                    if (item === row.name) {
+                    if (item === row.idCard) {
                         this.tableData.splice(index, 1)
                     }
                 })
@@ -427,7 +438,7 @@
       getUser(obj) {
           this.seleData.forEach(id => {
               this.tableData.forEach(row => {
-                   if (id === row.id) {
+                   if (id === row.idCard) {
                        row.workTypeName = obj.workTypeName
                        row.worktypeId = obj.worktypeId
                        row.duName = obj.duName
@@ -482,7 +493,7 @@
           return sexAndAge.age
       },
       handleSelectionChange (e) {
-          this.seleData = e.map(item => item.id)
+          this.seleData = e.map(item => item.idCard)
       },
       getValue(list) {
           this.tableData.push(...list)
diff --git a/company/src/components/enterprise/commissionDetails.vue b/company/src/components/enterprise/commissionDetails.vue
index 8a783f7..1f36186 100644
--- a/company/src/components/enterprise/commissionDetails.vue
+++ b/company/src/components/enterprise/commissionDetails.vue
@@ -172,7 +172,7 @@
                         data.forEach(item => {
                             price += item.totalFee
                         })
-                        sums[index] = price
+                        sums[index] = price.toFixed(2)
                     }
                 })
                 return sums;
diff --git a/company/src/components/enterprise/importEmployees.vue b/company/src/components/enterprise/importEmployees.vue
index d51130c..c06e9a6 100644
--- a/company/src/components/enterprise/importEmployees.vue
+++ b/company/src/components/enterprise/importEmployees.vue
@@ -46,7 +46,7 @@
             },
             // 瀵煎嚭妯℃澘
             exportTemplate () {
-                window.open(process.env.VUE_APP_USERTEMPLATE_URL)
+                window.open(process.env.VUE_APP_MEMBER_URL)
             },
             clickRef () {
                 this.$refs.fileExcel.click()
@@ -74,7 +74,7 @@
             confirm () {
                 for (let i = 0; i < this.addList.length; i++) {
                     for (let a = 0; a < this.list.length; a++) {
-                        if (this.addList[i].name === this.list[a].memberName || this.addList[i].idCard === this.list[a].idcardNo) {
+                        if (this.addList[i].idCard === this.list[a].idcardNo) {
                             this.$message.warning(`[${this.addList[i].name}]鍛樺伐閲嶅`)
                             return
                         }
diff --git a/company/src/components/enterprise/onlineReporting.vue b/company/src/components/enterprise/onlineReporting.vue
index c6ec883..548868d 100644
--- a/company/src/components/enterprise/onlineReporting.vue
+++ b/company/src/components/enterprise/onlineReporting.vue
@@ -290,7 +290,9 @@
                     // 璋冪敤鏂板缓鎺ュ彛
                     this.isWorking = true
                     let obj = JSON.parse(JSON.stringify(this.form))
-                    obj.areaId = obj.areaId.join(',')
+                    if (obj.areaId) {
+                        obj.areaId = obj.areaId.join(',')
+                    }
                     create(obj)
                         .then(() => {
                             this.visible = false
@@ -313,6 +315,7 @@
                     })
             },
             getVal(e) {
+                console.log(e)
                 this.form.insuranceApplyId = e.applyId
                 this.form.solutionId = e.solutionId
                 this.form.solutionName = e.solutionName
diff --git a/company/src/components/enterprise/renewalInsurance.vue b/company/src/components/enterprise/renewalInsurance.vue
index 7021e02..ec0ad3a 100644
--- a/company/src/components/enterprise/renewalInsurance.vue
+++ b/company/src/components/enterprise/renewalInsurance.vue
@@ -34,26 +34,43 @@
             <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
             <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
             <el-table-column
-                prop="address"
+                min-width="150"
                 label="鎿嶄綔">
+                <template slot-scope="{row}">
+                    <el-button type="text" @click="$refs.OperaInsuranceApply.open('缁繚', { id: row.id, type: 1 })">涓�浠剁画淇�</el-button>
+                    <el-button type="text" @click="dele(row)">鍒犻櫎鎻愰啋</el-button>
+                </template>
             </el-table-column>
         </el-table>
+        <div style="width: 100%; height: 10px;"></div>
+        <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+        </el-pagination>
+        <!--    缁繚    -->
+        <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
     </GlobalWindow>
 </template>
 
 <script>
     import BaseOpera from '@/components/base/BaseOpera'
     import GlobalWindow from '@/components/common/GlobalWindow'
+    import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+    import { fetchList } from '@/api/business/insuranceApply'
     export default {
         name: 'renewalInsurance',
         extends: BaseOpera,
-        components: { GlobalWindow },
+        components: { GlobalWindow, OperaInsuranceApply },
         data () {
             return {
                 form: {
                     id: null
                 },
-                tableData: []
+                tableData: [],
+                total: 0,
+                currentPage: 1
             }
         },
         created () {
@@ -63,7 +80,42 @@
             })
         },
         methods: {
+            open (title, target) {
+                this.title = title
+                this.visible = true
+                this.getList()
+            },
+            handleCurrentChange(page) {
+                this.currentPage = page
+                this.getList()
+            },
+            getList() {
+                fetchList({
+                    capacity: 10,
+                    page: this.currentPage,
+                    model: {
+                        loseEfficacy: 1
+                    }
+                }).then(res => {
+                    this.tableData = res.records
+                    this.total = res.total
+                })
+            },
+            dele(row) {
+                this.$confirm('纭畾鍏抽棴姝ゆ彁绀哄悧?', '鎻愮ず', {
+                    confirmButtonText: '纭畾',
+                    cancelButtonText: '鍙栨秷',
+                    type: 'warning'
+                }).then(() => {
 
+                }).catch(() => {
+
+                });
+                console.log(row)
+            },
+            successEvent(){
+                this.$emit('success')
+            }
         }
     }
 </script>
diff --git a/company/src/components/enterprise/selectEmployees.vue b/company/src/components/enterprise/selectEmployees.vue
index c74f776..1e7e5b3 100644
--- a/company/src/components/enterprise/selectEmployees.vue
+++ b/company/src/components/enterprise/selectEmployees.vue
@@ -99,7 +99,8 @@
                 }
                 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.seleData[i].name === this.oldList[a].memberName ||
+                        if (this.seleData[i].idCard === this.oldList[a].idcardNo) {
                             this.$message.warning(`[${this.seleData[i].name}]鍛樺伐閲嶅`)
                             return
                         }
diff --git a/company/src/components/enterprise/selectSolutions.vue b/company/src/components/enterprise/selectSolutions.vue
index c165df1..a3d6f1d 100644
--- a/company/src/components/enterprise/selectSolutions.vue
+++ b/company/src/components/enterprise/selectSolutions.vue
@@ -30,7 +30,7 @@
                 label="淇濆崟鍙�">
             </el-table-column>
             <el-table-column
-                prop="applyChangeId"
+                prop="pdCode"
                 label="鎵瑰崟鍙�">
             </el-table-column>
             <el-table-column
diff --git a/company/src/views/business/member.vue b/company/src/views/business/member.vue
index 3aaa5b9..29a9182 100644
--- a/company/src/views/business/member.vue
+++ b/company/src/views/business/member.vue
@@ -8,13 +8,13 @@
             <el-form-item label="韬唤璇佸彿" prop="idcardNo">
                 <el-input v-model="searchForm.idcardNo" placeholder="璇疯緭鍏�" maxlength="18" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="淇濋櫓鏂规" prop="solutionId">
-                <el-select v-model="searchForm.solutionId" placeholder="璇烽�夋嫨" @change="search">
+            <el-form-item label="淇濋櫓鏂规" prop="solutionsId">
+                <el-select v-model="searchForm.solutionsId" placeholder="璇烽�夋嫨" @change="search">
                     <el-option
                         v-for="item in solutions"
-                        :key="item.id"
+                        :key="item.baseId"
                         :label="item.name"
-                        :value="item.id">
+                        :value="item.baseId">
                     </el-option>
                 </el-select>
             </el-form-item>
@@ -137,7 +137,7 @@
                     name: '',
                     idcardNo: '',
                     solutionsStatus: '',
-                    solutionId: ''
+                    solutionsId: ''
                 },
                 options: [],
                 solutions: [],
diff --git a/company/src/views/business/settleClaims.vue b/company/src/views/business/settleClaims.vue
index 9e98eca..3ddb36d 100644
--- a/company/src/views/business/settleClaims.vue
+++ b/company/src/views/business/settleClaims.vue
@@ -22,9 +22,9 @@
                 <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
                     <el-option
                         v-for="item in solutionList"
-                        :key="item.id"
+                        :key="item.baseId"
                         :label="item.name"
-                        :value="item.id">
+                        :value="item.baseId">
                     </el-option>
                 </el-select>
             </el-form-item>
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index 429c6bb..617c916 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -43,7 +43,7 @@
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <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>
+                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠', {type: ''})">鎶曚繚鐢宠</el-button></li>
             </ul>
             <el-table
                 v-loading="isWorking.search"
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 87c499e..3188b54 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -9,9 +9,9 @@
                 <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
                     <el-option
                         v-for="item in solutionList"
-                        :key="item.id"
+                        :key="item.baseId"
                         :label="item.name"
-                        :value="item.id">
+                        :value="item.baseId">
                     </el-option>
                 </el-select>
             </el-form-item>
@@ -19,7 +19,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>
@@ -56,20 +56,20 @@
         </el-form>
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
-            <div style="margin-bottom: 30px;" v-if="obj.waitSignNum > 0 && obj.renewalNum > 0">
-                <el-alert type="warning" show-icon :closable="false" style="margin-bottom: 15px;" v-if="obj.renewalNum > 0">
+            <div style="margin-bottom: 15px;" v-if="obj.waitSignNum > 0 || obj.renewalNum > 0">
+                <el-alert type="warning" show-icon :closable="false" :style="obj.waitSignNum > 0 ? 'margin-bottom: 15px;' : ''" v-if="obj.renewalNum > 0">
                     <span style="margin-right: 15px;">缁繚鎻愰啋: 鎮ㄦ湁鍗冲皢鍒版湡淇濋櫓</span>
                     <el-button type="text" @click="$refs.renewalInsurance.open('缁繚鎻愰啋')">鏌ョ湅璇︽儏</el-button>
-                    <el-button type="text" @click="closeRemind(1)">鍏抽棴鎻愰啋</el-button>
+                    <el-button type="text" @click="closeRemind(6)">鍏抽棴鎻愰啋</el-button>
                 </el-alert>
                 <el-alert type="warning" :closable="false" show-icon v-if="obj.waitSignNum > 0">
                     <span style="margin-right: 15px;">鎶曚繚鎻愰啋: 鎮ㄦ湁鎶曚繚鐢宠寰呯缃�</span>
                     <el-button type="text" @click="see">鏌ョ湅璇︽儏</el-button>
-                    <el-button type="text" @click="closeRemind(2)">鍏抽棴鎻愰啋</el-button>
+                    <el-button type="text" @click="closeRemind(1)">鍏抽棴鎻愰啋</el-button>
                 </el-alert>
             </div>
             <ul class="toolbar" v-permissions="['business:dispatchunit:create']">
-                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠')">鎶曚繚鐢宠</el-button></li>
+                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠', { type: '' })">鎶曚繚鐢宠</el-button></li>
             </ul>
             <el-table
                 v-loading="isWorking.search"
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