From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 company/src/views/business/solutions.vue |  124 +++++++++++++++++++++++++----------------
 1 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/company/src/views/business/solutions.vue b/company/src/views/business/solutions.vue
index a35ea9e..a08f0ca 100644
--- a/company/src/views/business/solutions.vue
+++ b/company/src/views/business/solutions.vue
@@ -5,10 +5,16 @@
             <el-form-item label="淇濋櫓鏂规" prop="name">
                 <el-input v-model="searchForm.name" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="鍚敤鐘舵��" prop="status">
+            <el-form-item label="鍚敤鐘舵��" prop="status" v-if="userInfo.type !== 1">
                 <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @keypress.enter.native="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="type" >
+                <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+                    <el-option label="鐩翠繚" value="0"></el-option>
+                    <el-option label="濮旀墭鎶曚繚" value="1"></el-option>
                 </el-select>
             </el-form-item>
             <section>
@@ -19,19 +25,21 @@
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
             <ul class="toolbar" v-permissions="['business:solutions:create']">
-                <li><el-button type="primary" @click="$refs.operaSolutionsWindow.open('鏂板缓淇濋櫓鏂规')" v-permissions="['business:solutions:create']">娣诲姞鏂规</el-button></li>
+                <template v-if="userInfo.type !== 1">
+                    <li><el-button type="primary" @click="$refs.operaSolutionsWindow.open('鏂板缓淇濋櫓鏂规')" v-permissions="['business:solutions:create']">娣诲姞鏂规</el-button></li>
+                </template>
             </ul>
             <el-table
                 v-loading="isWorking.search"
                 :data="tableData.list"
                 stripe
             >
-                <el-table-column label="搴忓彿" width="80px">
+                <el-table-column label="搴忓彿" width="50px">
                     <template slot-scope="scope">
                         <span>{{scope.$index + 1}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
+                <el-table-column prop="name" label="淇濋櫓鏂规" min-width="150px"></el-table-column>
                 <el-table-column prop="insuranceName" label="淇濋櫓鍏徃" min-width="100px"></el-table-column>
                 <el-table-column label="鎶曚繚骞撮緞" min-width="100px">
                     <template slot-scope="{row}">
@@ -40,7 +48,7 @@
                 </el-table-column>
                 <el-table-column label="鎶曚繚鐢熸晥鏃ユ湡" min-width="100px">
                     <template slot-scope="{row}">
-                        <span v-if="row.validType === 0">鏃ュ悗鐢熸晥</span>
+                        <span v-if="row.validType === 0">{{row.validTypeNum}}鏃ュ悗鐢熸晥</span>
                         <span v-if="row.validType === 1">娆℃湀鐢熸晥</span>
                     </template>
                 </el-table-column>
@@ -53,7 +61,13 @@
                         <span v-if="row.timeUnit === 3">骞�</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="status" label="鍚敤鐘舵��" min-width="100px">
+                <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>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="status" label="鍚敤鐘舵��" min-width="100px" v-if="userInfo.type !== 1">
                     <template slot-scope="{row}">
                         <el-switch
                             @change="changeStatus($event, row)"
@@ -65,15 +79,18 @@
                         </el-switch>
                     </template>
                 </el-table-column>
+                <el-table-column prop="createDate" label="鏂规鏃ユ湡" min-width="100px"></el-table-column>
                 <el-table-column
                     v-if="containPermissions(['business:solutions:update', 'business:solutions:delete'])"
                     label="鎿嶄綔"
-                    min-width="120"
+                    min-width="150"
                     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.operaSolutionsWindow.open('缂栬緫淇濋櫓鏂规', { 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>
                     </template>
                 </el-table-column>
             </el-table>
@@ -90,47 +107,56 @@
         <OperaSolutionsDescWindow ref="OperaSolutionsDescWindow" @success="handlePageChange"/>
     </TableLayout>
 </template>
-
 <script>
-    import BaseTable from '@/components/base/BaseTable'
-    import TableLayout from '@/layouts/TableLayout'
-    import Pagination from '@/components/common/Pagination'
-    import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
-    import OperaSolutionsDescWindow from '@/components/business/OperaSolutionsDescWindow'
-    import { updateStatus } from '@/api/business/solutions'
-    export default {
-        name: 'Solutions',
-        extends: BaseTable,
-        components: { TableLayout, Pagination, OperaSolutionsWindow, OperaSolutionsDescWindow },
-        data () {
-            return {
-                // 鎼滅储
-                searchForm: {
-                    name: '',
-                    status: ''
-                }
-            }
-        },
-        created () {
-            this.config({
-                module: '淇濋櫓鏂规淇℃伅琛�',
-                api: '/business/solutions',
-                'field.id': 'id',
-                'field.main': 'id'
-            })
-            this.search()
-        },
-        methods: {
-            // 淇敼鐘舵��
-            changeStatus(status, row) {
-                updateStatus({ id: row.id, status })
-                    .then(res => {
-                        this.search()
-                    })
-                    .catch(err => {
-                        row.status = row.status === 0 ? 1 : 0
-                    })
-            }
-        }
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
+import OperaSolutionsDescWindow from '@/components/business/OperaSolutionsDescWindow'
+import { updateStatus } from '@/api/business/solutions'
+import { mapState } from 'vuex'
+export default {
+  name: 'Solutions',
+  extends: BaseTable,
+  components: { TableLayout, Pagination, OperaSolutionsWindow, OperaSolutionsDescWindow },
+  data () {
+    return {
+      // 鎼滅储
+      searchForm: {
+        name: '',
+        status: '',
+        type: ''
+      }
     }
+  },
+  computed: {
+    ...mapState(['userInfo'])
+  },
+  created () {
+    this.config({
+      module: '淇濋櫓鏂规淇℃伅琛�',
+      api: '/business/solutions',
+      'field.id': 'id',
+      'field.main': 'id'
+    })
+    if (this.userInfo.type === 1) {
+      this.searchForm.status = '0'
+    } else {
+      this.searchForm.status = ''
+    }
+    this.search()
+  },
+  methods: {
+    // 淇敼鐘舵��
+    changeStatus (status, row) {
+      updateStatus({ id: row.id, status })
+        .then(res => {
+          this.search()
+        })
+        .catch(err => {
+          row.status = row.status === 0 ? 1 : 0
+        })
+    }
+  }
+}
 </script>

--
Gitblit v1.9.3