main
fanfan 2 months ago
parent 23b0f0b277
commit 8be703d0eb
  1. 15
      src/components/Modal/GoodsModal/GoodsModal.vue
  2. 10
      src/views/goods/Create.vue
  3. 10
      src/views/goods/Index.vue
  4. 8
      src/views/goods/Update.vue
  5. 14
      src/views/goods/modules/Update.vue
  6. 4
      src/views/order/modules/DocumentRecordDetails.vue
  7. 4
      src/views/order/modules/DocumentRecordList.vue

@ -2,7 +2,7 @@
<a-modal
class="noborder"
:title="title"
:width="820"
: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 @@
/>
</template>
<!-- 商品状态 -->
<span slot="spec_type" slot-scope="text">
<span slot="item_1" slot-scope="item">
<p class="twoline-hide" style="width: 40px">
{{ item.spec_type == 10 ? '单规格' : '多规格' }}
</p>
<p class="twoline-hide" style="width: 40px">
{{ text == 10 ? '单规格' : '多规格' }}
{{ item.spu_id > 0 ? '已组合' : '未组合' }}
</p>
</span>
<span slot="status" slot-scope="text">
@ -84,8 +90,7 @@ const columns = [
},
{
title: '规格类型',
dataIndex: 'spec_type',
scopedSlots: { customRender: 'spec_type' },
scopedSlots: { customRender: 'item_1' },
},
{
title: '商品价格',

@ -70,11 +70,13 @@
</a-form-item>
<a-form-item label="商品来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['goods_source', { initialValue: 'JD', rules: [{ required: true }] }]">
<!-- <a-radio value="JD">京东</a-radio>
<a-radio value="SN">苏宁</a-radio> -->
<a-radio value="GC">工厂</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">
@ -381,7 +383,7 @@
</a-form-item>
<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"

@ -309,9 +309,12 @@
}}</a>
<p style="white-space: pre-wrap" v-else>{{ text }}</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>
<!-- 商品状态 -->
@ -404,8 +407,7 @@ const columns = [
{
title: '规格类型',
width: '90px',
dataIndex: 'spec_type',
scopedSlots: { customRender: 'spec_type' },
scopedSlots: { customRender: 'item_1' },
},
{
title: '商品价格',

@ -61,11 +61,13 @@
</a-form-item>
<a-form-item label="商品来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['goods_source', { initialValue: 'JD', 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">
@ -376,7 +378,7 @@
</a-form-item>
<div>
<a-divider orientation="left">销售区域</a-divider>
<a-form-item label="销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
<a-form-item label="销售区域" extra="默认是全国,指定供货区域请点击添加销售区域" :labelCol="labelCol" :wrapperCol="{ span: 15 }">
<a-table
v-show="ruleList.length"
class="table-rules"

@ -84,11 +84,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="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">
@ -420,7 +422,7 @@
</a-form-item>
<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"

@ -28,8 +28,8 @@
<a-row>
<a-col :span="24"
><a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<span v-if="record.standard_status == 10">通过</span>
<span v-if="record.standard_status == 20">不通过</span>
<span v-if="record.standard_status == 10">通过</span>
<span v-if="record.standard_status == 20">不通过</span>
<span v-if="record.standard_status == 30">审核中</span>
</a-form-item></a-col
></a-row

@ -41,8 +41,8 @@
<span v-if="text == 30">短视频平台客户</span>
</span>
<span slot="standard_status" slot-scope="text">
<span v-if="text == 10">通过</span>
<span v-if="text == 20">不通过</span>
<span v-if="text == 10">审通过</span>
<span v-if="text == 20">不通过</span>
<span v-if="text == 30">审核中</span>
</span>
<span slot="action" slot-scope="text, item">

Loading…
Cancel
Save