no message

src/components/FinancialModule/groupApproval.vue

@@ -115,6 +115,39 @@
             </el-pagination>
         </div>
 
+        <el-dialog
+          custom-class="w600"
+          title="驳回缘由"
+          :visible.sync="cancelOrderDialog"
+        >
+          <div style="padding-bottom:20px">
+            <el-input
+              type="textarea"
+              autofocus
+              rows="5"
+              placeholder="请填写驳回该团的缘由"
+              clear="w300"
+              v-model="cancelRemark"
+            ></el-input>
+            <el-row :gutter="20" style="margin-top: 20px;">
+              <el-col :span="24" style="text-align: right;">
+                <input
+                  type="button"
+                  class="normalBtn"
+                  value="确定驳回"
+                  @click="cancelOrderHandler"
+                />
+                <input
+                  type="button"
+                  class="hollowFixedBtn"
+                  value="关闭"
+                  @click="cancelOrderDialog = false"
+                />
+              </el-col>
+            </el-row>
+          </div>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -122,6 +155,9 @@
     export default {
         data() {
             return {
+                cancelRemark: '',
+                dataRow: null,
+                cancelOrderDialog: false,
                 loading: false,
                 dataList: [],
                 active: '1',
@@ -202,7 +238,24 @@
 
                 });
             },
+            cancelOrderHandler(){
+                if(!this.cancelRemark) return this.Error('请输入驳回缘由')
+                let that = this;
+                that.$confirm('是否驳回该团?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    //掉接口
+                    this.groupAudit(3,this.dataRow.TCID)
+                }).catch(() => {
+
+                });
+            },
             bohui(item) {
+                this.dataRow = item
+                this.cancelOrderDialog = true
+                return
                 let that = this;
                 that.$confirm('是否驳回该团?', '提示', {
                     confirmButtonText: '确定',
@@ -216,15 +269,20 @@
                 });
             },
             groupAudit(type,TCID){
-                this.apipost("travel_post_SetOutGroupAuditInfo", {TCID:TCID,OutGroupAuditState:type}, res => {
+                this.apipost("travel_post_SetOutGroupAuditInfo", {
+                    TCID:TCID,
+                    OutGroupAuditState:type,
+                    OutGroupAuditRemark:this.cancelRemark
+                }, res => {
                     if (res.data.resultCode == 1) {
+                        this.cancelOrderDialog = false
                         this.Success(res.data.message);
                         this.getList()
                     } else {
                         this.Error(res.data.message);
                     }   
                 },
-                    err => { }
+                    err => {  }
                 );
             },
             goTeamBalance(id, OutBranchId) {//团队收支明细

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1044,7 +1044,11 @@
                 </div>
               </div>
             </div>
-            <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast">
+            <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
+              <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
+                  <div class="TCL_remarkTitle">驳回缘由：</div>
+                  <div class="TCL_Content">{{item.OutGroupAuditRemark}} 日期：{{item.OutGroupAuditDate}}</div>
+              </div>
               <div class="clearfix TCL-redType" v-if="item.OPRemark">
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>
                 <div class="TCL_Content">{{item.OPRemark}}</div>

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -634,7 +634,11 @@
                 </div>
               </div>
             </div>
-            <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast">
+            <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
+              <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
+                <div class="TCL_remarkTitle">驳回缘由：</div>
+                <div class="TCL_Content">{{item.OutGroupAuditRemark}} 日期：{{item.OutGroupAuditDate}}</div>
+              </div>
               <div class="clearfix TCL-redType" v-if="item.OPRemark">
                 <div class="TCL_remarkTitle">{{$t('Operation.Op_duiwaiRemark')}}：</div>
                 <div class="TCL_Content">{{item.OPRemark}}</div>