修改耗材出库单位
This commit is contained in:
parent
933d70445e
commit
13b4a82ce6
|
|
@ -6,7 +6,7 @@ ENV = 'production'
|
||||||
VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
|
VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
|
||||||
|
|
||||||
# 生产
|
# 生产
|
||||||
VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
|
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
|
||||||
|
|
||||||
# 预发布接口
|
# 预发布接口
|
||||||
# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
|
# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,20 @@
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-input-number v-model="scope.row.price" :min="0" controls-position="right"
|
<el-input-number v-model="scope.row.price" :min="0" controls-position="right"
|
||||||
@change="consCountTotal($event, scope.row, 'price')"></el-input-number>
|
@change="consCountTotal($event, scope.row, 'price')"></el-input-number>
|
||||||
<div class="tips" style="font-size: 16px;">原价¥{{ scope.row.costPrice }}/{{ scope.row.conUnit }}
|
<div class="tips" style="font-size: 16px;">原价¥
|
||||||
|
<!-- {{ scope.row.costPrice }}/{{ scope.row.conUnit }} -->
|
||||||
|
|
||||||
|
{{ !scope.row.unit ?
|
||||||
|
(scope.row.defaultUnit ?
|
||||||
|
scope.row.defaultUnit== scope.row.conUnitTwo?
|
||||||
|
((scope.row.costPrice*scope.row.conUnitTwoConvert).toFixed(2)): scope.row.costPrice:scope.row.costPrice)
|
||||||
|
: scope.row.unit== scope.row.conUnitTwo?
|
||||||
|
((scope.row.costPrice*scope.row.conUnitTwoConvert).toFixed(2)): scope.row.costPrice}}
|
||||||
|
/
|
||||||
|
{{ !scope.row.unit ? (scope.row.defaultUnit ? scope.row.defaultUnit :
|
||||||
|
scope.row.conUnit) : scope.row.unit }}
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
|
||||||
|
|
@ -118,18 +118,32 @@
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-input-number v-model="scope.row.price" :min="0" controls-position="right"
|
<el-input-number v-model="scope.row.price" :min="0" controls-position="right"
|
||||||
@change="consCountTotal($event, scope.row, 'price')"></el-input-number>
|
@change="consCountTotal($event, scope.row, 'price')"></el-input-number>
|
||||||
<div class="tips" style="font-size: 16px;">原价¥{{ scope.row.costPrice }}/{{ scope.row.conUnit }}</div>
|
<div class="tips" style="font-size: 16px;">原价¥
|
||||||
|
<!-- {{ scope.row.costPrice }}/{{ scope.row.conUnit }} -->
|
||||||
|
{{ !scope.row.unit ?
|
||||||
|
(scope.row.defaultUnit ?
|
||||||
|
scope.row.defaultUnit== scope.row.conUnitTwo?
|
||||||
|
((scope.row.costPrice*scope.row.conUnitTwoConvert).toFixed(2)): scope.row.costPrice:scope.row.costPrice)
|
||||||
|
: scope.row.unit== scope.row.conUnitTwo?
|
||||||
|
((scope.row.costPrice*scope.row.conUnitTwoConvert).toFixed(2)): scope.row.costPrice}}
|
||||||
|
/
|
||||||
|
{{ !scope.row.unit ? (scope.row.defaultUnit ? scope.row.defaultUnit :
|
||||||
|
scope.row.conUnit) : scope.row.unit }}
|
||||||
|
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="单位">
|
<el-table-column label="单位">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit"
|
<el-select @change="consCountTotal($event, scope.row, 'unit')" v-model="scope.row.unit"
|
||||||
:placeholder="scope.row.conUnit">
|
:placeholder="scope.row.defaultUnit ? scope.row.defaultUnit : scope.row.conUnit">
|
||||||
<el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
|
<el-option :label="scope.row.conUnit" :value="scope.row.conUnit"> </el-option>
|
||||||
<el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo"
|
<el-option :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo"
|
||||||
v-if="scope.row.conUnitTwo"> </el-option>
|
v-if="scope.row.conUnitTwo"> </el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
<div class="tips"> </div>
|
<div class="tips"> </div>
|
||||||
|
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="数量">
|
<el-table-column label="数量">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue