From fed911357bda5169f00d0c6f32f8ca011389bbf6 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 07 九月 2022 08:57:04 +0800
Subject: [PATCH] 1.车间看板优化

---
 src/views/jcsz/yhqd.vue |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 89eb180..c0707bc 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,10 +1,14 @@
 <template>
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
-      <div class="bodyTopButtonGroup">
+      <div class="bodyTopButtonGroup" style="justify-content: space-between">
+
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
-        <el-button icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
-        <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+
+        <div style="display: flex">
+          <el-button icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
+          <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+        </div>
       </div>
 
       <div class="bodyTopFormGroup">
@@ -119,13 +123,23 @@
             label="鎵�灞炵粍缁�"
             min-width="110"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.org_name">{{ row.org_name }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="group_name"
             label="鐢熶骇鐝粍"
             min-width="110"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.group_name">{{ row.group_name }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="wagetype"
             label="宸ヨ祫绫诲瀷"
@@ -223,7 +237,6 @@
       </div>
       <!--鍒嗛〉-->
       <pagination
-        v-show="total>0"
         :total="total"
         :page.sync="form.page"
         :limit.sync="form.rows"
@@ -481,7 +494,6 @@
       </el-table>
       <!--鍒嗛〉-->
       <pagination
-        v-show="workingTableDataLength>0"
         :total="workingTableDataLength"
         :page.sync="formWorking.page"
         :limit.sync="formWorking.rows"
@@ -607,7 +619,7 @@
         id: '',
         UserCode: '',
         UserName: '',
-        Password: '',
+        Password: '123456',
         Enable: 'Y',
         StuOrg: '',
         Mobile: '',
@@ -615,7 +627,7 @@
         groupcode: '',
         Operator: '',
         OperType: '',
-        wagetype: ''
+        wagetype: '2'
       },
       usergroupArr: [], // 鐢熶骇鐝粍鏁扮粍
       wagetypeArr: [
@@ -810,6 +822,9 @@
         DeleteUser({ Userid: id }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getUserSearch()
           }
         })
@@ -822,14 +837,14 @@
       this.dialogForm.UserCode = ''
       this.dialogForm.UserCode = ''
       this.dialogForm.UserName = ''
-      this.dialogForm.Password = ''
+      this.dialogForm.Password = '123456'
       this.dialogForm.Enable = 'Y'
       this.$refs.dialogCascader.checkedValue = ''
       this.dialogForm.StuOrg = ''
       this.dialogForm.Mobile = ''
       this.dialogForm.Email = ''
       this.dialogForm.groupcode = ''
-      this.dialogForm.wagetype = ''
+      this.dialogForm.wagetype = '2'
       this.$refs.dialogForm.clearValidate()
     },
     // 瀵硅瘽妗嗗彇娑�
@@ -1222,6 +1237,9 @@
         UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.formWorking.page > 1 && this.workingTableData.length === 1) {
+              this.formWorking.page--
+            }
             this.getUserGroupSearch()
           }
         })
@@ -1342,6 +1360,11 @@
 <!--鍏叡椤甸潰鏍峰紡-->
 <style lang="scss" scoped>
 $main_color: #42b983;
+
+::v-deep .el-button--text{
+  font-size: 14px ;
+  cursor: pointer ;
+}
 .el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
   color: $main_color;
   cursor: pointer;

--
Gitblit v1.9.3