Skip to content

S
SuperMan
Commit 68d93787 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 3c510473 2d9dc7c9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4035 additions and 3109 deletions
src/assets/common/lang/jp.js
View file @ 68d93787
......@@ -2591,6 +2591,7 @@ export const op={
bmzg:'部門の主管',
fgszjl:'支社長',
opszje:'OP設定金額',
fgszjdb:'日本印象を新たにする',
}
......
src/assets/common/lang/zh-tw.js
View file @ 68d93787
......@@ -2586,6 +2586,7 @@ export const op={
bmzg:'部門首長',
fgszjl:'分公司總經理',
opszje:'OP設定金額',
fgszjdb:'新增日本印象',
}
......
src/assets/common/lang/zh.js
View file @ 68d93787
......@@ -2602,6 +2602,7 @@ export const op={
bmzg:'部门主管',
fgszjl:'分公司总经理',
opszje:'OP设置金额',
fgszjdb:'新增日本印象',
}
import invoicesManager from './zhCN/invoicesManager'
......
src/assets/utils/chartsUtils.js
View file @ 68d93787
......@@ -112,113 +112,117 @@ var chartsUtils = {
},
//销售 任务管理 部门执行力
saleTaskDepartment: function(id, myTitle, myValue, insideColor, outsideColor) {
var myChart3 = selfechart.init(document.getElementById(id));
myChart3.setOption({
series: [{
name: '业务指标',
type: 'gauge',
detail: {
show: true,
backgroundColor: 'rgba(0,0,0,0)',
borderWidth: 0,
borderColor: '#ccc',
offsetCenter: [0, '10%'],
formatter: '{value}%',
textStyle: {
color: insideColor, //百分比
fontSize: 15
}
},
radius: '90%',
startAngle: 200,
endAngle: -25,
data: [{ value: myValue, name: myTitle }],
splitLine: {
show: false
},
axisLine: {
show: true,
lineStyle: {
color: [
[1, 'transparent']
],
width: 2
}
}, //缩在里面的标线
axisTick: {
min: 0,
max: 100,
splitNumber: 3, //缩在里面的标线的宽度
length: 2, // //缩在里面的标线的长度
lineStyle: { // 属性lineStyle控制线条样式
color: insideColor //刻度
}
},
axisLabel: {
formatter: function(v) {
return "";
var obj=document.getElementById(id);
if(obj!=null)
{
var myChart3 = selfechart.init(obj);
myChart3.setOption({
series: [{
name: '业务指标',
type: 'gauge',
detail: {
show: true,
backgroundColor: 'rgba(0,0,0,0)',
borderWidth: 0,
borderColor: '#ccc',
offsetCenter: [0, '10%'],
formatter: '{value}%',
textStyle: {
color: insideColor, //百分比
fontSize: 15
}
},
radius: '90%',
startAngle: 200,
endAngle: -25,
data: [{ value: myValue, name: myTitle }],
splitLine: {
show: false
},
axisLine: {
show: true,
lineStyle: {
color: [
[1, 'transparent']
],
width: 2
}
}, //缩在里面的标线
axisTick: {
min: 0,
max: 100,
splitNumber: 3, //缩在里面的标线的宽度
length: 2, // //缩在里面的标线的长度
lineStyle: { // 属性lineStyle控制线条样式
color: insideColor //刻度
}
},
axisLabel: {
formatter: function(v) {
return "";
}
},
//指针的宽度
pointer: {
width: 0
},
title: {
show: true,
offsetCenter: [0, '40%'],
textStyle: {
color: '#9E9E9E',
fontSize: 14
}
}
},
//指针的宽度
pointer: {
width: 0
},
title: {
show: true,
offsetCenter: [0, '40%'],
textStyle: {
color: '#9E9E9E',
fontSize: 14
}
{ //空仪表,最外层边框
name: '',
type: 'gauge',
startAngle: 200,
endAngle: -25,
radius: "100%",
//symbol: 'circle', //设定为实心点
//symbolSize: 20, //设定实心点的大小
detail: { formatter: '{value}%' },
axisLine: { //仪表圈
show: true,
lineStyle: {
color: [
[myValue / 100, insideColor], //完成度
[1, outsideColor]
],
shadowColor: [
[myValue / 100, 'black'],
[1, outsideColor]
],
width: 2
}
},
splitLine: { //分割线
show: false
},
axisTick: { //刻度线
show: false
},
axisLabel: { //刻度标签
show: false
},
pointer: { //指针
show: true,
width: 5,
shadowColor: 'black', //默认透明
shadowBlur: 5
},
detail: {
show: false
},
data: []
}
},
{ //空仪表,最外层边框
name: '',
type: 'gauge',
startAngle: 200,
endAngle: -25,
radius: "100%",
//symbol: 'circle', //设定为实心点
//symbolSize: 20, //设定实心点的大小
detail: { formatter: '{value}%' },
axisLine: { //仪表圈
show: true,
lineStyle: {
color: [
[myValue / 100, insideColor], //完成度
[1, outsideColor]
],
shadowColor: [
[myValue / 100, 'black'],
[1, outsideColor]
],
width: 2
}
},
splitLine: { //分割线
show: false
},
axisTick: { //刻度线
show: false
},
axisLabel: { //刻度标签
show: false
},
pointer: { //指针
show: true,
width: 5,
shadowColor: 'black', //默认透明
shadowBlur: 5
},
detail: {
show: false
},
data: []
}
]
})
]
})
}
},
saleIndex: function(id, data) {
var myChart4 = selfechart.init(document.getElementById(id));
......
src/components/FinancialModule/CapitalAllocation.vue
View file @ 68d93787
......@@ -51,6 +51,7 @@
<div class="query-box">
<ul>
<li>
<input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')" @click="goAddurl('addCapitalAllocation')"/>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
......@@ -261,7 +262,8 @@ export default {
LogLoading: true,
EmId:0,
total: 0,
currentPage: 0
currentPage: 0,
btnShow:false,
}
},
created(){
......@@ -269,6 +271,10 @@ export default {
let userInfo = this.getLocalStorage(); // 读取缓存数据
this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; // 集团ID
this.EmId=userInfo.EmployeeId;
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('F_CreateBranchMoneyAllot')!=-1){
this.btnShow=true;
}
},
methods:{
getList: function () { // 获取列表数据
......@@ -353,6 +359,9 @@ export default {
}
}, err => {})
},
goAddurl(url){
this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
},
goURL: function (url, edit, id) {
this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
},
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 68d93787
......@@ -415,6 +415,9 @@ export default {
let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
if(this.$route.query.fengs){
this.msg.RB_Branch_Id = 1218;
}
this.BillName = userInfo.GroupName;
if(this.msg.RB_Branch_Id===0 || this.msg.RB_Branch_Id===45 || this.msg.RB_Branch_Id===49){
this.msg.TemplateId=34;
......
src/components/SalesModule/MyCustomer.vue
View file @ 68d93787
This diff is collapsed.
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