xiaofeng
/
JDHY
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

加长产品库商品标题显示

master
С·æ 4 years ago
parent
8261845876
commit
7b3492ed5c
10 changed files with 27 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
  2. 30
      客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
  3. 1
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.8a0133b1.css
  4. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.90b53025.css
  5. 1
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.aed7bccd.css
  6. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.css
  7. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/index.html
  8. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
  9. 2
      客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
  10. 8
      客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj

2
客户端/齐越慧眼/齐越慧眼/MainWindow.xaml
View File

@ -11,7 +11,7 @@
WindowStartupLocation="CenterScreen"
ActiveGlowColor="{DynamicResource PrimaryColor}"
Height="780"
Width="1280"
Width="1468"
>
<Border Padding="0 10" Background="#EEEEEE">
<hc:TabControl IsAnimationEnabled="True" IsTabFillEnabled="False" TabItemWidth="150" Name="tab">

30
客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/items/Index.vue
View File

@ -100,15 +100,21 @@
<!--采购价-->
<a-col :span="2" style="margin-top: 5px;">
<div v-for="(ext,index) in item.Extensions" style="height: 40px;" :key="index">
<a-input v-if="item.isEdit" v-model="ext.BuyPrice"></a-input>
<span class="spanValue" v-else>{{ext.BuyPrice}}</span>
<div v-if="ext.BuyPrice||item.isEdit">
<a-input v-if="item.isEdit" v-model="ext.BuyPrice"></a-input>
<span class="spanValue" v-else>{{ext.BuyPrice}}</span>
</div>
<span v-else>-</span>
</div>
</a-col>
<!--快递费-->
<a-col :span="2" style="margin-top: 5px;">
<div v-for="(ext,index) in item.Extensions" style="height: 40px;" :key="index">
<a-input v-if="item.isEdit" v-model="ext.KDPrice"></a-input>
<span class="spanValue" v-else>{{ext.KDPrice}}</span>
<div v-if="ext.BuyPrice||item.isEdit">
<a-input v-if="item.isEdit" v-model="ext.KDPrice"></a-input>
<span class="spanValue" v-else>{{ext.KDPrice}}</span>
</div>
<span v-else>-</span>
</div>
</a-col>
<!--平台扣点-->
@ -121,14 +127,16 @@
<!--利润-->
<a-col :span="1" style="margin-top: 5px;">
<div v-for="(ext,index) in item.Extensions" style="height: 40px;" :key="index">
<span class="spanValue">{{ext.Profit}}</span>
<span v-if="ext.BuyPrice" class="spanValue">{{ext.Profit}}</span>
<span v-else>-</span>
</div>
</a-col>
<!--利润率-->
<a-col :span="1" style="margin-top: 5px;">
<div v-for="(ext,index) in item.Extensions" style="height: 40px;" :key="index">
<!-- <a-input v-if="item.isEdit" v-model="ext.Profits"></a-input>-->
<span class="spanValue">{{ext.Profits}}%</span>
<span v-if="ext.BuyPrice" class="spanValue">{{ext.Profits}}%</span>
<span v-else>-</span>
</div>
</a-col>
<a-col :span="4">
@ -239,13 +247,13 @@
res.Data.forEach(item => {
item.isEdit = false
item.Extensions.forEach(ext => {
ext.PlatformPoint = item.RivalPrice * 0.05
ext.PlatformPoint = parseFloat(item.RivalPrice * 0.05).toFixed(2)
ext.Profit = item.RivalPrice - ext.BuyPrice - ext.KDPrice - ext.PlatformPoint
if (ext.BuyPrice == 0) {
ext.Profits = 0
}
else {
ext.Profits =parseFloat(ext.Profit / ext.BuyPrice).toFixed(2)
ext.Profits = parseFloat((ext.Profit / ext.BuyPrice) * 100).toFixed(2)
}
})
});
@ -262,14 +270,14 @@
},
setData(data) {
data.Extensions.forEach(ext => {
ext.PlatformPoint = data.RivalPrice * 0.05
ext.PlatformPoint = parseFloat(data.RivalPrice * 0.05).toFixed(2)
ext.Profit = data.RivalPrice - ext.BuyPrice - ext.KDPrice - ext.PlatformPoint
if (ext.BuyPrice == 0) {
ext.Profits = 0
}
else {
ext.Profits = parseFloat(ext.Profit / ext.BuyPrice).toFixed(2)
ext.Profits = parseFloat((ext.Profit / ext.BuyPrice) * 100).toFixed(2)
}
})
this.http.post('/HuiYan/teamitems/SetItem', data).then(res => {
@ -322,7 +330,7 @@
.border {
border: 1px solid rgba(215, 215, 215, 1);
width: 1280px;
width: 1450px;
}
.borderLeft {

1
客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.8a0133b1.css
View File

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.90e0b2bc.css → 客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.90b53025.css
View File

File diff suppressed because one or more lines are too long

1
客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.aed7bccd.css
View File

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.css
View File

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/index.html
View File

@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>client</title><link href="/css/app.90e0b2bc.css" rel="preload" as="style"><link href="/css/app.css" rel="preload" as="style"><link href="/css/chunk-vendors.09af4a6b.css" rel="preload" as="style"><link href="/css/chunk-vendors.css" rel="preload" as="style"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/css/chunk-vendors.09af4a6b.css" rel="stylesheet"><link href="/css/chunk-vendors.css" rel="stylesheet"><link href="/css/app.90e0b2bc.css" rel="stylesheet"><link href="/css/app.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/app.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>client</title><link href="/css/app.90b53025.css" rel="preload" as="style"><link href="/css/app.css" rel="preload" as="style"><link href="/css/chunk-vendors.09af4a6b.css" rel="preload" as="style"><link href="/css/chunk-vendors.css" rel="preload" as="style"><link href="/js/app.js" rel="preload" as="script"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/css/chunk-vendors.09af4a6b.css" rel="stylesheet"><link href="/css/chunk-vendors.css" rel="stylesheet"><link href="/css/app.90b53025.css" rel="stylesheet"><link href="/css/app.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/app.js"></script></body></html>

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js
View File

File diff suppressed because one or more lines are too long

2
客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/app.js.map
View File

File diff suppressed because one or more lines are too long

8
客户端/齐越慧眼/齐越慧眼/齐越慧眼.csproj
View File

@ -40,9 +40,7 @@
<None Remove="vuepage\client\.eslintrc.js" />
<None Remove="vuepage\client\.gitignore" />
<None Remove="vuepage\client\.postcssrc.js" />
<None Remove="vuepage\dist\css\app.8a0133b1.css" />
<None Remove="vuepage\dist\css\app.90e0b2bc.css" />
<None Remove="vuepage\dist\css\app.aed7bccd.css" />
<None Remove="vuepage\dist\css\app.90b53025.css" />
<None Remove="vuepage\dist\css\app.b0aefef5.css" />
<None Remove="vuepage\dist\css\app.css" />
<None Remove="vuepage\dist\css\chunk-vendors.09af4a6b.css" />
@ -69,9 +67,7 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="vuepage\dist\css\app.8a0133b1.css" />
<EmbeddedResource Include="vuepage\dist\css\app.90e0b2bc.css" />
<EmbeddedResource Include="vuepage\dist\css\app.aed7bccd.css" />
<EmbeddedResource Include="vuepage\dist\css\app.90b53025.css" />
<EmbeddedResource Include="vuepage\dist\css\app.css" />
<EmbeddedResource Include="vuepage\dist\css\chunk-vendors.09af4a6b.css" />
<EmbeddedResource Include="vuepage\dist\css\chunk-vendors.css" />

Write Preview
Loading…
Cancel
Save