Commit 9853f2c9 authored by 吴春's avatar 吴春

1

parent 1962421a
...@@ -379,11 +379,11 @@ ...@@ -379,11 +379,11 @@
<el-input v-model="addMsg.Bond" maxlength="20"></el-input> <el-input v-model="addMsg.Bond" maxlength="20"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <!-- <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.qyxianlu')"> <el-form-item :label="$t('fnc.qyxianlu')">
<el-input v-model="addMsg.SigningLine" class></el-input> <el-input v-model="addMsg.SigningLine" class></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.hetong')"> <el-form-item :label="$t('fnc.hetong')">
<el-select filterable v-model="addMsg.HaveContract" class> <el-select filterable v-model="addMsg.HaveContract" class>
...@@ -468,11 +468,10 @@ ...@@ -468,11 +468,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="所属线路"> <el-form-item :label="$t('fnc.qyxianlu')">
<el-select filterable multiple v-model="LineId" collapse-tags <el-select filterable multiple v-model="LineId" collapse-tags
@change="getLineId"> @change="getLineId">
<el-option :label="$t('pub.unlimitedSel')" value="-1"
:disabled="LineIDdisabled"></el-option>
<el-option v-for="item in LineList" <el-option v-for="item in LineList"
:label="item.LineName" :label="item.LineName"
:value="item.LineID" :key="item.LineID" :value="item.LineID" :key="item.LineID"
...@@ -579,6 +578,21 @@ ...@@ -579,6 +578,21 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-dialog title="审核" :visible.sync="examineLoading" width="600px" height="40%">
<div >
<span style="width: 15%; display: inline-block">审核状态</span>
<el-radio-group v-model="ExamineMsg.AccountState" >
<el-radio v-model="ExamineMsg.AccountState" label="1">通过</el-radio>
<el-radio v-model="ExamineMsg.AccountState" label="2">拒绝</el-radio>
</el-radio-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="examineLoading = false">取 消</el-button>
<el-button style="margin-right: 24px" type="primary" @click="examineInstitutions">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -596,6 +610,11 @@ ...@@ -596,6 +610,11 @@
loading: true, loading: true,
CompanySelect: [], CompanySelect: [],
ContractUrl: "", ContractUrl: "",
examineLoading: false,
ExamineMsg:{
ID:0,
AccountState:0
},
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
...@@ -609,7 +628,7 @@ ...@@ -609,7 +628,7 @@
SigningLine: "", SigningLine: "",
Accountholder: "" Accountholder: ""
}, },
LineId: ['-1'], LineId: [-1],
SettlementType: ['1'], SettlementType: ['1'],
addMsg: { addMsg: {
ID: 0, ID: 0,
...@@ -807,11 +826,12 @@ ...@@ -807,11 +826,12 @@
}, },
methods: { methods: {
getLineId(){ getLineId(){
console.log("this.LineId11",this.LineId);
let data = this.LineId.join(',') let data = this.LineId.join(',')
this.addMsg.SigningLine = data this.addMsg.SigningLine = data
if(this.LineId.length>1&&data.indexOf('-1')!=-1){ if(this.LineId.length>1&&data.indexOf('-1')!=-1){
this.LineId.forEach((x,index)=>{ this.LineId.forEach((x,index)=>{
if(x=='-1'){ if(x==-1){
this.LineId.splice(index,1) this.LineId.splice(index,1)
} }
}) })
...@@ -829,6 +849,10 @@ ...@@ -829,6 +849,10 @@
}, (res) => { }, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineList = res.data.data; this.LineList = res.data.data;
this.LineList.unshift({
LineID:-1,
LineName:'不限'
})
let arr = function(list){ let arr = function(list){
list.forEach(x=>{ list.forEach(x=>{
x.disabled = true x.disabled = true
...@@ -876,6 +900,8 @@ ...@@ -876,6 +900,8 @@
this.text = this.$t('pub.updateMsg') this.text = this.$t('pub.updateMsg')
this.addShow = true this.addShow = true
this.addCuren = true this.addCuren = true
}else if (params.type === 'examine') {
this.financeinfoExamine(params.id, params.alias)
} }
}, },
initColums() { initColums() {
...@@ -951,9 +977,19 @@ ...@@ -951,9 +977,19 @@
width: 80, width: 80,
formatter: function (rowData, rowIndex, pagingIndex, field) { formatter: function (rowData, rowIndex, pagingIndex, field) {
let text = that.$t('hotel.hotel_people') let text = that.$t('hotel.hotel_people')
return rowData.SettlementType == 1 ? let commissionStr="";
rowData.Commission.toFixed(2) + "%" : if (rowData.SettlementType=="1") {
rowData.Commission + "/" + text; commissionStr= rowData.Commission.toFixed(2) + "%" ;
}else if (rowData.SettlementType=="2") {
commissionStr= rowData.Commission + "/" + text ;
}
else{
commissionStr= rowData.Commission.toFixed(2) + "%"+'&nbsp;&nbsp;&nbsp;&nbsp;' + rowData.Commission + "/" + text ;
}
return commissionStr;
// return rowData.SettlementType == 1 ?
// rowData.Commission.toFixed(2) + "%" :
// rowData.Commission + "/" + text;
}, },
filterMultiple: true, filterMultiple: true,
result: [], result: [],
...@@ -1012,7 +1048,7 @@ ...@@ -1012,7 +1048,7 @@
type: "check" type: "check"
}; };
let signingLine = { let signingLine = {
field: "SigningLine", field: "LineList",
title: that.$t('fnc.qyluxian'), title: that.$t('fnc.qyluxian'),
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
...@@ -1031,6 +1067,22 @@ ...@@ -1031,6 +1067,22 @@
isResize: true, isResize: true,
width: 80 width: 80
}; };
let accountState = {
field: "AccountState",
title: "状态",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 40,
formatter: function (rowData, rowIndex, pagingIndex, field) {
let accountStateStr="";
if(rowData.AccountState==0){accountStateStr="待审核"}
else if(rowData.AccountState==1){accountStateStr="正常"}
else if(rowData.AccountState==2){accountStateStr="已驳回"}
else{accountStateStr=""}
return accountStateStr;
},
};
let remark = { let remark = {
field: "Remark", field: "Remark",
title: that.$t('hotel.hotel_remark'), title: that.$t('hotel.hotel_remark'),
...@@ -1046,7 +1098,7 @@ ...@@ -1046,7 +1098,7 @@
title: that.$t('hotel.table_operat'), title: that.$t('hotel.table_operat'),
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
width: 80, width: 120,
isResize: false, isResize: false,
componentName: 'table-operation' componentName: 'table-operation'
}; };
...@@ -1060,6 +1112,7 @@ ...@@ -1060,6 +1112,7 @@
this.columns.push(contract); this.columns.push(contract);
this.columns.push(signingLine); this.columns.push(signingLine);
this.columns.push(bindBank); this.columns.push(bindBank);
this.columns.push(accountState);
this.columns.push(remark); this.columns.push(remark);
this.columns.push(opera); this.columns.push(opera);
this.isReady = true; this.isReady = true;
...@@ -1269,9 +1322,23 @@ ...@@ -1269,9 +1322,23 @@
this.remoteMethod(data.InemName); this.remoteMethod(data.InemName);
this.remoteMethod2(data.OutemName); this.remoteMethod2(data.OutemName);
this.addMsg = data; this.addMsg = data;
let SigningLine = this.addMsg.SigningLine.slice(',') this.LineId =[];
this.LineId = SigningLine.length==1&&SigningLine[0]=='0'?['-1']:SigningLine let SigningLine = this.addMsg.SigningLine.split(',')
this.SettlementType = this.addMsg.SettlementType.slice(',') if(SigningLine.length==1&&SigningLine[0]=='0'){
this.LineId =[-1];
}
else{
SigningLine.forEach(item => {
this.LineId.push(Number(item));
});
}
//this.LineId = SigningLine.length==1&&SigningLine[0]=='0'?['-1']:SigningLine
console.log("SigningLine",SigningLine);
console.log("this.LineId",this.LineId);
this.SettlementType = this.addMsg.SettlementType.split(',')
Vue.set(this.addMsg, 'ContractStartDateInfo', []) Vue.set(this.addMsg, 'ContractStartDateInfo', [])
this.addMsg.ContractStartDateInfo.push(data.ContractStartDateStr) this.addMsg.ContractStartDateInfo.push(data.ContractStartDateStr)
...@@ -1319,6 +1386,8 @@ ...@@ -1319,6 +1386,8 @@
SettlementDate: "", SettlementDate: "",
SettlementInfo: "" SettlementInfo: ""
}; };
this.LineId=[-1],
this.SettlementType='-1',
this.SetProfitLossMsg = { this.SetProfitLossMsg = {
ID: 0, ID: 0,
EndRate: "", EndRate: "",
...@@ -1489,6 +1558,28 @@ ...@@ -1489,6 +1558,28 @@
err => {} err => {}
); );
}, },
financeinfoExamine(id, text) {
this.remoteLoading = false;
this.ExamineMsg = {ID:id,AccountState:0};
this.examineLoading = true;
},
examineInstitutions() {
this.apipost(
"BankAccount_get_ExaminePlatform", this.ExamineMsg,
res => {
if (res.data.resultCode == 1) {
this.innerVisible = false;
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
}
this.ExamineMsg = {ID:0,AccountState:0};
this.examineLoading = false;
this.getList();
},
err => {}
);
},
initAddMsg() { initAddMsg() {
//初始化添加、修改数据 //初始化添加、修改数据
let newMsg = { let newMsg = {
...@@ -1607,7 +1698,7 @@ ...@@ -1607,7 +1698,7 @@
}, },
created() { created() {
Vue.component('table-operation', { 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>`, template: `<div style='width:120px;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><el-button v-if="rowData.AccountState==0" type="examine" size='mini' icon="el-icon-check avatar-uploader-icon" circle @click="examineRow(rowData,index)"></el-button></div>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -1634,6 +1725,14 @@ ...@@ -1634,6 +1725,14 @@
alias: this.rowData.Alias alias: this.rowData.Alias
}; };
this.$emit('on-custom-comp', params); this.$emit('on-custom-comp', params);
},
examineRow() {
let params = {
type: 'examine',
id: this.rowData.ID,
alias: this.rowData.Alias
};
this.$emit('on-custom-comp', params);
} }
} }
}) })
......
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