From 5ec088f7b2c1281a1874ef6ba4e783a64acb8079 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 十一月 2024 09:15:19 +0800
Subject: [PATCH] 优化

---
 company/src/components/business/OperaSolutionsDescWindow.vue  |   40 +++++
 company/src/views/business/switchCourt.vue                    |    8 +
 company/src/api/business/applyChange.js                       |    8 +
 company/src/components/business/OperaInsuranceApplyWindow.vue |   14 +
 company/src/views/business/applyChange.vue                    |   21 ++
 company/.env.developmentCom                                   |    2 
 company/src/api/business/customerService.js                   |    5 
 company/src/views/business/insuranceApply.vue                 |   13 +
 company/src/views/business/contract.vue                       |   26 +-
 company/src/views/business/userManagement.vue                 |   14 +-
 company/src/api/business/companyPermission.js                 |   10 +
 company/src/components/business/authorizedEnterprise.vue      |   81 +++++++++--
 company/src/api/system/common.js                              |    5 
 company/src/components/common/CommonHeader.vue                |   93 +++++++++++--
 company/src/assets/icons/ic_company@2x.png                    |    0 
 company/src/views/system/role.vue                             |   18 +-
 company/src/components/system/role/Permissions.vue            |    2 
 company/.env.development                                      |    2 
 company/src/layouts/AppLayout.vue                             |    3 
 19 files changed, 291 insertions(+), 74 deletions(-)

diff --git a/company/.env.development b/company/.env.development
index 43c2afe..f368d2b 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -11,4 +11,4 @@
 # VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
 
 # 浠诲悍
-VUE_APP_API = 'http://192.168.0.134:10030/'
+VUE_APP_API = 'http://192.168.0.137:10030/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 821575c..92bdf7f 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -9,6 +9,6 @@
 
 #VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
 
-VUE_APP_API = 'http://192.168.0.134:10031/'
+VUE_APP_API = 'http://192.168.0.137:10031/'
 
 # VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/src/api/business/applyChange.js b/company/src/api/business/applyChange.js
index 53f514b..bf4a495 100644
--- a/company/src/api/business/applyChange.js
+++ b/company/src/api/business/applyChange.js
@@ -57,3 +57,11 @@
 export function update (data) {
     return request.post('/business/applyChange/update', data)
 }
+
+// 瀵煎嚭淇濆崟涓嬫墍鏈夊姞鍑忎繚璇︽儏鍗�
+export function exportApplyJiajianBaoExcel (data) {
+    return request.post('/business/applyChange/exportApplyJiajianBaoExcel', data, {
+        trim: true,
+        download: true
+    })
+}
diff --git a/company/src/api/business/companyPermission.js b/company/src/api/business/companyPermission.js
index 6afbf1a..c73e1fd 100644
--- a/company/src/api/business/companyPermission.js
+++ b/company/src/api/business/companyPermission.js
@@ -4,3 +4,13 @@
 export function create (data) {
     return request.post('/business/companyPermission/create', data)
 }
+
+// 鍒嗛〉鏌ヨ
+export function page (data) {
+    return request.post('/business/companyPermission/page', data)
+}
+
+// 鍒犻櫎
+export function deleteById (id) {
+    return request.get(`/business/companyPermission/delete/${id}`)
+}
diff --git a/company/src/api/business/customerService.js b/company/src/api/business/customerService.js
index 3bacb6c..32675ea 100644
--- a/company/src/api/business/customerService.js
+++ b/company/src/api/business/customerService.js
@@ -22,6 +22,11 @@
   return request.get(`/business/customerService/delete/${id}`)
 }
 
+// 鏍规嵁ID鏌ヨ
+export function findByCompanyId (companyId) {
+  return request.get(`/business/customerService/findByCompanyId?companyId=${companyId}`)
+}
+
 // 鎺堟潈浼佷笟
 export function auth (data) {
   return request.post('/business/customerService/auth', data)
diff --git a/company/src/api/system/common.js b/company/src/api/system/common.js
index 7689187..220281c 100644
--- a/company/src/api/system/common.js
+++ b/company/src/api/system/common.js
@@ -32,6 +32,11 @@
   })
 }
 
