细节

src/components/Modal/GoodsModal/GoodsModal.vue

@@ -2,7 +2,7 @@
   <a-modal
     class="noborder"
     :title="title"
-    :width="900"
+    :width="1050"
     :visible="visible"
     :isLoading="isLoading"
     :maskClosable="false"
@@ -23,6 +23,9 @@
               allowClear
               v-decorator="['categoryId', { initialValue: 0 }]"
             ></a-tree-select>
+          </a-form-item>
+             <a-form-item label="商品编码">
+            <a-input v-decorator="['goodsNo']" placeholder="请输入商品编码" />
           </a-form-item>
           <a-form-item class="search-btn">
             <a-button type="primary" icon="search" html-type="submit">搜索</a-button>
@@ -52,9 +55,12 @@
           :subTitleColor="true"
         />
       </template>
-       <span slot="spec_type" slot-scope="text">
+        <span slot="item_1" slot-scope="item">
         <p class="twoline-hide" style="width: 40px">
-          {{ text == 10 ? '单规格' : '多规格' }}
+          {{ item.spec_type == 10 ? '单规格' : '多规格' }}
+        </p>
+         <p class="twoline-hide" style="width: 40px">
+         {{ item.spu_id>0? '已组合' : '未组合' }}
         </p>
       </span>
       <span slot="specific_value" slot-scope="text">
@@ -88,8 +94,7 @@ const columns = [
   },
   {
     title: '规格类型',
-    dataIndex: 'spec_type',
+    scopedSlots: { customRender: 'item_1' },
-    scopedSlots: { customRender: 'spec_type' },
   },
   {
     title: '商品价格',

src/views/dataCenter/goods/Index.vue

@@ -345,9 +345,12 @@
       <span slot="profit_rate" slot-scope="text, item">
         <p>{{ text > 0 ? Number(text) + '%' : 0 }}</p>
       </span>
-      <span slot="spec_type" slot-scope="text">
+       <span slot="item_1" slot-scope="item">
         <p class="twoline-hide" style="width: 40px">
-          {{ text == 10 ? '单规格' : '多规格' }}
+          {{ item.spec_type == 10 ? '单规格' : '多规格' }}
+        </p>
+         <p class="twoline-hide" style="width: 40px">
+         {{ item.spu_id>0? '已组合' : '未组合' }}
         </p>
       </span>
       <!-- 商品池 -->
@@ -418,8 +421,7 @@ const columns = [
   {
     title: '规格类型',
     width: '90px',
-    dataIndex: 'spec_type',
+    scopedSlots: { customRender: 'item_1' },
-    scopedSlots: { customRender: 'spec_type' },
   },
   {
     title: '行情价',

src/views/dataCenter/goods/Update.vue

@@ -153,11 +153,13 @@
             </a-form-item> -->
             <a-form-item label="商品来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group v-decorator="['goods_source', { initialValue: 0, rules: [{ required: true }] }]">
-                <!-- <a-radio value="JD">京东</a-radio>
-                <a-radio value="SN">苏宁</a-radio> -->
                 <a-radio value="GC">工厂</a-radio>
                 <a-radio value="CC">仓储</a-radio>
                 <a-radio value="ZC">自采</a-radio>
+                <a-radio value="JD">京东</a-radio>
+                <a-radio value="SN">苏宁</a-radio>
+                <a-radio value="TM">天猫</a-radio>
+                <a-radio value="PF">批发平台</a-radio>
               </a-radio-group>
             </a-form-item>
             <a-form-item label="发货时效" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -393,7 +395,7 @@
 
             <div>
               <a-divider orientation="left">销售区域</a-divider>
-              <a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
+              <a-form-item label="销售区域" :labelCol="labelCol" extra="默认是全国，指定供货区域请点击添加销售区域" :wrapperCol="{ span: 15 }">
                 <a-table
                   v-show="ruleList.length"
                   class="table-rules"