Compare commits

..

No commits in common. "test" and "master" have entirely different histories.
test ... master

13 changed files with 751 additions and 644 deletions

View File

@ -1,10 +1,10 @@
# just a flag
ENV = 'development'
# base api
# VUE_APP_BASE_API = '/prod-api'
VUE_APP_ADDRESS = 'http://af-app.beida413.com/'
VUE_APP_BASE_INTERAPI = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
VUE_APP_BASE_INTERAPI2 = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
# VUE_APP_BASE_API = 'http://f.hzs413.com/inter-api'
VUE_APP_ADDRESS = 'http://f.hzs413.com/'
VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/online/language'
VUE_APP_BASE_INTERAPI2 = 'http://f.hzs413.com/language'
VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = 'http://localhost:8080'

View File

@ -4,11 +4,11 @@ ENV = 'production'
# base api
# VUE_APP_BASE_API = 'http://f.hzs413.com/prod-api'
# VUE_APP_ADDRESS = 'http://f.hzs413.com/'
# VUE_APP_BASE_INTERAPI = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
# VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
# VUE_APP_BASE_INTERAPI2 = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
VUE_APP_BASE_API = '/prod-api'
VUE_APP_ADDRESS = 'http://af.angelo413.com/'
VUE_APP_BASE_INTERAPI = 'https://agl413-test.s3.af-south-1.amazonaws.com/test'
VUE_APP_BASE_INTERAPI2 = 'http://ma.angelo413.com/lang'
VUE_APP_BASE_API = 'http://13.247.98.15/inter-api'
VUE_APP_ADDRESS = 'http://13.247.98.15/'
VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
VUE_APP_BASE_INTERAPI2 = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'

View File

@ -2,8 +2,7 @@
ENV = 'test'
# base api
VUE_APP_ADDRESS = 'http://af-app.beida413.com/'
VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_INTERAPI = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
VUE_APP_BASE_INTERAPI2 = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
VUE_APP_BASE_API = 'http://f.hzs413.com/inter-api/'
VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
VUE_APP_BASE_INTERAPI2 = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
VUE_APP_BASE_AREA = ''

View File

@ -74,4 +74,4 @@
"npm": ">= 3.0.0"
},
"license": "MIT"
}
}

View File

@ -11,7 +11,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>tab-icon.png">
<link rel="icon" href="<%= BASE_URL %>fave.png">
<title>
<%= webpackConfig.name %>
</title>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

View File

