feat：出入库增加颜色机型

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -146,7 +146,17 @@
             ></el-input>
           </el-form-item>
         </el-col>
-
+        <el-col :span="6">
+          <el-form-item label="颜色">
+            <el-input
+              clearable
+              type="text"
+              placeholder="请输入"
+              v-model="searchForm.colorKey"
+              @keyup.enter.native="doSearch"
+            ></el-input>
+          </el-form-item>
+        </el-col>
         <el-col>
           <div style="float: right">
             <el-button type="primary" @click="doSearch">搜索</el-button>
@@ -254,7 +264,8 @@
           categoryLevelId: '',
           warehouseId: '',
           pageNum: 1,
-          size: 20
+          size: 20,
+          colorKey: ''
         },
         selectionList: [],
         materialType: '',
@@ -435,6 +446,18 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'categoryModel',
             label: '型号',

src/views/warehouseManagement/outgoingManagement/index.vue

@@ -87,7 +87,7 @@
               ></auth-selection>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
+          <el-col :span="6" style="height: 42px;">
             <el-form-item label="所属工厂" prop="factoryId">
               <el-select
                 filterable
@@ -106,7 +106,7 @@
                 ></el-option>
               </el-select> </el-form-item
           ></el-col>
-          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+          <el-col :span="6" style="height: 42px;">
             <el-form-item label="仓库名称" prop="warehouseId">
               <el-select
                 filterable
@@ -124,12 +124,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="颜色" prop="colorKey">
+              <el-input
+                size="small"
+                class="w100"
+                placeholder="请输入"
+                v-model="formData.colorKey"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col
             style="
               display: flex;
               justify-content: flex-end;
               margin-bottom: 10px;
             "
+            :span="6"
           >
             <div>
               <el-button icon="el-icon-refresh-left" size="small" @click="reset"
@@ -339,7 +350,8 @@
           status: '',
           factoryId: '',
           time: [],
-          warehouseId: ''
+          warehouseId: '',
+          colorKey: ''
         },
         total: 0,
         status: [

src/views/warehouseManagement/stockManagement/components/selectType.vue

@@ -210,6 +210,18 @@
             align: 'brandNum',
             showOverflowTooltip: true
           },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'modelType',
             label: '型号',

src/views/warehouseManagement/stockManagement/index.vue

@@ -92,7 +92,7 @@
               ></auth-selection>
             </el-form-item>
           </el-col> -->
-          <el-col :span="6">
+          <el-col :span="6"  style="height: 42px;">
             <el-form-item label="所属工厂" prop="factoryId">
               <el-select
                 filterable
@@ -111,7 +111,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+          <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"  style="height: 42px;">
             <el-form-item label="仓库名称" prop="warehouseId">
               <el-select
                 filterable
@@ -129,12 +129,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="颜色" prop="colorKey">
+              <el-input
+                size="small"
+                class="w100"
+                placeholder="请输入"
+                v-model="formData.colorKey"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col
             style="
               display: flex;
               justify-content: flex-end;
               margin-bottom: 10px;
             "
+            :span="6"
           >
             <div>
               <el-button icon="el-icon-refresh-left" size="small" @click="reset"