add

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -2,33 +2,86 @@
   <el-dialog :visible.sync="visible" :title="`${title}信息`" width="80vw">
     <el-form :model="searchForm" label-width="100px">
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="编号">
+        <el-col :span="6">
+          <el-form-item label="仓库：" prop="warehouseId">
+            <el-select
+              style="width: 100%"
+              clearable
+              v-model="searchForm.warehouseId"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="货位：" prop="cargoSpaceCode">
+            <el-input
+              v-model.trim="searchForm.cargoSpaceCode"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="批次号：" prop="batchNum">
+            <el-input
+              v-model.trim="searchForm.batchNum"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="包装编码：" prop="num">
+            <el-input
+              v-model.trim="searchForm.num"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="列表维度：" prop="dimension">
+            <template>
+              <el-select
+                style="width: 100%"
+                clearable
+                @change="$emit('handledime', $event)"
+                v-model="dimension"
+                placeholder="请选择"
+              >
+                <el-option label="物品维度" value="1"> </el-option>
+                <el-option label="批次维度" value="2"> </el-option>
+                <el-option label="库存维度" value="3"> </el-option>
+              </el-select>
+            </template>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物品编码">
             <el-input
               type="text"
-              size="small"
               placeholder="搜索物品编码"
               v-model="searchForm.code"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="名称">
+        <el-col :span="6">
+          <el-form-item label="物品名称">
             <el-input
               type="text"
-              size="small"
               placeholder="搜索物品名称"
               v-model="searchForm.name"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="padding-left: 40px">
-          <el-button type="primary" size="small" @click="doSearch"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh-left" size="small" @click="reset"
-            >重置</el-button
-          >
+        <el-col :span="6" style="padding-left: 40px">
+          <el-button type="primary" @click="doSearch">搜索</el-button>
+          <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
         </el-col>
       </el-row>
     </el-form>
@@ -114,6 +167,7 @@
   import { tableHeader } from '../common';
   import outin from '@/api/warehouseManagement/outin';
   import { login } from '@/api/login';
+  import { getWarehouseList } from '@/api/classifyManage/itemInformation';
   export default {
     components: { AssetTree },
     props: {
@@ -147,10 +201,19 @@
           name: ''
         },
         selectionList: [],
-        materialType: ''
+        materialType: '',
+        warehouseList: []
       };
     },
+    created() {
+      this.getArguInfo();
+    },
     methods: {
+      //搜索数据源
+      async getArguInfo() {
+        const { data } = await getWarehouseList();
+        this.warehouseList = data;
+      },
       selectable(row, index) {
         if (row.canUsedCount != 0) {
           return true;

src/views/warehouseManagement/outgoingManagement/components/detailSelect.vue

@@ -2,12 +2,45 @@
   <el-dialog :visible.sync="visible" title="选择出库明细" width="90vw">
     <el-form :model="formData" label-width="120px">
       <el-row>
+        <el-col :span="6">
+          <el-form-item label="仓库：" prop="warehouseId">
+            <el-select
+              style="width: 100%"
+              clearable
+              v-model="formData.warehouseId"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物品编码" prop="cargoSpaceCode">
+            <el-input
+              v-model.trim="formData.cargoSpaceCode"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物品名称" prop="cargoSpaceCode">
+            <el-input
+              v-model.trim="formData.cargoSpaceCode"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="货位" prop="cargoSpaceCode">
             <el-input
               v-model.trim="formData.cargoSpaceCode"
               placeholder="请输入"
-              size="small"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -16,7 +49,6 @@
             <el-input
               v-model.trim="formData.onlyCode"
               placeholder="请输入"
-              size="small"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -25,7 +57,6 @@
             <el-input
               v-model.trim="formData.batchNum"
               placeholder="请输入"
-              size="small"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -34,13 +65,13 @@
             <el-input
               v-model.trim="formData.num"
               placeholder="请输入"
-              size="small"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="时间类型">
             <el-select
+              style="width: 100%"
               v-model="formData.dateType"
               placeholder=""
               @change="$forceUpdate()"
@@ -65,7 +96,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="text-align: right">
+        <el-col style="text-align: right">
           <el-button @click="reset" icon="el-icon-refresh-left" size="small"
             >重置</el-button
           >
@@ -219,6 +250,7 @@
 <script>
   // import { getWarehouseActualDetail } from '@/api/stockManagement/stockLedger.js'
   import outin from '@/api/warehouseManagement/outin';
+  import { getWarehouseList } from '@/api/classifyManage/itemInformation';
 
   export default {
     props: {
@@ -252,7 +284,8 @@
         infoData: {},
         memo: [],
         memo1: [],
-        total: 0
+        total: 0,
+        warehouseList: []
       };
     },
     computed: {
@@ -268,7 +301,15 @@
         }
       }
     },
+    created() {
+      this.getArguInfo();
+    },
     methods: {
+      //搜索数据源
+      async getArguInfo() {
+        const { data } = await getWarehouseList();
+        this.warehouseList = data;
+      },
       handleCurrentChange() {
         this.handleList();
       },