1
0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-10 12:01:57 +08:00

Switching from document type (#987)

* Switching from document type

* minimal changes

Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
This commit is contained in:
Elsio Sanchez 2021-07-14 10:58:20 -04:00 committed by GitHub
parent 80b9e9e95b
commit fe28675214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 22 deletions

View File

@ -27,7 +27,8 @@ export function getProductPrice({
name, name,
posUuid, posUuid,
businessPartnerUuid, businessPartnerUuid,
validFrom validFrom,
priceListUuid
}) { }) {
return request({ return request({
url: `${config.priceChecking.endpoint}/product-price`, url: `${config.priceChecking.endpoint}/product-price`,
@ -39,7 +40,8 @@ export function getProductPrice({
name, name,
pos_uuid: posUuid, pos_uuid: posUuid,
business_partner_uuid: businessPartnerUuid, business_partner_uuid: businessPartnerUuid,
valid_from: validFrom valid_from: validFrom,
price_list_uuid: priceListUuid
} }
}) })
.then(productPriceResponse => { .then(productPriceResponse => {

View File

@ -54,15 +54,15 @@
</el-col> </el-col>
<el-col :span="5" :style="styleTab"> <el-col :span="5" :style="styleTab">
<el-form-item> <el-form-item>
<br> <template slot="label" />
<el-dropdown <el-dropdown
v-if="!isEmptyValue(currentWarehouse)" v-if="!isEmptyValue(currentDocumentType)"
trigger="click" trigger="click"
class="info-pos" style="padding-top: 10%;font-size: 15px;color: black;"
@command="changeDocumentType" @command="changeDocumentType"
> >
<span> <span>
<svg-icon icon-class="tree" /> <icon class="el-icon-document" />
<b style="cursor: pointer"> {{ currentDocumentType.name }} </b> <b style="cursor: pointer"> {{ currentDocumentType.name }} </b>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
@ -75,7 +75,6 @@
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<br>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="isEmptyValue(currentOrder) ? 1 : 4" :style="isShowedPOSKeyLayout ? 'padding: 0px; margin-top: 3.%;' : 'padding: 0px; margin-top: 2.4%;'"> <el-col :span="isEmptyValue(currentOrder) ? 1 : 4" :style="isShowedPOSKeyLayout ? 'padding: 0px; margin-top: 3.%;' : 'padding: 0px; margin-top: 2.4%;'">

View File

@ -359,17 +359,6 @@ export default {
message: error.message, message: error.message,
showClose: true showClose: true
}) })
this.$store.commit('updateValueOfField', {
containerUuid: 'Products-Price-List',
columnName: 'ProductValue',
value: `${searchProduct}`
})
this.$store.commit('showListProductPrice', {
attribute: 'isShowPopoverField',
isShowed: true
})
}) })
.finally(() => { .finally(() => {
this.$store.commit('updateValuesOfContainer', { this.$store.commit('updateValuesOfContainer', {

View File

@ -37,13 +37,14 @@ export default {
createOrder({ commit, dispatch, rootGetters }, { createOrder({ commit, dispatch, rootGetters }, {
posUuid, posUuid,
customerUuid, customerUuid,
documentTypeUuid documentTypeUuid,
warehouseUuid
}) { }) {
return createOrder({ return createOrder({
posUuid, posUuid,
customerUuid, customerUuid,
warehouseUuid: rootGetters.currentWarehouse.uuid, documentTypeUuid,
documentTypeUuid warehouseUuid
}) })
.then(order => { .then(order => {
commit('setOrder', order) commit('setOrder', order)
@ -115,7 +116,13 @@ export default {
}) { }) {
createOrderLine({ createOrderLine({
orderUuid, orderUuid,
productUuid warehouseUuid,
productUuid,
chargeUuid,
description,
quantity,
price,
discountRate
}) })
.then(orderLine => { .then(orderLine => {
dispatch('updateOrderLines', orderLine) dispatch('updateOrderLines', orderLine)