From 9832aac5f54e3b97ac105cc8f8b0347fb74f559a Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Thu, 8 Dec 2022 10:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E8=A3=85=E6=AC=BE=E5=BC=8F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ZyClothsStyleForm.vue             | 370 +++++++++++++++---
 1 file changed, 313 insertions(+), 57 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
index 9863cc3b..fe33b498 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleForm.vue
@@ -1,15 +1,14 @@
 <template>
   <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail" :layout="horizontal">
         <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
+          <a-col :span="12">
+            <a-form-model-item label="企业" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="enterpriseId">
               <j-select-depart v-model="model.enterpriseId" multi  />
             </a-form-model-item>
           </a-col>
-
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
               <j-popup
                 v-model="model.typeName"
@@ -19,92 +18,336 @@
                 code="cloths_type"
                 :multi="false"
                 @input="popupCallback"
-                />
+              />
             </a-form-model-item>
             <a-input  v-model="model.typeId" hidden/>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shape">
+        </a-row>
+        <a-row>
+          <a-col :span="12">
+            <a-form-model-item label="形式" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="shape">
               <j-dict-select-tag  type="radio" v-model="model.shape" dictCode="style_shape" placeholder="请输入形式"  ></j-dict-select-tag>
             </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="请输入编号"  ></a-input>-->
-<!--            </a-form-model-item>-->
-<!--          </a-col>-->
-          <a-col :span="24">
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nums">-->
+          <!--              <a-input v-model="model.nums" placeholder="请输入编号"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <a-col :span="12">
             <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">
               <a-input v-model="model.styleNames" placeholder="请输入款式名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specification">
+        </a-row>
+
+        <a-row>
+          <a-col :span="12">
+            <a-form-model-item label="规格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="specification">
               <a-input v-model="model.specification" placeholder="请输入规格"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="销售地区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="salesTerritory">
