From 9fa0ad17c703d687e2a6de5305f62f59827a3d23 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 8 Oct 2024 00:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/public/doc/goods_template.xls      | Bin 20992 -> 20992 bytes
 .../views/material/modules/MaterialModal.vue  |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/public/doc/goods_template.xls b/jshERP-web/public/doc/goods_template.xls
index 169a49ff0573d3f09f6e34ba52d2dd7ec7486e14..d7b40e55118e8cf9791f831297f0c8c5c525ddfc 100644
GIT binary patch
delta 2961
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
D1*AJ-

delta 3031
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
AT>t<8

diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 795c23a4..5e5228af 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -36,7 +36,7 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="单位"
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单位"
                   data-step="4" data-title="单位" data-intro="此处支持单个单位和多单位，勾选多单位就可以切换到多单位的下拉框，多单位需要先在【计量单位】页面进行录入。
                   比如牛奶有瓶和箱两种单位，12瓶=1箱，这就构成了多单位，多单位中有个换算比例">
                   <a-row class="form-row" :gutter="24">
@@ -83,7 +83,7 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="类别"
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别"
                              data-step="8" data-title="类别" data-intro="类别需要在【商品类别】页面进行录入，录入之后在此处进行调用">
                   <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
                                  :treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别">
@@ -111,7 +111,7 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="制造商" data-step="12" data-title="制造商"
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="制造商" data-step="12" data-title="制造商"
                              data-intro="请填写商品的制造商，一般适用于制造行业">
                   <a-input placeholder="请输入制造商" v-decorator.trim="[ 'mfrs' ]" />
                 </a-form-item>