From ef9633e0d1689fd8869170f3aa0af6c90c2e5e7f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 07 九月 2022 16:18:24 +0800
Subject: [PATCH] 1.优化项目2.搜索栏多行的变为一行可展开

---
 src/views/zzmx/chda.vue |   98 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 296eba2..a05d39d 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -2,24 +2,27 @@
   <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 type="primary" icon="el-icon-office-building" @click="office">鍗曚綅</el-button>-->
-        <el-button
-          icon="el-icon-refresh-right"
-          @click="syncSeaveSearchUnit"
-        >鍚屾璁¢噺鍗曚綅
-        </el-button>
-        <el-button
-          icon="el-icon-refresh-right"
-          @click="syncInventoryFileSelect"
-        >鍚屾瀛樿揣妗f
-        </el-button>
-        <el-button
-          icon="el-icon-refresh-right"
-          @click="syncStockTypeSelect"
-        >鍚屾瀛樿揣绫诲瀷
-        </el-button>
+        <div style="display: flex">
+          <el-button
+            icon="el-icon-refresh-right"
+            @click="syncSeaveSearchUnit"
+          >鍚屾璁¢噺鍗曚綅
+          </el-button>
+          <el-button
+            icon="el-icon-refresh-right"
+            @click="syncInventoryFileSelect"
+          >鍚屾瀛樿揣妗f
+          </el-button>
+          <el-button
+            icon="el-icon-refresh-right"
+            @click="syncStockTypeSelect"
+          >鍚屾瀛樿揣绫诲瀷
+          </el-button>
+        </div>
         <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
       </div>
 
@@ -139,7 +142,12 @@
             label="鐗╂枡瑙勬牸"
             width="110"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.partspec">{{ row.partspec }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="uom_name"
             label="鍗曚綅"
@@ -162,19 +170,34 @@
             label="浠撳簱鍚嶇О"
             sortable="custom"
             min-width="110"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.stck_name">{{ row.stck_name }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="maxqty"
             label="搴撳瓨涓婇檺"
             width="110"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.maxqty">{{ row.maxqty }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="minqty"
             label="搴撳瓨涓嬮檺"
             width="110"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.minqty">{{ row.minqty }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
@@ -219,12 +242,12 @@
       </div>
       <!--鍒嗛〉-->
       <pagination
-        v-show="total>0"
+
         :total="total"
         :page.sync="form.page"
         :limit.sync="form.rows"
         align="right"
-        layout="prev, pager, next,sizes"
+        layout="total,prev, pager, next,sizes"
         popper-class="select_bottom"
         @pagination="getInventoryFileSelect"
       />
@@ -442,12 +465,11 @@
       </el-table>
       <!--鍒嗛〉-->
       <pagination
-        v-show="officeTableDataLength>0"
         :total="officeTableDataLength"
         :page.sync="officeForm.page"
         :limit.sync="officeForm.rows"
         align="right"
-        layout="prev, pager, next,sizes"
+        layout="total,prev, pager, next,sizes"
         popper-class="select_bottom"
         @pagination="getUomSearch"
       />
@@ -508,8 +530,9 @@
         <el-select
           v-model="defaultroute_code"
           filterable
-          style="width: 200px"
+          style="width: 200px;"
           placeholder="璇烽�夋嫨"
+          class="defaultroute_code"
         >
           <el-option
             v-for="item in defaultroute_codeArr"
@@ -585,25 +608,14 @@
 } from '@/api/zzmx'
 import $ from 'jquery'
 import { SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'
+import { validateCode } from '@/utils/global'
 
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   name: 'CHDA',
   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 {
       isIpad: false,
       mainHeight: 0,
@@ -645,7 +657,7 @@
       operation: '',
       dialogFormRules: {
         materialcode: [
-          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
         ],
         materialname: [
           { required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉�', trigger: ['blur', 'change'] }
@@ -884,6 +896,9 @@
         DeleteInventoryFile({ materialcode: row.partcode }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getInventoryFileSelect()
           }
         })
@@ -1229,6 +1244,13 @@
     }
   }
 }
+
+.defaultroute_code ::v-deep .el-input__suffix-inner{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: -3px;
+}
 </style>
 
 <!--鍏叡椤甸潰鏍峰紡-->

--
Gitblit v1.9.3