-              <a-textarea v-model="model.salesTerritory" rows="4" placeholder="请输入销售地区" />
+          <a-col :span="12">
+            <a-form-model-item label="定额用料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quotaMaterials">
+              <a-input v-model="model.quotaMaterials" placeholder="请输入定额用料"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="产品概述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productOverview">
-              <a-textarea v-model="model.productOverview" rows="4" placeholder="请输入产品概述" />
+        </a-row>
+        <a-row>
+          <a-col :span="12">
+            <a-form-model-item label="风格" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="characteristic">
+              <a-input v-model="model.characteristic" placeholder="请输入风格"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="结构" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="structure">
-              <a-input v-model="model.structure" placeholder="请输入结构"  ></a-input>
+          <a-col :span="12">
+            <a-form-model-item label="测体余量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="error">
+              <a-input v-model="model.error" placeholder="请输入测体余量"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="风格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="characteristic">
-              <a-input v-model="model.characteristic" placeholder="请输入风格"  ></a-input>
+        </a-row>
+        <a-row>
+          <a-col :span="12">
+            <a-form-model-item label="结构" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="structure">
+              <a-input v-model="model.structure" placeholder="请输入结构"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="效果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="designSketch">
-              <j-image-upload isMultiple  v-model="model.designSketch" ></j-image-upload>
+          <a-col :span="12">
+            <a-form-model-item label="缝纫形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sewingForm">
+              <j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="主图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mainMap">
-              <j-image-upload isMultiple  v-model="model.mainMap" ></j-image-upload>
+
+        </a-row>
+        <a-row>
+          <a-col :span="12">
+            <a-form-model-item label="折叠搭配及包装" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="foldingPackaging">
+              <j-dict-select-tag v-model="model.foldingPackaging"  placeholder="请选择折叠搭配及包装" dict-code="foldingPackaging" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="制衣参数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measuringMethod">
-              <a-textarea v-model="model.measuringMethod" placeholder="请输入制衣参数"  ></a-textarea>
+        </a-row>
+        <a-row>
+          <a-col >
+            <a-form-model-item label="产品概述" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="productOverview">
+              <a-textarea v-model="model.productOverview"  placeholder="请输入产品概述" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="测体余量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="error">
-              <a-input v-model="model.error" placeholder="请输入测体余量"  ></a-input>
+        </a-row>
+        <a-row>
+          <a-col>
+            <a-form-model-item label="销售地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="salesTerritory" :labelAlign="left">
+              <a-textarea v-model="model.salesTerritory"  placeholder="请输入销售地区" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="定额用料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quotaMaterials">
-              <a-input v-model="model.quotaMaterials" placeholder="请输入定额用料"  ></a-input>
+        </a-row>
+        <a-row>
+          <a-col>
+            <a-form-model-item label="制衣参数" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="measuringMethod">
+              <a-textarea v-model="model.measuringMethod" placeholder="请输入制衣参数"  ></a-textarea>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="折叠搭配及包装" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="foldingPackaging">
-              <j-dict-select-tag v-model="model.foldingPackaging"  placeholder="请选择折叠搭配及包装" dict-code="foldingPackaging" />
+        </a-row>
+
+        <a-row>
+          <a-col>
+            <a-form-model-item label="配件及标志" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="accLogos">
+              <a-textarea v-model="model.accLogos"  placeholder="请输入配件及标志" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="配件及标志" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accLogos">
-              <a-textarea v-model="model.accLogos" rows="4" placeholder="请输入配件及标志" />
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-model-item label="效果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="designSketch">
+              <j-image-upload isMultiple  v-model="model.designSketch" ></j-image-upload>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="缝纫形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sewingForm">
-              <j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/>
+          <a-col :span="8">
+            <a-form-model-item label="主图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mainMap">
+              <j-image-upload isMultiple  v-model="model.mainMap" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+        </a-row>
+        <a-row>
+          <!--          <a-col :span="24">-->
+          <!--                      <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
+          <!--                      <j-select-depart v-model="model.enterpriseId" multi  />-->
+          <!--                    </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">-->
+          <!--              <j-popup-->
+          <!--                v-model="model.typeName"-->
+          <!--                field="type_name"-->
+          <!--                org-fields="type_name,id"-->
+          <!--                dest-fields="typeName,typeId"-->
+          <!--                code="cloths_type"-->
+          <!--                :multi="false"-->
+          <!--                @input="popupCallback"-->
+          <!--              />-->
+          <!--            </a-form-model-item>-->
+          <!--            <a-input  v-model="model.typeId" hidden/>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shape">-->
+          <!--              <j-dict-select-tag  type="radio" v-model="model.shape" dictCode="style_shape" placeholder="请输入形式"  ></j-dict-select-tag>-->
+          <!--            </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="请输入编号"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">-->
+          <!--              <a-input v-model="model.styleNames" placeholder="请输入款式名称"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specification">-->
+          <!--              <a-input v-model="model.specification" placeholder="请输入规格"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col>-->
+          <!--            <a-form-model-item label="销售地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="salesTerritory" :labelAlign="left">-->
+          <!--              <a-textarea v-model="model.salesTerritory" rows="4" placeholder="请输入销售地区" />-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col>-->
+          <!--            <a-form-model-item label="产品概述" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="productOverview">-->
+          <!--              <a-textarea v-model="model.productOverview" rows="4" placeholder="请输入产品概述" />-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specification">-->
+          <!--              <a-input v-model="model.specification" placeholder="请输入规格"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="结构" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="structure">-->
+          <!--              <a-input v-model="model.structure" placeholder="请输入结构"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="风格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="characteristic">-->
+          <!--              <a-input v-model="model.characteristic" placeholder="请输入风格"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="测体余量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="error">-->
+          <!--              <a-input v-model="model.error" placeholder="请输入测体余量"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="效果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="designSketch">-->
+          <!--              <j-image-upload isMultiple  v-model="model.designSketch" ></j-image-upload>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="主图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mainMap">-->
+          <!--              <j-image-upload isMultiple  v-model="model.mainMap" ></j-image-upload>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col>-->
+          <!--            <a-form-model-item label="制衣参数" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="measuringMethod">-->
+          <!--              <a-textarea v-model="model.measuringMethod" placeholder="请输入制衣参数"  ></a-textarea>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
 
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="定额用料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quotaMaterials">-->
+          <!--              <a-input v-model="model.quotaMaterials" placeholder="请输入定额用料"  ></a-input>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="折叠搭配及包装" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="foldingPackaging">-->
+          <!--              <j-dict-select-tag v-model="model.foldingPackaging"  placeholder="请选择折叠搭配及包装" dict-code="foldingPackaging" />-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col>-->
+          <!--            <a-form-model-item label="配件及标志" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="accLogos">-->
+          <!--              <a-textarea v-model="model.accLogos" rows="4" placeholder="请输入配件及标志" />-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
+          <!--          <a-col :span="24">-->
+          <!--            <a-form-model-item label="缝纫形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sewingForm">-->
+          <!--              <j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/>-->
+          <!--            </a-form-model-item>-->
+          <!--          </a-col>-->
         </a-row>
