From 78a173f85f8a4666d83cf8d900f04dd9f8e3e127 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:12 +0800
Subject: [PATCH] 提交一把订单

---
 company/src/views/business/companyUserApply.vue |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/company/src/views/business/companyUserApply.vue b/company/src/views/business/companyUserApply.vue
index a1443b8..4a4e0cd 100644
--- a/company/src/views/business/companyUserApply.vue
+++ b/company/src/views/business/companyUserApply.vue
@@ -16,7 +16,7 @@
         </el-form>
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
-            <ul class="toolbar" v-permissions="['business:companyuserapply:create']">
+            <ul class="toolbar" v-permissions="['business:companyuserapply:create']" v-if="userInfo.type === 1">
                 <li><el-button type="primary" @click="$refs.operaCompanyUserApplyWindow.open('鏂板缓鐢宠')" icon="el-icon-plus" v-permissions="['business:companyuserapply:create']">鏂板缓</el-button></li>
             </ul>
             <el-table
@@ -35,9 +35,9 @@
                 <el-table-column prop="createDate" label="鐢宠鏃堕棿"></el-table-column>
                 <el-table-column label="鐢宠鐘舵��">
                     <template slot-scope="{row}">
-                        <span v-if="row.status === 0">寰呭鏍�</span>
-                        <span v-if="row.status === 1">瀹℃牳閫氳繃</span>
-                        <span v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
+                        <span style="color: #216EEE;" v-if="row.status === 0">寰呭鏍�</span>
+                        <span style="color: #00BA92;" v-if="row.status === 1">瀹℃牳閫氳繃</span>
+                        <span style="color: red;" v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -46,8 +46,9 @@
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="$refs.operaCompanyUserApplyWindow.open('鐢宠璁板綍璇︽儏', row)" icon="el-icon-view">鏌ョ湅</el-button>
-                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:companyuserapply:delete']">鍒犻櫎</el-button>
+                        <el-button type="text" @click="$refs.operaCompanyUserApplyDescWindow.open('鐢宠璁板綍璇︽儏', row.id)" icon="el-icon-view">鏌ョ湅</el-button>
+                        <el-button type="text" v-if="userInfo.type === 0 && row.status === 0" @click="$refs.operaCompanyUserApplyCarefulWindow.open('闆嗗洟鐢宠璁板綍瀹℃牳', row.id)">瀹℃牳</el-button>
+                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-if="userInfo.type === 1 && row.status === 0" v-permissions="['business:companyuserapply:delete']">鍒犻櫎</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -60,6 +61,10 @@
         </template>
         <!-- 鏂板缓/淇敼 -->
         <OperaCompanyUserApplyWindow ref="operaCompanyUserApplyWindow" @success="handlePageChange"/>
+        <!--    鏌ョ湅    -->
+        <operaCompanyUserApplyDescWindow ref="operaCompanyUserApplyDescWindow" />
+        <!--    瀹℃牳    -->
+        <OperaCompanyUserApplyCarefulWindow ref="operaCompanyUserApplyCarefulWindow" @success="handlePageChange"/>
     </TableLayout>
 </template>
 
@@ -67,11 +72,17 @@
   import BaseTable from '@/components/base/BaseTable'
   import TableLayout from '@/layouts/TableLayout'
   import Pagination from '@/components/common/Pagination'
+  import OperaCompanyUserApplyCarefulWindow from '@/components/business/OperaCompanyUserApplyCarefulWindow'
   import OperaCompanyUserApplyWindow from '@/components/business/OperaCompanyUserApplyWindow'
+  import operaCompanyUserApplyDescWindow from '@/components/business/operaCompanyUserApplyDescWindow'
+  import { mapState } from 'vuex'
   export default {
     name: 'CompanyUserApply',
     extends: BaseTable,
-    components: { TableLayout, Pagination, OperaCompanyUserApplyWindow },
+    components: { TableLayout, Pagination, OperaCompanyUserApplyWindow, operaCompanyUserApplyDescWindow, OperaCompanyUserApplyCarefulWindow },
+    computed: {
+      ...mapState(['userInfo'])
+    },
     data () {
       return {
         // 鎼滅储

--
Gitblit v1.9.3