Commit 49eeab58 authored by 吴春's avatar 吴春

1

parent e26b0716
...@@ -122,9 +122,9 @@ ...@@ -122,9 +122,9 @@
</template> </template>
<template v-if="pagesTitle == '审核'"> <template v-if="pagesTitle == '审核'">
<el-button <el-button
v-if="scope.row.ApplyForState == 1||(scope.row.ApplyForState == 2&&(userInfo.EmployeeId==1||userInfo.RB_Department_Id==2))" v-if="scope.row.ApplyForState == 1||(scope.row.ApplyForState == 2&&(userInfo.EmployeeId==ExamineBy||userInfo.RB_Department_Id==2))"
size="mini" type="primary" @click="ckChangePrice(scope.row, 2)">{{$t('fnc.shenhe')}}</el-button> size="mini" type="primary" @click="ckChangePrice(scope.row, 2)">{{$t('fnc.shenhe')}}</el-button>
<p v-if="(scope.row.ApplyForState == 2&&userInfo.EmployeeId!=1)||scope.row.ApplyForState==3||scope.row.ApplyForState==4" <p v-if="(scope.row.ApplyForState == 2&&userInfo.EmployeeId!=ExamineBy)||scope.row.ApplyForState==3||scope.row.ApplyForState==4"
class=" fz14" :class="{ 'cursor-pointer c059FF6': scope.row.OrderType > 0 }" class=" fz14" :class="{ 'cursor-pointer c059FF6': scope.row.OrderType > 0 }"
@click="ckChangePrice(scope.row, 3)"> @click="ckChangePrice(scope.row, 3)">
{{$t('salesModule.CheckDetails')}} {{$t('salesModule.CheckDetails')}}
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</el-table-column> </el-table-column>
<template slot="append" v-if="(pagesTitle == '审核'||pagesTitle == '申请'||pagesTitle=='查看') <template slot="append" v-if="(pagesTitle == '审核'||pagesTitle == '申请'||pagesTitle=='查看')
&&(item.SaleRemarks||item.OP_Remarks||item.ApplyForState &&(item.SaleRemarks||item.OP_Remarks||item.ApplyForState
||((userInfo.EmployeeId==1||userInfo.RB_Department_Id==2)&&item.ManagerExamineName))"> ||((userInfo.EmployeeId==ExamineBy||userInfo.RB_Department_Id==2)&&item.ManagerExamineName))">
<div style="padding:10px;"> <div style="padding:10px;">
<div> <div>
<p style="font-size: 13px;" v-if="item.FinanceList && item.FinanceList.length>0"> <p style="font-size: 13px;" v-if="item.FinanceList && item.FinanceList.length>0">
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<div style="margin-top: 10px;" v-if="item.ApplyForState <div style="margin-top: 10px;" v-if="item.ApplyForState
||(item.ApplyForState==1&&item.ManagerExamineName) ||(item.ApplyForState==1&&item.ManagerExamineName)
||item.ApplyForState==2||item.ApplyForState==4 ||item.ApplyForState==2||item.ApplyForState==4
||((userInfo.EmployeeId==1||userInfo.RB_Department_Id==2)&&item.ManagerExamineName)"> ||((userInfo.EmployeeId==ExamineBy||userInfo.RB_Department_Id==2)&&item.ManagerExamineName)">
<template v-if="item.ApplyForState"> <template v-if="item.ApplyForState">
<span> <span>
{{$t('objFill.shengqgaijjia')}}{{$t('fnc.jine')}}<span style="color: red;">{{item.ApplyForMoney}}</span> {{$t('objFill.shengqgaijjia')}}{{$t('fnc.jine')}}<span style="color: red;">{{item.ApplyForMoney}}</span>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</template> </template>
</span> </span>
</span> </span>
<span v-if="(userInfo.EmployeeId==1||userInfo.RB_Department_Id==2)&&item.ManagerExamineName" <span v-if="(userInfo.EmployeeId==ExamineBy||userInfo.RB_Department_Id==2)&&item.ManagerExamineName"
style="margin-left: 20px;"> style="margin-left: 20px;">
{{$t('salesModule.AdultPeople')}}: {{$t('salesModule.AdultPeople')}}:
<span v-if="item.ManagerExamineName" style="color: red;">{{item.ManagerExamineName }}</span> <span v-if="item.ManagerExamineName" style="color: red;">{{item.ManagerExamineName }}</span>
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
<el-form-item :label="$t('objFill.yinshouzje')" prop="Money"> <el-form-item :label="$t('objFill.yinshouzje')" prop="Money">
<!-- :disabled="userInfo.EmployeeId!=1" --> <!-- :disabled="userInfo.EmployeeId!=1" -->
<el-input type="number" <el-input type="number"
:readonly="changePriceMsg.DialogType == 1||userInfo.EmployeeId!=1||titleType == 3 ? true : false" :readonly="changePriceMsg.DialogType == 1||userInfo.EmployeeId!=ExamineBy||titleType == 3 ? true : false"
v-model="changePriceMsg.Money" rows="6"></el-input> v-model="changePriceMsg.Money" rows="6"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -960,7 +960,7 @@ ...@@ -960,7 +960,7 @@
} else { } else {
name = "groupTourOrderByTuan"; name = "groupTourOrderByTuan";
} }
if (this.userInfo.EmployeeId == 1 || this.userInfo.RB_Department_Id == 2) { if (this.userInfo.EmployeeId == ExamineBy || this.userInfo.RB_Department_Id == 2) {
name = "RegistrationList"; name = "RegistrationList";
} }
this.$router.push({ 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