+
+
+
+
+
+
+
+
+
+
+
+
+        <!--        <a-row>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">-->
+        <!--            <j-select-depart v-model="model.enterpriseId" multi  />-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="服装类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">-->
+        <!--            <j-popup-->
+        <!--              v-model="model.typeName"-->
+        <!--              field="type_name"-->
+        <!--              org-fields="type_name,id"-->
+        <!--              dest-fields="typeName,typeId"-->
+        <!--              code="cloths_type"-->
+        <!--              :multi="false"-->
+        <!--              @input="popupCallback"-->
+        <!--            />-->
+        <!--          </a-form-model-item>-->
+        <!--          <a-input  v-model="model.typeId" hidden/>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shape">-->
+        <!--            <j-dict-select-tag  type="radio" v-model="model.shape" dictCode="style_shape" placeholder="请输入形式"  ></j-dict-select-tag>-->
+        <!--          </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="nums">&ndash;&gt;-->
+        <!--        &lt;!&ndash;              <a-input v-model="model.nums" 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="styleNames">-->
+        <!--            <a-input v-model="model.styleNames" placeholder="请输入款式名称"  ></a-input>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specification">-->
+        <!--            <a-input v-model="model.specification" placeholder="请输入规格"  ></a-input>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="销售地区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="salesTerritory">-->
+        <!--            <a-textarea v-model="model.salesTerritory" rows="4" placeholder="请输入销售地区" />-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="产品概述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productOverview">-->
+        <!--            <a-textarea v-model="model.productOverview" rows="4" placeholder="请输入产品概述" />-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="结构" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="structure">-->
+        <!--            <a-input v-model="model.structure" placeholder="请输入结构"  ></a-input>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="风格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="characteristic">-->
+        <!--            <a-input v-model="model.characteristic" placeholder="请输入风格"  ></a-input>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="效果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="designSketch">-->
+        <!--            <j-image-upload isMultiple  v-model="model.designSketch" ></j-image-upload>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="主图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mainMap">-->
+        <!--            <j-image-upload isMultiple  v-model="model.mainMap" ></j-image-upload>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="制衣参数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measuringMethod">-->
+        <!--            <a-textarea v-model="model.measuringMethod" placeholder="请输入制衣参数"  ></a-textarea>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="测体余量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="error">-->
+        <!--            <a-input v-model="model.error" placeholder="请输入测体余量"  ></a-input>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="定额用料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quotaMaterials">-->
+        <!--            <a-input v-model="model.quotaMaterials" placeholder="请输入定额用料"  ></a-input>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="折叠搭配及包装" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="foldingPackaging">-->
+        <!--            <j-dict-select-tag v-model="model.foldingPackaging"  placeholder="请选择折叠搭配及包装" dict-code="foldingPackaging" />-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="配件及标志" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accLogos">-->
+        <!--            <a-textarea v-model="model.accLogos" rows="4" placeholder="请输入配件及标志" />-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+        <!--        <a-col :span="24">-->
+        <!--          <a-form-model-item label="缝纫形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sewingForm">-->
+        <!--            <j-dict-select-tag v-model="model.sewingForm" placeholder="请选择缝纫形式" dict-code="sewingForm"/>-->
+        <!--          </a-form-model-item>-->
+        <!--        </a-col>-->
+
+        <!--      </a-row>-->
       </a-form-model>
     </j-form-container>
   </a-spin>
@@ -133,7 +376,7 @@
         typeName:"",
         model:{
           shape:1
-         },
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -142,6 +385,14 @@
           xs: { span: 24 },
           sm: { span: 16 },
         },
+        labelCol1: {
+          xs: { span: 24 },
+          sm: { span: 3 },
+        },
+        wrapperCol1: {
+          xs: { span: 24 },
+          sm: { span: 18 },
+        },
         confirmLoading: false,
         validatorRules: {
           typeId: [
@@ -170,7 +421,7 @@
       },
     },
     created () {
-       //备份model原始值
+      //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
@@ -194,7 +445,7 @@
               method = 'post';
             }else{
               httpurl+=this.url.edit;
-               method = 'put';
+              method = 'put';
             }
             httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
@@ -211,8 +462,13 @@
         })
       },
       popupCallback(value,row){
-         this.model = Object.assign(this.model, row);
+        this.model = Object.assign(this.model, row);
       },
     }
   }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+  .ant-form-item{
+    margin-bottom: 16px;
+  }
+</style>
\ No newline at end of file