Skip to content

D
DataCenter_Core2.1_20190520
Commit c5891e1a by DESKTOP-732ATD8\BLT
Options

增加功能:流水自动检测

parent d26f1849
Showing with 16 additions and 30 deletions
Bailun.DC.Services/WebApiService/FinanceService.cs
......@@ -1554,16 +1554,16 @@ t1.exchange_rate AS ExchangeRate,t1.amountval_rmb AS AmountValRmb,t1.month AS Mo
sumRmb = y.Sum(s => s.AmountValRmb),
}).ToList();
var sum = group.Sum(x => x.sumRmb);
var groupMx = group.Where(x => x.platform == "亚马逊" && x.site.ToLower() == "mx" && x.sumRmb < 0).Select(x => x.sumRmb).FirstOrDefault();
var groupMx = group.Where(x => x.platform == "亚马逊" && x.site.ToLower() == "mx" && x.sumRmb < 0).Select(x => x.sumRmb).FirstOrDefault() ?? 0;
oldData.incoming_non_operating = Math.Round(sum.Value - groupMx.Value, 2);
oldData.incoming_non_operating = Math.Round(sum.Value - groupMx, 2);
//oldData.incoming_non_operating = Math.Round(SyncMonthProfitFeePlatformFeeSummary(
// new GetMonthProfitPlatformDetailInput { Month = time, FeeName = "营业外收入" }), 2);
//减：营业外支出
oldData.pay_non_operating = Math.Abs(Math.Round((SyncMonthProfitFeePlatformFeeSummary(
new GetMonthProfitPlatformDetailInput { Month = time, FeeName = "营业外支出" }) + Math.Abs(groupMx.Value)), 2)) * (-1);
new GetMonthProfitPlatformDetailInput { Month = time, FeeName = "营业外支出" }) + Math.Abs(groupMx)), 2)) * (-1);
//销售费用-税金
......
Bailun.DC.Web/Areas/Component/Views/Control/Form.cshtml
......@@ -4,7 +4,7 @@
v-model="item_value"
autosize
v-bind:clearable="item.clearable == null || item.clearable"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-bind:placeholder="item.placeholder || ('请输入' + (item.label || item.name || ''))"
v-bind:size="item.size || 'small'"
v-bind:maxlength="item.maxlength"
......@@ -17,7 +17,7 @@
class="header-search header-search-input"
v-bind:min="item.min"
v-bind:clearable="item.clearable == null || item.clearable"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-bind:placeholder="item.placeholder || ('请输入' + (item.label || item.name || ''))"
v-bind:size="item.size || 'small'"
v-bind:precision="item.precision || 0">
......@@ -25,7 +25,7 @@
<el-select v-else-if="item.type == 'select' && !item.code"
v-model="item_value"
v-bind:clearable="item.clearable == null || item.clearable"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-bind:placeholder="item.placeholder || ('请选择' + (item.label || item.name || ''))"
v-bind:loading="item.loading"
v-bind:size="item.size || 'small'"
......@@ -46,7 +46,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
v-bind:clearable="item.clearable == null || item.clearable"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-bind:placeholder="item.placeholder || ('请选择' + (item.label || item.name || ''))"
v-bind:size="item.size || 'small'"
v-bind:type="item.type"
......@@ -56,7 +56,7 @@
v-model="item_value"
value-format="yyyy/MM/dd"
v-bind:clearable="item.clearable == null || item.clearable"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-bind:placeholder="item.placeholder || ('请选择' + (item.label || item.name || ''))"
v-bind:size="item.size || 'small'"
v-bind:type="item.type"
......@@ -66,7 +66,7 @@
v-model="item_value"
value-format="yyyy-MM"
v-bind:clearable="item.clearable == null || item.clearable"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-bind:placeholder="item.placeholder || ('请选择' + (item.label || item.name || ''))"
v-bind:size="item.size || 'small'"
v-bind:type="item.type">
......@@ -74,7 +74,7 @@
<el-date-picker v-else-if="item.type == 'year' || item.type == 'month'"
v-model="item_value"
v-bind:type="item.type"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-bind:editable="false"
v-bind:placeholder="item.placeholder || ('请选择' + (item.label || item.name || ''))"
v-bind:size="item.size || 'small'"
......@@ -83,7 +83,7 @@
<template v-else-if="item.type == 'radio'">
<el-radio v-model="item_value"
v-for="option in item.listOption"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-bind:key="option[item.value || 'value']"
v-bind:label="option[item.value || 'value']">
{{option[item.display || 'display']}}
......@@ -91,20 +91,21 @@
</template>
<el-switch v-else-if="item.type == 'switch'"
v-model="item_value"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))">
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)">
</el-switch>
<el-button v-else-if="item.type == 'button'"
v-bind:icon="item.icon"
v-bind:size="item.size || 'small'"
v-bind:type="item.buttonType"
v-bind:loading="loading"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-on:click="($emit && $listeners && $listeners.click && $emit('click')) || javaScript.call(this,item.click)">
{{item.name}}
</el-button>
<el-link v-else-if="item.type == 'a'"
v-bind:underline="false"
v-bind:href="item.href"
v-bind:disabled="disabled || (disabled == null && item.disabled != null && (item.disabled == true || javaScript.call(this,item.disabled)))"
v-bind:disabled="item.disabled == true || javaScript.call(this,item.disabled)"
v-on:click="$emit('click')">
{{item.name}}
</el-link>
......
Bailun.DC.Web/wwwroot/js/component/form-control.js
......@@ -4,24 +4,9 @@
type: Object,
default: {}
},
emit: {
type: Boolean,
default: false
},
queryParams: {
type: Object,
default: () => { }
},
form: {
type: Object,
default: () => { }
},
value: {
default: null
},
disabled: {
default: null
},
loading: {
type: Boolean,
default: false
......
Bailun.DC.Web/wwwroot/js/component/query-table.js
......@@ -68,8 +68,8 @@
that.setting = $.extend({}, result.data);
//面包屑
if (that.setting.listCrumb && that.setting.listCrumb.length && document.getElementsByClassName("breadcrumb").length == 1) {
$(".breadcrumb").empty();
$(".breadcrumb").append("<li><a href='#'>首页</a></li>" + that.setting.listCrumb.map(function (i) { return "<li><a href='#'>" + i + "</a></li>" }).join(""));
$(".breadcrumb li").remove();
$(".breadcrumb").prepend("<li><a href='#'>首页</a></li>" + that.setting.listCrumb.map(function (i) { return "<li><a href='#'>" + i + "</a></li>" }).join(""));
}
//引用JS脚本
if (that.setting.listJavascriptSrc) {
......
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