Skip to content

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

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

parents dee429cd b1ef8090
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 33 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ 3c4c29a9
......@@ -613,13 +613,12 @@
.page_fnDm .btmAddStore {
border-top: 1px solid #d1d1d1;
display: none;
overflow-x: auto;
width: 86%;
overflow-y: auto;
width: 94%;
max-height: 694px;
position: fixed;
background: #f9f9f9;
top:220px;
bottom: 0;
z-index:2
}
.page_fnDm .btmTitle {
padding: 0 10px;
......@@ -632,6 +631,8 @@
.page_fnDm .impoTable {
width: 100%;
min-width: 1400px;
max-height:580px;
overflow: auto;
border-collapse: collapse;
}
......@@ -659,6 +660,10 @@
width: 100px !important;
height:37px !important;
}
/deep/ .financiaUpload2 .el-upload-dragger{
width: 30px !important;
height: 20px !important;
}
.page_fnDm ._show_img_box {
position: fixed;
background: rgba(0, 0, 0, .6);
......@@ -1535,10 +1540,10 @@
<button v-loading="matchBtn" class="normalBtn" @click="sureMatchTransfer()" style="margin-left: 150px;margin-bottom: 10px">确认转移</button>
</el-dialog>
<div class="btmAddStore" :class="{'fillShow':fillShow}">
<div v-if="fillShow" class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">{{$t('objFill.daorugzdxx')}}</div>
<div style="color:red;padding:10px 0" v-if="BatchAddWagesMessage">提示：{{BatchAddWagesMessage}}</div>
<div style="height:250px;overflow-y: auto;">
<div style="max-height:580px;overflow-y: auto;">
<table class="impoTable" style="border-spacing: 0px 1px;" v-loading="tabLoading">
<thead>
<tr>
......@@ -1549,6 +1554,7 @@
<th >{{$t('objFill.pinzhengsc')}}</th>
<th width="150">{{$t('pub.pubRemark')}}</th>
<th width="150">下一步审核人</th>
<th width="150">是否公账</th>
</tr>
<tr v-for="(item,index) in importData" >
<td >
......@@ -1590,10 +1596,11 @@
<span class="iconfont icon-guanbi1" style="font-size:12px;" @click="deleteInvoiceUploadFile(fIndex,index)"></span>
</div>
</template>
<div class="_pic_upload financiaUpload" @click="importDataIndex=index">
<el-upload drag :http-request="uploadFileInvoiceBtn" :multiple="true" :show-file-list="false" action="">
<div class="_pic_upload financiaUpload2" @click="importDataIndex=index">
<el-upload drag :http-request="uploadFileInvoiceBtn" :multiple="true" :show-file-list="false" action=""
style="height:20px">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text" >{{$t('tips.dianjishanhcuan')}}</div>
<!-- <div class="el-upload__text" >{{$t('tips.dianjishanhcuan')}}</div> -->
</el-upload>
</div>
</div>
......@@ -1604,11 +1611,14 @@
<td>
<span>{{item.ReviewedBy}}</span>
</td>
<td>
<span>{{item.IsPublic}}</span>
</td>
</tr>
</thead>
</table>
</div>
<div class="btmBtn impotBtn">
<div class="btmBtn impotBtn" style="padding:10px 0">
<input type="button" class="normalBtn" @click="importInfo" :value="$t('ground.qrdr')" />
<input type="button" class="hollowFixedBtn" @click="hideFill" :value="$t('pub.cancelBtn')" />
</div>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 3c4c29a9
......@@ -2529,26 +2529,25 @@
<td colspan="4" class="groupTourOrder_remarksBytuan" style="height: 40px">
<div>
<div style="color: red">
<span>OP备注:</span>
<span>OP备注: {{item.opRemarkUpdateTimeStr}}</span>
<p>{{ item.oP_Remarks ? item.oP_Remarks : "无" }}</p>
</div>
<div
v-if="item.changePriceId>0&&(item.isOwn == 1 || IsSupperOrderEdit ||IsLookOrder || isUpdateOrder)"
style=" overflow:hidden;">
<span style="color:red;">改价申请:</span> <span> 申请金额【<span
style=" overflow:hidden;margin-top:10px;">
<span style="color:red;">改价申请:</span> <span> {{item.changePriceTime}} 申请金额【<span
style="color:red;">{{item.changePriceMoney}}</span>元】{{item.changePriceReason}}</span>
<div style="text-align:right;" v-if="item.changePriceState==1">
待{{item.ChangePriceType=="2"?"OP":"主管"}}{{item.managerExamineName}}审核
</div>
<div style="text-align:right;" v-if="item.changePriceState==2">
待{{item.ChangePriceType=="2"?"会计":"总经理"}}{{item.examineByName}}审核
</div>
<div v-if="item.changePriceState==4" style="text-align:right;">
已驳回
</div>
<div v-if="item.changePriceState==3" style="text-align:right;">
已通过
</div>
<div style="text-align:right;" v-if="item.changePriceState==1"> 待{{item.ChangePriceType=="2"?"OP":"主管"}}{{item.managerExamineName}}审核 </div>
<div style="text-align:right;" v-if="item.changePriceState==2">
待{{item.ChangePriceType=="2"?"会计":"总经理"}}{{item.examineByName}}审核
</div>
<div style="text-align:right;" v-if="item.changePriceState==4" >
已驳回
</div>
<div style="text-align:right;" v-if="item.changePriceState==3" >
已通过
</div>
</div>
</div>
</td>
......@@ -3019,7 +3018,7 @@
<td colspan="5" class="groupTourOrder_remarksBytuan" style="height: 40px">
<div>
<div>
<span>OP备注:</span>
<span>OP备注:{{item.opRemarkUpdateTimeStr }}</span>
<p>{{ item.oP_Remarks ? item.oP_Remarks : "无" }}</p>
</div>
</div>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 3c4c29a9
......@@ -2853,20 +2853,20 @@
</el-button>
</el-popover>
</div>
<div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;">
<span>改价申请: 申请金额【<span
<div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;margin-top:10px;">
<span>改价申请: {{childItem.ChangePriceTime}}申请金额【<span
style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span>
<div style="text-align:right;" v-if="childItem.ChangePriceState==1">
待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核
<div style="text-align:right;" v-if="childItem.ChangePriceState==1">
待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核
</div>
<div style="text-align:right;" v-if="childItem.ChangePriceState==2">
待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核
待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核
</div>
<div v-if="childItem.ChangePriceState==4" style="text-align:right;">
已驳回
已驳回 {{childItem.ExamineTime}}
</div>
<div v-if="childItem.ChangePriceState==3" style="text-align:right;">
已通过
已通过 {{childItem.ExamineTime}}
</div>
</div>
</div>
......
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