@ -11,11 +11,11 @@
</template>
<script>
import { env } from 'echarts'
import { env } from "echarts";
export default {
name: 'App',
name: "App",
data() {
return {}
return {};
},
beforeCreate() {
// var localEnUS = {}
@ -29,149 +29,149 @@ export default {
// console.log('xxxxxxxxxxxxxxx')
},
created() {
const self = this
self.loading = false
self.addScriptChild('zh-CN')
self.addScriptChild('en-US')
// self.addScriptChild("ru-RU");
self.addScriptChild('fr-FR')
if (process.env.NODE_ENV != 'production') {
const self = this;
self.loading = false;
self.addScriptChild("zh-CN");
self.addScriptChild("en-US");
self.addScriptChild("ru-RU");
self.addScriptChild("fr-FR");
if (process.env.NODE_ENV != "production") {
// self.addScriptChild("fr-FR");
// self.addScriptChild("pt-PT");
}
},
methods: {
addScriptChild2(name) {
const self = this
const s = document.createElement('script')
s.type = 'text/javascript'
const base_url = process.env.VUE_APP_BASE_INTERAPI2
s.src = base_url + '/' + name + '.js'
s.ref = 'local1'
document.body.appendChild(s)
const self = this;
const s = document.createElement("script");
s.type = "text/javascript";
const base_url = process.env.VUE_APP_BASE_INTERAPI2;
s.src = base_url + "/" + name + ".js";
s.ref = "local1";
document.body.appendChild(s);
if (window.ActiveXObject || 'ActiveXObject' in window) {
if (window.ActiveXObject || "ActiveXObject" in window) {
// ie
if (s.readyState) {
// readyState
s.onreadystatechange = function() {
if (this.readyState == 'loaded' || this.readyState == 'complete') {
self.readyAdd(name)
console.log('ie10及以下加载完成')
s.onreadystatechange = function () {
if (this.readyState == "loaded" || this.readyState == "complete") {
self.readyAdd(name);
console.log("ie10及以下加载完成");
}
}
};
} else {
s.onload = function() {
self.readyAdd(name)
console.log('ie11及Edge加载完成')
}
s.onerror = function() {
console.log('ie11及Edge加载第二地址失败:' + name)
}
s.onload = function () {
self.readyAdd(name);
console.log("ie11及Edge加载完成");
};
s.onerror = function () {
console.log("ie11及Edge加载第二地址失败:" + name);
};
}
} else {
// ie
s.onload = function() {
self.readyAdd(name)
console.log('非ie浏览器第二地址加载完成:' + name)
}
s.onerror = function() {
console.log('非ie浏览器加载第二地址失败:' + name)
}
s.onload = function () {
self.readyAdd(name);
console.log("非ie浏览器第二地址加载完成:" + name);
};
s.onerror = function () {
console.log("非ie浏览器加载第二地址失败:" + name);
};
}
},
addScriptChild(name) {
const self = this
const s = document.createElement('script')
s.type = 'text/javascript'
const base_url = process.env.VUE_APP_BASE_INTERAPI
s.src = base_url + '/' + name + '.js'
s.ref = 'local1'
document.body.appendChild(s)
const self = this;
const s = document.createElement("script");
s.type = "text/javascript";
const base_url = process.env.VUE_APP_BASE_INTERAPI;
s.src = base_url + "/" + name + ".js";
s.ref = "local1";
document.body.appendChild(s);
if (window.ActiveXObject || 'ActiveXObject' in window) {
if (window.ActiveXObject || "ActiveXObject" in window) {
// ie
if (s.readyState) {
// readyState
s.onreadystatechange = function() {
if (this.readyState == 'loaded' || this.readyState == 'complete') {
self.readyAdd(name)
console.log('ie10及以下加载完成')
s.onreadystatechange = function () {
if (this.readyState == "loaded" || this.readyState == "complete") {
self.readyAdd(name);
console.log("ie10及以下加载完成");
}
}
};
} else {
s.onload = function() {
self.readyAdd(name)
console.log('ie11及Edge加载完成')
}
s.onerror = function() {
console.log('ie11及Edge加载失败:' + name)
self.addScriptChild2(name)
}
s.onload = function () {
self.readyAdd(name);
console.log("ie11及Edge加载完成");
};
s.onerror = function () {
console.log("ie11及Edge加载失败:" + name);
self.addScriptChild2(name);
};
}
} else {
// ie
s.onload = function() {
self.readyAdd(name)
console.log('非ie浏览器加载完成')
}
s.onerror = function() {
console.log('非ie浏览器加载失败:' + name)
self.addScriptChild2(name)
}
s.onload = function () {
self.readyAdd(name);
console.log("非ie浏览器加载完成");
};
s.onerror = function () {
console.log("非ie浏览器加载失败:" + name);
self.addScriptChild2(name);
};
}
},
getJS(res, name) {
const funcStr =
'function test(value){' + res.data + ';return ' + name + '}'
const test = eval('(false || ' + funcStr + ')')
return test()
"function test(value){" + res.data + ";return " + name + "}";
const test = eval("(false || " + funcStr + ")");
return test();
},
readyAdd(name) {
if (name === 'zh-CN') {
if (name === "zh-CN") {
if (zhCN) {
const localzhCN = this.getJS(zhCN, 'zhCN')
var STlocalzhCN = JSON.stringify(localzhCN)
localStorage.setItem('local-zhCN', STlocalzhCN)
const localzhCN = this.getJS(zhCN, "zhCN");
var STlocalzhCN = JSON.stringify(localzhCN);
localStorage.setItem("local-zhCN", STlocalzhCN);
}
this.$i18n.mergeLocaleMessage(name, zhCN)
this.$i18n.mergeLocaleMessage(name, zhCN);
}
if (name === 'en-US') {
if (name === "en-US") {
if (enUS) {
const localEnUS = this.getJS(enUS, 'enUS')
var STlocalEnUS = JSON.stringify(localEnUS)
localStorage.setItem('local-enUS', STlocalEnUS)
const localEnUS = this.getJS(enUS, "enUS");
var STlocalEnUS = JSON.stringify(localEnUS);
localStorage.setItem("local-enUS", STlocalEnUS);
}
this.$i18n.mergeLocaleMessage(name, enUS)
this.$i18n.mergeLocaleMessage(name, enUS);
}
if (name === 'ru-RU') {
if (name === "ru-RU") {
if (ruRU) {
const localruRU = this.getJS(ruRU, 'ruRU')
var STlocalruRU = JSON.stringify(localruRU)
localStorage.setItem('local-ruRU', STlocalruRU)
const localruRU = this.getJS(ruRU, "ruRU");
var STlocalruRU = JSON.stringify(localruRU);
localStorage.setItem("local-ruRU", STlocalruRU);
}
this.$i18n.mergeLocaleMessage(name, ruRU)
this.$i18n.mergeLocaleMessage(name, ruRU);
}
if (name === 'fr-FR') {
if (name === "fr-FR") {
if (frFR) {
const localfrFR = this.getJS(frFR, 'frFR')
var STlocalfrFR = JSON.stringify(localfrFR)
localStorage.setItem('local-frFR', STlocalfrFR)
const localfrFR = this.getJS(frFR, "frFR");
var STlocalfrFR = JSON.stringify(localfrFR);
localStorage.setItem("local-frFR", STlocalfrFR);
}
this.$i18n.mergeLocaleMessage(name, frFR)
this.$i18n.mergeLocaleMessage(name, frFR);
}
if (name === 'pt-PT') {
if (name === "pt-PT") {
if (ptPT) {
const localptPT = this.getJS(ptPT, 'ptPT')
var STlocalptPT = JSON.stringify(localptPT)
localStorage.setItem('local-ptPT', STlocalptPT)
const localptPT = this.getJS(ptPT, "ptPT");
var STlocalptPT = JSON.stringify(localptPT);
localStorage.setItem("local-ptPT", STlocalptPT);
}
this.$i18n.mergeLocaleMessage(name, ptPT)
this.$i18n.mergeLocaleMessage(name, ptPT);
}
// document.title = this.$t('HTML_TITL')
}
}
}
},
},
};
</script>
<style lang="scss">
.el-dialog__header {

View File

@ -34,7 +34,7 @@ if (localStorage.getItem('local-ptPT') != undefined) {
import enLocale from 'element-ui/lib/locale/lang/en'
import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
import ElementLocale from 'element-ui/lib/locale'
// import ruLocale from 'element-ui/lib/locale/lang/ru-RU'
import ruLocale from 'element-ui/lib/locale/lang/ru-RU'
import frLocale from 'element-ui/lib/locale/lang/fr'
import ptLocale from 'element-ui/lib/locale/lang/pt'
const lang = localStorage.getItem('lang') || 'en-US'
@ -57,10 +57,10 @@ const i18n = new VueI18n({
...localenUS,
...enLocale
},
// 'ru-RU': {
// ...localruRU,
// ...ruLocale
// },
'ru-RU': {
...localruRU,
...ruLocale
},
'fr-FR': {
...localfrFR,
...frLocale

View File

@ -2,9 +2,9 @@
<div class="page">
<topBar
v-if="topList.length > 0"
:top-list="topList"
:topList="topList"
:moren="moren"
/>
></topBar>
<div class="main">
<div class="thetable">
<div class="fontTitle">{{ $t("MN_F_T_14") }}</div>
@ -13,10 +13,11 @@
<div>
<el-radio-group v-model="memberPetitionVo.signType">
<el-radio
:label="item.value"
v-for="item in checkList"
:key="item.value"
:label="item.value"
>{{ item.label }}</el-radio>
>{{ item.label }}</el-radio
>
</el-radio-group>
</div>
</div>
@ -51,28 +52,29 @@
v-model="ctem.pkApprover"
filterable
size="mini"
:placeholder="$t('CK_KS_38')"
@change="getApprover"
:placeholder="$t('CK_KS_38')"
>
<el-option
v-for="item in approbalList"
:key="item.userId"
:label="item.nickName + '(' + item.deptName + ')'"
:value="item.userId"
/>
>
</el-option>
</el-select>
</span>
<span style="margin: 0 5px 5px 0">
<i
class="el-icon-remove-outline"
style="font-size: 18px; margin-right: 5px"
@click.stop="delData"
/>
style="font-size: 18px; margin-right: 5px"
></i>
<i
class="el-icon-circle-plus-outline"
style="font-size: 18px"
@click.stop="addData"
/>
></i>
</span>
</div>
</td>
@ -90,28 +92,29 @@
v-model="ctem.pkSend"
filterable
size="mini"
:placeholder="$t('CK_KS_38')"
@change="getApprover2"
:placeholder="$t('CK_KS_38')"
>
<el-option
v-for="item in userAllList"
:key="item.userId"
:label="item.nickName + '(' + item.deptName + ')'"
:value="item.userId"
/>
>
</el-option>
</el-select>
</span>
<span style="margin: 0 5px 5px 0">
<i
class="el-icon-remove-outline"
style="font-size: 18px; margin-right: 5px"
@click.stop="delData2"
/>
style="font-size: 18px; margin-right: 5px"
></i>
<i
class="el-icon-circle-plus-outline"
style="font-size: 18px"
@click.stop="addData2"
/>
></i>
</span>
</div>
</td>
@ -121,11 +124,12 @@
<td colspan="3" style="padding: 0">
<div style="height: 100%">
<el-input
v-model="memberPetitionVo.remark"
type="textarea"
:rows="6"
:placeholder="$t('S_C_70')"
/>
v-model="memberPetitionVo.remark"
>
</el-input>
</div>
</td>
</tr>
@ -145,13 +149,15 @@
prop="memberCode"
:label="$t('MN_T_1')"
min-width="120px"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="memberName"
:label="$t('CK_KS_14')"
min-width="100px"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="paymentMethod"
@ -160,25 +166,25 @@
>
<template slot-scope="scope">
<el-select
v-model="scope.row.paymentMethod"
clearable
:placeholder="$t('CK_KS_38')"
disabled
v-model="scope.row.paymentMethod"
>
<el-option
v-for="item in paymentTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
min-width="100px"
v-for="(item, index) in enumsAccountList"
:key="index"
min-width="100px"
align="center"
:prop="`${item.pkId}`"
:label="item.pkTransactionKeyVal"
@ -196,13 +202,15 @@
prop="memberRemarks"
:label="$t('MN_F_T_593')"
min-width="120px"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="remarks"
:label="$t('MN_F_T_594')"
min-width="120px"
/>
>
</el-table-column>
</el-table>
</div>
</td>
@ -234,203 +242,205 @@
<div class="footer">
<div style="margin: 0 auto">
<el-button class="thebtn" @click="cancelCz">
{{ $t("ENU_P_TYPE0") }}</el-button>
{{ $t("ENU_P_TYPE0") }}</el-button
>
<el-button type="primary" class="thebtn" @click="saveDate">
{{ $t("MN_F_32") }}</el-button>
{{ $t("MN_F_32") }}</el-button
>
</div>
</div>
</div>
</template>
<script>
import topBar from '@/components/topBar'
import { rechargeFill, rechargePlFill } from '@/api/financial'
import { getUserAll } from '@/api/signing'
import * as man from '@/api/manage'
import { mapGetters } from 'vuex'
import { getenumsCzAccount, getpaymentType } from '@/api/financial'
import topBar from "@/components/topBar";
import { rechargeFill, rechargePlFill } from "@/api/financial";
import { getUserAll } from "@/api/signing";
import * as man from "@/api/manage";
import { mapGetters } from "vuex";
import { getenumsCzAccount, getpaymentType } from "@/api/financial";
export default {
name: 'Czzxqc',
name: "Czzxqc",
components: {
topBar
topBar,
},
computed: {
...mapGetters(['getUser'])
...mapGetters(["getUser"]),
},
data() {
return {
moren: 'czzxqc',
moren: "czzxqc",
topList: [
{
name: this.$t('MN_F_T_1015'),
path: 'jcyw'
name: this.$t("MN_F_T_1015"),
path: "jcyw",
},
{
name: this.$t('MN_F_T_12'),
path: 'ddyw'
name: this.$t("MN_F_T_12"),
path: "ddyw",
},
{
name: '确认业务',
path: 'shyw'
name: "确认业务",
path: "shyw",
},
{
name: '在线签呈',
path: 'czzxqc'
}
name: "在线签呈",
path: "czzxqc",
},
],
checked: [],
checkList: [],
paymentTypeList: [], //
enumsAccountList: [], //
ywsq: '',
paymentTypeList: [], //
enumsAccountList: [], //
ywsq: "",
ywsqList: [
{ value: '0', label: '同意' },
{ value: '1', label: '驳回' }
{ value: "0", label: "同意" },
{ value: "1", label: "驳回" },
],
qcData: {},
memberPetitionVo: {
isSpecial: 0,
signType: 1,
remark: '', //
userIdList: [{ pkApprover: '' }],
sendIdList: [{ pkSend: '' }],
rechargeMethod: '', //
detailParams: []
remark: "", //
userIdList: [{ pkApprover: "" }],
sendIdList: [{ pkSend: "" }],
rechargeMethod: "", //
detailParams: [],
},
czlx: '', // /
czlx: "", ///
approbalList: [],
userAllList: []
}
userAllList: [],
};
},
created() {
this.getSignData()
this.getSignData();
},
methods: {
getSignData() {
getpaymentType().then((res) => {
this.paymentTypeList = res.data
})
this.paymentTypeList = res.data;
});
man.signData(300).then((res) => {
this.qcData = res.data[0]
this.memberPetitionVo.sendIdList = this.qcData.sendList
this.memberPetitionVo.userIdList = this.qcData.detailList
this.qcData = res.data[0];
this.memberPetitionVo.sendIdList = this.qcData.sendList;
this.memberPetitionVo.userIdList = this.qcData.detailList;
this.memberPetitionVo.detailParams = JSON.parse(
this.$route.query.detailParams
)
);
this.memberPetitionVo.rechargeMethod = JSON.parse(
this.$route.query.rechargeMethod
)
this.isSpecial = this.$route.query.isSpecial
);
this.isSpecial = this.$route.query.isSpecial;
if (this.isSpecial == 1) {
this.getenumsCzAccount()
this.getenumsCzAccount();
} else {
this.getenumsCzAccount1()
this.getenumsCzAccount1();
}
this.czlx = this.$route.query.czlx
this.getSignType()
})
this.czlx = this.$route.query.czlx;
this.getSignType();
});
},
getenumsCzAccount() {
getenumsCzAccount().then((res) => {
this.enumsAccountList = res.rows
})
this.enumsAccountList = res.rows;
});
},
getenumsCzAccount1() {
getenumsCzAccount({ accountProperty: 1 }).then((res) => {
this.enumsAccountList = res.rows
})
this.enumsAccountList = res.rows;
});
},
getSignType() {
man.signType().then((res) => {
this.checkList = res.data
})
this.checkList = res.data;
});
//
man.approvalUser().then((res) => {
this.approbalList = res.data
})
//
this.approbalList = res.data;
});
//
getUserAll().then((res) => {
this.userAllList = res.data
})
this.userAllList = res.data;
});
},
//
getApprover() {
this.$nextTick(() => {
this.$forceUpdate()
})
this.$forceUpdate();
});
},
//
addData() {
const arr = JSON.parse(JSON.stringify(this.memberPetitionVo.userIdList))
arr.push({ pkApprover: '' })
this.$set(this.memberPetitionVo, 'userIdList', arr)
this.$forceUpdate()
let arr = JSON.parse(JSON.stringify(this.memberPetitionVo.userIdList));
arr.push({ pkApprover: "" });
this.$set(this.memberPetitionVo, "userIdList", arr);
this.$forceUpdate();
},
//
delData() {
this.memberPetitionVo.userIdList.pop()
this.$forceUpdate()
this.memberPetitionVo.userIdList.pop();
this.$forceUpdate();
},
//
getApprover2() {
this.$nextTick(() => {
this.$forceUpdate()
})
this.$forceUpdate();
});
},
//
addData2() {
const arr2 = JSON.parse(JSON.stringify(this.memberPetitionVo.sendIdList))
arr2.push({ pkSend: '' })
this.$set(this.memberPetitionVo, 'sendIdList', arr2)
this.$forceUpdate()
let arr2 = JSON.parse(JSON.stringify(this.memberPetitionVo.sendIdList));
arr2.push({ pkSend: "" });
this.$set(this.memberPetitionVo, "sendIdList", arr2);
this.$forceUpdate();
},
//
delData2() {
this.memberPetitionVo.sendIdList.pop()
this.$forceUpdate()
this.memberPetitionVo.sendIdList.pop();
this.$forceUpdate();
},
saveDate() {
//
const userIdList = this.memberPetitionVo.userIdList.map(
this.memberPetitionVo.userIdList = this.memberPetitionVo.userIdList.map(
(item) => item.pkApprover
)
);
const sendIdList = this.memberPetitionVo.sendIdList.map(
this.memberPetitionVo.sendIdList = this.memberPetitionVo.sendIdList.map(
(item) => item.pkSend
)
);
let url = ''
let url = "";
if (this.czlx == 1) {
url = rechargeFill
url = rechargeFill;
} else if (this.czlx == 2) {
url = rechargePlFill
url = rechargePlFill;
}
this.memberPetitionVo.isSpecial = this.isSpecial
url(Object.assign({}, this.memberPetitionVo, { userIdList, sendIdList })).then((res) => {
this.memberPetitionVo.isSpecial = this.isSpecial;
url(Object.assign(this.memberPetitionVo)).then((res) => {
if (res.code == 200) {
this.$message({
message: res.msg,
type: 'success'
})
type: "success",
});
this.$router.push({
name: 'RechargeDetail'
})
name: "RechargeDetail",
});
}
})
});
},
cancelCz() {
this.$router.go(-1)
this.$router.go(-1);
},
findQcDetail() {
findQcDetail(this.$route.query.pkId).then((res) => {
this.qcList = res.data
})
}
}
}
this.qcList = res.data;
});
},
},
};
</script>
<style lang="scss" scoped>