+// 鍒囨崲浼佷笟
+export function switchCompany (params) {
+  return request.get('/system/switchCompany', { params })
+}
+
 // 鍝佺墝鍒楄〃鏌ヨ
 export function brand (data) {
   return request.post('/business/brand/list', data)
diff --git a/company/src/assets/icons/ic_company@2x.png b/company/src/assets/icons/ic_company@2x.png
new file mode 100644
index 0000000..c98e42c
--- /dev/null
+++ b/company/src/assets/icons/ic_company@2x.png
Binary files differ
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 3337197..5ea47f1 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -195,8 +195,8 @@
                             <el-button type="primary" style="width: 80px;" @click="search">鏌ヨ</el-button>
                             <el-button @click="resetting" style="width: 80px;">閲嶇疆</el-button>
                             <el-button type="primary" style="width: 80px;" @click="exportExcel" v-if="activeName === '0'">瀵煎嚭鍚嶅崟</el-button>
-                          <el-button type="primary" style="width: 100px;" @click="$refs.OperaApplyChangeMonthWindow.open('鍔犲噺淇濊垂鐢ㄦ湀搴︾粺璁�',model)" v-if="activeName === '1'">璐圭敤缁熻鏌ヨ</el-button>
-
+                            <el-button type="primary" style="width: 100px;" @click="$refs.OperaApplyChangeMonthWindow.open('鍔犲噺淇濊垂鐢ㄦ湀搴︾粺璁�',model)" v-if="activeName === '1'">璐圭敤缁熻鏌ヨ</el-button>
+                            <el-button type="primary" style="width: 120px;" @click="exportRecords" v-if="activeName === '1' && (model.status === 5 || model.status === 27)">瀵煎嚭鍔犲噺淇濊褰�</el-button>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -504,7 +504,7 @@
 import applyReturn from '@/components/enterprise/applyReturn'
 import { getDetail, getSignLink, applyDetailPage,  exportExcel, applyChagneDetailExcel, applyOpt } from '@/api/business/insuranceApply'
 import { findListByDTO } from '@/api/business/dispatchUnit'
-import { fetchList } from '@/api/business/applyChange'
+import { fetchList, exportApplyJiajianBaoExcel } from '@/api/business/applyChange'
 import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
 import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
 import { mapState } from 'vuex'
@@ -604,6 +604,14 @@
       this.getDW()
       this.getGZ()
     },
+    exportRecords() {
+      // let formDate = new FormData()
+      // formDate.append('id', this.dataId)
+      exportApplyJiajianBaoExcel({ id: this.dataId })
+        .then(response => {
+          this.download(response)
+        })
+    },
     result(flag,param){
       console.log(flag,param)
       if(param && param.godetail && param.id){
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index bacd9ca..988a7fe 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -57,6 +57,7 @@
                     <div class="info_list_item_val" ><a v-if="form.fanganFile && form.fanganFile.fileurlFull" style="cursor: pointer;color: #2E68EC" title="鐐瑰嚮鏌ョ湅" @click="openFile(form.fanganFile.fileurlFull)">{{ form.fanganFile.name || '鐐瑰嚮鏌ョ湅' }}</a></div>
                 </div>
             </div>
+            <div style="font-size: 18px; font-weight: bold; margin-bottom: 10px;">鏂规浣跨敤鎯呭喌</div>
             <el-table
                 :data="form.worktypeList"
                 border
@@ -70,11 +71,37 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                    prop="worktypeName"
+                    prop="companyName"
                     align="center"
-                    label="宸ョ鍚嶇О">
+                    label="浼佷笟鍚嶇О">
+                </el-table-column>
+                <el-table-column
+                    align="center"
+                    label="绛剧珷鎯呭喌">
+                    <template slot-scope="{row}">
+                        <span v-if="row.signStatus === 0">寰呯绔�</span>
+                        <span v-if="row.signStatus === 1">宸茬绔�</span>
+                    </template>
                 </el-table-column>
             </el-table>
+<!--            <el-table-->
+<!--                :data="form.worktypeList"-->
+<!--                border-->
+<!--                style="width: 100%; margin-bottom: 20px;">-->
+<!--                <el-table-column-->
+<!--                    label="搴忓彿"-->
+<!--                    align="center"-->
+<!--                    width="80">-->
+<!--                    <template slot-scope="scope">-->
+<!--                        <span>{{scope.$index + 1}}</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                    prop="worktypeName"-->
+<!--                    align="center"-->
+<!--                    label="宸ョ鍚嶇О">-->
+<!--                </el-table-column>-->
+<!--            </el-table>-->
         </div>
         <!-- 淇敼 -->
         <OperaSolutionsWindow ref="operaSolutionsWindow" @success="callback"/>
@@ -89,7 +116,7 @@
 import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
 import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
 import OperaSolutionsBaseDescWindow from '@/components/business/OperaSolutionsBaseDescWindow'
-import { solutionsId } from '@/api/business/solutions'
+import { solutionsId, listForCompany } from '@/api/business/solutions'
 import { mapState } from 'vuex'
 export default {
   name: 'OperaSolutionsDescWindow',
@@ -186,8 +213,15 @@
           this.form[key] = target[key]
         }
         this.getDetails()
+        this.getList()
       })
     },
