From 51a5d0a5cc599997b821ca290910031628a090f5 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Sat, 17 Dec 2022 16:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E6=96=99=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessories/modules/ZyAccessoriesForm.vue | 109 +++++++++++++-----
 1 file changed, 82 insertions(+), 27 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
index 3716f4bf..e68d0658 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
@@ -2,8 +2,8 @@
   <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
+        <a-row type="flex" justify="space-around">
+          <a-col :span="11">
             <a-form-model-item label="辅料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
               <j-popup
                 v-model="model.typeName"
@@ -17,52 +17,107 @@
               <a-input v-model="model.typeId" hidden />
             </a-form-model-item>
           </a-col>
-
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">
               <a-input v-model="model.nums" placeholder="请输入编号" disabled  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="11">
             <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contents">
               <a-input v-model="model.contents" placeholder="请输入名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
-              <j-image-upload isMultiple  v-model="model.picture" ></j-image-upload>
+          <a-col :span="12">
+            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
+              <j-search-select-tag v-model="model.material" dict="material"  />
             </a-form-model-item>
+
           </a-col>
-          <a-col :span="24">
-<!--            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">-->
-<!--              <a-input v-model="model.material" placeholder="请输入材质"  ></a-input>-->
-              <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
-                <j-search-select-tag v-model="model.material" dict="material"  />
-              </a-form-model-item>
-<!--          </a-col>-->
-<!--            </a-form-model-item>-->
+          <a-col :span="11">
+            <a-form-model-item label="库存量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="store">
+              <a-input-number v-model="model.store" placeholder="请输入库存量" style="width: 100%" />
+            </a-form-model-item>
+
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specs">
               <a-input v-model="model.specs" placeholder="请输入规格"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="库存量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="store">
-              <a-input-number v-model="model.store" placeholder="请输入库存量" style="width: 100%" />
+          <a-col :span="11">
+            <a-form-model-item label="供货商信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierInfo">
+              <j-select-depart  v-model="model.supplierInfo" placeholder="请输入供货商信息" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">
+              <j-image-upload isMultiple  v-model="model.picture" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="11"></a-col>
+          <a-col :span="12"></a-col>
+        </a-row>
+<!--        <a-row>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="辅料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">-->
+<!--              <j-popup-->
+<!--                v-model="model.typeName"-->
+<!--                field="typeName"-->
+<!--                org-fields="nums,contents"-->
+<!--                dest-fields="typeId,typeName"-->
+<!--                code="zy_accessories_type"-->
+<!--                :multi="false"-->
+<!--                @input="popupCallback"-->
+<!--              />-->
+<!--              <a-input v-model="model.typeId" hidden />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
+<!--              <a-input v-model="model.nums" placeholder="请输入编号" disabled  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contents">-->
+<!--              <a-input v-model="model.contents" placeholder="请输入名称"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">-->
+<!--              <j-image-upload isMultiple  v-model="model.picture" ></j-image-upload>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--&lt;!&ndash;            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">&ndash;&gt;-->
+<!--&lt;!&ndash;              <a-input v-model="model.material" placeholder="请输入材质"  ></a-input>&ndash;&gt;-->
+<!--              <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">-->
+<!--                <j-search-select-tag v-model="model.material" dict="material"  />-->
+<!--              </a-form-model-item>-->
+<!--&lt;!&ndash;          </a-col>&ndash;&gt;-->
+<!--&lt;!&ndash;            </a-form-model-item>&ndash;&gt;-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specs">-->
+<!--              <a-input v-model="model.specs" placeholder="请输入规格"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="库存量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="store">-->
+<!--              <a-input-number v-model="model.store" placeholder="请输入库存量" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--&lt;!&ndash;          <a-col :span="24">&ndash;&gt;-->
+<!--&lt;!&ndash;            <a-form-model-item label="供货商信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierInfo">&ndash;&gt;-->
+<!--&lt;!&ndash;              <a-input v-model="model.supplierInfo" placeholder="请输入供货商信息"  ></a-input>&ndash;&gt;-->
+<!--&lt;!&ndash;            </a-form-model-item>&ndash;&gt;-->
+<!--&lt;!&ndash;          </a-col>&ndash;&gt;-->
 <!--          <a-col :span="24">-->
 <!--            <a-form-model-item label="供货商信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierInfo">-->
-<!--              <a-input v-model="model.supplierInfo" placeholder="请输入供货商信息"  ></a-input>-->
+<!--              <j-select-depart  v-model="model.supplierInfo" placeholder="请输入供货商信息" />-->
 <!--            </a-form-model-item>-->
 <!--          </a-col>-->
-          <a-col :span="24">
-            <a-form-model-item label="供货商信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierInfo">
-              <j-select-depart  v-model="model.supplierInfo" placeholder="请输入供货商信息" />
-            </a-form-model-item>
-          </a-col>
-        </a-row>
+<!--        </a-row>-->
       </a-form-model>
     </j-form-container>
   </a-spin>