shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-09-20 06:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

5.14 修改

Browse source
This commit is contained in:
tczjx58520 2020-05-14 13:15:25 +08:00
parent 83095bbae5
commit 859d57c149
26 changed files with 151 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/views/SaleContract/AddSaleContract.vue
View file

@ -323,7 +323,7 @@
/>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150px"/>
<!-- <el-editable-column prop="costPrice" align="center" :label="$t('updates.cbj')" min-width="150px"/>-->
<el-editable-column :label="$t('updates.hsj')" prop="taxprice" align="center" min-width="150px">
<template slot-scope="scope">
@ -349,7 +349,7 @@
@change="gettaxRate(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>

4
src/views/SaleContract/components/DetailList.vue
View file

@ -205,14 +205,14 @@
<el-editable-column :label="$t('updates.jxf')" prop="performanceScore" align="center" />
<el-editable-column :label="$t('updates.spjf')" prop="productScore" align="center" />
<el-editable-column :label="$t('updates.ddsl')" prop="quantity" align="center" />
<el-editable-column v-if="jundgeprice()" :label="$t('updates.lsj')" prop="salePrice" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.lsj')" prop="salePrice" align="center" />
<!-- <el-editable-column prop="costPrice" align="center" :label="$t('updates.cbj')" />-->
<el-editable-column :label="$t('updates.hsj')" prop="taxprice" align="center" />
<!-- <el-editable-column prop="costMoney" align="center" label="成本金额" />-->
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" />
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" />
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" />
<!-- <el-editable-column prop="includeTaxCostMoney" align="center" :label="$t('updates.hscbje')" />-->
<el-editable-column :label="$t('updates.ckl')" prop="discount" align="center" />
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" />

4
src/views/SaleContract/components/MyDialog.vue
View file

@ -302,7 +302,7 @@
/>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150px"/>
<!-- <el-editable-column prop="costPrice" align="center" :label="$t('updates.cbj')" min-width="150px"/>-->
<el-editable-column :label="$t('updates.hsj')" prop="taxprice" align="center" min-width="150px">
<template slot-scope="scope">
@ -333,7 +333,7 @@
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>

4
src/views/SaleOrder/AddSaleOrder.vue
View file

@ -268,7 +268,7 @@
<el-editable-column :label="$t('updates.ythsl')" prop="retreatQuantity" align="center" min-width="150px"/>
<!-- <el-editable-column prop="salePrice" align="center" :label="$t('updates.lsj')" min-width="150px"/>-->
<!-- <el-editable-column prop="costPrice" align="center" :label="$t('updates.cbj')" min-width="150px"/>-->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.xsdj')" prop="taxprice" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.xsdj')" prop="taxprice" align="center" min-width="150px">
<template slot-scope="scope">
<span>{{ gettaxprice(scope.row) }}</span>
</template>
@ -302,7 +302,7 @@
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.sxje')" prop="includeTaxCostMoney" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sxje')" prop="includeTaxCostMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ getincludeTaxCostMoney(scope.row) }}</p>
</template>

4
src/views/SaleOrder/components/DetailList.vue
View file

@ -146,13 +146,13 @@
<el-editable-column :label="$t('updates.ythsl')" prop="retreatQuantity" align="center" min-width="150px"/>
<!-- <el-editable-column prop="salePrice" align="center" :label="$t('updates.lsj')" />-->
<!-- <el-editable-column prop="costPrice" align="center" :label="$t('updates.cbj')" />-->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.xsdj')" prop="taxprice" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.xsdj')" prop="taxprice" align="center" />
<!-- <el-editable-column prop="costMoney" align="center" label="成本金额" /> -->
<!-- <el-editable-column prop="includeTaxMoney" align="center" :label="$t('updates.hsje')" /> -->
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" />
<!-- <el-editable-column prop="money" align="center" :label="$t('Hmodule.je')" /> -->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.sxje')" prop="includeTaxCostMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sxje')" prop="includeTaxCostMoney" align="center" />
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" />
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" />
<el-editable-column :label="$t('updates.yxdcgsl')" prop="alreadyApplicationQuantity" align="center" />

4
src/views/SaleOrder/components/MyDialog.vue
View file

