Commit a9b2e7eb authored by Mac's avatar Mac

修改放的位置

parent 2a9e5693
...@@ -47,7 +47,8 @@ module.exports = function (ctx) { ...@@ -47,7 +47,8 @@ module.exports = function (ctx) {
vueRouterMode: 'hash', // available values: 'hash', 'history' vueRouterMode: 'hash', // available values: 'hash', 'history'
env: ctx.dev ? { env: ctx.dev ? {
API: 'http://localhost:5001/api', // API: 'http://localhost:5001/api',
API: 'http://192.168.10.65:8085/api',
// API: 'http://192.168.20.24:8300/api', // API: 'http://192.168.20.24:8300/api',
// API: 'http://192.168.10.46:8300/api', // API: 'http://192.168.10.46:8300/api',
......
...@@ -448,12 +448,16 @@ ...@@ -448,12 +448,16 @@
if (this.saveObj.B2CRatio) { if (this.saveObj.B2CRatio) {
let num = Number(100 - this.saveObj.B2CRatio) / 100; let num = Number(100 - this.saveObj.B2CRatio) / 100;
Count = (num * this.saveObj.SellPrice).toFixed(2); Count = (num * this.saveObj.SellPrice).toFixed(2);
}else{
Count = this.saveObj.SellPrice
} }
} }
if (type == 2) { if (type == 2) {
if (this.saveObj.B2CReNewRatio) { if (this.saveObj.B2CReNewRatio) {
let num = Number(100 - this.saveObj.B2CReNewRatio) / 100; let num = Number(100 - this.saveObj.B2CReNewRatio) / 100;
Count = (num * this.saveObj.SellPrice).toFixed(2); Count = (num * this.saveObj.SellPrice).toFixed(2);
}else{
Count = this.saveObj.SellPrice
} }
} }
return Count; return Count;
......
...@@ -31,6 +31,15 @@ ...@@ -31,6 +31,15 @@
<q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand" <q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
:icon="props.row.expand ? 'remove' : 'add'" /> :icon="props.row.expand ? 'remove' : 'add'" />
</q-td> </q-td>
<q-td key="SaleStateName">
<template v-if="props.row.SaleState==1">
{{props.row.SaleStateName}}
</template>
<template v-if="props.row.SaleState!=1">
<a style="cursor:pointer;color:blue;" @click="ShowInfo(props.row)" title="点击查看审核信息">
{{props.row.SaleStateName}}</a>
</template>
</q-td>
<q-td key="ProductTypeName" :props="props" style="width:100px;"> <q-td key="ProductTypeName" :props="props" style="width:100px;">
{{props.row.ProductTypeName}} {{props.row.ProductTypeName}}
</q-td> </q-td>
...@@ -185,15 +194,7 @@ ...@@ -185,15 +194,7 @@
<div class="remark-font">暂无佣金信息</div> <div class="remark-font">暂无佣金信息</div>
</div> </div>
</q-td> --> </q-td> -->
<q-td key="SaleStateName">
<template v-if="props.row.SaleState==1">
{{props.row.SaleStateName}}
</template>
<template v-if="props.row.SaleState!=1">
<a style="cursor:pointer;color:blue;" @click="ShowInfo(props.row)" title="点击查看审核信息">
{{props.row.SaleStateName}}</a>
</template>
</q-td>
<q-td key="Id" style="width:200px;"> <q-td key="Id" style="width:200px;">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditStudy(props.row)" /> @click="EditStudy(props.row)" />
...@@ -309,6 +310,11 @@ ...@@ -309,6 +310,11 @@
label: '备注', label: '备注',
field: 'Remark', field: 'Remark',
align: 'left' align: 'left'
}, {
name: 'SaleStateName',
label: '销售状态',
field: 'SaleStateName',
align: 'left'
}, },
{ {
name: 'ProductTypeName', name: 'ProductTypeName',
...@@ -467,12 +473,7 @@ ...@@ -467,12 +473,7 @@
// align: "left", // align: "left",
// field: row => row.PreferentialList // field: row => row.PreferentialList
// }, // },
{
name: 'SaleStateName',
label: '销售状态',
field: 'SaleStateName',
align: 'left'
},
{ {
name: 'Id', name: 'Id',
label: '操作', label: '操作',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment