From b4882e617627d537f405774b6576af1de154714d Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 10:04:41 +0800
Subject: [PATCH] 枚举

---
 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue |   55 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
index 474d889..fc14202 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
@@ -8,25 +8,36 @@
     @cancel="handleCancel">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-form-item label="瀹瑰櫒绫诲瀷ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" />
-        </a-form-item>
         <a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" /> -->
+
+          <a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒绫诲瀷鍚嶇О" v-decorator="['containerTypeId']">
+            <a-select-option v-for="(item, index) in selectTypeData" :key="index"
+              :value="item.typeCode">{{ item.typeName }}</a-select-option>
+          </a-select>
+
+        </a-form-item>
+        <!-- <a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉�" v-decorator="['containerTypeName', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉帮紒'}]}]" />
+        </a-form-item> -->
+        <a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <!-- <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨婭D锛�'}]}]" /> -->
+
+          <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId']">
+            <a-select-option v-for="(item, index) in selectTypeData2" :key="index"
+              :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
+          </a-select>
+
         </a-form-item>
-        <a-form-item label="鐗╂枡绫诲瀷ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨婭D锛�'}]}]" />
-        </a-form-item>
-        <a-form-item label="鐗╂枡绫诲瀷缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+        <!-- <a-form-item label="鐗╂枡绫诲瀷缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬬紪鍙�" v-decorator="['materialTypeCode', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬬紪鍙凤紒'}]}]" />
         </a-form-item>
         <a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" v-decorator="['materialTypeName', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉帮紒'}]}]" />
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item label="鐗╂枡瀹瑰櫒瀹归噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ョ墿鏂欏鍣ㄥ閲�" v-decorator="['boxQty', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欏鍣ㄥ閲忥紒'}]}]" />
         </a-form-item>
-        <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
       </a-form>
     </a-spin>
   </a-modal>
@@ -37,6 +48,11 @@
   import {
   WmsContainerPackagingEdit
   } from '@/api/modular/main/WmsBase/WmsContainerPackagingManage'
+
+
+  import { WmsContainerTypePage, WmsContainerTypeDelete, WmsContainerTypeToExcel } from '@/api/modular/main/WmsBase/WmsContainerTypeManage'
+	import { WmsMaterialTypePage,} from '@/api/modular/main/WmsBase/WmsMaterialTypeManage'
+
   export default {
   data () {
   return {
@@ -55,6 +71,18 @@
         form: this.$form.createForm(this)
       }
     },
+    created() {
+      WmsContainerTypePage().then((d) => {
+        this.selectTypeData = d.data.rows || []
+      }).catch(() => {
+
+      })
+      WmsMaterialTypePage().then((d) => {
+        this.selectTypeData2 = d.data.rows || []
+      }).catch(() => {
+
+      })
+  },
     methods: {
 	moment,
       // 鍒濆鍖栨柟娉�
@@ -68,15 +96,10 @@
         this.$nextTick(() => {
           this.form.setFieldsValue(
             {
-              id: record.id,
-              containerTypeId: record.containerTypeId,
-              containerTypeName: record.containerTypeName,
-              materialTypeId: record.materialTypeId,
-              materialTypeCode: record.materialTypeCode,
-              materialTypeName: record.materialTypeName,
-              boxQty: record.boxQty
+              ...record
             }
           )
+
         })
       },
       handleSubmit () {

--
Gitblit v1.9.3