@ -241,7 +241,7 @@
<el-editable-column :label="$t('updates.ythsl')" prop="retreatQuantity" align="center" min-width="150px"/>
<!-- <el-editable-column prop="salePrice" align="center" :label="$t('updates.lsj')" min-width="150px"/>-->
<!-- <el-editable-column prop="costPrice" align="center" :label="$t('updates.cbj')" min-width="150px"/>-->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.xsdj')" prop="taxprice" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.xsdj')" prop="taxprice" align="center" min-width="150px">
<template slot-scope="scope">
<span>{{ gettaxprice(scope.row) }}</span>
</template>
@ -275,7 +275,7 @@
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.sxje')" prop="includeTaxCostMoney" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sxje')" prop="includeTaxCostMoney" align="center" min-width="170px"/>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number

4
src/views/SaleOut/AddSaleOut.vue
View file

@ -331,7 +331,7 @@
<el-editable-column v-if="false" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150"/>
<el-editable-column v-if="false" :label="$t('updates.cbj')" prop="costPrice" align="center" min-width="150"/>
<!-- <el-editable-column prop="taxprice" align="center" :label="$t('updates.hsj')" min-width="150px"> -->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ gettaxprice(scope.row) }}</span>
</template>
@ -365,7 +365,7 @@
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<template slot-scope="scope">
<p>{{ getincludeTaxCostMoney(scope.row) }}</p>
</template>

4
src/views/SaleOut/NewAccessoriesOut.vue
View file

@ -230,7 +230,7 @@
<el-editable-column v-if="false" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150"/>
<el-editable-column v-if="false" :label="$t('updates.cbj')" prop="costPrice" align="center" min-width="150"/>
<!-- <el-editable-column prop="taxprice" align="center" :label="$t('updates.hsj')" min-width="150px"> -->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ gettaxprice(scope.row) }}</span>
</template>
@ -265,7 +265,7 @@
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<template slot-scope="scope">
<p>{{ getincludeTaxCostMoney(scope.row) }}</p>
</template>

4
src/views/SaleOut/NewBatteryOut.vue
View file

@ -186,7 +186,7 @@
<el-editable-column v-if="false" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150"/>
<el-editable-column v-if="false" :label="$t('updates.cbj')" prop="costPrice" align="center" min-width="150"/>
<!-- <el-editable-column prop="taxprice" align="center" :label="$t('updates.hsj')" min-width="150px"> -->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ gettaxprice(scope.row) }}</span>
</template>
@ -221,7 +221,7 @@
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<template slot-scope="scope">
<p>{{ getincludeTaxCostMoney(scope.row) }}</p>
</template>

4
src/views/SaleOut/components/DetailList.vue
View file

@ -230,13 +230,13 @@
<el-editable-column :label="$t('updates.thsl')" prop="retreatQuantity" align="center" />
<!-- <el-editable-column prop="salePrice" align="center" :label="$t('updates.lsj')" />
<el-editable-column prop="costPrice" align="center" :label="$t('updates.cbj')" /> -->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckj')" prop="salePrice" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckj')" prop="salePrice" align="center" />
<!-- <el-editable-column prop="costMoney" align="center" label="成本金额" />
<el-editable-column prop="includeTaxMoney" align="center" :label="$t('updates.hsje')" /> -->
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" />
<!-- <el-editable-column prop="money" align="center" :label="$t('Hmodule.je')" /> -->
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" />
<el-editable-column :formatter="formatter" :label="$t('updates.ckl')" prop="discountRate" align="center"/>
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" />
<el-editable-column :label="$t('updates.cjbm')" prop="carCode" align="center" />

4
src/views/SaleOut/components/MyDialog.vue
View file

@ -334,7 +334,7 @@
</el-editable-column>
<el-editable-column v-if="false" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150"/>
<el-editable-column v-if="false" :label="$t('updates.cbj')" prop="costPrice" align="center" min-width="150"/>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ gettaxprice(scope.row) }}</span>
</template>
@ -368,7 +368,7 @@
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<template slot-scope="scope">
<p>{{ getincludeTaxCostMoney(scope.row) }}</p>
</template>

4
src/views/SaleOut/components/MyDialog2.vue
View file

@ -309,7 +309,7 @@
</el-editable-column>
<el-editable-column v-if="false" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150"/>
<el-editable-column v-if="false" :label="$t('updates.cbj')" prop="costPrice" align="center" min-width="150"/>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ gettaxprice(scope.row) }}</span>
</template>
@ -343,7 +343,7 @@
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<template slot-scope="scope">
<p>{{ getincludeTaxCostMoney(scope.row) }}</p>
</template>

4
src/views/SaleOut/components/MyDialog3.vue
View file

