Skip to content

S
SuperMan
Commit 9294f1f4 authored by 沈良进's avatar 沈良进
Browse files
Options

页面修改

parent f2243463
Show whitespace changes
Inline Side-by-side
Showing with 2732 additions and 2719 deletions
src/components/FinancialModule/PlatformAccount.vue
View file @ 9294f1f4
<template>
<div class="flexOne page_PlatformAccount">
<div class="query-box">
......@@ -59,12 +58,8 @@
value="查询"
@click="resetPageIndex(),getList()"
>-->
<input
type="button"
class="normalBtn"
:value="$t('pub.addBtn')"
@click="addShow=true,text=$t('pub.addBtn'),ed=false"
>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')"
@click="addShow=true,text=$t('pub.addBtn'),ed=false">
<input type="button" class="normalBtn" @click="downMuban()" :value="$t('visa.v_daochu')">
</li>
</ul>
......@@ -214,50 +209,23 @@
></el-pagination>
</div>
</div>-->
<v-table
v-if="isReady"
is-horizontal-resize
column-width-drag
style="width:100%"
:columns="columns"
:table-data="DataList"
:filter-method="filterMethod"
:total="total"
:pageSize="msg.pageSize"
:pageIndex="msg.pageIndex"
:handleCurrentChange="handleCurrentChanges"
:multiple-sort="multipleSort"
:is-loading="loading"
sort-always
@sort-change="sortChange"
@on-custom-comp='customCompFunc'
:row-click="rowClick"
></v-table>
<v-table v-if="isReady" is-horizontal-resize column-width-drag style="width:100%" :columns="columns"
:table-data="DataList" :filter-method="filterMethod" :total="total" :pageSize="msg.pageSize"
:pageIndex="msg.pageIndex" :handleCurrentChange="handleCurrentChanges" :multiple-sort="multipleSort"
:is-loading="loading" sort-always @sort-change="sortChange" @on-custom-comp='customCompFunc'
:row-click="rowClick"></v-table>
<div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button
type="button"
class="normalBtn"
@click="submitForm('addMsg',1)"
>{{$t('pub.saveBtn')}}</button>
<button
class="hollowFixedBtn"
type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false"
>{{$t('pub.cancelBtn')}}</button>
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<el-form
class="_info_box clearfix"
:model="addMsg"
ref="addMsg"
:rules="rules"
label-width="110px"
>
<el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
......@@ -268,12 +236,8 @@
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')" prop="TypeId">
<el-select filterable v-model="addMsg.TypeId" class>
<el-option
v-for="item in AccountTypeList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
<el-option v-for="item in AccountTypeList" :label="item.Name" :value="item.ID" :key="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -281,13 +245,8 @@
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ptjigou')" prop="BackId">
<el-select filterable v-model="addMsg.BackId" class>
<el-option
v-for="item in FinancialList"
v-if="item.Type == 1"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
<el-option v-for="item in FinancialList" v-if="item.Type == 1" :label="item.Name" :value="item.ID"
:key="item.ID"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -303,12 +262,12 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="平台密码：" prop="PlatFormPwd">
<el-input v-model="addMsg.PlatFormPwd" class ></el-input>
<el-input v-model="addMsg.PlatFormPwd" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="平台网址：" prop="PlatFormUrl">
<el-input v-model="addMsg.PlatFormUrl" class ></el-input>
<el-input v-model="addMsg.PlatFormUrl" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
......@@ -329,15 +288,13 @@
<el-col :span="4" :gutter="35">
<el-form-item label="结款时间和方式：" prop="SettlementInfo">
<el-input v-model="addMsg.SettlementInfo" class ></el-input>
<el-input v-model="addMsg.SettlementInfo" class></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同时间：">
<el-date-picker v-model="addMsg.ContractStartDateInfo"
type="datetimerange" start-placeholder="开始日期" end-placeholder="结束日期"
size="small" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
></el-date-picker>
<el-date-picker v-model="addMsg.ContractStartDateInfo" type="datetimerange" start-placeholder="开始日期"
end-placeholder="结束日期" size="small" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
......@@ -400,12 +357,8 @@
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhbizhong')" prop="CurrencyId">
<el-select filterable v-model="addMsg.CurrencyId" class>
<el-option
v-for="item in financeinfoList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
<el-option v-for="item in financeinfoList" :label="item.Name" :value="item.ID" :key="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -456,13 +409,8 @@
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-select filterable v-model="addMsg.BranchIdS" collapse-tags>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
:disabled="item.disabled"
></el-option>
<el-option v-for="item in CompanyList" :label="item.BName" :value="item.Id" :key="item.Id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -478,19 +426,9 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.bdyhzhanghu')" prop="BindBankID">
<el-select
v-model="addMsg.BindBankID"
filterable
remote
:placeholder="$t('fnc.qsryhzhgjc')"
:remote-method="remoteQueryBankMethod"
:loading="remoteLoading"
class="minmargin-box">
<el-option
v-for="item in bankList"
:key="item.ID"
:label="item.Alias"
:value="item.ID">
<el-select v-model="addMsg.BindBankID" filterable remote :placeholder="$t('fnc.qsryhzhgjc')"
:remote-method="remoteQueryBankMethod" :loading="remoteLoading" class="minmargin-box">
<el-option v-for="item in bankList" :key="item.ID" :label="item.Alias" :value="item.ID">
<span style="float: left">{{ item.Alias }}</span>
<span class="right-tag">{{ item.BranchName }}</span>
</el-option>
......@@ -509,8 +447,7 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="期初应用日期">
<el-date-picker type="date" v-model="addMsg.BeginTimeStr"
value-format="yyyy-MM-dd"></el-date-picker>
<el-date-picker type="date" v-model="addMsg.BeginTimeStr" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
......@@ -523,31 +460,20 @@
</el-row>
</el-form>
</div>
<div
class="_vMG_edit _scrollbar"
v-if="addCuren == false"
:class="addCuren==false?'edHeight_t':''"
>
<div class="_vMG_edit _scrollbar" v-if="addCuren == false" :class="addCuren==false?'edHeight_t':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{$t('fnc.qmtiaohui')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button
class="hollowFixedBtn"
type="button"
@click="cancelEdit(),resetForm('SetProfitLossMsg')"
>{{$t('pub.cancelBtn')}}</button>
<button type="button" class="normalBtn"
@click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<el-form
class="_info_box clearfix"
:model="SetProfitLossMsg"
ref="SetProfitLossMsg"
:rules="rules"
label-width="100px"
>
<el-form class="_info_box clearfix" :model="SetProfitLossMsg" ref="SetProfitLossMsg" :rules="rules"
label-width="100px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.sqhuilv')">
......@@ -561,24 +487,14 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.xzqishu')" prop="TermNum">
<el-date-picker
v-model="SetProfitLossMsg.TermNum"
value-format="yyyy-MM-dd"
type="month"
class="_wAuto"
:placeholder="$('admin.admin_choDate')"
></el-date-picker>
<el-date-picker v-model="SetProfitLossMsg.TermNum" value-format="yyyy-MM-dd" type="month" class="_wAuto"
:placeholder="$('admin.admin_choDate')"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" v-if="costType.length">
<el-form-item :label="$t('fnc.fyleixing')" prop="CostTypeID">
<el-select filterable v-model="SetProfitLossMsg.CostTypeID">
<el-option
v-for="item in costType"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
<el-option v-for="item in costType" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -602,20 +518,20 @@
</div>
</template>
<script>
import Vue from 'vue'
export default {
import Vue from 'vue'
export default {
data() {
return {
columns: [],
remoteLoading:false,
remoteLoading: false,
total: 0,
tableData: [],
bankList:[],
bankList: [],
isReady: false,
multipleSort: false,
loading: true,
CompanySelect:[],
ContractUrl:"",
CompanySelect: [],
ContractUrl: "",
msg: {
pageIndex: 1,
pageSize: 15,
......@@ -645,26 +561,26 @@ export default {
OutCharge: 0,
InCharge: 0,
RiskLowerLimitMoney: "",
SettlementType:'1',
Royalty:0,
Bond:0,
SigningLine:'',
Remark:'',
BindBankID:null,
HaveContract:'0',
ContraceDateRange:'',
AccountStartMoney:0,
AccountStartWBMoney:0,
BeginTimeStr:'',
PlatFormPwd:"",
PlatFormUrl:"",
ContractStartDateStr:'',
ContractEndDateStr:"",
ContractStartDateInfo:[],
FinanceNo:"",
ContractUrl:"",
SettlementDate:"",
SettlementInfo:""
SettlementType: '1',
Royalty: 0,
Bond: 0,
SigningLine: '',
Remark: '',
BindBankID: null,
HaveContract: '0',
ContraceDateRange: '',
AccountStartMoney: 0,
AccountStartWBMoney: 0,
BeginTimeStr: '',
PlatFormPwd: "",
PlatFormUrl: "",
ContractStartDateStr: '',
ContractEndDateStr: "",
ContractStartDateInfo: [],
FinanceNo: "",
ContractUrl: "",
SettlementDate: "",
SettlementInfo: ""
},
getCompanyMsg: {
RB_Group_Id: "0",
......@@ -687,57 +603,91 @@ export default {
InitTimeFun: "",
rules: {
//表单必填验证
Alias: [{ required: true, message: this.$t('rule.qsrzhbieming'), trigger: "blur" }],
TypeId: [
{ required: true, message: this.$t('rule.qxzzhleixing'), trigger: "change" }
],
BackId: [
{ required: true, message: this.$t('rule.qxzyhjigou'), trigger: "change" }
],
Accountholder: [
{ required: true, message: this.$t('rule.qsrkhuren'), trigger: "blur" }
],
PlatformNo: [
{ required: true, message: this.$t('rule.qsrptzhanghao'), trigger: "blur" }
],
Commission: [
{ required: true, message: this.$t('rule.qsrptsxufei'), trigger: "blur" },
Alias: [{
required: true,
message: this.$t('rule.qsrzhbieming'),
trigger: "blur"
}],
TypeId: [{
required: true,
message: this.$t('rule.qxzzhleixing'),
trigger: "change"
}],
BackId: [{
required: true,
message: this.$t('rule.qxzyhjigou'),
trigger: "change"
}],
Accountholder: [{
required: true,
message: this.$t('rule.qsrkhuren'),
trigger: "blur"
}],
PlatformNo: [{
required: true,
message: this.$t('rule.qsrptzhanghao'),
trigger: "blur"
}],
Commission: [{
required: true,
message: this.$t('rule.qsrptsxufei'),
trigger: "blur"
},
{
pattern: this.$commonUtils.Regex.el_IsdecimalTrr,
message: this.$t('rule.qsrzqxufei')
}
],
BranchIdS: [
{ required: true, message: this.$t('rule.qszssgongsi'), trigger: "change" }
],
CurrencyId: [
{ required: true, message: this.$t('rule.qxzzhbizhong'), trigger: "change" }
],
Initialbalance: [
{ required: true, message: this.$t('rule.qsrcsyue'), trigger: "blur" },
BranchIdS: [{
required: true,
message: this.$t('rule.qszssgongsi'),
trigger: "change"
}],
CurrencyId: [{
required: true,
message: this.$t('rule.qxzzhbizhong'),
trigger: "change"
}],
Initialbalance: [{
required: true,
message: this.$t('rule.qsrcsyue'),
trigger: "blur"
},
{
pattern: this.$commonUtils.Regex.el_IsInventer,
message: this.$t('rule.qsrzqdyue')
}
],
OutCharge: [
{ required: true, message: this.$t('rule.szfzeren'), trigger: "change" }
],
InCharge: [
{ required: true, message: this.$t('rule.fkfzeren'), trigger: "change" }
],
CostTypeID: [
{ required: true, message: this.$t('rule.qxzfyleixing'), trigger: "change" }
],
Royalty:[
{ required: true, message: this.$t('rule.qtxptsyongfei'), trigger: "change" }
],
Bond:[
{ required: true, message: this.$t('rule.qtxptbzhengjin'), trigger: "change" }
],
BindBankID:[
{ required: true, message: this.$t('rule.qxzbdyinhang'), trigger: "change" }
]
OutCharge: [{
required: true,
message: this.$t('rule.szfzeren'),
trigger: "change"
}],
InCharge: [{
required: true,
message: this.$t('rule.fkfzeren'),
trigger: "change"
}],
CostTypeID: [{
required: true,
message: this.$t('rule.qxzfyleixing'),
trigger: "change"
}],
Royalty: [{
required: true,
message: this.$t('rule.qtxptsyongfei'),
trigger: "change"
}],
Bond: [{
required: true,
message: this.$t('rule.qtxptbzhengjin'),
trigger: "change"
}],
BindBankID: [{
required: true,
message: this.$t('rule.qxzbdyinhang'),
trigger: "change"
}]
},
addCuren: true,
ed: false,
......@@ -776,36 +726,38 @@ export default {
};
},
methods: {
rowClick(rowIndex,rowData,column){
let path='PlatformAccDetail';
if(column.title=="账户余额"){
rowClick(rowIndex, rowData, column) {
let path = 'PlatformAccDetail';
if (column.title == "账户余额") {
this.$router.push({
name: path,
query: {
TypeId: rowData.TypeId,
ID:rowData.ID,
ID: rowData.ID,
blank: "y",
}
});
}
},
remoteQueryBankMethod(query){
if(query!=''){
this.remoteLoading=true
this.apipost('bankbase_get_searchbyalias',{query},x=>{
this.remoteLoading=false
this.bankList=x.data.data
remoteQueryBankMethod(query) {
if (query != '') {
this.remoteLoading = true
this.apipost('bankbase_get_searchbyalias', {
query
}, x => {
this.remoteLoading = false
this.bankList = x.data.data
})
}
},
customCompFunc(params){
if (params.type === 'delete'){
this.financeinfoRemove(params.id,params.alias)
}else if (params.type === 'edit'){
customCompFunc(params) {
if (params.type === 'delete') {
this.financeinfoRemove(params.id, params.alias)
} else if (params.type === 'edit') {
this.editCurency(params.id)
this.text= this.$t('pub.updateMsg')
this.addShow=true
this.addCuren=true
this.text = this.$t('pub.updateMsg')
this.addShow = true
this.addCuren = true
}
},
initColums() {
......@@ -863,14 +815,11 @@ export default {
isResize: true,
width: 80,
orderBy: "desc",
formatter: function(rowData, rowIndex, pagingIndex, field) {
if(rowData["Initialbalance"]>=rowData["RiskLimitMoney"] && rowData["Initialbalance"]!=0)
{
formatter: function (rowData, rowIndex, pagingIndex, field) {
if (rowData["Initialbalance"] >= rowData["RiskLimitMoney"] && rowData["Initialbalance"] != 0) {
let text = that.$t('fnc.chaoxian')
return `<span style='color:red;font-weight:bold'>${rowData["Initialbalance"].toFixed(2)}</span><span style='color:red;margin-left:12px;'>${text}</span>`;
}
else
{
} else {
return rowData["Initialbalance"].toFixed(2)
}
}
......@@ -882,16 +831,15 @@ export default {
columnAlign: "left",
isResize: true,
width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) {
formatter: function (rowData, rowIndex, pagingIndex, field) {
let text = that.$t('hotel.hotel_people')
return rowData.SettlementType == 1
? rowData.Commission.toFixed(2) + "%"
: rowData.Commission + "/" + text;
return rowData.SettlementType == 1 ?
rowData.Commission.toFixed(2) + "%" :
rowData.Commission + "/" + text;
},
filterMultiple: true,
result: [],
filters: [
{
filters: [{
label: that.$t('fnc.jyebfenbi'),
value: "1"
},
......@@ -910,7 +858,7 @@ export default {
isResize: true,
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
formatter: function (rowData, rowIndex, pagingIndex, field) {
return rowData.Royalty.toFixed(2);
}
};
......@@ -921,7 +869,7 @@ export default {
columnAlign: "left",
isResize: true,
width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) {
formatter: function (rowData, rowIndex, pagingIndex, field) {
let whetong = that.$t('fnc.whetong')
let yhetong = that.$t('fnc.yhetong')
return `<span style='color:${
......@@ -934,8 +882,7 @@ export default {
},
filterMultiple: true,
result: [],
filters: [
{
filters: [{
label: that.$t('fnc.whetong'),
value: "1"
},
......@@ -973,7 +920,7 @@ export default {
columnAlign: "left",
isResize: true,
width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) {
formatter: function (rowData, rowIndex, pagingIndex, field) {
return `<span style='color:gray'>${rowData.Remark?rowData.Remark:''}</span>`;
},
};
......@@ -983,7 +930,7 @@ export default {
columnAlign: "left",
width: 80,
isResize: false,
componentName:'table-operation'
componentName: 'table-operation'
};
this.columns = [];
this.columns.push(Alias);
......@@ -1013,8 +960,8 @@ export default {
},
filterMethod(filters) {
this.msg.Alias = filters.Alias;
if(filters.allName=='__all__'){
filters.allName='-1'
if (filters.allName == '__all__') {
filters.allName = '-1'
}
this.msg.RB_Branch_Id = filters.allName;
this.msg.SettlementType =
......@@ -1064,13 +1011,13 @@ export default {
},
getTemplateCostTypeList(t) {
this.apipost(
"financeinfo_post_GetCostTypeList",
{ Type: t },
"financeinfo_post_GetCostTypeList", {
Type: t
},
res => {
if (res.data.resultCode == 1) {
this.costType = res.data.data;
} else {
}
} else {}
},
err => {}
);
......@@ -1079,8 +1026,9 @@ export default {
if (query !== "") {
this.loadingPeople = true;
this.apipost(
"admin_Get_Chat_All_SelectEmpName",
{ EmName: query },
"admin_Get_Chat_All_SelectEmpName", {
EmName: query
},
res => {
if (res.data.resultCode == 1) {
this.showEmployeeList = res.data.data;
......@@ -1097,8 +1045,9 @@ export default {
if (query !== "") {
this.loadingPeople = true;
this.apipost(
"admin_Get_Chat_All_SelectEmpName",
{ EmName: query },
"admin_Get_Chat_All_SelectEmpName", {
EmName: query
},
res => {
if (res.data.resultCode == 1) {
this.showEmployeeList2 = res.data.data;
......@@ -1132,13 +1081,13 @@ export default {
getfinanceinfoList() {
//获取币种列表
this.apipost(
"financeinfo_post_GetList",
{ Name: "" },
"financeinfo_post_GetList", {
Name: ""
},
res => {
if (res.data.resultCode == 1) {
this.financeinfoList = res.data.data;
} else {
}
} else {}
},
err => {}
);
......@@ -1146,19 +1095,19 @@ export default {
getFinancialList() {
//获取机构列表
this.apipost(
"FinancialInstitutions_post_GetList",
{ Type: -1 },
"FinancialInstitutions_post_GetList", {
Type: -1
},
res => {
if (res.data.resultCode == 1) {
this.FinancialList = res.data.data;
} else {
}
} else {}
},
err => {}
);
},
getCompanyList(t, info) {
if(t){
if (t) {
this.CompanyList.push({
BName: info.BranchName,
Id: info.RB_Branch_id
......@@ -1177,8 +1126,7 @@ export default {
});
this.CompanyList = data;
this.initColums();
} else {
}
} else {}
},
err => {}
);
......@@ -1186,8 +1134,9 @@ export default {
editCurency(id) {
// 修改根据ID 获取信息
this.apipost(
"BankAccount_post_GetPlatform",
{ ID: id },
"BankAccount_post_GetPlatform", {
ID: id
},
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
......@@ -1195,20 +1144,19 @@ export default {
this.remoteMethod(data.InemName);
this.remoteMethod2(data.OutemName);
this.addMsg = data;
if(this.addMsg.ContractStartDateInfo.length==0){
if (this.addMsg.ContractStartDateInfo.length == 0) {
this.addMsg.ContractStartDateInfo = ''
}
this.addMsg.HaveContract = this.addMsg.HaveContract.toString()
this.addMsg.SettlementType =this.addMsg.SettlementType.toString()
this.addMsg.BindBankID = this.addMsg.BindBankID==-1?null:this.addMsg.BindBankID
this.addMsg.ContractStartDateInfo=[];
if (this.addMsg.ContractEndDateStr&&this.addMsg.ContractEndDateStr.length>0){
this.addMsg.ContractStartDateInfo[0]=this.addMsg.ContractStartDateStr;
this.addMsg.SettlementType = this.addMsg.SettlementType.toString()
this.addMsg.BindBankID = this.addMsg.BindBankID == -1 ? null : this.addMsg.BindBankID
this.addMsg.ContractStartDateInfo = [];
if (this.addMsg.ContractEndDateStr && this.addMsg.ContractEndDateStr.length > 0) {
this.addMsg.ContractStartDateInfo[0] = this.addMsg.ContractStartDateStr;
}
if (this.addMsg.ContractEndDateStr&&this.addMsg.ContractEndDateStr.length>0){
this.addMsg.ContractStartDateInfo[1]= this.addMsg.ContractEndDateStr;
if (this.addMsg.ContractEndDateStr && this.addMsg.ContractEndDateStr.length > 0) {
this.addMsg.ContractStartDateInfo[1] = this.addMsg.ContractEndDateStr;
}
console.log("this.addMsg.ContractStartDateInfo11111",this.addMsg.ContractStartDateInfo);
this.remoteQueryBankMethod(this.addMsg.BindBankName)
} else {
this.tips(res.data.message, "error");
......@@ -1235,18 +1183,18 @@ export default {
OutCharge: 0,
InCharge: 0,
RiskLowerLimitMoney: "",
AccountStartMoney:0,
AccountStartWBMoney:0,
BeginTimeStr:'',
PlatFormPwd:"",
PlatFormUrl:"",
ContractStartDateStr:'',
ContractEndDateStr:"",
ContractStartDateInfo:"",
FinanceNo:"",
ContractUrl:"",
SettlementDate:"",
SettlementInfo:""
AccountStartMoney: 0,
AccountStartWBMoney: 0,
BeginTimeStr: '',
PlatFormPwd: "",
PlatFormUrl: "",
ContractStartDateStr: '',
ContractEndDateStr: "",
ContractStartDateInfo: "",
FinanceNo: "",
ContractUrl: "",
SettlementDate: "",
SettlementInfo: ""
};
this.SetProfitLossMsg = {
ID: 0,
......@@ -1272,8 +1220,7 @@ export default {
getAccountTypeList() {
//获取账户类型(平台账户只能获取对公账户类型)
this.apipost(
"AccountType_post_GetList",
{},
"AccountType_post_GetList", {},
res => {
if (res.data.resultCode == 1) {
this.AccountTypeList = res.data.data;
......@@ -1334,9 +1281,9 @@ export default {
},
//导出
downMuban() {
let msg=this.msg;
let msg = this.msg;
let userInfo = this.getLocalStorage();
msg.UId=userInfo.EmployeeId;
msg.UId = userInfo.EmployeeId;
this.GetLocalFile(
"BankAccount_post_OutToExcelPlatform",
msg,
......@@ -1355,12 +1302,10 @@ export default {
RB_Branch_Id: this.addMsg.BranchIdS
};
this.addMsg.BranchList.push(msg);
console.log("this.ContractStartDateInfo",this.addMsg.ContractStartDateInfo);
if (this.addMsg.ContractStartDateInfo&&this.addMsg.ContractStartDateInfo!=null){
this.addMsg.ContractStartDateStr=this.addMsg.ContractStartDateInfo[0];
this.addMsg.ContractEndDateStr=this.addMsg.ContractStartDateInfo[1];
if (this.addMsg.ContractStartDateInfo && this.addMsg.ContractStartDateInfo != null) {
this.addMsg.ContractStartDateStr = this.addMsg.ContractStartDateInfo[0];
this.addMsg.ContractEndDateStr = this.addMsg.ContractStartDateInfo[1];
}
console.log(" this.addMsg,", this.addMsg,);
this.apipost(
"BankAccount_post_SetPlatform",
this.addMsg,
......@@ -1381,8 +1326,7 @@ export default {
//删除
this.$confirm(
this.$t('tips.shifoudui') + "“" + text + "”" + this.$t('tips.zhshanchu'),
this.$t('tips.tips'),
{
this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
......@@ -1400,8 +1344,9 @@ export default {
},
deletInstitutions(id) {
this.apipost(
"BankAccount_post_RemovePlatform",
{ ID: id },
"BankAccount_post_RemovePlatform", {
ID: id
},
res => {
if (res.data.resultCode == 1) {
this.innerVisible = false;
......@@ -1498,7 +1443,12 @@ export default {
goUrl(path, id, name, source, CurrencyId) {
this.$router.push({
name: path,
query: { id: id, name: name, source: source, CurrencyId: CurrencyId }
query: {
id: id,
name: name,
source: source,
CurrencyId: CurrencyId
}
});
},
InitTime() {
......@@ -1511,10 +1461,10 @@ export default {
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
var branchId = userInfo.RB_Branch_id;
this.addMsg.BranchIdS = branchId;
if(branchId==0||branchId==49){
if (branchId == 0 || branchId == 49) {
this.getCompanyList();
}else{
this.getCompanyList(2,userInfo);
} else {
this.getCompanyList(2, userInfo);
this.msg.RB_Branch_Id = branchId;
}
......@@ -1525,57 +1475,68 @@ export default {
this.getfinanceinfoList();
},
created() {
Vue.component('table-operation',{
template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-edit" circle @click="update(rowData,index)"></el-button><el-button type="danger" size='mini' icon="el-icon-delete" circle @click="deleteRow(rowData,index)"></el-button></div>`,
props:{
rowData:{
type:Object
Vue.component('table-operation', {
template: `<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-edit" circle @click="update(rowData,index)"></el-button><el-button type="danger" size='mini' icon="el-icon-delete" circle @click="deleteRow(rowData,index)"></el-button></div>`,
props: {
rowData: {
type: Object
},
field:{
type:String
field: {
type: String
},
index:{
type:Number
index: {
type: Number
}
},
methods:{
update(){
let params = {type:'edit',id:this.rowData.ID};
this.$emit('on-custom-comp',params);
methods: {
update() {
let params = {
type: 'edit',
id: this.rowData.ID
};
this.$emit('on-custom-comp', params);
},
deleteRow(){
let params = {type:'delete',id:this.rowData.ID,alias:this.rowData.Alias};
this.$emit('on-custom-comp',params);
deleteRow() {
let params = {
type: 'delete',
id: this.rowData.ID,
alias: this.rowData.Alias
};
this.$emit('on-custom-comp', params);
}
}
})
}
};
};
</script>
<style scoped>
.page_PlatformAccount .query-box li label {
.page_PlatformAccount .query-box li label {
display: inline-block;
min-width: 80px;
text-align: right;
font-style: normal;
margin: 0 20px 0 0;
}
._scrollbar::-webkit-scrollbar {
}
._scrollbar::-webkit-scrollbar {
width: 4px;
height: 8px;
}
._scrollbar::-webkit-scrollbar-thumb {
}
._scrollbar::-webkit-scrollbar-thumb {
border-radius: 4px;
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
}
._scrollbar::-webkit-scrollbar-track {
}
._scrollbar::-webkit-scrollbar-track {
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
.page_PlatformAccount ._vMG_edit {
}
.page_PlatformAccount ._vMG_edit {
overflow: auto;
display: none;
position: absolute;
......@@ -1586,20 +1547,22 @@ export default {
background-color: #ffffff;
padding: 10px;
width: 100%;
}
.page_PlatformAccount ._vMG_edit ._tit {
}
.page_PlatformAccount ._vMG_edit ._tit {
padding-left: 10px;
border-left: 3px solid #e95252;
font-size: 16px;
color: #000000;
}
.page_PlatformAccount ._vMG_edit ._tit span {
}
.page_PlatformAccount ._vMG_edit ._tit span {
color: #666666;
font-size: 14px;
}
}
/deep/ .page_PlatformAccount ._vMG_edit .avatar-uploader .el-upload {
/deep/ .page_PlatformAccount ._vMG_edit .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9 !important;
border-radius: 6px;
cursor: pointer;
......@@ -1643,6 +1606,7 @@ export default {
line-height: 14px;
color: #000;
}
._vMG_edit .el-form-item__label {
font-size: 12px !important;
}
......@@ -1676,27 +1640,32 @@ export default {
.cm_content {
.cm_content {
margin: 0;
padding: 0;
overflow-x: auto;
}
._edHeight {
}
._edHeight {
height: 500px;
}
.edHeight {
}
.edHeight {
display: block !important;
height: 400px;
}
.edHeight_t {
}
.edHeight_t {
display: block !important;
height: 152px;
}
.page_PlatformAccount ._info_box ul li {
}
.page_PlatformAccount ._info_box ul li {
float: left;
margin-right: 12px;
}
.instMg_list_item {
}
.instMg_list_item {
width: 296px;
height: auto;
border-radius: 4px;
......@@ -1706,78 +1675,93 @@ export default {
overflow: hidden;
margin-right: 15px;
margin-bottom: 15px;
}
.instMg_list_item:hover {
}
.instMg_list_item:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
._tips {
}
._tips {
font-size: 12px;
color: #666666;
padding: 15px 0;
}
._top {
}
._top {
text-align: center;
height: 50px;
border-bottom: 1px solid #eeeeee;
overflow: hidden;
padding: 10px 0;
}
._top img {
}
._top img {
height: 100%;
}
._bt {
}
._bt {
padding: 20px;
font-size: 14px;
}
._bt_t {
}
._bt_t {
border-radius: 4px;
background-color: #47bf8c;
color: #ffffff;
}
._bt_t > p {
}
._bt_t>p {
padding: 10px 0;
text-align: center;
}
._bt_t > p > span {
}
._bt_t>p>span {
display: inline-block;
padding: 3px 10px;
background-color: #ffa200;
border-radius: 4px;
}
._bt_t ._btt_b {
}
._bt_t ._btt_b {
padding: 14px;
background-color: #32b37c;
}
._bt_t ._btt_b > div:nth-child(1) {
}
._bt_t ._btt_b>div:nth-child(1) {
display: flex;
text-align: center;
padding: 0 0 9px 0;
}
._bt_t ._btt_b > div > p {
}
._bt_t ._btt_b>div>p {
flex: 1;
}
._bt_t ._btt_b > div:nth-child(1) > p:nth-child(2) {
}
._bt_t ._btt_b>div:nth-child(1)>p:nth-child(2) {
border-left: 2px solid #4fc794;
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding: 0 5px;
}
.icon-img-ren {
}
.icon-img-ren {
color: #4fc794;
}
._bt_t ._btt_b .PingFangSC {
}
._bt_t ._btt_b .PingFangSC {
font-weight: bold;
text-align: center;
padding: 5px 0;
border: 1px solid rgba(79, 199, 148, 1);
border-radius: 4px;
width: 162px;
}
.icon-qiehuan,
.icon-ico-renwuyaoqiu {
}
.icon-qiehuan,
.icon-ico-renwuyaoqiu {
background-color: #e7e7e7;
border-radius: 50%;
color: #999999;
......@@ -1788,33 +1772,40 @@ export default {
text-align: center;
line-height: 19px;
cursor: pointer;
}
.icon-ico-renwuyaoqiu {
}
.icon-ico-renwuyaoqiu {
font-size: 10px;
}
.icon-qiehuan:hover,
.icon-ico-renwuyaoqiu:hover {
}
.icon-qiehuan:hover,
.icon-ico-renwuyaoqiu:hover {
background-color: #e95252;
color: white;
}
._bt_b {
}
._bt_b {
padding: 15px 0 0 0;
border-bottom: 1px solid #eeeeee;
}
._bt_b > p {
}
._bt_b>p {
display: flex;
justify-content: space-between;
padding-bottom: 10px;
}
._bt_b > p span._name {
}
._bt_b>p span._name {
color: #333333;
font-size: 12px;
}
._btn {
}
._btn {
padding: 20px 30px 0 30px;
text-align: center;
}
._btn span {
}
._btn span {
display: inline-block;
font-size: 12px;
background-color: #e7e7e7;
......@@ -1823,34 +1814,41 @@ export default {
border-radius: 14px;
cursor: pointer;
margin-left: 10px;
}
._btn span:hover {
}
._btn span:hover {
background-color: #e95252;
color: white;
}
.fc_green {
}
.fc_green {
color: #47bf8c !important;
}
.fc_red {
}
.fc_red {
color: #e95252 !important;
}
.page_PlatformAccount .PingFangSC,
._bold,
.PingFangCom {
}
.page_PlatformAccount .PingFangSC,
._bold,
.PingFangCom {
font-weight: bold;
}
._no_bold {
}
._no_bold {
font-weight: normal;
}
._max_wd {
}
._max_wd {
max-width: 80px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
vertical-align: top;
display: inline-block;
}
._bt_t .PingFangCom {
}
._bt_t .PingFangCom {
font-family: "PingFangSC-fine" !important;
text-align: center;
padding: 6px 2px;
......@@ -1862,15 +1860,18 @@ export default {
white-space: nowrap;
display: inline-block;
overflow: hidden;
}
._btt_b > div:nth-child(1).over_ellipsis {
}
._btt_b>div:nth-child(1).over_ellipsis {
max-width: 107px;
}
._add_saveBtn {
}
._add_saveBtn {
text-align: right;
margin-bottom: 10px;
}
._cp_name {
}
._cp_name {
width: 185px;
display: inline-block;
text-overflow: ellipsis;
......@@ -1878,34 +1879,43 @@ export default {
display: inline-block;
overflow: hidden;
text-align: right;
}
._underline {
}
._underline {
text-decoration: underline;
cursor: pointer;
}
.page_PlatformAccount .el-button-group .el-button {
}
.page_PlatformAccount .el-button-group .el-button {
padding: 4px;
}
._yingkui {
}
._yingkui {
height: 40px;
line-height: 40px;
font-size: 12px;
color: #666666;
padding-left: 20px;
}
.page_PlatformAccount .query-box {
}
.page_PlatformAccount .query-box {
padding: 20px 0 0;
}
.page_PlatformAccount ._wAuto {
}
.page_PlatformAccount ._wAuto {
width: auto;
}
.el-date-editor.el-input {
}
.el-date-editor.el-input {
width: 100% !important;
}
.page_PlatformAccount .el-input-group__append,.page_PlatformAccount .el-input-group__prepend{
}
.page_PlatformAccount .el-input-group__append,
.page_PlatformAccount .el-input-group__prepend {
border-radius: 0px;
}
.right-tag{
}
.right-tag {
float: right;
color: rgb(255, 255, 255);
font-size: 12px;
......@@ -1915,21 +1925,25 @@ export default {
height: 22px;
line-height: 18px;
margin-top: 7px;
}
.el-select-dropdown__item.selected{
}
.el-select-dropdown__item.selected {
font-weight: unset;
}
.minmargin-box .el-select-dropdown__item{
}
.minmargin-box .el-select-dropdown__item {
padding: 0 5px;
}
.monthAndKmStyle{
}
.monthAndKmStyle {
display: flex;
::v-deep{
.el-input{
::v-deep {
.el-input {
width: 50%;
display: inline-block;
}
}
}
</style>
</style>
src/components/scenicSpot/reservation/OrderList.vue
View file @ 9294f1f4
<style scoped>
.row {
.row {
display: flex;
}
}
.row-c {
.row-c {
display: flex;
align-items: center;
}
}
.column {
.column {
display: flex;
flex-direction: column;
}
}
.column-jac {
.column-jac {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
}
.column-ac {
.column-ac {
display: flex;
flex-direction: column;
align-items: center;
}
}
.wrap {
.wrap {
flex-wrap: wrap;
}
}
.justify-sb {
.justify-sb {
justify-content: space-between;
}
}
.justify-c {
.justify-c {
justify-content: center;
}
}
.justify-e {
.justify-e {
justify-content: flex-end;
align-items: flex-end;
}
}
.flex-g {
.flex-g {
flex-grow: 1;
}
}
.flex-s {
.flex-s {
flex-shrink: 0;
}
}
.align-c {
.align-c {
align-items: center;
}
}
.cblack {
.cblack {
color: black;
}
}
.cf {
.cf {
color: #ffffff;
}
}
.c9e {
.c9e {
color: #9e9e9e;
}
}
.c20C997 {
.c20C997 {
color: #20c997;
}
}
.c02C854 {
.c02C854 {
color: #02c854;
}
}
.cff9800 {
.cff9800 {
color: #ff9800;
}
}
.cF1416C {
.cF1416C {
color: #f1416c;
}
}
.cF57A98 {
.cF57A98 {
color: #f57a98;
}
}
.c04C8C8 {
.c04C8C8 {
color: #04c8c8;
}
}
.c059FF6 {
.c059FF6 {
color: #059ff6;
}
}
.c3FC4FF {
.c3FC4FF {
color: #3fc4ff;
}
}
.fz10 {
.fz10 {
font-size: 10px;
}
}
.fz11 {
.fz11 {
font-size: 11px;
}
}
.fz12 {
.fz12 {
font-size: 12px;
}
}
.fz13 {
.fz13 {
font-size: 13px;
}
}
.fz14 {
.fz14 {
font-size: 14px;
}
}
.fz15 {
.fz15 {
font-size: 15px;
}
}
.fz16 {
.fz16 {
font-size: 16px;
}
}
.fz17 {
.fz17 {
font-size: 17px;
}
}
.fz18 {
.fz18 {
font-size: 18px;
}
}
.fbold {
.fbold {
font-weight: bold;
}
}
.ml {
.ml {
margin-left: 10px;
}
}
.mr {
.mr {
margin-right: 10px;
}
}
.mt {
.mt {
margin-top: 10px;
}
}
.mt20 {
.mt20 {
margin-top: 20px;
}
}
.mb {
.mb {
margin-bottom: 10px;
}
}
.mb20 {
.mb20 {
margin-bottom: 20px;
}
}
.mx {
.mx {
margin-left: 10px;
margin-right: 10px;
}
}
.mx5 {
.mx5 {
margin-left: 5px;
margin-right: 5px;
}
}
.mb5 {
.mb5 {
margin-bottom: 5px;
}
}
.py {
.py {
padding: 15px 0;
}
}
.py5 {
.py5 {
padding: 5px 0;
}
}
.px5 {
.px5 {
padding: 0 5px;
}
}
.px15 {
.px15 {
padding: 0 15px;
}
}
.pa15 {
.pa15 {
padding: 15px;
}
}
.py20 {
.py20 {
padding: 20px 0;
}
}
.pb5 {
.pb5 {
padding: 0 0 5px 0;
}
}
.pa {
.pa {
padding: 10px 20px;
}
}
.pa20 {
.pa20 {
padding: 20px;
}
}
.pt20 {
.pt20 {
padding: 20px 0;
}
}
.borderD {
.borderD {
border-bottom: 1px dashed #dddddd;
}
}
.bgf {
.bgf {
background: #ffffff;
}
}
.bgf5 {
.bgf5 {
background: #f5f5f5;
}
}
.bgE8F5E9 {
.bgE8F5E9 {
background: #e8f5e9;
}
}
.bgD9F3FF {
.bgD9F3FF {
background: #d9f3ff;
}
}
.bgFAEAED {
.bgFAEAED {
background: #faeaed;
}
}
.bj {
.bj {
background: #ffffff;
}
}
.bjFFF3E0 {
.bjFFF3E0 {
background: #FFF3E0;
}
}
.radius5 {
.radius5 {
border-radius: 5px;
}
}
.cursor-pointer {
.cursor-pointer {
cursor: pointer;
}
}
.relative {
.relative {
position: relative;
}
}
.absolute {
.absolute {
position: absolute;
}
}
.left0 {
.left0 {
left: 0;
}
}
.right0 {
.right0 {
right: 0;
}
}
.top0 {
.top0 {
top: 0;
}
}
.bottom0 {
.bottom0 {
bottom: 0;
}
}
.left20 {
.left20 {
left: 020px;
}
}
.right20 {
.right20 {
right: 20px;
}
}
.top20 {
.top20 {
top: 20px;
}
}
.bottom20 {
.bottom20 {
bottom: 20px;
}
}
.text-center {
.text-center {
text-align: center;
}
}
.orderType {
.orderType {
padding: 3px 15px;
border-radius: 3px;
background: #f57a98;
margin-right: 15px;
}
}
.orderType.active {
.orderType.active {
background: #4dd0e1;
}
}
.orderType.activeNo {
.orderType.activeNo {
background: #E95252;
}
}
.copy {
.copy {
display: inline-block;
padding: 3px 15px;
border-radius: 3px;
margin-left: 20px;
}
}
.copy:hover {
.copy:hover {
background: #f5f5f5;
}
}
.see-rec div {
.see-rec div {
padding: 1px 5px;
border-radius: 3px;
}
}
.see {
.see {
border: 1px solid #04c8c8;
}
}
.seeLK {
.seeLK {
border: 1px solid #059ff6;
}
}
.see:hover {
.see:hover {
background-color: rgba(4, 200, 200, 0.1);
}
}
.rec {
.rec {
border: 1px solid #04c8c8;
background-color: rgba(4, 200, 200, 1);
}
}
.rec:hover {
.rec:hover {
border: 1px solid rgba(4, 200, 200, 0.9);
background-color: rgba(4, 200, 200, 0.9);
}
}
.cancel:hover {
.cancel:hover {
background-color: #f3dce2;
}
}
.confirm:hover {
.confirm:hover {
background-color: #dcedc8;
}
}
.change:hover {
.change:hover {
background-color: #d7e9f3;
}
}
.change1:hover {
.change1:hover {
background-color: #dcedc8;
}
}
.orderop {
.orderop {
text-align: center;
}
}
.orderop div {
.orderop div {
width: auto;
height: 30px;
display: flex;
padding: 0 5px;
justify-content: center;
}
}
.RoomList div {
.RoomList div {
border-bottom: 1px solid #e7e7e7;
}
}
.RoomList div:last-child {
.RoomList div:last-child {
border: 0;
}
}
.el-table {
.el-table {
font-size: 13px;
}
}
.shezhifrom {
.shezhifrom {
position: relative;
}
}
.shebox {
.shebox {
position: absolute;
top: 0;
left: -100px;
display: none;
}
}
.shezhifrom:hover .shebox {
.shezhifrom:hover .shebox {
display: block;
}
}
.flexOne-form-bj h3 {
.flexOne-form-bj h3 {
font-size: 18px;
color: black;
padding: 0 0 20px 0;
font-weight: 400;
}
}
.flexOne-type {
.flexOne-type {
display: flex;
align-items: center;
padding: 0 0 20px 0;
}
}
.flexOne-type b {
.flexOne-type b {
font-size: 13px;
width: 100px;
flex-shrink: 0;
}
}
.flexOne-type div {
.flexOne-type div {
display: flex;
}
}
.flexOne-description {
.flexOne-description {
padding: 15px 15px;
border-radius: 5px;
background: #E1F5FE;
margin-bottom: 20px;
}
}
.flexOne-description b {
.flexOne-description b {
font-size: 14px;
}
}
.flexOne-description p {
.flexOne-description p {
font-size: 12px;
color: #4C5759;
padding: 10px 0 0 0;
}
}
.flexOne-infor-box b {
.flexOne-infor-box b {
font-size: 13px;
}
}
.infor-list {
.infor-list {
display: flex;
flex-direction: column;
}
}
.list-title {
.list-title {
padding: 20px 0;
border-bottom: 1px dashed #eeeeee;
color: #7E8299;
font-size: 13px;
}
}
.list-title,
.list-centent {
.list-title,
.list-centent {
display: flex;
flex-wrap: wrap;
margin-top: 20px;
}
}
.infor-list li {
.infor-list li {
width: 25%;
}
}
.list-centent li {
.list-centent li {
width: 33.33%;
}
}
.list-centent.active li {
.list-centent.active li {
width: 25%;
}
}
/deep/.el-table tr td:first-child {
/deep/.el-table tr td:first-child {
border-bottom: 0;
}
}
/deep/.el-table tr:last-child td {
/deep/.el-table tr:last-child td {
border-bottom: 1px solid #EBEEF5;
}
}
/deep/.el-table tr td {
/deep/.el-table tr td {
border-bottom: 1px solid #EBEEF5;
}
}
</style>
<template>
<div>
<div style="text-align: right;position: fixed;top: 62px; right: 89px;">
<el-button class="hollowFixedBtn" v-if="pagesTitle=='OP'" @click="setCompleted"
:loading="CompletedLoading">一键完结</el-button>
<el-button class="hollowFixedBtn" v-if="pagesTitle=='OP'" @click="setCompleted" :loading="CompletedLoading">一键完结
</el-button>
</div>
<el-table ref="multipleTable" :data="OrderList" tooltip-effect="dark" style="width: 100%" row-key="OrderId"
@selection-change="handleSelectionChange">
<el-table-column type="selection" :selectable="selectable" :reserve-selection="true"
v-if="pagesTitle=='OP'">
<el-table-column type="selection" :selectable="selectable" :reserve-selection="true" v-if="pagesTitle=='OP'">
</el-table-column>
<el-table-column :label="pagesTitle=='OP'?'全选':''">
<template slot-scope="scope">
<div class="row-c justify-sb align-c py">
<div class="row-c">
<div>
<div class="orderType cf fz12" :class="{ active: scope.row.MailingState == 1,activeNo: scope.row.MailingState == 4 }">
<div class="orderType cf fz12"
:class="{ active: scope.row.MailingState == 1,activeNo: scope.row.MailingState == 4 }">
<template v-if="scope.row.MailingState == 1">自行取件</template>
<template v-if="scope.row.MailingState > 1&&scope.row.MailingState < 4">邮寄票券</template>
<template v-if="scope.row.MailingState == 4">电子券</template>
......@@ -534,14 +535,17 @@
<div class="c9e fz12">
<span>订单编号：</span>
<span>{{ scope.row.OrderNo }}({{ scope.row.OrderId}})</span>
<span class="copy cblack cursor-pointer" v-if="copyId != scope.row.OrderId" @click="CopyHandler(scope.row)">复制</span>
<span class="copy cblack cursor-pointer" v-if="copyId != scope.row.OrderId"
@click="CopyHandler(scope.row)">复制</span>
<span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span>
</div>
</div>
<div class="c9e fz12">
<span v-if="scope.row.Name||scope.row.EName">客人信息：{{ scope.row.Name }}({{ scope.row.EName }})<template v-if="scope.row.Mobile"> /{{ scope.row.Mobile }}</template></span>
<span v-if="scope.row.Name||scope.row.EName">客人信息：{{ scope.row.Name }}({{ scope.row.EName }})<template
v-if="scope.row.Mobile"> /{{ scope.row.Mobile }}</template></span>
<span v-if="pagesTitle!='销售'">
<template v-if="scope.row.Name||scope.row.EName"> /</template>来源<template v-if="!scope.row.OrderSource&&!scope.row.CustomerId">销售</template>
<template v-if="scope.row.Name||scope.row.EName"> /</template>来源<template
v-if="!scope.row.OrderSource&&!scope.row.CustomerId">销售</template>
<template v-if="!scope.row.OrderSource&&scope.row.CustomerId>0">B2B</template>
<template v-if="scope.row.OrderSource==1">B2C</template>
</span>
......@@ -550,7 +554,8 @@
<span class="mr" v-if="scope.row.LureEmpName">引流人：{{ scope.row.LureEmpName }}</span>
<span class="mr">销售：{{ scope.row.SaleName }}</span>
<span class="mr" v-if="scope.row.OpName&&pagesTitle=='OP'">关联OP：{{ scope.row.OpName }}</span>
<span class="mr" v-if="scope.row.CustomerName">创建人：{{ scope.row.CustomerName }} ({{ scope.row.CustomerContact }}<template v-if="scope.row.CustomerTel">/{{
<span class="mr" v-if="scope.row.CustomerName">创建人：{{ scope.row.CustomerName }}
({{ scope.row.CustomerContact }}<template v-if="scope.row.CustomerTel">/{{
scope.row.CustomerTel
}}</template>)</span>
<span class="mr">下单时间：{{ scope.row.CreateTime }}</span>
......@@ -597,13 +602,18 @@
<span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
</template>
</el-table-column>
<template slot="append" v-if="(scope.row.Remark||scope.row.OPRemark||scope.row.isMore)||(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)">
<div v-if="(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)||scope.row.Remark" style="padding:10px;color:#f1416c">客户备注：{{scope.row.Remark}}
<i v-if="pagesTitle=='销售'&&scope.row.OrderStatus>1&&scope.row.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(scope.row)"></i></div>
<div v-if="(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)||scope.row.OPRemark" style="padding:10px;color:#f1416c"
<template slot="append"
v-if="(scope.row.Remark||scope.row.OPRemark||scope.row.isMore)||(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)">
<div v-if="(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)||scope.row.Remark"
style="padding:10px;color:#f1416c">客户备注：{{scope.row.Remark}}
<i v-if="pagesTitle=='销售'&&scope.row.OrderStatus>1&&scope.row.OrderStatus!=3"
class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(scope.row)"></i></div>
<div v-if="(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)||scope.row.OPRemark"
style="padding:10px;color:#f1416c"
:style="{'padding':!scope.row.Remark&&scope.row.isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
OP备注：{{scope.row.OPRemark}}
<i v-if="pagesTitle=='OP'&&scope.row.OrderStatus>1&&scope.row.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(scope.row)"></i>
<i v-if="pagesTitle=='OP'&&scope.row.OrderStatus>1&&scope.row.OrderStatus!=3"
class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(scope.row)"></i>
</div>
</template>
</el-table>
......@@ -641,23 +651,27 @@
<template slot-scope="scope">
{{scope.row.DueInMoney}}
<span class="fz15 fbold"
:class="{'cF1416C':scope.row.DueInMoney>0}">
<span class="fz15 fbold" :class="{'cF1416C':scope.row.DueInMoney>0}">
</span>
</template>
</el-table-column>
<el-table-column label="利润" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
<span
class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
<el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)" label="提成" style="background:#EAEAEA">
<el-table-column
v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)"
label="提成" style="background:#EAEAEA">
<template slot-scope="scope">
<div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span class="float-l">销售：</span>
<div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span
class="float-l">销售：</span>
<commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
</div>
<div class="width100-float-l" v-if="scope.row.OPCommission&&scope.row.OPCommission>0"><span class="float-l">OP：</span>
<div class="width100-float-l" v-if="scope.row.OPCommission&&scope.row.OPCommission>0"><span
class="float-l">OP：</span>
<commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
</div>
</template>
......@@ -696,12 +710,7 @@
{{ scope.row.TicketCodeFile.split("/").at(-1) }}
</div>
<div class="cursor-pointer ml mr rec cf">
<a
class="cf"
style="text-decoration:none"
:href="scope.row.TicketCodeFile"
>下载</a
>
<a class="cf" style="text-decoration:none" :href="scope.row.TicketCodeFile">下载</a>
</div>
</div>
</template>
......@@ -711,14 +720,11 @@
<span class="cff9800">{{scope.row.UseDate}}</span> 前
</div>
<div class="row fz12 see-rec mt">
<el-upload ref="my-upload"
:http-request="uploadFileBtn"
v-loading="loadingDZP"
:multiple="true"
:show-file-list="false" action="">
<el-upload ref="my-upload" :http-request="uploadFileBtn" v-loading="loadingDZP"
:multiple="true" :show-file-list="false" action="">
<div :class="{'cursor-pointer seeLK c059FF6':!loadingDZP,
'cursor-pointer see c04C8C8':loadingDZP}"
@click="uploadOrderId=scope.row.OrderId">上传电子券</div>
'cursor-pointer see c04C8C8':loadingDZP}" @click="uploadOrderId=scope.row.OrderId">上传电子券
</div>
</el-upload>
</div>
</template>
......@@ -733,8 +739,7 @@
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
<span class="cursor-pointer radius5 mr mb px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.IncomeList"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="scope.row.IncomeList.length == 0" class="c9e fz12">
......@@ -749,8 +754,7 @@
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
<span class="cursor-pointer radius5 mr mb px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.RefundList"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="scope.row.RefundList.length == 0" class="c9e fz12">
......@@ -765,8 +769,7 @@
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
<span class="cursor-pointer radius5 mr mb px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.CostList"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="scope.row.CostList.length == 0" class="c9e fz12">
......@@ -774,58 +777,45 @@
</span>
</div>
<div class="item absolute right20 bottom20" v-if="scope.row.OrderStatus == 2 && pagesTitle != '销售'">
<el-tooltip class="" effect="dark" content="制单"
placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(scope.row, index, 3)"></i>
<el-tooltip class="" effect="dark" content="制单" placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" @click="makeAdocument(scope.row, index, 3)"></i>
</el-tooltip>
<el-tooltip v-if="scope.row.OrderStatus == 2" class="" effect="dark" content="冲抵" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(scope.row, index, 3)"></i>
<i class="el-icon-circle-plus cursor-pointer c3FC4FF" @click="isOffset(scope.row, index, 3)"></i>
</el-tooltip>
</div>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">发票单据</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
v-for="(x, i) in scope.row.InvoiceApplyList"
@click="openDetails(x)"
>{{ x.ID }}</span
>
v-for="(x, i) in scope.row.InvoiceApplyList" @click="openDetails(x)">{{ x.ID }}</span>
<span v-if="scope.row.InvoiceApplyList&&scope.row.InvoiceApplyList.length == 0" class="c9e fz12">
暂无发票单据
</span>
</div>
</div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb pb5" :class="{'borderD':scope.row.MailingMoney>0||scope.row.DiscountsMoney>0}">
<div class="row-c justify-sb pb5"
:class="{'borderD':scope.row.MailingMoney>0||scope.row.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span>
<div class="ml">
<span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
<span class="fz12">{{ scope.row.CurrencyName }}</span>
</div>
</div>
<div
class="row-c justify-sb py5"
v-if="scope.row.MailingMoney>0"
:class="{'borderD':scope.row.DiscountsMoney>0}"
>
<div class="row-c justify-sb py5" v-if="scope.row.MailingMoney>0"
:class="{'borderD':scope.row.DiscountsMoney>0}">
<span class="fz12 c9e">邮寄费</span>
<div class="ml">
<span class="fz14">{{ scope.row.MailingMoney.toFixed(2) }}</span>
<span class="fz12 ml">{{ scope.row.CurrencyName }}</span>
</div>
</div>
<div
class="row-c justify-sb py5"
v-if="scope.row.DiscountsMoney>0"
>
<div class="row-c justify-sb py5" v-if="scope.row.DiscountsMoney>0">
<span class="fz12 c9e">优惠金额</span>
<div class="ml">
<span class="fz14">{{ scope.row.DiscountsMoney.toFixed(2) }}</span>
......@@ -834,8 +824,7 @@
</div>
</div>
<!-- v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3" -->
<div
class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s">
<div class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s">
<div v-if="
scope.row.OrderStatus == 1 &&
scope.row.IncomeList.length == 0 &&
......@@ -845,8 +834,8 @@
<i v-loading="msg.OrderId == scope.row.OrderId && loading0"></i>
<span class="cF1416C">取消订单</span>
</div>
<div v-if="scope.row.OrderStatus == 1 && pagesTitle != '销售' && scope.row.OrderSource!=1" class="row-c cursor-pointer radius5 confirm py5"
@click="clickRightButtom(scope.row, 1)">
<div v-if="scope.row.OrderStatus == 1 && pagesTitle != '销售' && scope.row.OrderSource!=1"
class="row-c cursor-pointer radius5 confirm py5" @click="clickRightButtom(scope.row, 1)">
<i v-loading="msg.OrderId == scope.row.OrderId && loading1"></i>
<span class="c20C997">确认订单</span>
</div>
......@@ -877,21 +866,14 @@
<i v-loading="msg.OrderId == scope.row.OrderId && loading2"></i>
<span class="c20C997">收损</span>
</div>
<div
v-if="scope.row.OrderStatus >1 && scope.row.OrderStatus != 3
<div v-if="scope.row.OrderStatus >1 && scope.row.OrderStatus != 3
&& scope.row.OrderStatus != 4
&&pagesTitle=='OP'&&is_correlationOP"
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(scope.row,1)"
>
&&pagesTitle=='OP'&&is_correlationOP" class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(scope.row,1)">
<span class="c059FF6">编辑关联OP</span>
</div>
<div
v-if="scope.row.OrderStatus != 3
&&pagesTitle=='OP'"
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(scope.row,2)"
>
<div v-if="scope.row.OrderStatus != 3
&&pagesTitle=='OP'" class="row-c cursor-pointer radius5 change py5" @click="clickCorrelation(scope.row,2)">
<span class="c059FF6">编辑总金额</span>
</div>
<!-- 申请发票 -->
......@@ -909,7 +891,8 @@
</div>
<div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">
<div style="font-size:16px;font-weight:bold;font-family: pingfangR;">取消理由：</div>
<div style="margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;">{{ scope.row.CancelRemark }}
<div style="margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;">
{{ scope.row.CancelRemark }}
</div>
<div style="margin-left:12px;font-size:12px;font-family: microsoft yahei;">
{{ scope.row.CancelEmpName }} {{ scope.row.CancelTime }}
......@@ -932,8 +915,8 @@
</el-col> -->
<el-col :span="20" v-if="typeState == 3">
<el-form-item label="自提地址" prop="SelffetchAddress">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
v-model="msg.SelffetchAddress"></el-input>
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" v-model="msg.SelffetchAddress">
</el-input>
</el-form-item>
</el-col>
<el-col :span="20" v-if="typeState == 4">
......@@ -954,8 +937,8 @@
</el-dialog>
<el-dialog custom-class="w600" title="取消订单" :visible.sync="cancelOrderDialog">
<div style="padding-bottom:20px">
<el-input type="textarea" autofocus rows="5" placeholder="请填写取消订单的缘由" clear="w300"
v-model="cancelRemark"></el-input>
<el-input type="textarea" autofocus rows="5" placeholder="请填写取消订单的缘由" clear="w300" v-model="cancelRemark">
</el-input>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<input type="button" class="normalBtn" value="取消订单" @click="cancelOrderHandler" />
......@@ -983,7 +966,8 @@
</div>
<div class="flexOne-infor-box">
<b>{{msgParameter.MailingState==1?'客人讯息':msgParameter.MailingState==2?'邮寄讯息':''}}</b>
<el-form v-if="msgParameter.MailingState!=4" label-width="80px" :model="msgParameter" :rules="rules2" ref="msgParameter">
<el-form v-if="msgParameter.MailingState!=4" label-width="80px" :model="msgParameter" :rules="rules2"
ref="msgParameter">
<div class="infor-list">
</span>
<div class="list-centent" :class="{ 'active': msgParameter.MailingState == 1 }">
......@@ -1039,7 +1023,8 @@
</div>
</el-dialog>
<!-- op备注 -->
<el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?'编辑客户备注':'编辑OP备注'" :visible.sync="isShowRemark" center width="400px">
<el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?'编辑客户备注':'编辑OP备注'" :visible.sync="isShowRemark" center
width="400px">
<el-row class="flex" style="margin-top: 10px;">
<el-col>
<span style="display: block;margin-bottom: 10px;">备注：</span>
......@@ -1055,8 +1040,7 @@
</div>
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
<correlationOP :isShowCorrelation="isShowCorrelation" :CorrelationObj="CorrelationObj"
@close="close"
<correlationOP :isShowCorrelation="isShowCorrelation" :CorrelationObj="CorrelationObj" @close="close"
@success="success"></correlationOP>
</div>
</template>
......@@ -1068,14 +1052,21 @@
export default {
components: {
offset,correlationOP,commissionDialog,ApplyFoInvoice
offset,
correlationOP,
commissionDialog,
ApplyFoInvoice
},
props: ["OrderList", "pagesTitle"],
data() {
return {
postMsg:{OrderId:0,Type:1,Remark:''},
postMsg: {
OrderId: 0,
Type: 1,
Remark: ''
},
isShowRemark: false,
queryObj:null,
queryObj: null,
cdState: false,
copyId: 0,
CompletedLoading: false,
......@@ -1096,7 +1087,7 @@
msg: {
OrderId: "",
LossMoney: 0,
State: '',//状态 1确认 2已邮寄 3设置自提 4收损
State: '', //状态 1确认 2已邮寄 3设置自提 4收损
SelffetchAddress: ''
},
msgParameter: {
......@@ -1104,15 +1095,15 @@
OrderId: 0,
Money: 0.0,
Remark: '',
MailingState: '1',//邮寄状态 1自取 2邮寄
MailingAddress: '',//MailingState =2 填写邮寄
UseDate: '',//门票日期
MailingState: '1', //邮寄状态 1自取 2邮寄
MailingAddress: '', //MailingState =2 填写邮寄
UseDate: '', //门票日期
Name: '',
EName: '',
Sex: '1',//1男2女
Sex: '1', //1男2女
Birthday: '',
Mobile: '',
CouponsId: '',//景点id
CouponsId: '', //景点id
DetailList: [],
},
rules2: {
......@@ -1126,8 +1117,11 @@
message: '请输入英文名',
trigger: 'blur'
}],
Mobile: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
Mobile: [{
required: true,
message: "请输入联系电话",
trigger: "blur"
},
{
pattern: this.$commonUtils.Regex.el_ISphone,
message: "请输入正确的电话"
......@@ -1138,33 +1132,29 @@
message: '请输入邮寄地址',
trigger: 'blur'
}],
MailingMoney: [
{ required: true, message: "请输入邮寄费用", trigger: "blur" },
],
MailingMoney: [{
required: true,
message: "请输入邮寄费用",
trigger: "blur"
}, ],
},
outerVisible: false,
rules: {
State: [
{
State: [{
required: true,
message: "请选择订单状态",
trigger: "change"
}
],
SelffetchAddress: [
{
}],
SelffetchAddress: [{
required: true,
message: "请输入自提地址",
trigger: "blur"
}
],
LossMoney: [
{
}],
LossMoney: [{
required: true,
message: "请输入收损金额",
trigger: "blur"
}
]
}]
},
cancelOrderDialog: false,
cancelRemark: "",
......@@ -1174,11 +1164,22 @@
fileList: [],
GuestFile: '',
ChangeOrderDialog: false,
OrderStatusType: [
{ Name: this.$t('OrderList.orderStatus.apply'), ID: '1' },
{ Name: this.$t('OrderList.orderStatus.check'), ID: '2' },
{ Name: this.$t('OrderList.orderStatus.cancel'), ID: '3' },
{ Name: this.$t('OrderList.orderStatus.sun'), ID: '4' },
OrderStatusType: [{
Name: this.$t('OrderList.orderStatus.apply'),
ID: '1'
},
{
Name: this.$t('OrderList.orderStatus.check'),
ID: '2'
},
{
Name: this.$t('OrderList.orderStatus.cancel'),
ID: '3'
},
{
Name: this.$t('OrderList.orderStatus.sun'),
ID: '4'
},
],
items: null,
typeState: '',
......@@ -1186,7 +1187,7 @@
uploadOrderId: 0,
GuestFile: '',
isShowCorrelation: false,
CorrelationObj:{},
CorrelationObj: {},
is_correlationOP: false
};
},
......@@ -1196,43 +1197,43 @@
},
OrderList: {
handler(val, oldVal) {
console.log(val,'------');
console.log(val, '------');
}
}
},
methods: {
close(){
close() {
this.isShowCorrelation = false
this.CorrelationObj.TypeNum = null
this.CorrelationObj.Money = null
},
success(){
success() {
this.close()
this.$emit('success')
},
clickCorrelation(item,type){
clickCorrelation(item, type) {
this.CorrelationObj = JSON.parse(JSON.stringify(item))
if(type==2){
if (type == 2) {
this.CorrelationObj.TypeNum = 4 //编辑总价
}else{
} else {
this.CorrelationObj.TypeNum = 2
}
this.isShowCorrelation = true
},
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
isOffset(row, index, num) {
this.makeAdocument(row, index, num, 'Offset')
},
editRemark(item){
editRemark(item) {
this.postMsg.OrderId = item.OrderId
this.postMsg.Remark = this.pagesTitle=='销售'?item.Remark:item.OPRemark
this.postMsg.Remark = this.pagesTitle == '销售' ? item.Remark : item.OPRemark
this.isShowRemark = true
},
selectable(row, index) {
if (((this.OrderList[index].IsFinish != 1 && this.OrderList[index].Income > 0 && this.OrderList[index]
.DueInMoney == 0)||(this.OrderList[index].Money==0&&this.OrderList[index].Income==0
&&this.OrderList[index].CostMoney==0&&this.OrderList[index].Refund==0
&&this.OrderList[index].PlatformTax==0&&this.OrderList[index].IncomeList
&&this.OrderList[index].IncomeList.length>0))) {
.DueInMoney == 0) || (this.OrderList[index].Money == 0 && this.OrderList[index].Income == 0 &&
this.OrderList[index].CostMoney == 0 && this.OrderList[index].Refund == 0 &&
this.OrderList[index].PlatformTax == 0 && this.OrderList[index].IncomeList &&
this.OrderList[index].IncomeList.length > 0))) {
return true;
} else {
return false;
......@@ -1295,14 +1296,14 @@
this.$message.info('已取消！');
});
},
submitEditRemark(){
if(!this.postMsg.Remark){
submitEditRemark() {
if (!this.postMsg.Remark) {
this.$message.error('OP备注不能为空');
return
}
this.apipost('ticket_post_SetTicketOrderRemark', {
OrderId: this.postMsg.OrderId,
Type: this.pagesTitle=='销售'?1:2,
Type: this.pagesTitle == '销售' ? 1 : 2,
Remark: this.postMsg.Remark
}, res => {
if (res.data.resultCode == 1) {
......@@ -1330,21 +1331,21 @@
}
let m
let url
if(this.pagesTitle=='OP'){
if (this.pagesTitle == 'OP') {
m = {
OrderId: this.msgParameter.OrderId,
MailingMoney: this.msgParameter.MailingMoney,
MailingState: this.msgParameter.MailingState,//邮寄状态 1自取 2邮寄
MailingAddress: this.msgParameter.MailingAddress,//MailingState =2 填写邮寄
SelffetchAddress: this.msgParameter.SelffetchAddress,//自取地址
MailingState: this.msgParameter.MailingState, //邮寄状态 1自取 2邮寄
MailingAddress: this.msgParameter.MailingAddress, //MailingState =2 填写邮寄
SelffetchAddress: this.msgParameter.SelffetchAddress, //自取地址
Name: this.msgParameter.Name,
EName: this.msgParameter.EName,
Sex: this.msgParameter.Sex,//1男2女
Sex: this.msgParameter.Sex, //1男2女
Mobile: this.msgParameter.Mobile,
}
url = 'dict_post_SetTicketOrderMailingState'
}
if(this.pagesTitle=='销售'){
if (this.pagesTitle == '销售') {
m = {
IsUpdateMailing: 1,
OrderId: this.msgParameter.OrderId,
......@@ -1353,11 +1354,11 @@
UseDate: this.msgParameter.UseDate,
Birthday: this.msgParameter.Birthday,
DetailList: this.msgParameter.DetailList,
MailingState: this.msgParameter.MailingState,//邮寄状态 1自取 2邮寄
MailingAddress: this.msgParameter.MailingAddress,//MailingState =2 填写邮寄
MailingState: this.msgParameter.MailingState, //邮寄状态 1自取 2邮寄
MailingAddress: this.msgParameter.MailingAddress, //MailingState =2 填写邮寄
Name: this.msgParameter.Name,
EName: this.msgParameter.EName,
Sex: this.msgParameter.Sex,//1男2女
Sex: this.msgParameter.Sex, //1男2女
Mobile: this.msgParameter.Mobile,
Remark: this.msgParameter.Remark,
}
......@@ -1422,7 +1423,7 @@
// 单据详情
openDetails(item) {
let query = {
id: item.FrID?item.FrID:item.ID,
id: item.FrID ? item.FrID : item.ID,
blank: "y",
};
this.$router.push({
......@@ -1432,18 +1433,17 @@
},
// 制作单据
makeAdocument(row, index, num, Offset) {
console.log("row",row);
if((num==2||num==3)&&(row.Income)<=0){
if ((num == 2 || num == 3) && (row.Income) <= 0) {
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
if (Offset) {
this.cdState = true
}
let type = 0
if(num==3){
if (num == 3) {
type = 2
}else{
} else {
type = num
}
this.BillMakingMsg.ReFinanceId = row.OrderId;
......@@ -1467,13 +1467,13 @@
tradeObj: JSON.stringify(this.BillMakingMsg),
// companyID:row.OutBranchId
};
if(num==2){
query.searchTitle='溢收团费退款';
}else if(num ==3 && this.cdState == false){
query.portTypeId= 6;
if (num == 2) {
query.searchTitle = '溢收团费退款';
} else if (num == 3 && this.cdState == false) {
query.portTypeId = 6;
}
this.queryObj = query
if(!Offset){
if (!Offset) {
this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
......@@ -1498,7 +1498,7 @@
tab: title
}
});
} else {//变更门票预定
} else { //变更门票预定
this.msgParameter = JSON.parse(JSON.stringify(obj))
this.msgParameter.MailingState = JSON.stringify(this.msgParameter.MailingState)
this.msgParameter.Sex = JSON.stringify(this.msgParameter.Sex)
......@@ -1507,8 +1507,8 @@
this.GetTicketCouponsInfo()
}
},
GetTicketCouponsInfo(){
this.apipost('ticket_post_GetTicketCouponsInfo',{
GetTicketCouponsInfo() {
this.apipost('ticket_post_GetTicketCouponsInfo', {
CouponsId: this.msgParameter.CouponsId,
OpenTime: this.msgParameter.UseDate,
},
......@@ -1516,10 +1516,11 @@
this.loading3 = false
if (res.data.resultCode == 1) {
this.msgParameter.SelffetchAddress = res.data.data.SelffetchAddress
let arr = res.data.data.TicketPriceList.sort((a,b)=>{
return a.MailingMoney-b.MailingMoney
let arr = res.data.data.TicketPriceList.sort((a, b) => {
return a.MailingMoney - b.MailingMoney
})
this.msgParameter.MailingMoney = this.msgParameter.MailingMoney?this.msgParameter.MailingMoney:arr[0].MailingMoney
this.msgParameter.MailingMoney = this.msgParameter.MailingMoney ? this.msgParameter.MailingMoney : arr[
0].MailingMoney
}
},
err => {
......@@ -1615,8 +1616,7 @@
if (this.loading0) return;
this.loading0 = true
this.apipost(
"ticket_post_CancelSaleTicketOrder",
{
"ticket_post_CancelSaleTicketOrder", {
OrderId: this.cancelOrderId,
IsOPCancel: this.pagesTitle != '销售' ? 1 : 0,
Remark: this.pagesTitle != '销售' ? this.cancelRemark : ''
......@@ -1656,8 +1656,7 @@
.then(() => {
this.loading2 = true;
this.apipost(
"ticket_post_SetSaleTicketOrderState",
{
"ticket_post_SetSaleTicketOrderState", {
OrderId: this.msg.OrderId,
State: this.typeState,
SelffetchAddress: this.typeState == 3 ? this.msg.SelffetchAddress : '',
......@@ -1678,7 +1677,7 @@
}
);
})
.catch(() => { });
.catch(() => {});
},
confirmFun(item, type) {
let text
......@@ -1696,8 +1695,7 @@
.then(() => {
this.loading1 = true;
this.apipost(
"ticket_post_SetSaleTicketOrderState",
{
"ticket_post_SetSaleTicketOrderState", {
OrderId: item.OrderId,
State: type,
SelffetchAddress: type == 3 ? this.msg.SelffetchAddress : '',
......@@ -1725,7 +1723,7 @@
CopyHandler(item) {
this.copyId = item.OrderId;
let copyText = item.OrderId;
const save = function(e) {
const save = function (e) {
e.clipboardData.setData('text/plain', copyText)
e.preventDefault() // 阻止默认行为
}
......@@ -1763,7 +1761,7 @@
mounted() {
this.userInfo = this.getLocalStorage();
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('is_correlationOP') != -1 ){
if (ActionMenuCode.indexOf('is_correlationOP') != -1) {
this.is_correlationOP = true
}
//自适应高度调节
......@@ -1772,7 +1770,8 @@
this.com_onresize();
};
}
};
};
</script>
<style>
......
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