From a65112ecf7580c7d5a2ae60d05150cac34e59f5d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 26 九月 2022 16:30:33 +0800
Subject: [PATCH] 1.工艺路线工艺设置下拉选中之后自动回车2.工序定义检验人员选中默认当前登录人员

---
 src/views/sbgl/sbqd.vue |   55 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 5788568..1e3be5b 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -67,7 +67,6 @@
                 style="width: 200px"
                 filterable
                 placeholder="璇烽�夋嫨"
-
                 @change="deviceTypeChange"
               >
                 <!--                @focus="getDeviceTypeSelect"-->
@@ -79,7 +78,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="璁惧缁�" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="璁惧缁�" style=" display: flex;">
               <el-select
                 v-model="form.DeviceGroup"
                 filterable
@@ -97,21 +96,30 @@
               </el-select>
             </el-form-item>
           </div>
-          <div style="display: flex;align-items: start;margin-top: 5px;">
+          <div class="bodySearchReset">
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
             <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
         </el-form>
       </div>
-
-      <div class="elTableDiv">
+      <div
+        class="bodyTopFormExpand"
+        @click="isExpandForm=!isExpandForm"
+      >
+        <i
+          :class="!isExpandForm?'el-icon-arrow-down':'el-icon-arrow-up'"
+          :style="{color:'#42B983'}"
+        /></div>
+      <div class="elTableDiv" style="margin-top: 0;">
         <el-table
+          ref="tableDataRef"
           :data="tableData"
           border
-          :height="tableHeight+'px'"
+          class="tableFixed"
+          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
           highlight-current-row
           :row-class-name="tableRowClassName"
-          :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
+          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
@@ -397,7 +405,7 @@
           sortable="custom"
         >
           <template slot-scope="{row}">
-            <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+            <el-input v-if="row.isVisible===1" v-model="row.code" oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')" placeholder="璇疯緭鍏�" />
             <div v-else> {{ row.code }}</div>
           </template>
         </el-table-column>
@@ -487,7 +495,7 @@
           sortable="custom"
         >
           <template slot-scope="{row}">
-            <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+            <el-input v-if="row.isVisible===1"v-model="row.code" oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')" placeholder="璇疯緭鍏�" />
             <div v-else> {{ row.code }}</div>
           </template>
         </el-table-column>
@@ -580,27 +588,16 @@
   DeviceTypeSelectGroup,
   WorkShopSelect, WorkShopSelectLine
 } from '@/api/sbgl'
-import { handleDatetime } from '@/utils/global'
+import { handleDatetime, validateCode } from '@/utils/global'
 
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   name: 'SBQD',
   components: {
     Pagination
   },
   data() {
-    const validateName = (rule, value, callback) => {
-      if (!value) {
-        return callback(new Error('璇疯緭鍏ョ紪鐮�'))
-      } else {
-        if (SER_HZ.test(value)) {
-          return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
-        } else {
-          callback()
-        }
-      }
-    }
     return {
+      isExpandForm: false,
       mainHeight: 0,
       tableHeight: 0,
       form: {
@@ -642,7 +639,7 @@
       operation: '',
       dialogFormRules: {
         devicecode: [
-          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
         ],
         devicename: [
           { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -870,7 +867,8 @@
     getHeight() {
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 240
+        this.tableHeight = this.mainHeight - 250
+        this.$refs.tableDataRef.doLayout()
         // if (window.innerHeight < 769) {
         //   this.tableHeight = this.tableHeight - 50
         // }
@@ -1202,6 +1200,15 @@
   justify-content: center;
   align-items: center;
 }
+
+.tableFixed{
+  ::v-deep .el-table__fixed-right{
+    height: 100% !important;
+  }
+  ::v-deep .el-table__fixed{
+    height: 100% !important;
+  }
+}
 </style>
 <style>
 

--
Gitblit v1.9.3