|
@@ -12,8 +12,11 @@
|
|
{{detail.personName}}
|
|
{{detail.personName}}
|
|
<p class='mui-ellipsis'><span class="colorfe616c">{{detail.typeN}}</span>申请</p>
|
|
<p class='mui-ellipsis'><span class="colorfe616c">{{detail.typeN}}</span>申请</p>
|
|
</div>
|
|
</div>
|
|
- <button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined '+(detail.status>0?(detail.status==1?'status_a':'status_r'):'')">
|
|
|
|
|
|
+ <!-- <button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined '+(detail.status>0?(detail.status==1?'status_a':'status_r'):'')">
|
|
{{detail.status>0?(detail.status==1?'已同意':'已拒绝'):'未审核'}}
|
|
{{detail.status>0?(detail.status==1?'已同意':'已拒绝'):'未审核'}}
|
|
|
|
+ </button> -->
|
|
|
|
+ <button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined '+(detail.remark?'status_a':'status_r')">
|
|
|
|
+ {{detail.remark?'已批示':'未批示'}}
|
|
</button>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -52,11 +55,12 @@
|
|
</div>
|
|
</div>
|
|
</li>
|
|
</li>
|
|
<li v-if="detail.remark" class="mui-table-view-cell mui-media">
|
|
<li v-if="detail.remark" class="mui-table-view-cell mui-media">
|
|
- <div class="mui-media-body">备注意见</div>
|
|
|
|
|
|
+ <div class="mui-media-body">批示意见</div>
|
|
<span class="colorf8b155" v-text="detail.remark"></span>
|
|
<span class="colorf8b155" v-text="detail.remark"></span>
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
|
|
+ <!--
|
|
<div class="mui-content-padded vongi-wordcard-center">
|
|
<div class="mui-content-padded vongi-wordcard-center">
|
|
<h5>审批意见</h5>
|
|
<h5>审批意见</h5>
|
|
<ul class="mui-table-view">
|
|
<ul class="mui-table-view">
|
|
@@ -73,9 +77,10 @@
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
|
|
+ -->
|
|
|
|
|
|
<div v-if="can_remark" class="fyy-scon-botton">
|
|
<div v-if="can_remark" class="fyy-scon-botton">
|
|
- <div class="examine-btn examine-btn1" @click="openFromVisible=true">备注意见</div>
|
|
|
|
|
|
+ <div class="examine-btn examine-btn1-blue" @click="openFromVisible=true">填写意见</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -83,7 +88,7 @@
|
|
<!-- 审批弹窗 -->
|
|
<!-- 审批弹窗 -->
|
|
<div v-show="openFromVisible" @click="openFromVisible=false" class="mui-backdrop mui-active"></div>
|
|
<div v-show="openFromVisible" @click="openFromVisible=false" class="mui-backdrop mui-active"></div>
|
|
<div v-show="openFromVisible" class="mui-card fyy-popup">
|
|
<div v-show="openFromVisible" class="mui-card fyy-popup">
|
|
- <div class="mui-card-header mui-h3">备注意见</div>
|
|
|
|
|
|
+ <div class="mui-card-header mui-h3">填写意见</div>
|
|
<div class="mui-card-content">
|
|
<div class="mui-card-content">
|
|
<div class="mui-input-row">
|
|
<div class="mui-input-row">
|
|
<textarea v-model="remarkForm.remark" rows="5" placeholder="请输入"></textarea>
|
|
<textarea v-model="remarkForm.remark" rows="5" placeholder="请输入"></textarea>
|
|
@@ -155,7 +160,7 @@
|
|
//领导添加备注
|
|
//领导添加备注
|
|
addRemark() {
|
|
addRemark() {
|
|
if (!this.remarkForm.remark) {
|
|
if (!this.remarkForm.remark) {
|
|
- mui.toast('请输入备注意见');
|
|
|
|
|
|
+ mui.toast('请填写意见');
|
|
} else {
|
|
} else {
|
|
this.isLoading = true;
|
|
this.isLoading = true;
|
|
API_Attendance.addRemark(this.remarkForm).then(response => {
|
|
API_Attendance.addRemark(this.remarkForm).then(response => {
|
|
@@ -214,4 +219,8 @@
|
|
color: #05c8af !important;
|
|
color: #05c8af !important;
|
|
border: 1px solid #05c8af !important;
|
|
border: 1px solid #05c8af !important;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ .examine-btn1-blue {
|
|
|
|
+ background-color: #3385FF;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|