From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

---
 company/src/views/business/solutions.vue |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/company/src/views/business/solutions.vue b/company/src/views/business/solutions.vue
index c7caba8..fce885a 100644
--- a/company/src/views/business/solutions.vue
+++ b/company/src/views/business/solutions.vue
@@ -38,11 +38,11 @@
                 <el-table-column prop="solutionBaseName" label="涓绘柟妗�" min-width="100px" v-if="userInfo.type === 0"></el-table-column>
                 <el-table-column label="鎶曚繚绫诲瀷" min-width="120px" align="center">
                     <template slot-scope="{row}">
-                        <span v-if="row.type === 0">鐩翠繚</span>
-                        <span v-if="row.type === 1">濮旀墭<div style="color: blue;display:  block" >{{row.shopName||'-'}}</div></span>
+                        <span v-if="row.type === 0">鐩翠繚<div style="color: blue;display:  block" >{{ row.shopName || '-' }}</div></span>
+                        <span v-if="row.type === 1">濮旀墭<div style="color: blue;display:  block" >{{ row.shopName || '-' }}</div></span>
                     </template>
                 </el-table-column>
-                <el-table-column label="鎶曚繚浠锋牸" min-width="100px">
+                <el-table-column label="鏂规璐圭敤" min-width="100px">
                     <template slot-scope="{row}">
                         <span>{{row.price}}鍏�/浜�/</span>
                         <span v-if="row.timeUnit === 0">澶�</span>
@@ -73,9 +73,9 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column prop="signDate" label="绛剧讲鏃堕棿" min-width="100px"></el-table-column>
-                <el-table-column prop="signUserName" label="绛剧讲浜�" min-width="100px"></el-table-column>
-                <el-table-column label="绛剧讲鐘舵��" min-width="100px">
+                <el-table-column prop="signDate" label="绛剧讲鏃堕棿" min-width="100px" v-if="userInfo.type === 1"></el-table-column>
+                <el-table-column prop="signUserName" label="绛剧讲浜�" min-width="100px" v-if="userInfo.type === 1"></el-table-column>
+                <el-table-column label="绛剧讲鐘舵��" min-width="100px" v-if="userInfo.type === 1">
                     <template slot-scope="{row}">
                         <span v-if="row.signStatus === 0">寰呯绔�</span>
                         <span v-else-if="!row.signStatus">寰呯绔�</span>
@@ -90,7 +90,7 @@
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="$refs.OperaSolutionsDescWindow.open('瀛愭柟妗堣鎯�', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">鏌ョ湅璇︽儏</el-button>
+                        <el-button type="text" @click="$refs.OperaSolutionsDescWindow.open(userInfo.type !== 1?'瀛愭柟妗堣鎯�':'鏂规璇︽儏 ', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">鏌ョ湅璇︽儏</el-button>
                         <template v-if="userInfo.type !== 1">
                             <el-button type="text" @click="$refs.operaSolutionsWindow.open('缂栬緫瀛愭柟妗�', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">淇敼</el-button>
                         </template>
@@ -100,6 +100,7 @@
                         <template v-if="userInfo.type === 1 && row.signStatus === 1">
                             <el-button type="text" icon="el-icon-tickets" @click="seeFleSignUrl(row.fileSignUrl)">鏌ョ湅鏂规纭涔�</el-button>
                         </template>
+                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:solutions:delete']">鍒犻櫎</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -114,6 +115,8 @@
         <OperaSolutionsWindow ref="operaSolutionsWindow" @success="handlePageChange"/>
         <!-- 璇︽儏 -->
         <OperaSolutionsDescWindow ref="OperaSolutionsDescWindow" @success="handlePageChange"/>
+        <!-- 棰勮pdf -->
+        <OperaPdfViewerWindow ref="OperaPdfViewerWindow"  />
     </TableLayout>
 </template>
 <script>
@@ -122,13 +125,14 @@
   import Pagination from '@/components/common/Pagination'
   import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
   import OperaSolutionsDescWindow from '@/components/business/OperaSolutionsDescWindow'
+  import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
   import { updateStatus } from '@/api/business/solutions'
   import { getSignLink } from '@/api/business/company'
   import { mapState } from 'vuex'
   export default {
     name: 'Solutions',
     extends: BaseTable,
-    components: { TableLayout, Pagination, OperaSolutionsWindow, OperaSolutionsDescWindow },
+    components: { TableLayout, Pagination, OperaSolutionsWindow, OperaSolutionsDescWindow, OperaPdfViewerWindow },
     data () {
       return {
         // 鎼滅储
@@ -136,7 +140,8 @@
           name: '',
           status: '',
           type: '',
-          signStatus: ''
+          signStatus: '',
+          dataType: 0
         }
       }
     },
@@ -159,7 +164,7 @@
     },
     methods: {
       seeFleSignUrl(url) {
-        window.open(url)
+        this.$refs.OperaPdfViewerWindow.open('鏂规纭涔�', url)
       },
       sign(id) {
         getSignLink(id)

--
Gitblit v1.9.3