fe / yoho-shop-manage · Commits

Go to a project

Authored by 李奇
Commit e6f95ccaf640271f41846f6264a94e58d494db12 1 parent 3ccc6375

待处理超时样式修改

Inline Side-by-side
Showing 5 changed files with 47 additions and 41 deletions
... ... @@ -2,7 +2,8 @@
<div class="cell-deliver">
<p class="row">
发货<span class="num">
<Input v-model="deliver"></Input>
<Input v-if="rowDisabled" v-model="deliver" placeholder="数量" disabled></Input>
<Input v-else placeholder="数量"></Input>
</span>
</p>
<p class="row">已发数：{{shipNum}}</p>
... ... @@ -13,6 +14,9 @@
export default {
name: 'CellDeliver',
props: {
rowDisabled: {
type: Boolean
},
rowIndex: {
type: Number
},
... ...
... ... @@ -2,12 +2,14 @@
<div class="cell-stock-out">
<p class="row">
缺货<span class="num">
<Input number v-model="uploadNum"></Input>
<Input v-if="rowDisabled" v-model="uploadNum" placeholder="数量" disabled></Input>
<Input v-else placeholder="数量"></Input>
</span>
</p>
<p class="row">缺货数：{{lackNum}}</p>
<p class="row">
<Button type="error" @click="showModal">上传确认缺货</Button>
<Button v-if="rowDisabled" type="error" @click="showModal" disabled>上传确认缺货</Button>
<Button v-else type="error" @click="showModal">上传确认缺货</Button>
</p>
</div>
</template>
... ... @@ -18,6 +20,9 @@
export default {
name: 'CellStockOut',
props: {
rowDisabled: {
type: Boolean
},
rowIndex: {
type: [String, Number]
},
... ...
... ... @@ -10,47 +10,35 @@ export default () => {
orderNo: {
label: '入库单号',
model: '',
holder: '入库单号',
holder: '',
},
expressNo: {
label: '物流单号',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
holder: ''
},
prodCode: {
label: '商品编码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
holder: 'SKN/SKU'
},
merChantCode: {
label: '商家编码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
holder: '商家商品编码'
},
prodBarCode: {
label: '商品条码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
holder: ''
},
orderTime: {
label: '下单时间',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
holder: ''
},
prodStatus: {
label: '商品状态',
labelSpan: 6,
fieldSpan: 18,
model: -1,
options: [
{
... ...
... ... @@ -10,17 +10,17 @@ export default () => {
orderNo: {
label: '入库单号',
model: '',
holder: '入库单号',
holder: '',
},
prodCode: {
label: '商品编码',
model: '',
holder: ''
holder: 'SKN/SKU'
},
merChantCode: {
label: '商家编码',
model: '',
holder: '',
holder: '商家商品编码',
},
prodBarCode: {
label: '商品条码',
... ... @@ -108,6 +108,7 @@ export default () => {
render(row, column, i){
return `<cell-deliver
:row-index="${i}"
:row-disabled="${row._disabled}"
:ship-num="row.shipmentsNums"
@deliver-change="deliverChange">
</cell-deliver>`
... ... @@ -119,6 +120,7 @@ export default () => {
render(row, column, index){
return `<cell-stock-out
:row-index="${index}"
:row-disabled="${row._disabled}"
:lack-num="row.lackNum"
@lack-num-change="lackNumChange"
@click-upload="showUploadModal(${index})"
... ...
... ... @@ -35,7 +35,7 @@
</LayoutFilter>
<LayoutAction>
<Button type="primary" @click="sendOut">发货</Button>
<Button type="primary" @click="deliver">发货</Button>
</LayoutAction>
<LayoutList>
... ... @@ -139,16 +139,20 @@
pageSize: 20
}))
.then(res => {
const fmt = 'YYYY-MM-DD HH:mm:ss';
const list = res.data.records;
this.processData(res.data);
});
},
processData(data) {
const fmt = 'YYYY-MM-DD HH:mm:ss';
const list = data.records;
_.each(list, i => {
i.createTime = moment(i.createTime).format(fmt);
});
_.each(list, i => {
i.createTime = moment(i.createTime).format(fmt);
i._disabled = i.isOvertime === 'Y';
});
this.table.list = list;
this.page.total = res.data.totalCount;
});
this.table.list = list;
this.page.total = data.totalCount;
},
filterSearch(){
const params = this.params();
... ... @@ -185,10 +189,10 @@
const v = data.value;
this.table.list[i].inputDeliverNum = +v;
},
sendOut(){
deliver(){
const len = this.deliverRows.length;
if(!len) {
this.$Message.error('请先勾选要发货的订单');
this.$Message.error('请勾选要发货的订单');
return;
}
this.$refs.deliverModal.show();
... ... @@ -212,10 +216,14 @@
},
showUploadModal(index) {
const row = this.table.list[index];
const lackNum = row.inputLackNum;
if(!lackNum) {
this.$Message.error('请输入缺货数量');
const inputLackNum = row.inputLackNum;
const buyNum = row.buyingNums;
const shipNum = row.shipmentsNums;
const lackNum = row.lackNum;
const needDeliver = buyNum - lackNum - shipNum;
if(!inputLackNum || inputLackNum > needDeliver) {
this.$Message.error('请输入缺货数量,且缺货数量不能大于当前需发数', 3);
return;
}
this.$refs.stockOutModal.show(row);
... ... @@ -235,7 +243,6 @@
<style lang="scss">
.ivu-table .over-time td{
background-color: #2db7f5;
color: #fff;
background-color: #fcecec;
}
</style>
... ...