From bd916670e7915ec914d71ed7daadbe8eb5fd0835 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 24 4月 2024 15:31:37 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
index a281a74..79009a1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -29,8 +29,10 @@
         <a-form-item label="ERP浠g爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏RP浠g爜" v-decorator="['erpCode', {rules: [{required: true, message: '璇疯緭鍏RP浠g爜锛�'}]}]" />
         </a-form-item>
-        <a-form-item label="鎵�灞炰粨搴�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="璇疯緭鍏ユ墍灞炰粨搴�" v-decorator="['warehouseId', {rules: [{required: true, message: '璇疯緭鍏ユ墍灞炰粨搴擄紒'}]}]" />
+        <a-form-item label="鎵�灞炰粨搴�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炰粨搴�" v-decorator="['warehouseId', {rules: [{ required: true, message: '璇烽�夋嫨鎵�灞炰粨搴擄紒' }]}]">
+            <a-select-option v-for="(item,index) in warehouseIdData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+          </a-select>
         </a-form-item>
         <a-form-item label="闆朵欢绾х鎺�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-switch v-decorator="['isBarcodeLevelControl',{rules: [{ required: true, message: '璇烽�夋嫨闆朵欢绾х鎺э紒' }], valuePropName: 'checked'}]" />
@@ -74,6 +76,7 @@
   xs: { span: 24 },
   sm: { span: 15 }
   },
+  warehouseIdData: [],
         visible: false,
         confirmLoading: false,
         form: this.$form.createForm(this)
@@ -87,6 +90,8 @@
         this.$nextTick(() => {
 
         });
+        const warehouseIdOption = this.$options
+        this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
       },
       /**
        * 鎻愪氦琛ㄥ崟

--
Gitblit v1.9.3