Compare commits

...

2 Commits

  1. 15
      src/components/Modal/GoodsModal/GoodsModal.vue
  2. 1259
      src/views/dataCenter/goods/Create.vue
  3. 80
      src/views/dataCenter/goods/Index.vue
  4. 10
      src/views/dataCenter/goods/Update.vue
  5. 1333
      src/views/dataCenter/goods/modules/Update.vue

@ -2,7 +2,7 @@
<a-modal
class="noborder"
:title="title"
:width="900"
:width="1050"
:visible="visible"
:isLoading="isLoading"
:maskClosable="false"
@ -24,6 +24,9 @@
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>
</a-form-item>
@ -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: 'spec_type' },
scopedSlots: { customRender: 'item_1' },
},
{
title: '商品价格',

File diff suppressed because it is too large Load Diff

@ -113,12 +113,12 @@
</a-select>
</a-form-item>
<a-form-item label="比同款下架">
<a-select @change="getGoodsJingDong" style="width: 120px" placeholder="请选择">
<a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
<a-select @change="getGoodsJingDong" style="width: 120px" placeholder="请选择">
<a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="添加时间">
<div style="display: flex" class="goodsType" id="date">
<el-date-picker
@ -191,9 +191,15 @@
title="批量加价"
@ok="handleBatchPrice(selectedRowKeys, batchRate)"
>
<div class="fen" style="margin-top:-10px">
<div class="fen" style="margin-top: -10px">
<span style="margin-right: 5px">加价利润率</span>
<input placeholder="请输入加价利润率" @input="validateBatchAmount" v-model="batchRate" class="input" type="text" />
<input
placeholder="请输入加价利润率"
@input="validateBatchAmount"
v-model="batchRate"
class="input"
type="text"
/>
</div>
</a-modal>
<a-modal
@ -271,8 +277,8 @@
>分类加价</a-button
>
<a-button
v-if="selectedRowKeys.length"
style="background-color: #67C23A; color: #fff; border: none; border-radius: 2px"
v-if="selectedRowKeys.length"
style="background-color: #67c23a; color: #fff; border: none; border-radius: 2px"
@click="batchPrice = true"
>批量加价</a-button
>
@ -349,22 +355,25 @@
{{ text == 0 ? '待处理' : text == 1 ? '已入池' : '未入池' }}
</p>
</span>
<span slot="spec_type" slot-scope="text">
<p class="twoline-hide" style="width: 40px">
{{ text == 10 ? '单规格' : '多规格' }}
</p>
</span>
<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">
{{ item.spu_id > 0 ? '已组合' : '未组合' }}
</p>
</span>
<span slot="cate_status" slot-scope="text">
<p class="twoline-hide" style="width: 40px" :style="{ color: text == 0 ? 'red' : 'green' }">
{{ text == 0 ? '待处理' : '已归类' }}
</p>
</span>
<!-- 京东下架 -->
<span slot="is_jd_remove" slot-scope="text">
<p style="width: 40px;text-align: center;" :style="{ color: text == 1 ? 'red' : 'green'}">
{{ text == 1 ? '是' : '否' }}
</p>
</span>
<span slot="is_jd_remove" slot-scope="text">
<p style="width: 40px; text-align: center" :style="{ color: text == 1 ? 'red' : 'green' }">
{{ text == 1 ? '是' : '否' }}
</p>
</span>
<!-- 商品状态 -->
<span slot="is_sale" slot-scope="text, item">
<a-tag class="cur-p" :color="text == 0 ? 'red' : text == 1 ? 'green' : 'gray'">{{
@ -410,11 +419,10 @@ const columns = [
scopedSlots: { customRender: 'goods_name' },
},
{
title: '规格类型',
width: '90px',
dataIndex: 'spec_type',
scopedSlots: { customRender: 'spec_type' },
},
title: '规格类型',
width: '90px',
scopedSlots: { customRender: 'item_1' },
},
{
title: '行情价',
width: '100px',
@ -477,11 +485,11 @@ const columns = [
scopedSlots: { customRender: 'is_pool' },
},
{
title: '比同款下架',
width: '100px',
dataIndex: 'is_jd_remove',
scopedSlots: { customRender: 'is_jd_remove' },
},
title: '比同款下架',
width: '100px',
dataIndex: 'is_jd_remove',
scopedSlots: { customRender: 'is_jd_remove' },
},
{
title: '状态',
width: '50px',
@ -541,7 +549,7 @@ export default {
end_time: '',
is_has_banner: '',
is_has_detail: '',
is_jd_remove:''
is_jd_remove: '',
},
//
isLoading: false,
@ -577,7 +585,7 @@ export default {
saleVisible: false,
priceVisible: false,
jingPinVisible: false,
batchPrice:false,
batchPrice: false,
specsType: [
{ name: '全部', val: '' },
{ name: '单规格', val: 10 },
@ -612,7 +620,7 @@ export default {
categoryIds: [],
categoryPriceIds: [],
rate: '',
batchRate:'',
batchRate: '',
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now()
@ -873,8 +881,8 @@ export default {
})
},
getGoodsJingDong(val) {
this.queryParam.is_jd_remove = val
},
this.queryParam.is_jd_remove = val
},
getChannel(val) {
this.queryParam.channel = val
},
@ -1089,7 +1097,7 @@ export default {
'&is_self=' +
this.queryParam.is_self +
'&is_jd_remove=' +
(this.queryParam.is_jd_remove || '') +
(this.queryParam.is_jd_remove || '') +
'&goodsIds=' +
goodsIds +
'&Access-Token=' +

@ -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="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"

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save