master
toesbieya 6 years ago
parent aed701c2ec
commit 8cb4d32cd9
  1. 4
      vue/src/assets/styles/variables.scss
  2. 8
      vue/src/views/purchase/inbound/components/EditDialog.vue
  3. 12
      vue/src/views/sell/outbound/components/EditDialog.vue

@ -20,8 +20,8 @@ $--color-gray: #9E9E9E;
$--color-blue-gray: #607D8B;
//覆盖element颜色
$--color-primary: $--color-blue;
$--color-success: $--color-green;
$--color-primary: #1890ff;
$--color-success: #21BA45;
$--color-warning: $--color-deep-orange;
$--color-danger: $--color-red;
$--color-info: $--color-teal;

@ -64,7 +64,7 @@
v-model="row.num"
:min="0"
size="small"
@change="changeInboundNum($event,row)"
@change="(nv,ov)=>changeInboundNum(nv,ov,row)"
/>
<span v-else>{{row.num}}</span>
</template>
@ -128,10 +128,10 @@
num: i.remain_num
}))
},
changeInboundNum(v, row) {
changeInboundNum(nv, ov, row) {
let parentSub = this.parentSubList.find(i => i.cid === row.cid)
if (!parentSub || v > parentSub.remain_num) {
return elAlert(`${row.cname}的入库数量超出采购数量`, () => row.num = parentSub.remain_num)
if (!parentSub || nv > parentSub.remain_num) {
return elAlert(`${row.cname}的入库数量超出采购数量`, () => row.num = ov)
}
},
validate() {

@ -69,7 +69,7 @@
v-model="d.row.num"
:min="0"
size="small"
@change="changeOutboundNum($event,d.row,row)"
@change="(nv,ov)=>changeOutboundNum(nv,ov,d.row,row)"
/>
<span v-else>{{d.row.num}}</span>
</template>
@ -208,9 +208,9 @@
return sum
}
},
changeOutboundNum(v, row, displayTableRow) {
if (v > row.max_num) {
return elAlert(`${row.cname}的出库数量超出库存数量`, () => row.num = row.max_num)
changeOutboundNum(nv, ov, row, displayTableRow) {
if (nv > row.max_num) {
return elAlert(`${row.cname}的出库数量超出库存数量`, () => row.num = ov)
}
let outboundNum = displayTableRow.data.map(i => i.num)
@ -219,10 +219,10 @@
if (!outboundNum) return
if (outboundNum > displayTableRow.remain_num) {
let correctNum = sub(displayTableRow.remain_num, sub(outboundNum, v))
let correctNum = sub(displayTableRow.remain_num, sub(outboundNum, nv))
if (correctNum < 0) correctNum = 0
else if (correctNum > row.max_num) correctNum = row.max_num
return elAlert(`${displayTableRow.cname}的出库数量超出销售数量`, () => row.num = correctNum)
return elAlert(`${displayTableRow.cname}的出库数量超出销售数量`, () => row.num = ov)
}
},
validate() {

Loading…
Cancel
Save