From 1e9fa82cb2fe2c15f46bd1dd73f5c878c74b83b8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 04 八月 2022 15:35:50 +0800
Subject: [PATCH] 1.系统多账号登录问题2.采购订单页面样式修改及数据渲染

---
 src/views/jcsz/yhqd.vue |   61 +++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index bd26d4d..db4f7be 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -71,7 +71,7 @@
       <div style="margin-left: 10px;display: flex">
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
         <el-button type="primary" icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
-        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
       </div>
       <el-divider />
       <div class="elTableDiv">
@@ -94,36 +94,43 @@
             prop="RowNum"
             width="50"
             label="搴忓彿"
+            fixed
           />
           <el-table-column
             prop="usercode"
             label="鐢ㄦ埛缂栫爜"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="username"
             label="鐢ㄦ埛鍚嶇О"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="password"
             label="鐢ㄦ埛瀵嗙爜"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="org_name"
             label="鎵�灞炵粍缁�"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="group_name"
             label="鐢熶骇鐝粍"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="wagetype"
             label="宸ヨ祫绫诲瀷"
             sortable="custom"
+            width="110"
           >
             <template slot-scope="{row}">
               <div v-if="row.wagetype==='1'">璁℃椂鍒�</div>
@@ -133,6 +140,7 @@
           <el-table-column
             prop="mobile"
             label="鑱旂郴鏂瑰紡"
+            min-width="110"
             sortable="custom"
           >
             <template slot-scope="{row}">
@@ -144,6 +152,7 @@
             prop="email"
             label="鐢靛瓙閭"
             sortable="custom"
+            min-width="110"
           >
             <template slot-scope="{row}">
               <div v-if="row.email===''">/</div>
@@ -151,8 +160,9 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop=""
+            prop="enable"
             label="鍦ㄨ亴鐘舵��"
+            width="110"
             sortable="custom"
           >
             <template slot-scope="{row}">
@@ -163,25 +173,28 @@
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
+            width="110"
             sortable="custom"
           />
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
-            width="200"
+            width="160"
             sortable="custom"
           />
           <el-table-column
             prop="is_role"
             label="鍏宠仈瑙掕壊"
+            width="110"
           >
             <template slot-scope="{row}">
               <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
-              <i v-if="row.is_role==='N'" class="el-icon-share" style="color: #E4E7ED" @click="roleClick({row})" />
+              <i v-if="row.is_role==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="roleClick({row})" />
             </template>
           </el-table-column>
           <el-table-column
             label="鎿嶄綔"
+            fixed="right"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
@@ -461,16 +474,20 @@
         </div>
       </span>
     </el-dialog>
+
+    <!--瀵煎叆缁勪欢-->
+    <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/Pagination'
+import ImportPicker from '@/components/ImportPicker'
+
 import {
   AddUpdateUser,
   DeleteUser,
-  RoleTypeAdd,
-  RoleTypeDelete,
   SaveUserAssoctRole,
   UserAssociationRole,
   UserGroupAdd,
@@ -488,7 +505,7 @@
 export default {
   name: 'YYQD',
   components: {
-    Pagination
+    Pagination, ImportPicker
   },
   data() {
     const validateName = (rule, value, callback) => {
@@ -635,23 +652,43 @@
         page: 1,
         prop: 'group_code',
         order: 'desc'
+      },
+
+      title_value: '鏁版嵁瀵煎叆 / 鐢ㄦ埛娓呭崟',
+      code: '2',
+      shows: false
+    }
+  },
+  watch: {
+    shows() {
+      if (!this.shows) {
+        this.getUserSearch()
       }
     }
   },
   created() {
-    this.getUserSearch()
-    this.getUserOrganization()
+    this.handleRequest()
   },
+
   mounted() {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
   },
   methods: {
+    handleRequest() {
+      this.getUserSearch().then(res => {
+        if (res.code === '200') {
+          this.getUserOrganization()
+        }
+      })
+    },
+
     // 鑾峰彇鐢ㄦ埛娓呭崟
     async getUserSearch() {
       const res = await UserSearch(this.form)
       this.tableData = res.data
       this.total = res.count
+      return { code: res.code }
     },
     // 鑾峰彇鎵�灞炵粍缁�
     async getUserOrganization() {
@@ -665,7 +702,11 @@
     },
     // 瀵煎叆鎸夐挳
     upload() {
-
+      this.shows = true
+      this.$refs.importPickerFunc.newDataFunc()
+    },
+    colos() {
+      this.shows = false
     },
     // 鎺掑簭鏀瑰彉鏃�
     sortChange({ column, prop, order }) {

--
Gitblit v1.9.3