feat：库存调拨增加颜色筛选

src/views/warehouseManagement/inventoryAllocation/add.vue

@@ -54,7 +54,7 @@
             @submit.native.prevent
           >
             <el-row :gutter="10">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item
                   label-width="65px"
                   label="所属工厂:"
@@ -76,7 +76,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item
                   label-width="65px"
                   label="调出仓库:"
@@ -174,9 +174,9 @@
                   </template>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="15">
-              <el-col :span="9">
+            <!-- </el-row>
+            <el-row :gutter="15"> -->
+              <el-col :span="8">
                 <el-form-item
                   label="列表维度:"
                   label-width="65px"
@@ -196,14 +196,36 @@
                   </template>
                 </el-form-item>
               </el-col>
-              <el-col :span="7">
-                <el-input
-                  placeholder="请输入名称/编码/批次号/型号/规格/客户代号/刻码"
-                  v-model="query.keyWord"
-                  class="input-with-select"
-                  @keyup.enter.native="querySearch"
+              <el-col :span="8">
+                <el-form-item
+                  label="关键字:"
+                  label-width="65px"
+                  prop="keyWord"
                 >
-                </el-input>
+                  <el-input
+                    placeholder="请输入名称/编码/批次号/型号/规格/客户代号/刻码"
+                    v-model="query.keyWord"
+                    class="input-with-select"
+                    @keyup.enter.native="querySearch"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item
+                  label="颜色:"
+                  label-width="65px"
+                  prop="colorKey"
+                >
+                  <el-input
+                    placeholder="请输入颜色"
+                    v-model="query.colorKey"
+                    class="input-with-select"
+                    @keyup.enter.native="querySearch"
+                  >
+                  </el-input>
+                </el-form-item>
+                
               </el-col>
               <el-col :span="8">
                 <div
@@ -238,12 +260,14 @@
             ref="table"
             :columns="columns"
             height="calc(100vh-300px)"
+            :fullZIndex="this.leftTableFullscreen ? 1000 : 999"
             :pageSize="20"
             :datasource="datasource"
             :cache-key="cacheKeyUrl"
             :selection.sync="selection"
             row-key="id"
             :initLoad="false"
+            @fullscreen-change="fullscreenLeftChange"
             @done="onDone"
           >
           </ele-pro-table>
@@ -386,6 +410,8 @@
             cache-key="wms-inventoryAllocation-add-table-right"
             :initLoad="false"
             :need-page="false"
+            @fullscreen-change="fullscreenRightChange"
+            :fullZIndex="rightTableFullscreen ? 1000 : 999"
           >
             <template v-slot:quantity="{ row }">
               <el-input-number 
@@ -481,6 +507,8 @@
         page: 1,
         size: 20,
         total: 0,
+        leftTableFullscreen: false,
+        rightTableFullscreen: false,
       };
     },
     computed: {
@@ -905,6 +933,14 @@
       }
     },
     methods: {
+      fullscreenLeftChange(fullscreen) {
+        console.log('fullscreen------', fullscreen);
+        this.leftTableFullscreen = fullscreen;
+      },
+      fullscreenRightChange(fullscreen) {
+        console.log('fullscreen------', fullscreen);
+        this.rightTableFullscreen = fullscreen;
+      },
       /* 表格数据源 */
       async datasource({ page, limit, where }) {
         // return storageApi.getAllotApplyPage({

vue.config.js

@@ -35,11 +35,11 @@ module.exports = {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
         // target: 'http://192.168.1.105:18086', //开发
-        // target: 'http://192.168.1.251:18086', //开发
+        target: 'http://192.168.1.251:18086', //开发
         // target: 'http://192.168.1.251:18186', //测试
-        // target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.25:18086',
 
-        target: 'http://192.168.1.116:18086',
+        // target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''