@ -304,7 +304,7 @@
</el-editable-column>
<el-editable-column v-if="false" :label="$t('updates.lsj')" prop="salePrice" align="center" min-width="150"/>
<el-editable-column v-if="false" :label="$t('updates.cbj')" prop="costPrice" align="center" min-width="150"/>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckj')" prop="taxprice" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ gettaxprice(scope.row) }}</span>
</template>
@ -338,7 +338,7 @@
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckje')" prop="includeTaxCostMoney" align="center" min-width="170">
<template slot-scope="scope">
<p>{{ getincludeTaxCostMoney(scope.row) }}</p>
</template>

28
src/views/StockArrival/AddStockArrival.vue
View file

@ -189,26 +189,26 @@
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.jhrq')" prop="giveDate" align="center" min-width="170px"/>
<el-editable-column :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ getdiscountMoney(scope.row) }}</p>
</template>
@ -224,7 +224,7 @@
</el-editable>
</div>
</el-card>
<el-card :body-style="{ padding: '5px' }" class="box-card" shadow="never" style="margin-bottom:20px;">
<el-card v-show="jundgeprice()" :body-style="{ padding: '5px' }" class="box-card" shadow="never" style="margin-bottom:20px;">
<div ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">{{ $t('updates.hjxx') }}</div>
<div class="container" style="margin-top: 25px">
<el-form :inline="true" status-icon class="demo-ruleForm" label-width="130px">
@ -522,6 +522,16 @@ export default {
_that = this
},
methods: {
jundgeprice() {
const value = ['1-22-24-115']
const roles = this.$store.getters && this.$store.getters.roles
const permissionRoles = value
const hasPermission = roles.some(role => {
return permissionRoles.includes(role)
})
console.log('hasPermission=======', hasPermission)
return hasPermission
},
handlechooseRep() {
this.repositorycontrol = true
},

18
src/views/StockArrival/StockArrivalList.vue
View file

@ -140,22 +140,22 @@
<span>{{ scope.row.stockPersonName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockArrival.allMoney')" :resizable="false" align="center" min-width="100">
<el-table-column v-show="jundgeprice()" :label="$t('StockArrival.allMoney')" :resizable="false" align="center" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.allMoney }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockArrival.allTaxMoney')" :resizable="false" align="center" min-width="100">
<el-table-column v-show="jundgeprice()" :label="$t('StockArrival.allTaxMoney')" :resizable="false" align="center" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.allTaxMoney }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockArrival.allIncludeTaxMoney')" :resizable="false" align="center" min-width="100">
<el-table-column v-show="jundgeprice()" :label="$t('StockArrival.allIncludeTaxMoney')" :resizable="false" align="center" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.allIncludeTaxMoney }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockOrder.discountMoney')" :resizable="false" align="center" min-width="100">
<el-table-column v-show="jundgeprice()" :label="$t('StockOrder.discountMoney')" :resizable="false" align="center" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.allDiscountMoney }}</span>
</template>
@ -340,6 +340,16 @@ export default {
_that = this
},
methods: {
jundgeprice() {
const value = ['1-22-24-115']
const roles = this.$store.getters && this.$store.getters.roles
const permissionRoles = value
const hasPermission = roles.some(role => {
return permissionRoles.includes(role)
})
console.log('hasPermission=======', hasPermission)
return hasPermission
},
getinformation() {
if (this.$store.getters.empcontract) {
console.log('getempcontract', this.$store.getters.empcontract)

18
src/views/StockArrival/components/DetailList.vue
View file

@ -117,14 +117,14 @@
<span >{{ timestampToTime(scope.row.giveDate) }}</span>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" />
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" />
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" />
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" />
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" />
<el-editable-column :label="$t('updates.zk')" prop="discountRate" align="center" />
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.zk')" prop="discountRate" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" />
<el-editable-column :label="$t('updates.bz')" prop="remark" align="center" />
<el-editable-column :label="$t('updates.ydbh')" prop="sourceNumber" align="center" />
<el-editable-column :label="$t('updates.ydxh')" prop="sourceSerialNumber" align="center" />
@ -137,7 +137,7 @@
</el-editable>
</div>
</el-card>
<el-card class="box-card" shadow="never" style="margin-top: 10px">
<el-card v-show="jundgeprice()" class="box-card" shadow="never" style="margin-top: 10px">
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">{{ $t('updates.hjxx') }}</h2>
<div class="container" style="margin-top: 37px">
<el-form :inline="true" status-icon class="demo-ruleForm" label-width="130px">

18
src/views/StockArrival/components/MyDialog.vue
View file

@ -193,26 +193,26 @@
<span> {{ timestampToTime(scope.row.giveDate) }}</span>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.zk')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.zk')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ getdiscountMoney(scope.row) }}</p>
</template>
@ -229,7 +229,7 @@
</el-editable>
</div>
</el-card>
<el-card :body-style="{ padding: '5px' }" class="box-card" shadow="never" style="margin-top: 10px">
<el-card v-show="jundgeprice()" :body-style="{ padding: '5px' }" class="box-card" shadow="never" style="margin-top: 10px">
<div ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">{{ $t('updates.hjxx') }}</div>
<div class="container" style="margin-top: 25px">
<el-form :inline="true" status-icon class="demo-ruleForm" label-width="130px">

