From 6caecd26f75979777956dc96e14d6f3b39ce6688 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 15 七月 2022 17:23:42 +0800
Subject: [PATCH] 1.修改bug

---
 src/views/zzmx/chda.vue |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 575d561..8cfed2f 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -22,11 +22,12 @@
             <el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">
               <el-select
                 v-model="form.stocktypecode"
+                filterable
                 :popper-append-to-body="false"
                 style="width: 200px"
                 placeholder="璇烽�夋嫨"
-                @change="val=>stocktypecodeChange(val,'form')"
               >
+                <!--                @change="val=>stocktypecodeChange(val,'form')"-->
                 <el-option
                   v-for="item in stocktypeArr"
                   :key="item.code"
@@ -35,9 +36,10 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="鐗╂枡绫诲瀷" style=" display: flex;">
+            <el-form-item v-if="false" label="鐗╂枡绫诲瀷" style=" display: flex;">
               <el-select
                 v-model="form.materialtypecode"
+                filterable
                 :disabled="form.stocktypecode===''"
                 :popper-append-to-body="false"
                 style="width: 200px"
@@ -54,10 +56,12 @@
             <el-form-item label="鎵�灞炰粨搴�" style=" display: flex;">
               <el-select
                 v-model="form.storehousecode"
+                filterable
                 :popper-append-to-body="false"
                 style="width: 200px"
                 placeholder="璇烽�夋嫨"
               >
+                <!--                @focus="getWareHouseSelect"-->
                 <el-option
                   v-for="item in storehouseArr"
                   :key="item.code"
@@ -77,7 +81,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-office-building" @click="office">鍗曚綅</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">
@@ -128,11 +132,11 @@
             label="瀛樿揣绫诲瀷"
             sortable="custom"
           />
-          <el-table-column
-            prop="materialtypename"
-            label="鐗╂枡绫诲埆"
-            sortable="custom"
-          />
+          <!--          <el-table-column-->
+          <!--            prop="materialtypename"-->
+          <!--            label="鐗╂枡绫诲埆"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
           <el-table-column
             prop="stck_name"
             label="浠撳簱鍚嶇О"
@@ -160,6 +164,7 @@
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
             sortable="custom"
+            width="160"
           />
           <el-table-column
             label="宸ヨ壓璺嚎"
@@ -201,7 +206,7 @@
       :close-on-click-modal="false"
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
-      width="65%"
+      width="800px"
       top="15vh"
       @closed="handleClose"
       @close="handleClose"
@@ -219,6 +224,7 @@
         <el-form-item label="浣跨敤鍗曚綅" prop="uomcode">
           <el-select
             v-model="dialogForm.uomcode"
+            filterable
             :popper-append-to-body="false"
             style="width: 200px"
             placeholder="璇烽�夋嫨"
@@ -234,10 +240,12 @@
         <el-form-item label="鎵�灞炰粨搴�" prop="warehousecode">
           <el-select
             v-model="dialogForm.warehousecode"
+            filterable
             :popper-append-to-body="false"
             style="width: 200px"
             placeholder="璇烽�夋嫨"
           >
+            <!--            @focus="getWareHouseSelect2"-->
             <el-option
               v-for="item in storehouseArr"
               :key="item.code"
@@ -249,11 +257,13 @@
         <el-form-item label="瀛樿揣绫诲瀷" prop="stocktypecode">
           <el-select
             v-model="dialogForm.stocktypecode"
+            filterable
             :popper-append-to-body="false"
             style="width: 200px"
             placeholder="璇烽�夋嫨"
-            @change="val=>stocktypecodeChange(val,'dialogForm')"
           >
+            <!--            @change="val=>stocktypecodeChange(val,'dialogForm')"-->
+
             <el-option
               v-for="item in stocktypeArr"
               :key="item.code"
@@ -262,11 +272,12 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="鐗╂枡绫诲瀷" prop="materialtypecode">
+        <el-form-item v-if="false" label="鐗╂枡绫诲瀷" prop="materialtypecode">
           <el-select
             v-model="dialogForm.materialtypecode"
             :popper-append-to-body="false"
             style="width: 200px"
+            filterable
             :disabled="dialogForm.stocktypecode===''"
             placeholder="璇烽�夋嫨"
           >
@@ -298,7 +309,7 @@
       :close-on-click-modal="false"
       title="鍗曚綅璁剧疆"
       :visible.sync="officeDialogVisible"
-      width="65%"
+      width="800px"
       top="15vh"
       class="officeDialogVisible"
       @close="handleCloseOffice"
@@ -418,7 +429,7 @@
       :close-on-click-modal="false"
       title="鍏宠仈宸ヨ壓璺嚎"
       :visible.sync="dialogVisibleRoute"
-      width="50%"
+      width="800px"
       top="15vh"
       :fullscreen="isFullscreen"
       class="dialogVisibleRoute"
@@ -521,7 +532,7 @@
 
 const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'Zzjg',
+  name: 'CHDA',
   components: {
     Pagination
   },
@@ -557,6 +568,7 @@
       stocktypeArr: [], // 瀛樿揣绫诲瀷鏁扮粍
       materialtypeArr: [], // 鐗╂枡绫诲瀷鏁扮粍
       storehouseArr: [], // 鎵�灞炰粨搴撴暟缁�
+      storehouseArr2: [], // 鎵�灞炰粨搴撴暟缁勫璇濇
       tableData: [],
       dialogVisible: false,
       dialogForm: {
@@ -652,6 +664,10 @@
       const { data: res } = await WareHouseSelect()
       this.storehouseArr = res
     },
+    // async getWareHouseSelect2() {
+    //   const { data: res } = await WareHouseSelect()
+    //   this.storehouseArr2 = res
+    // },
     async getuomSelect() {
       const { data: res } = await UomSelect()
       this.uomArr = res
@@ -788,7 +804,7 @@
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 250
         this.tableHeight = this.mainHeight - 100
-        this.isFullscreen = window.innerHeight < 800
+        // this.isFullscreen = window.innerHeight < 800
         if (window.innerHeight < 800) {
           this.tableHeight = this.tableHeight - 50
         }
@@ -967,7 +983,7 @@
     // 鏂板
     addOffice() {
       let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
-      number = number === 0 ? Math.random() * Math.random() : number
+      number = number === 0 ? (10 + Math.random()) : number
       const data = { code: '', name: '', digdect: '', r_ule: '', isVisible: 1, number: number }
       this.officeTableData.unshift(data)
     },
@@ -1101,9 +1117,9 @@
   color: #606266;
 }
 
-//::v-deep .el-dialog__body {
-//  padding: 20px 100px !important;
-//}
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
 
 .dialogVisibleRoute {
   ::v-deep .el-dialog__body {

--
Gitblit v1.9.3