Skip to content

S
SuperMan
Commit be032aeb authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 2241fe8e dac37c5a
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 29 deletions
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ be032aeb
......@@ -263,7 +263,8 @@
</tr>
<tr v-else class="_show_class">
<td>
<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-select filterable v-model='item.AccName'
@change="clearAccBank(),item.show=false,CalculationMoney()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
......@@ -272,7 +273,8 @@
</el-select>
</td>
<td>
<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">
<el-select filterable v-model='item.Type'
@change="getAccountList(item.Type),item.show=false,CalculationMoney()" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
......@@ -281,7 +283,8 @@
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')"
@change="setAccountName(item.AccountId,1,index),item.show=false,CalculationMoney()" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -490,9 +493,9 @@ export default {
this.BankAccount_post_GetCashAccountList("query");
}
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):'';
this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):'';
this.AccountId=parseInt(this.$route.query.ID);
let mon1=moment().format("YYYY-MM-DD");
let mon1=moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
this.msg.sTradeDate=mon2;
......@@ -504,7 +507,7 @@ export default {
})
this.bankaccount_post_GetList();
this.getList();
}
},methods:{
Export(){
......@@ -814,9 +817,9 @@ export default {
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
......@@ -959,7 +962,7 @@ export default {
endStartMoney = endStartMoney + x.Money;
x.enRSMoney = endRStartMoney;//外币收入
x.enSMoney = endStartMoney;
}else if(x.Type===2){//支出
this.bZhi = this.bZhi + x.Money;
this.wZhi = this.wZhi + x.OriginalMoney;
......@@ -967,7 +970,7 @@ export default {
endStartMoney = endStartMoney - x.Money;
x.enRSMoney = endRStartMoney;
x.enSMoney = endStartMoney;
}
x.check = false;
x.disabled = false;
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ be032aeb
......@@ -318,7 +318,7 @@
</template>
<tr>
<td>
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank(),addList()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
......@@ -327,7 +327,7 @@
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type)" class=" _border_b_1">
<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type),addList()" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
......@@ -336,7 +336,8 @@
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(payMsg.AccountId,2)" class=" _border_b_1">
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')"
@change="setAccountName(payMsg.AccountId,2),addList()" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ be032aeb
......@@ -169,7 +169,7 @@
</td>
<td>{{ item.BName }}</td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
<td>
<span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
......@@ -196,7 +196,7 @@
<td>
<span v-if="item.Type == 1 && item.IsPlatformMergeBank==1">{{moneyFormat(item.Money)}}</span>
<span v-else>{{ item.Type == 2 ? moneyFormat(item.Money) : '' }}</span>
</td>
<td>{{ moneyFormat(item.EndMoney) }}</td>
</tr>
......@@ -218,7 +218,7 @@
<td>
<span v-if="OutMoney == 0">0</span>
<span v-else>{{ moneyFormat(allMoney) }}</span>
</td>
</tr>
</table>
......@@ -230,10 +230,10 @@
<tr >
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<th height="34px">{{$t('fnc.jine')}}</th>
<th height="34px" width="70">{{$t('hotel.hotel_Currency')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<th height="34px" width="100px">{{$t('fnc.a_zongjine')}}</th>
<!-- <th>操作</th> -->
</tr>
......@@ -252,7 +252,8 @@
</tr>
<tr v-else class="_show_class">
<td>
<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-select filterable v-model='item.AccName'
@change="clearAccBank(),item.show=false,CalculationMoney()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
......@@ -261,7 +262,8 @@
</el-select>
</td>
<td>
<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">
<el-select filterable v-model='item.Type'
@change="getAccountList(item.Type),item.show=false,CalculationMoney()" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
......@@ -270,7 +272,8 @@
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')"
@change="setAccountName(item.AccountId,1,index),item.show=false,CalculationMoney()" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
......@@ -478,9 +481,9 @@ export default {
this.AccountId = this.$route.query.AccountId
}
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):"";
this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):"";
this.AccountId=parseInt(this.$route.query.ID);
let mon1=moment().format("YYYY-MM-DD");
let mon1=moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
this.msg.sTradeDate=mon2;
......@@ -490,8 +493,8 @@ export default {
Type:this.Type,
AccountId:this.AccountId
})
this.bankaccount_post_GetList();
this.getList();
this.bankaccount_post_GetList();
this.getList();
}
},methods:{
......@@ -512,9 +515,9 @@ export default {
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ be032aeb
......@@ -1728,9 +1728,9 @@
id = [98, 99];
} else {
if (obj.OutBranchId === 0) {
id = [43, 48];
id = [43, 48, 245, 246];
} else {
id = [56, 53];
id = [56, 53, 245, 246];
}
}
this.$router.push({
......
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