File diff suppressed because it is too large Load Diff

View File

@ -20,23 +20,23 @@
>
<el-row>
<!-- 一层 -->
<el-col :span="4">
<el-col :span="4" >
<el-form-item :label="$t('MN_F_T_930')">
<div style="display: flex">
<div>
<el-input v-model="select.period" clearable />
</div>
<!-- <span style="margin: 0 10px"></span>-->
<!-- <div>-->
<!-- <el-input v-model="select.endPeriod" clearable />-->
<!-- </div>-->
<!-- <span style="margin: 0 10px"></span>-->
<!-- <div>-->
<!-- <el-input v-model="select.endPeriod" clearable />-->
<!-- </div>-->
</div>
</el-form-item>
</el-col>
<el-collapse-transition>
<div v-show="isActive">
<el-col :span="4">
<el-col :span="4" >
<el-form-item :label="$t('MN_F_T_931')">
<el-select
v-model="select.isRetry"
@ -111,8 +111,8 @@
:range-separator="$t('w_0139')"
:start-placeholder="$t('CK_KS_4')"
:end-placeholder="$t('CK_KS_5')"
format="yyyy-MM-dd"
@change="changeTime"
format="yyyy-MM-dd"
/>
</el-form-item>
</el-col>
@ -120,7 +120,7 @@
<el-button
class="my_search"
type="primary"
@click="searchHandle"
@click="openFullScreen"
> {{ $t('MN_T_2') }}</el-button>
<el-button
class="my_reset"
@ -142,47 +142,42 @@
<div class="maintop">
<div class="mainbtn">
<el-button
v-has-buttons="['bonusCountSettlement']"
size="small"
style="background-color: #48B2FD;"
class="thebtn2"
:loading="calculateOperatorLoading"
@click="balance"
v-has-buttons="['bonusCountSettlement']"
>{{ $t('MN_F_T_934') }}</el-button>
<el-button
v-has-buttons="['bonusCountPublish']"
size="small"
class="thebtn2"
:loading="calculateOperatorLoading"
@click="publish"
v-has-buttons="['bonusCountPublish']"
>{{ $t('MN_F_T_935') }}</el-button>
<el-button
size="small"
class="thebtn2"
:loading="calculateOperatorLoading"
@click="publish1"
>{{ $t('MN_F_T_936') }}</el-button>
<el-button
v-has-buttons="['bonusCountGrant']"
size="small"
style="background-color: #009B58"
class="thebtn2"
:loading="calculateOperatorLoading"
v-has-buttons="['bonusCountGrant']"
@click="grant"
>{{ $t('MN_F_T_937') }}</el-button>
<el-button
v-has-buttons="['bonusCountCash']"
size="small"
style="background-color: #48B2FD"
class="thebtn2"
:loading="calculateOperatorLoading"
@click="withdraw"
v-has-buttons="['bonusCountCash']"
>{{ $t('MN_F_T_938') }}</el-button>
</div>
<div>
<el-dropdown :hide-on-click="false">
<span class="el-dropdown-link kuang">
{{ $t('MN_F_T_939') }}<i class="el-icon-arrow-down el-icon--right" />
{{$t('MN_F_T_939')}}<i class="el-icon-arrow-down el-icon--right" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
@ -210,7 +205,7 @@
:summary-method="getSummaries"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" />
<el-table-column type="selection"> </el-table-column>
<el-table-column
align="center"
prop="pkId"
@ -280,15 +275,15 @@
:label="$t('MN_F_T_945')+'(%)'"
:formatter="stateFormat"
/>
<!-- <el-table-column-->
<!-- v-for="item in menuList"-->
<!-- v-if="item.checked&&item.id != 0&&item.id < 5"-->
<!-- :key="item.id"-->
<!-- align="center"-->
<!-- width="130"-->
<!-- :prop="item.prop"-->
<!-- :label="item.text"-->
<!-- />-->
<!-- <el-table-column-->
<!-- v-for="item in menuList"-->
<!-- v-if="item.checked&&item.id != 0&&item.id < 5"-->
<!-- :key="item.id"-->
<!-- align="center"-->
<!-- width="130"-->
<!-- :prop="item.prop"-->
<!-- :label="item.text"-->
<!-- />-->
<el-table-column
align="center"
prop="isSettleVal"
@ -359,17 +354,17 @@
<!-- </el-table-column>-->
</el-table>
</div>
<!-- <div class="heji">-->
<!-- <div-->
<!-- v-for="item in menuList"-->
<!-- v-if="item.checked&&item.id != 0&&item.id > 13"-->
<!-- :key="item.id"-->
<!-- class="dis"-->
<!-- >-->
<!-- <div>{{ item.text }}</div>-->
<!-- <div>{{ tableData[item.prop] }}</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="heji">-->
<!-- <div-->
<!-- v-for="item in menuList"-->
<!-- v-if="item.checked&&item.id != 0&&item.id > 13"-->
<!-- :key="item.id"-->
<!-- class="dis"-->
<!-- >-->
<!-- <div>{{ item.text }}</div>-->
<!-- <div>{{ tableData[item.prop] }}</div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<pagination
@ -389,23 +384,23 @@ import * as api from '@/api/settle.js'
import { classifyUpdate, classifySave } from '@/api/product'
import * as log from '@/api/logistics'
import { getcountryAllList } from '@/api/exchangerate'
import { getDealerYesno, settleBonus, publishBonus, grantBonus, withdrawalBonus, noPublishBonus } from '@/api/member'
import {getDealerYesno, settleBonus, publishBonus, grantBonus, withdrawalBonus, noPublishBonus,} from '@/api/member'
import { listPeriod } from '@/api/bonus'
import { Message } from 'element-ui'
import { isLocal, isLocalSymbol, stateFormat } from '@/utils/numberToCurrency'
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui'
import {isLocal, isLocalSymbol, stateFormat} from "@/utils/numberToCurrency";
import {mapGetters} from "vuex";
import { Loading } from 'element-ui';
export default {
name: 'Bzpz',
components: {
topBar
},
filters: {
isAgree(val) {
isAgree(val) {
if (!val) {
return this.$t('ENU_POPUP_TYPE_1')
return this.$t('ENU_POPUP_TYPE_1');
} else {
return this.$t('ENU_POPUP_TYPE_2')
return this.$t('ENU_POPUP_TYPE_2');
}
}
},
@ -426,18 +421,18 @@ export default {
digList: [
{
value: 0,
label: this.$t('ENU_POPUP_TYPE_1')
label: this.$t('ENU_POPUP_TYPE_1'),
},
{
value: 1,
label: this.$t('ENU_POPUP_TYPE_2')
}
label: this.$t('ENU_POPUP_TYPE_2'),
},
],
menuList: [
{
id: 0,
text: this.$t('MN_F_T_948'),
checked: true
checked: true,
},
{
id: 1,
@ -449,19 +444,19 @@ export default {
id: 2,
text: `${this.$t('MN_F_T_843')}(${isLocalSymbol()})`,
checked: true,
prop: 'upgradeAmountDollar'
prop: 'upgradeAmountDollar',
},
{
id: 3,
text: `${this.$t('MN_F_T_854')}(${isLocalSymbol()})`,
checked: true,
prop: 'repurchaseAmountDollar'
prop: 'repurchaseAmountDollar',
},
{
id: 4,
text: `${this.$t('MN_F_T_943')}(${isLocalSymbol()})`,
checked: true,
prop: 'fansAmountDollar'
prop: 'fansAmountDollar',
}
],
creationTime: [],
@ -500,7 +495,10 @@ export default {
yieldStatus: [],
countryList: [],
orderTypeList: [],
calculateOperatorLoading: false
button1Flag:false,
button2Flag:false,
button3Flag:false,
button4Flag:false,
}
},
mounted() {
@ -531,7 +529,6 @@ export default {
const verify = this.verifySelect()
const time = this.$refs.multipleTable.selection[0].settleDate
if (verify) {
this.calculateOperatorLoading = true
settleBonus({ 'settleDate': time }).then((res) => {
if (res.code == 200) {
Message({
@ -544,8 +541,6 @@ export default {
type: 'error'
})
}
}).finally(() => {
this.calculateOperatorLoading = false
})
}
},
@ -554,7 +549,6 @@ export default {
const verify = this.verifySelect()
const time = this.$refs.multipleTable.selection[0].settleDate
if (verify) {
this.calculateOperatorLoading = true
noPublishBonus({ 'settleDate': time }).then((res) => {
if (res.code == 200) {
Message({
@ -567,8 +561,6 @@ export default {
type: 'error'
})
}
}).finally(() => {
this.calculateOperatorLoading = false
})
}
},
@ -577,7 +569,6 @@ export default {
const verify = this.verifySelect()
const time = this.$refs.multipleTable.selection[0].settleDate
if (verify) {
this.calculateOperatorLoading = true
publishBonus({ 'settleDate': time }).then((res) => {
if (res.code == 200) {
Message({
@ -590,8 +581,6 @@ export default {
type: 'error'
})
}
}).finally(() => {
this.calculateOperatorLoading = false
})
}
},
@ -600,7 +589,6 @@ export default {
const verify = this.verifySelect()
const time = this.$refs.multipleTable.selection[0].settleDate
if (verify) {
this.calculateOperatorLoading = true
grantBonus({ 'settleDate': time }).then((res) => {
if (res.code == 200) {
Message({
@ -613,8 +601,6 @@ export default {
type: 'error'
})
}
}).finally(() => {
this.calculateOperatorLoading = false
})
}
},
@ -623,7 +609,6 @@ export default {
const verify = this.verifySelect()
const time = this.$refs.multipleTable.selection[0].settleDate
if (verify) {
this.calculateOperatorLoading = true
withdrawalBonus({ 'settleDate': time }).then((res) => {
if (res.code == 200) {
Message({
@ -636,8 +621,6 @@ export default {
type: 'error'
})
}
}).finally(() => {
this.calculateOperatorLoading = false
})
}
},
@ -671,7 +654,7 @@ export default {
})
},
changeTime(val) {
if (val) {
if(val){
this.select.startDate = val[0]
this.select.endDate = val[1]
}
@ -692,7 +675,7 @@ export default {
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = this.$t('MN_F_T_951') + '(¥)'
sums[index] = this.$t('MN_F_T_951') +'(¥)'
return
}
if (index === 1) {
@ -767,36 +750,36 @@ export default {
})
},
getDataList() {
if (this.select.period) {
this.select.period = parseInt(this.select.period)
if(this.select.period){
this.select.period=parseInt(this.select.period)
}
if (this.creationTime == '' || this.creationTime == null) {
this.select.startDate = ''
this.select.endDate = ''
}
Number(this.select)
listPeriod(Object.assign({}, this.select), `?pageNum=${this.queryParams.pageNum}&pageSize=${this.queryParams.pageSize}`)
listPeriod(Object.assign({}, this.select),`?pageNum=${this.queryParams.pageNum}&pageSize=${this.queryParams.pageSize}`)
.then((res) => {
this.tableData.censusSummaryList = res.rows
this.total = res.total
})
},
searchHandle() {
const loading = Loading.service({
openFullScreen(){
const loading = Loading.service({
lock: true,
text: 'Loading',
background: 'rgba(0, 0, 0, 0.7)'
background: 'rgba(0, 0, 0, 0.7)',
})
setTimeout(() => {
loading.close()
this.getDataList()
this.getDataList()
}, 1000)
},
handleSelectionChange(val) {},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams
this.$confirm(this.$t('MN_F_T_407'), this.$t('MN_F_T_304'), {
this.$confirm( this.$t('MN_F_T_407'), this.$t('MN_F_T_304'), {
confirmButtonText: this.$t('w_0035'),
cancelButtonText: this.$t('ENU_P_TYPE0'),
type: 'warning'

View File

@ -30,20 +30,13 @@ module.exports = {
lintOnSave: false,
productionSourceMap: false,
devServer: {
port: 30188,
port: port,
open: true,
overlay: {
warnings: false,
errors: true
},
proxy: {
'/prod-api': {
target: 'http://192.168.0.86:8080',
changeOrigin: true,
pathRewrite: { '^/prod-api': '' }
}
}
// before: require('./mock/mock-server.js')
before: require('./mock/mock-server.js')
},
configureWebpack: {
// provide the app's title in webpack's name field, so that
@ -59,7 +52,7 @@ module.exports = {
'zhCN': 'zhCN',
'zhTC': 'zhTC',
'ruRU': 'ruRU',
'frFR': 'frFR'
'frFR': 'frFR',
}
},
chainWebpack(config) {