24
src/views/StockOrder/AddStockOrder.vue
View file

@ -208,7 +208,7 @@
@input="getprice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -220,22 +220,22 @@
<p>{{ gettaxRate(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="tax" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="tax" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -243,7 +243,7 @@
@change="getdiscountRate(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -259,7 +259,7 @@
</el-editable>
</div>
</el-card>
<el-card :body-style="{ padding: '5px' }" class="box-card" shadow="never" style="margin-bottom:20px;">
<el-card v-show="jundgeprice()" :body-style="{ padding: '5px' }" class="box-card" shadow="never" style="margin-bottom:20px;">
<div ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">{{ $t('updates.hjxx') }}</div>
<div class="container" style="margin-top: 37px">
<el-form :inline="true" status-icon class="demo-ruleForm" label-width="130px">
@ -597,6 +597,16 @@ export default {
_that = this
},
methods: {
jundgeprice() {
const value = ['1-22-24-115']
const roles = this.$store.getters && this.$store.getters.roles
const permissionRoles = value
const hasPermission = roles.some(role => {
return permissionRoles.includes(role)
})
console.log('hasPermission=======', hasPermission)
return hasPermission
},
handlechooseRep() {
this.repositorycontrol = true
},

8
src/views/StockOrder/StockOrderList.vue
View file

@ -227,22 +227,22 @@
<span>{{ scope.row.supplierName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockOrder.allMoney')" :resizable="false" align="center" min-width="150">
<el-table-column v-show="jundgeprice()" :label="$t('StockOrder.allMoney')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.allMoney }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockOrder.allTaxMoney')" :resizable="false" align="center" min-width="150">
<el-table-column v-show="jundgeprice()" :label="$t('StockOrder.allTaxMoney')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.allTaxMoney }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockOrder.allIncludeTaxMoney')" :resizable="false" align="center" min-width="150">
<el-table-column v-show="jundgeprice()" :label="$t('StockOrder.allIncludeTaxMoney')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.allIncludeTaxMoney }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockOrder.discountMoney')" :resizable="false" align="center" min-width="150">
<el-table-column v-show="jundgeprice()" :label="$t('StockOrder.discountMoney')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.allDiscountMoney }}</span>
</template>

18
src/views/StockOrder/components/DetailList.vue
View file

@ -114,14 +114,14 @@
<el-editable-column :label="$t('updates.cgsl')" prop="stockQuantity" align="center" />
<el-editable-column :label="$t('updates.jhrq')" prop="deliveryDate" align="center" />
<el-editable-column :label="$t('updates.bz')" prop="remarks" align="center" />
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" />
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" />
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" />
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" />
<el-editable-column :label="$t('updates.se')" prop="tax" align="center" />
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" />
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="tax" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckl')" prop="discountRate" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" />
<el-editable-column :label="$t('updates.ydbh')" prop="sourceNumber" align="center" />
<el-editable-column :label="$t('updates.ydxh')" prop="sourceSerialNumber" align="center" />
<el-editable-column :label="$t('updates.ydhsl')" prop="arrivalQuantity" align="center" />
@ -130,7 +130,7 @@
</el-editable>
</div>
</el-card>
<el-card class="box-card" shadow="never" style="margin-top: 10px">
<el-card v-show="jundgeprice()" class="box-card" shadow="never" style="margin-top: 10px">
<h2 ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">{{ $t('updates.hjxx') }}</h2>
<div class="container" style="margin-top: 37px">
<el-form :inline="true" status-icon class="demo-ruleForm" label-width="130px">

18
src/views/StockOrder/components/MyDialog.vue
View file

@ -200,7 +200,7 @@
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('updates.bz')" prop="remarks" align="center" min-width="150px"/>
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -208,7 +208,7 @@
@input="getprice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -217,7 +217,7 @@
@input="getincludeTaxPrice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -225,22 +225,22 @@
@input="gettaxRate(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="tax" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="tax" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -248,7 +248,7 @@
@change="getdiscountRate(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -264,7 +264,7 @@
</el-editable>
</div>
</el-card>
<el-card :body-style="{ padding: '5px' }" class="box-card" shadow="never" style="margin-top: 10px">
<el-card v-show="jundgeprice()" :body-style="{ padding: '5px' }" class="box-card" shadow="never" style="margin-top: 10px">
<div ref="geren" class="form-name" style="font-size: 16px;color: #606266;margin-top: -5px;">{{ $t('updates.hjxx') }}</div>
<div class="container" style="margin-top: 37px">
<el-form :inline="true" status-icon class="demo-ruleForm" label-width="130px">

24
src/views/StockRetreat/AddStockRetreat.vue
View file

@ -197,25 +197,25 @@
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible', events: {change: jungleNumbers}}" :label="$t('updates.thsl')" prop="retreatQuantity" align="center" min-width="150px"/>
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('updates.thyy')" prop="retreatReason" align="center" min-width="170px"/>
<el-editable-column :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ getdiscountMoney(scope.row) }}</p>
</template>
@ -510,6 +510,16 @@ export default {
_that = this
},
methods: {
jundgeprice() {
const value = ['1-22-24-115']
const roles = this.$store.getters && this.$store.getters.roles
const permissionRoles = value
const hasPermission = roles.some(role => {
return permissionRoles.includes(role)
})
console.log('hasPermission=======', hasPermission)
return hasPermission
},
enter(val) {
console.log('enter', val)
// this.$refs.editable.clear()

16
src/views/StockRetreat/components/DetailList.vue
View file

@ -111,14 +111,14 @@
<el-editable-column :label="$t('updates.dhsl')" prop="arrivalQuantity" align="center" />
<el-editable-column :label="$t('updates.thsl')" prop="retreatQuantity" align="center" />
<el-editable-column :label="$t('updates.thyy')" prop="retreatReason" align="center" />
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" />
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" />
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" />
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" />
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" />
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" />
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckl')" prop="discountRate" align="center" />
<el-editable-column v-show="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" />
<el-editable-column :label="$t('updates.bz')" prop="remark" align="center" />
<el-editable-column :label="$t('updates.ydbh')" prop="sourceNumber" align="center" />
<el-editable-column :label="$t('updates.ydxh')" prop="sourceSerialNumber" align="center" />

16
src/views/StockRetreat/components/MyDialog.vue
View file

@ -182,26 +182,26 @@
<el-editable-column :label="$t('updates.dhsl')" prop="arrivalQuantity" align="center" min-width="150px"/>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible', events: {change: jungleNumbers}}" :label="$t('updates.thsl')" prop="retreatQuantity" align="center" min-width="150px"/>
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('updates.thyy')" prop="retreatReason" align="center" min-width="170px"/>
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column v-if="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column v-show="jundgeprice()" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ getdiscountMoney(scope.row) }}</p>
</template>

2
src/views/Supplier/components/DetailList.vue
View file

@ -157,7 +157,7 @@
<el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
<el-editable-column prop="proportion" align="center" label="供货比列(%)" min-width="150px"/>
<el-editable-column v-if="jundgeprice()" prop="price" align="center" label="价格" min-width="150px"/>
<el-editable-column v-show="jundgeprice()" prop="price" align="center" label="价格" min-width="150px"/>
<el-editable-column :label="$t('updates.zk')" prop="discountRate" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="150px"/>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="150px"/>

2
src/views/Supplier/components/MyDialog.vue
View file

@ -232,7 +232,7 @@
<!-- <my-supplier :control.sync="proporcontrol" :procode="procode" @supplierName="personName2(scope, $event)"/>-->
</template>
</el-editable-column>
<el-editable-column v-if="jundgeprice()" :edit-render="{name: 'ElInputNumber', attrs: {min: 0,max: 100,precision: 6,controls:false}, type: 'visible'}" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px">
<el-editable-column v-show="jundgeprice()" :edit-render="{name: 'ElInputNumber', attrs: {min: 0,max: 100,precision: 6,controls:false}, type: 'visible'}" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"