+    getList() {
+      listForCompany({ solutionId: this.form.id })
+        .then(res => {
+          console.log(res)
+        })
+    },
     openFile (url) {
       setTimeout(() => {
         this.$refs.OperaPdfViewerWindow.open('鏂规纭涔�',url)
diff --git a/company/src/components/business/authorizedEnterprise.vue b/company/src/components/business/authorizedEnterprise.vue
index d75ab9e..3817fde 100644
--- a/company/src/components/business/authorizedEnterprise.vue
+++ b/company/src/components/business/authorizedEnterprise.vue
@@ -12,41 +12,55 @@
             border
             style="width: 100%">
             <el-table-column
-                prop="date"
+                prop="username"
                 label="璐﹀彿">
             </el-table-column>
             <el-table-column
-                prop="name"
+                prop="realname"
                 label="濮撳悕">
             </el-table-column>
             <el-table-column
-                prop="address"
+                prop="mobile"
                 label="鑱旂郴鏂瑰紡">
             </el-table-column>
             <el-table-column
-                prop="address"
+                width="200"
+                prop="companyName"
                 label="鎺堟潈浼佷笟鍚嶇О">
             </el-table-column>
             <el-table-column
-                prop="address"
+                prop="auditName"
                 label="鎺堟潈浜�">
             </el-table-column>
             <el-table-column
-                prop="address"
+                width="170"
+                prop="createDate"
                 label="鎺堟潈鏃堕棿">
             </el-table-column>
             <el-table-column
-                prop="address"
                 label="鎿嶄綔">
+                <template slot-scope="{row}">
+                    <el-button type="text" @click="cancel(row.id)">鍙栨秷鎺堟潈</el-button>
+                </template>
             </el-table-column>
         </el-table>
+        <div style="width: 100%; height: 15px;"></div>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="form.page"
+            :page-sizes="[10, 30, 50, 100]"
+            :page-size="form.size"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total">
+        </el-pagination>
     </GlobalWindow>
 </template>
 
 <script>
   import BaseOpera from '@/components/base/BaseOpera'
   import GlobalWindow from '@/components/common/GlobalWindow'
-  import { page } from '@/api/business/companyUserApply'
+  import { page, deleteById } from '@/api/business/companyPermission'
   export default {
     name: 'authorizedEnterprise',
     extends: BaseOpera,
@@ -54,22 +68,55 @@
     data () {
       return {
         model: {},
-        tableData: []
+        tableData: [],
+        form: {
+          page: 1,
+          capacity: 10,
+          model: {
+            userId: null
+          }
+        },
+        total: 0
       }
     },
     methods: {
-      open (title, target) {
+      cancel(id) {
+        this.$confirm('纭畾鍙栨秷鎺堟潈璇ヤ紒涓氬悧?', '鎻愮ず', {
+          confirmButtonText: '纭畾',
+          cancelButtonText: '鍙栨秷',
+          type: 'warning'
+        }).then(() => {
+          deleteById(id)
+            .then(res => {
+              this.getList()
+            })
+        }).catch(() => {
+
+        });
+      },
+      handleSizeChange(e) {
+        this.form.capacity = e
+        this.getList()
+      },
+      handleCurrentChange(e) {
+        this.form.page = e
+        this.getList()
+      },
+      open (title, id) {
         this.title = title
         this.visible = true
+        this.form.page = 1
+        this.form.capacity = 10
+        this.form.model.userId = id
+        this.getList()
       },
       getList() {
-        page({
-          capacity: 10,
-          page: 1,
-          model: {
-            userId: ''
-          }
-        })
+        page(this.form)
+          .then(res => {
+            console.log(res)
+            this.total = res.total
+            this.tableData = res.records
+          })
       }
     }
   }
diff --git a/company/src/components/common/CommonHeader.vue b/company/src/components/common/CommonHeader.vue
index a5705fc..9945708 100644
--- a/company/src/components/common/CommonHeader.vue
+++ b/company/src/components/common/CommonHeader.vue
@@ -6,16 +6,40 @@
         <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
       </div>
       <div class="user">
-        <el-dropdown v-if="isLogined" trigger="click">
+        <!--    浼佷笟    -->
+        <div style="display: flex; align-items: center;" v-if="userInfo.type === 1">
+          <div class="user_kf" v-if="info">
+            鏈嶅姟浜哄憳锛歿{info.name}} {{info.mobile}}
+          </div>
+          <el-dropdown v-if="isLogined" trigger="click">
           <span class="el-dropdown-link">
-            <!-- <img v-if="userInfo != null" :src="userInfo.avatar == null ? `${require('@/assets/avatar/man.png')}` : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i> -->
-            <img v-if="userInfo != null" style="width: 30px !important;" src="@/assets/avatar/man.png" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i>
+            <img v-if="userInfo != null" class="img1" style="width: 20px !important;" src="@/assets/icons/ic_company@2x.png" alt="">{{userInfo.showCompany.name}}<i class="el-icon-arrow-down el-icon--right"></i>
           </span>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="changePwd">淇敼瀵嗙爜</el-dropdown-item>
-            <el-dropdown-item @click.native="logout">閫�鍑虹櫥褰�</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item @click.native="changeCompany(item)" v-for="(item, index) in userInfo.companyPermissionList" :key="index">{{item.companyName}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <el-dropdown v-if="isLogined" trigger="click" style="top: -7px;">
+          <span class="el-dropdown-link">
+            <img v-if="userInfo != null" class="img2" style="width: 30px !important;" src="@/assets/avatar/man.png" alt="">{{userInfo.realname}}<i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item @click.native="changePwd">淇敼瀵嗙爜</el-dropdown-item>
+              <el-dropdown-item @click.native="logout">閫�鍑虹櫥褰�</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+        <div v-else>
+          <el-dropdown v-if="isLogined" trigger="click" style="top: -7px;">
+          <span class="el-dropdown-link">
+            <img v-if="userInfo != null" class="img2" style="width: 30px !important;" src="@/assets/avatar/man.png" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item @click.native="changePwd">淇敼瀵嗙爜</el-dropdown-item>
+              <el-dropdown-item @click.native="logout">閫�鍑虹櫥褰�</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
       </div>
     </div>
     <!-- 淇敼瀵嗙爜 -->
@@ -43,7 +67,8 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import GlobalAlertWindow from './GlobalAlertWindow'
-import { logout, updatePwd } from '@/api/system/common'
+import { logout, updatePwd, switchCompany } from '@/api/system/common'
+import { findByCompanyId } from '@/api/business/customerService'
 export default {
   name: 'CommonHeader',
   components: { GlobalAlertWindow },
@@ -65,6 +90,7 @@
         changePwd: false
       },
       username: 'bob', // 鐢ㄦ埛鍚�
+      info: null,
       // 淇敼瀵嗙爜寮规
       changePwdData: {
         form: {
@@ -88,6 +114,7 @@
   },
   created () {
     document.title=this.systemTitle
+    this.setFindByCompanyId(this.userInfo.companyId)
   },
   computed: {
     ...mapState(['menuData', 'userInfo']),
@@ -114,6 +141,24 @@
   },
   methods: {
     ...mapMutations(['setUserInfo', 'switchCollapseMenu']),
+    // 鍒囨崲浼佷笟
+    changeCompany(row) {
+      if (row.companyId === this.userInfo.companyId) {
+        this.$message.warning('涓嶈兘鍒囨崲褰撳墠浼佷笟')
+        return
+      }
+      switchCompany({ companyId: row.companyId })
+        .then(res => {
+          location.reload();
+        })
+    },
+    setFindByCompanyId(companyId) {
+      findByCompanyId(companyId)
+        .then(res => {
+          console.log(res)
+          this.info = res
+        })
+    },
     // 淇敼瀵嗙爜
     changePwd () {
       this.visible.changePwd = true
@@ -205,13 +250,31 @@
     padding-right: 25px;
     background: url('../../assets/images/top_ic_bolang@2x.png') no-repeat;
     flex-shrink: 0;
-    text-align: right;
-    .el-dropdown {
-      top: 10px;
-      color: #fff;
+    /*text-align: right;*/
+    display: flex;
+    align-items: center;
+    justify-content: end;
+    .user_kf {
+      color: #ffffff;
+      font-size: 14px;
+      margin-right: 30px;
     }
-    img {
-      width: 32px;
+    .el-dropdown {
+      top: -2px;
+      color: #fff;
+      margin-right: 30px;
+      &:last-child {
+        margin: 0 !important;
+      }
+    }
+    .img1 {
+      width: 20px;
+      position: relative;
+      top: 5px;
+      margin-right: 10px;
+    }
+    .img2 {
+      width: 20px;
       position: relative;
       top: 10px;
       margin-right: 10px;
diff --git a/company/src/components/system/role/Permissions.vue b/company/src/components/system/role/Permissions.vue
index 5ec691e..d7bed0a 100644
--- a/company/src/components/system/role/Permissions.vue
+++ b/company/src/components/system/role/Permissions.vue
@@ -75,6 +75,8 @@
           let obj = JSON.parse(JSON.stringify(this.form))
           if (obj.customData.length > 0) {
             obj.customData = obj.customData.flat().join(',')
+          } else {
+            obj.customData = ''
           }
           createRoleDataPermission(obj)
             .then(() => {
diff --git a/company/src/layouts/AppLayout.vue b/company/src/layouts/AppLayout.vue
index 96b84b5..ab907f4 100644
--- a/company/src/layouts/AppLayout.vue
+++ b/company/src/layouts/AppLayout.vue
@@ -47,7 +47,8 @@
       // 浼佷笟绔敤鎴疯缃按鍗�
       if (this.userInfo.type === 1 || this.userInfo.type === 2) {
         if(this.userInfo.company && this.userInfo.company.name){
-          Watermark.set(this.userInfo.company.name, this.$refs.containerS);
+          Watermark.set(this.userInfo.showCompany.name, this.$refs.containerS);
+          // Watermark.set(this.userInfo.company.name, this.$refs.containerS);
         }
       }
     },
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index 1e2c6e7..07a1949 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -14,6 +14,12 @@
           <el-option label="宸插叧闂�" value="6"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="鎶曚繚绫诲瀷" prop="solutionType">
+        <el-select v-model="searchForm.solutionType" placeholder="璇烽�夋嫨" @change="search">
+          <el-option label="鐩翠繚鎶曚繚" :value="0"></el-option>
+          <el-option label="濮旀墭鎶曚繚" :value="1"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="鎶曚繚浼佷笟" prop="companyId">
         <el-select v-model="searchForm.companyId" filterable placeholder="璇烽�夋嫨" @change="search">
           <el-option
@@ -85,7 +91,7 @@
             fixed="right"
         >
           <template slot-scope="{row}">
-            <el-button type="text" @click="$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)">鏌ョ湅璇︽儏</el-button>
+            <el-button type="text" @click="openEdit(row)">鏌ョ湅璇︽儏</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -98,6 +104,7 @@
     </template>
     <!-- 璇︽儏 -->
     <OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handlePageChange"/>
+    <OperaUnionChangeDetailWindow ref="OperaUnionChangeDetailWindow" @success="handlePageChange"/>
   </TableLayout>
 </template>
 
@@ -105,13 +112,14 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
+import OperaUnionChangeDetailWindow from '@/components/business/OperaUnionChangeDetailWindow'
 import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
 import {all as solutionAll, all} from '@/api/business/solutions'
 import {pageAll as companyAll} from "@/api/business/company";
 export default {
   name: 'add_subtract',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaApplyChangeDetailWindow },
+  components: { TableLayout, Pagination, OperaApplyChangeDetailWindow, OperaUnionChangeDetailWindow },
   data () {
     return {
       // 鎼滅储
@@ -122,7 +130,7 @@
         createDateE: '',
         createDateS: '',
         companyId: '',
-        solutionType: 0,
+        solutionType: '',
         baseSolutionsId: '',
         time: []
       },
@@ -141,6 +149,13 @@
     this.loadSelectList()
   },
   methods: {
+    openEdit(row) {
+      if (row.solutionType === 0) {
+        this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)
+      } else if (row.solutionType === 1) {
+        this.$refs.OperaUnionChangeDetailWindow.open('鍔犲噺淇濊鎯�', row)
+      }
+    },
     loadSelectList() {
       solutionAll({dataType:2,type:0}).then(res => {
         this.solutionList = res
diff --git a/company/src/views/business/contract.vue b/company/src/views/business/contract.vue
index a424fe5..66fe8e0 100644
--- a/company/src/views/business/contract.vue
+++ b/company/src/views/business/contract.vue
@@ -12,12 +12,12 @@
                     <el-option label="鍟嗘埛-浼佷笟" :value="2"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="鐘舵��" prop="status">
-                <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
-                    <el-option label="寰呯绔�" :value="0"></el-option>
-                    <el-option label="鎴戞柟宸茬绔�" :value="1"></el-option>
-                    <el-option label="浼佷笟鍟嗘埛宸茬绔�" :value="2"></el-option>
-                    <el-option label="瀹屾垚" :value="3"></el-option>
+            <el-form-item label="鐘舵��" prop="queryStatus">
+                <el-select v-model="searchForm.queryStatus" placeholder="璇烽�夋嫨" @change="search">
+                    <el-option label="寰呭钩鍙扮缃�" :value="0"></el-option>
+                    <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="4"></el-option>
                     <el-option label="宸插叧闂�" :value="5"></el-option>
                 </el-select>
@@ -62,12 +62,12 @@
                 </el-table-column>
                 <el-table-column label="鐘舵��" min-width="100px">
                     <template slot-scope="{row}">
-                        <template v-if="row.status === 0">寰呯绔�</template>
-                        <template v-else-if="row.status === 1">鎴戞柟宸茬绔�</template>
-                        <template v-else-if="row.status === 2">浼佷笟鍟嗘埛宸茬绔�</template>
-                        <template v-else-if="row.status === 3">瀹屾垚</template>
-                        <template v-else-if="row.status === 4">宸插彇娑�</template>
-                        <template v-else-if="row.status === 5">宸插叧闂�</template>
+                        <template v-if="row.queryStatus === 0">寰呭钩鍙扮缃�</template>
+                        <template v-else-if="row.queryStatus === 1">寰呭晢鎴风缃�</template>
+                        <template v-else-if="row.queryStatus === 2">寰呬紒涓氱缃�</template>
+                        <template v-else-if="row.queryStatus === 3">宸插畬鎴�</template>
+                        <template v-else-if="row.queryStatus === 4">宸插彇娑�</template>
+                        <template v-else-if="row.queryStatus === 5">宸插叧闂�</template>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -133,7 +133,7 @@
         searchForm: {
           name: '',
           signType: '',
-          status: ''
+          queryStatus: ''
         }
       }
     },
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 9f674f5..8fd10dc 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -3,7 +3,7 @@
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
             <el-form-item label="淇濆崟鐘舵��" prop="statusCollect">
-                <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+                <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>
@@ -12,6 +12,12 @@
                   <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="solutionType">
+                <el-select v-model="searchForm.solutionType" placeholder="璇烽�夋嫨" @change="search">
+                    <el-option label="鐩翠繚鎶曚繚" :value="0"></el-option>
+                    <el-option label="濮旀墭鎶曚繚" :value="1"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="鎶曚繚浼佷笟" prop="companyId">
@@ -52,6 +58,9 @@
         </el-form>
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
+            <ul class="toolbar">
+                <li><el-button type="primary">鏂板</el-button></li>
+            </ul>
               <el-table
                   v-loading="isWorking.search"
                   :data="tableData.list"
@@ -149,7 +158,7 @@
                 createTimeE: '',
                 time: [],
                 baseSolutionId: '',
-                 solutionType: 0,
+                 solutionType: '',
                 companyId: '',
                 statusCollect: ''
             },
diff --git a/company/src/views/business/switchCourt.vue b/company/src/views/business/switchCourt.vue
index c329e25..94ce2e1 100644
--- a/company/src/views/business/switchCourt.vue
+++ b/company/src/views/business/switchCourt.vue
@@ -14,6 +14,12 @@
           <el-option label="宸插叧闂�" value="6"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="鎶曚繚绫诲瀷" prop="solutionType">
+        <el-select v-model="searchForm.solutionType" placeholder="璇烽�夋嫨" @change="search">
+          <el-option label="鐩翠繚鎶曚繚" :value="0"></el-option>
+          <el-option label="濮旀墭鎶曚繚" :value="1"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="鎶曚繚浼佷笟" prop="companyId">
         <el-select v-model="searchForm.companyId" filterable placeholder="璇烽�夋嫨" @change="search">
           <el-option
@@ -122,7 +128,7 @@
         type: '1',
         solutionsId: '',
         createDateE: '',
-        solutionType: 0,
+        solutionType: '',
         createDateS: '',
         baseSolutionsId: '',
         companyId: '',
diff --git a/company/src/views/business/userManagement.vue b/company/src/views/business/userManagement.vue
index a33803b..f0d98fb 100644
--- a/company/src/views/business/userManagement.vue
+++ b/company/src/views/business/userManagement.vue
@@ -36,20 +36,19 @@
                 <el-table-column prop="username" label="璐﹀彿" min-width="120px"></el-table-column>
                 <el-table-column prop="realname" label="濮撳悕" min-width="100px"></el-table-column>
                 <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="100px"></el-table-column>
-                <el-table-column prop="companyDepartmentPathName" label="褰掑睘鍏徃" min-width="100px"></el-table-column>
+                <el-table-column prop="companyName" label="褰掑睘鍏徃" min-width="100px"></el-table-column>
                 <el-table-column label="鎺堟潈浼佷笟" min-width="100px">
                     <template slot-scope="{row}">
                         <span>{{row.authNum}}瀹�</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
+                <el-table-column label="鏄惁瓒呯" min-width="100px">
                     <template slot-scope="{row}">
-                        <ul>
-                            <li v-for="role in row.roles" :key="role.id">{{role.name}}</li>
-                        </ul>
+                        <span v-if="row.isAdmin === '1'">鏄�</span>
+                        <span v-if="row.isAdmin === '0'">鍚�</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="鍚敤鐘舵��" min-width="100px">
+                <el-table-column label="鐘舵��" min-width="100px">
                     <template slot-scope="{row}">
                         <el-switch
                             v-if="!row.fixed"
@@ -99,7 +98,8 @@
           username: '',
           realname: '',
           mobile: '',
-          companyName: ''
+          companyName: '',
+          type: 1
         }
       }
     },
diff --git a/company/src/views/system/role.vue b/company/src/views/system/role.vue
index fcaf19b..667cc71 100644
--- a/company/src/views/system/role.vue
+++ b/company/src/views/system/role.vue
@@ -47,7 +47,7 @@
         >
           <template slot-scope="{row}">
             <el-button type="text" @click="$refs.operaRoleWindow.open('缂栬緫瑙掕壊', row)" icon="el-icon-edit" v-permissions="['system:role:update']">缂栬緫</el-button>
-            <el-button type="text" @click="openRole(row.systemDataPermission)">鏁版嵁鏉冮檺</el-button>
+            <el-button type="text" @click="openRole(row.systemDataPermission, row.id)">鏁版嵁鏉冮檺</el-button>
             <el-button type="text" @click="$refs.permissionConfigWindow.open(row)" v-permissions="['system:role:createRolePermission']">閰嶇疆鏉冮檺</el-button>
             <el-button type="text" @click="$refs.menuConfigWindow.open(row)" icon="el-icon-menu" v-permissions="['system:role:createRoleMenu']">鎺堟潈鑿滃崟</el-button>
             <el-button v-if="!row.fixed" type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['system:role:delete']">鍒犻櫎</el-button>
@@ -105,12 +105,16 @@
     this.search()
   },
   methods: {
-    openRole(row) {
-      let customData = []
-      row.customData.split(',').forEach(item => {
-        customData.push([item])
-      })
-      this.$refs.permissions.open('鏁版嵁鏉冮檺', { ...row, customData })
+    openRole(row, id) {
+      if (row) {
+        let customData = []
+        row.customData.split(',').forEach(item => {
+          customData.push([item])
+        })
+        this.$refs.permissions.open('鏁版嵁鏉冮檺', { ...row, customData })
+      } else {
+        this.$refs.permissions.open('鏁版嵁鏉冮檺', { roleId: id, customData: [] })
+      }
     }
   }
 }

--
Gitblit v1.9.3