1

src/assets/common/lang/zhCN/fill.js

@@ -5180,7 +5180,7 @@ export const obj = {
       zhikdwsh: '只看待我审核',
       piliansh: '批量审核',
       luodtxbtddtc: '注：落地团，小包团，国内线 均按订单利润的20%计算最大预计销售提成，实际发放提成不会超过最大预期销售提成',
-      opshenqrq: 'OP/申请日期',
+      opshenqrq: 'OP/申请日',
       yudxstc: '预计销售提成',
       shenpjg: '审批结果',
       shenpxinx: '审批信息',

src/assets/common/lang/zhTW/fill.js

@@ -5180,7 +5180,7 @@ export const obj = {
       zhikdwsh: '只看待我審覈',
       piliansh: '批量審覈',
       luodtxbtddtc: '注：落地團，小包團，國內線 均按訂單利潤的20%計算最大預計銷售提成，實際發放提成不會超過最大預期銷售提成',
-      opshenqrq: 'OP/申請日期',
+      opshenqrq: 'OP/申請日',
       yudxstc: '預計銷售提成',
       shenpjg: '審批結果',
       shenpxinx: '審批信息',

src/components/FinancialModule/groupApproval.vue

@@ -109,20 +109,16 @@
                 </el-table-column>
                 <el-table-column
                 prop="LtName"
-                :label="$t('advmanager.v_xilie')"
-                width="80"
+                :label="$t('advmanager.v_xilie')+'/'+$t('Operation.Op_TeamName')"
+                width="200"
                 show-overflow-tooltip>
                 <template slot-scope="scope">
+                    {{scope.row.Title}}</br>
                     {{scope.row.LineName}}</br>
                     {{scope.row.LtName}}
                 </template>
                 </el-table-column>
                 <el-table-column
-                prop="Title"
-                :label="$t('Operation.Op_TeamName')"
-                width="200"
-                show-overflow-tooltip></el-table-column>
-                <el-table-column
                 prop="OPName"
                 :label="$t('objFill.v101.FinancialModule.opshenqrq')">
                 <template slot-scope="scope">
@@ -161,7 +157,7 @@
                 :label="$t('objFill.v101.FinancialModule.tuanduilr')"></el-table-column>
                 <el-table-column
                 prop="SaleCommission"
-                :label="$t('objFill.v101.FinancialModule.yudxstc')" width="130px">
+                :label="$t('objFill.v101.FinancialModule.yudxstc')" width="110px">
                     <template slot-scope="scope">
                         <span
                         :style="{'cursor':scope.row.SaleCommissionType>0?'pointer':'',
@@ -187,6 +183,13 @@
                         <p>{{$t('objFill.dsh')}}：{{scope.row.AuditEmpName}}</p>
                         <p v-if="scope.row.FinanceAuditEmpName">{{$t('fnc.a_yshenhe')}}：{{scope.row.FinanceAuditEmpName}}/{{scope.row.FinanceOutGroupAuditDate}}</p>
                     </template>
+            </el-table-column>
+            <el-table-column v-if="active==1"
+                prop=""
+                :label="$t('objFill.caiwubz')" width="130px">
+                <template slot-scope="scope">
+                        <p>{{scope.row.AuditRemark}}</p>
+                    </template>
             </el-table-column>
                 <el-table-column v-if="active==2"
                 prop=""
@@ -210,9 +213,12 @@
                 width="150">
                     <template slot-scope="scope">
                         <div class="_icon_btn">
-                        <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top" v-if="active==1 && EmployeeId==scope.row.OutGroupAuditEmpId">
+                        <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top" v-if="active==1 && EmployeeId==scope.row.OutGroupAuditEmpId && EmployeeId==5">
                             <i class="iconfont icon-ico_commodity_defaul" @click="shenhei(scope.row)" v-if="active==1 && EmployeeId==scope.row.OutGroupAuditEmpId"></i>
                         </el-tooltip>
+                        <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top" v-if="active==1 && EmployeeId==scope.row.OutGroupAuditEmpId && EmployeeId !=5">
+                            <i class="iconfont icon-ico_commodity_defaul" @click="financeAudit(scope.row)" v-if="active==1 && EmployeeId==scope.row.OutGroupAuditEmpId"></i>
+                        </el-tooltip>
                         <el-tooltip class="item" effect="dark" :content="$t('fnc.bohui')" placement="top" v-if="active==1 && EmployeeId==scope.row.OutGroupAuditEmpId">
                             <i class="iconfont icon-shenhebohui" @click="bohui(scope.row)" v-if="active==1 && EmployeeId==scope.row.OutGroupAuditEmpId"></i>
                         </el-tooltip>
@@ -266,6 +272,39 @@
             </el-row>
           </div>
         </el-dialog>
+
+        <el-dialog
+          custom-class="w600"
+          :title="$t('objFill.caiwubz')"
+          :visible.sync="auditDialog"
+        >
+          <div style="padding-bottom:20px">
+            <el-input
+              type="textarea"
+              autofocus
+              rows="5"
+              clear="w300"
+              v-model="auditRemark"
+            ></el-input>
+            <el-row :gutter="20" style="margin-top: 20px;">
+              <el-col :span="24" style="text-align: right;">
+                <input
+                  type="button"
+                  class="normalBtn"
+                  :value="$t('pub.saveBtn')"
+                  @click="auditOrderHandler"
+                />
+                <input
+                  type="button"
+                  class="hollowFixedBtn"
+                  :value="$t('pub.closeSel')"
+                  @click="auditDialog = false,auditRemark=''"
+                />
+              </el-col>
+            </el-row>
+          </div>
+        </el-dialog>
+
         <el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
             <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
           </el-dialog>
@@ -280,8 +319,10 @@
                 PendingMyTrial: '0',
                 companyList:[],
                 cancelRemark: '',
+                auditRemark: '',
                 dataRow: null,
                 cancelOrderDialog: false,
+                auditDialog: false,
                 loading: false,
                 dataList: [],
                 active: '1',
@@ -480,6 +521,11 @@
 
                 });
             },
+            financeAudit(item){
+                this.dataRow = item
+                this.auditDialog = true
+                this.auditRemark='';
+            },
             cancelOrderHandler(){
                 if(!this.cancelRemark) return this.Error(this.$t('objFill.v101.dmc.qingsrbhyy'))
                 let that = this;
@@ -494,9 +540,13 @@
 
                 });
             },
+            auditOrderHandler(){
+                this.groupAudit(2,this.dataRow.TCID);
+            },
             bohui(item) {
                 this.dataRow = item
                 this.cancelOrderDialog = true
+                this.cancelRemark='';
                 return
                 let that = this;
                 that.$confirm(this.$t('objFill.v101.dmc.shifoubhgt'), this.$t('tips.tips'), {
@@ -515,16 +565,19 @@
                 this.apipost("travel_post_SetOutGroupAuditInfo", {
                     TCID:TCID,
                     OutGroupAuditState:type,
-                    OutGroupAuditRemark:this.cancelRemark
+                    OutGroupAuditRemark:this.cancelRemark,
+                    AuditRemark: this.auditRemark
                 }, res => {
                     if (res.data.resultCode == 1) {
                         if(!name){
                            this.cancelOrderDialog = false
+                           this.auditDialog=false
                            this.Success(res.data.message);
                            this.getList()
                         }else{
                             if(length){
                                 this.cancelOrderDialog = false
+                                this.auditDialog=false
                                 this.Success(res.data.message);
                                 this.getList()
                             }