Jelajahi Sumber

Merge remote-tracking branch 'origin/dev_ml'

13660505945 1 bulan lalu
induk
melakukan
4f1bcae5b6
1 mengubah file dengan 44 tambahan dan 10 penghapusan
  1. 44 10
      jshERP-web/src/views/material/modules/MaterialModal.vue

+ 44 - 10
jshERP-web/src/views/material/modules/MaterialModal.vue

@@ -111,14 +111,47 @@
                   </a-row>
                 </a-form-item>
               </a-col>
+           
             </a-row>
             <a-row class="form-row" :gutter="24">
+              <a-col :md="6" :sm="24" v-if="!model.id">
+                <a-form-item
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  label="多属性"
+                  data-step="5"
+                  data-title="多属性"
+                  data-intro="多属性是针对的sku商品(比如服装、鞋帽行业),此处开关如果启用就可以在下方进行多sku的配置,配置具体的颜色、尺码之类的组合"
+                >
+                  <a-tooltip title="多属性针对服装、鞋帽等行业,需要先录入单位才能激活此处输入框">
+                    <a-tag class="tag-info" v-if="!manySkuStatus">需要先录入单位才能激活</a-tag>
+                    <a-select
+                      mode="multiple"
+                      v-decorator="['manySku']"
+                      showSearch
+                      optionFilterProp="children"
+                      placeholder="请选择多属性(可多选)"
+                      @change="onManySkuChange"
+                      v-show="manySkuStatus"
+                    >
+                      <a-select-option
+                        v-for="(item, index) in materialAttributeList"
+                        :key="index"
+                        :value="item.value"
+                        :disabled="item.disabled"
+                      >
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-tooltip>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   label="颜色"
-                  data-step="5"
+                  data-step="6"
                   data-title="颜色"
                   data-intro="请填写商品的颜色,如果是多属性商品可以不填(下面有多属性开关)"
                 >
@@ -130,7 +163,7 @@
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   label="品牌"
-                  data-step="6"
+                  data-step="7"
                   data-title="品牌"
                   data-intro="请填写商品的品牌,方便区别不同品牌的商品"
                 >
@@ -142,19 +175,22 @@
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   label="助记码"
-                  data-step="7"
+                  data-step="8"
                   data-title="助记码"
                   data-intro="助记码自动生成,助记码是商品名称的首字母缩写"
                 >
                   <a-input placeholder="" v-decorator.trim="['mnemonic']" :readOnly="true" />
                 </a-form-item>
               </a-col>
+    
+            </a-row>
+            <a-row class="form-row" :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   label="类别"
-                  data-step="8"
+                  data-step="9"
                   data-title="类别"
                   data-intro="类别需要在【商品类别】页面进行录入,录入之后在此处进行调用"
                 >
@@ -169,14 +205,12 @@
                   </a-tree-select>
                 </a-form-item>
               </a-col>
-            </a-row>
-            <a-row class="form-row" :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   label="基础重量"
-                  data-step="9"
+                  data-step="10"
                   data-title="基础重量"
                   data-intro="请填写基本单位对应的重量,用于计算按重量分摊费用时单据中各行商品分摊的费用成本"
                 >
@@ -188,7 +222,7 @@
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   label="序列号"
-                  data-step="10"
+                  data-step="11"
                   data-title="序列号"
                   data-intro="此处是商品的序列号开关,如果选择了有,则在采购入库单据需要录入该商品的序列号,在销售出库单据需要选择该商品的序列号进行出库"
                 >
@@ -205,7 +239,7 @@
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   label="系统SKU"
-                  data-step="11"
+                  data-step="12"
                   data-title="系统SKU"
                   data-intro="系统SKU"
                 >
@@ -217,7 +251,7 @@
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   label="无动销提醒周期"
-                  data-step="12"
+                  data-step="13"
                   data-title="无动销提醒周期"
                   data-intro="无动销提醒周期"
                 >