no message

src/assets/common/lang/zh-tw.js

@@ -977,7 +977,7 @@ export const fnc = {
   sprleibie: '審批人類別',
   jdmiaoshu: '節點描述',
   jddongzuo: '節點動作',
-  zhuguan: '首長',
+  zhuguan: '主管',
   zdchengyuan: '指定成員',
   tsjiedian: '特殊節點',
   fqrende: '發起人的',
@@ -1357,12 +1357,12 @@ export const tips = {
   czchenggong: '操作成功！',
   rsbncgtr: '人數不能超過10人',
   qtxjdmiaoshu: '請填寫節點描述！',
-  qxzbmzgjibie: '請選擇部門首長級別！',
+  qxzbmzgjibie: '請選擇部門主管級別！',
   cybnweikong: '成員不能為空',
   qxzgangwei: '請選擇崗位',
   qxzbumen: '請選擇部門！',
   di: '第',
-  jizhuguan: '級首長',
+  jizhuguan: '級主管',
   xzqyshijian: '選擇啟用時間',
   cicaozuoyongjiushanchu: '此操作將永久删除該提成規則,是否繼續？',
   shanchutishi: '删除提示',
@@ -2679,7 +2679,7 @@ export const op={
   btsy:'本團使用',
   kcqk:'庫存情况',
   syr:'所有人',
-  bmzg:'部門首長',
+  bmzg:'部門主管',
   fgszjl:'分公司總經理',
   opszje:'OP設定金額',
   fgszjdb:'新增日本印象',

src/components/FinancialModule/FinancialDocuments.vue

@@ -802,14 +802,19 @@
             <button class="hollowFixedBtn" v-if="BOSSBtn3" @click="BOSSBtnClick(3)">{{$t('ground.dayin')}}</button>
           </template>
 
-          <template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604">
+          <template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604 || ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
             <el-dropdown width:100px>
               <span class="el-dropdown-link">
                 更多<i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
+                <template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604">
                   <el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item>
                   <el-dropdown-item><span @click="ToYFDetial()">压房明细</span></el-dropdown-item>
+                </template>
+                <template v-if="ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
+                  <el-dropdown-item><span @click="openAirPayDialog()">机票今日应付款</span></el-dropdown-item>
+                </template>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -1957,6 +1962,60 @@
         </div>
       </el-dialog>
 
+      <el-dialog title="机票今日付款查询" width="1260px" height="900px" :visible.sync="airPayState" :close-on-click-modal="false" center>
+        <el-form class="cdForm" label-width="80px">
+          <el-form-item label="付款日期" prop="picPayDate">
+            <el-date-picker class="h34" v-model="picPayDate" type="daterange"
+                  value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')">
+                </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <input type="button" :value="$t('pub.searchBtn')" class="hollowFixedBtn" @click="getAirPayList()">
+            <input type="button" :value="$t('visa.v_daochu')" class="hollowFixedBtn" @click="downloadAirPayData()">
+          </el-form-item>
+        </el-form>
+        <div style="height:500px">
+        <p>待付合计：{{waitAirTotal}}</p>
+        <p>已付合计：{{payAirTotal}}</p>
+        <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="MarkLoading" >
+          <tr>
+            <th>{{$t('fnc.danhao')}}</th>
+            <th>{{$t('sm.company')}}</th>
+            <th>{{$t('fnc.feiyongleixing')}}</th>
+            <th>付款批次</th>
+            <th>{{$t('fnc.jine')}}</th>
+            <th>{{$t('fnc.fkduixiang')}}</th>
+            <th>备注</th>
+            <th>{{$t('fnc.zhidanren')}}</th>
+            <th>{{$t('fnc.a_djztai')}}</th>
+            <th>是否付款</th>
+            <th>付款日期</th>
+            <th>会计</th>
+          </tr>
+          <tr v-for="(item,index) in picPayData" :key="index">
+            <td><span @click="goUrlFDetail(item.FrID)" style="cursor: pointer; color:blur">{{item.FrID}}</span></td>
+            <td>{{item.RB_BranchName}}</td>
+            <td>{{item.CostTypeIdStr}}</td>
+            <td>{{item.TicketNum}}</td>
+            <td>{{item.WBMoney+" " + item.CurrencyName}}</td>
+            <td style="max-width: 120px;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;">{{item.RemitterName}}</td>
+            <td style="max-width: 170px;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;">{{item.AuditDescription}}</td>
+            <td>{{item.CreateBy}}{{item.CreateDate}}</td>
+            <td>{{item.StatusName}}</td>
+            <td :style="item.Is_Cashier==1?'color:red':''">{{(item.Is_Cashier==1?'√':'')}}</td>
+            <td>{{item.PayDate}}</td>
+            <td>{{item.FinanceName}}</td>
+          </tr>
+          <tr v-if="picPayTotal">
+            <td colspan='4'>{{$t('fnc.a_heji')}}</td>
+            <td>{{picPayTotal}}</td>
+          </tr>
+          <tr v-if="picPayData.length==0">
+            <td colspan="13">{{$t('system.content_noData')}}</td>
+          </tr>
+        </table>
+        </div>
+      </el-dialog>
       <!-- 修改汇率
         <el-dialog :title="$t('objFill.modifytheexchangerate')" width="400px"
         :visible.sync="costmodeHL" center >
@@ -2242,6 +2301,7 @@
         imgLength: 0,
         //工资单附件结束
         picPayState: false,
+        airPayState: false,
         picPayDate:[],
         picMsg:{
           pageIndex: 1,
@@ -2252,7 +2312,9 @@
           EmployeeId:0
         },
         picPayData:[],
-        picPayTotal:0
+        picPayTotal:0,
+        payAirTotal:0,
+        waitAirTotal:0
       };
     },
     created() {
@@ -2832,6 +2894,31 @@
           null
         );
       },
+      openAirPayDialog(){
+        this.airPayState = true;
+        this.picPayData = [];
+        this.picMsg.QEndDate= this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
+        this.picMsg.QStartDate =this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
+        this.picPayDate = [this.picMsg.QStartDate,this.picMsg.QEndDate];
+        this.getAirPayList();
+      },
+      getAirPayList() {
+        this.picMsg.QEndDate= this.picPayDate[1];
+        this.picMsg.QStartDate =this.picPayDate[0];
+        this.MarkLoading = true
+        this.apipost(
+          "Financial_post_GetAirTicketPayDatePageList", this.picMsg,res => {
+            this.MarkLoading = false
+            if (res.data.resultCode === 1) {
+              this.picPayData = res.data.data.list.pageData;
+              this.picPayTotal = res.data.data.TotalMoney;
+              this.payAirTotal = res.data.data.PayMoney;
+              this.waitAirTotal = res.data.data.WaitMoney;
+            }
+          },
+          null
+        );
+      },
       goUrlZD(item) {
         let that = this;
         let yfcheckList
@@ -3001,6 +3088,12 @@
         this.picMsg.EmployeeId = this.getLocalStorage().EmployeeId
         this.GetLocalFile("Financial_post_GetPICPayDateListToExcel", this.picMsg, "今日付款" +this.picMsg.QEndDate+".xls");        
       },
+      downloadAirPayData() {
+        this.picMsg.QEndDate= this.picPayDate[1];
+        this.picMsg.QStartDate =this.picPayDate[0];
+        this.picMsg.EmployeeId = this.getLocalStorage().EmployeeId
+        this.GetLocalFile("Financial_post_GetAirTicketPayDateListToExcel", this.picMsg, "机票今日付款" +this.picMsg.QEndDate+".xls");        
+      },
       HebingSPLast() {
         if (this.checkList.length == 0) {
           this.Error(this.$t('fnc.a_qxzdanju'));
@@ -4054,6 +4147,10 @@
           }
         });
       },
+      goUrlFDetail(id){
+        let url = this.domainManager().erpSiteUrl+"FinancialDocumentsDetail?id="+id+"&Conditon=3&pageIndex=1&tab=单据详情";
+        window.open(url);
+      },
       goUrlAdd(path) {
         this.$router.push({
           name: path,

src/components/FinancialModule/RecPayQuery.vue

@@ -628,7 +628,8 @@
                 <div class="recpayQueryMore"  v-if="(scope.row.Type==1||scope.row.Type==2)&& IsUpdatePayment"  @click="showHelpBranch(scope.row)">{{scope.row.Type==1?$t('objFill.xiugaibdsgs'):(scope.row.Type==2?$t('objFill.xiugaibdfgs'):'')}}</div>
                 <div class="recpayQueryMore" v-if="scope.row.Type==2 && scope.row.CostTypeList && scope.row.CostTypeList[0]=='固定资产-车辆'" @click="showAssets(scope.row.FrID)">{{$t('objFill.v101.FinancialModule.shezzjrq')}}</div>
                 <div  class="recpayQueryMore" v-if="scope.row.KingdeeMark!=1&&IsUpdatePayment"  @click="EditKingdeeMark(scope.row)">标记金蝶已导入</div>
-                <div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2" @click="showPICPayDateDialog(scope.row)">修改预付款日</div>
+                <div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2 && scope.row.TemplateId!=2" @click="showPICPayDateDialog(scope.row)">修改预付款日</div>
+                <div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2 && scope.row.TemplateId==2" @click="showAirPayDateDialog(scope.row)">修改机票付款日</div>
             <i slot="reference" style="width: 30px;
                         height: 30px;
                         display: inline-block;
@@ -953,6 +954,23 @@
         <el-button class="normalBtn" type="primary" @click="setPICPayDate" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button>
       </div>
     </el-dialog>
+    <!--修改机票付款日-->
+    <el-dialog title="修改机票预付款日期" width="400px" :visible.sync="showAirPayDate" center >
+      <el-form class="cdForm" label-width="110px">
+        <el-form-item label="预付款日" prop="CreateDate">
+          <el-date-picker
+            v-model="FixedAssetsMsg.CreateDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="hollowFixedBtn" @click="showAirPayDate=false">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="setAirPayDate" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1134,6 +1152,7 @@
         ShowFixedAssets: false,
         showUpdateCreate:false,
         showPICPayDate:false,
+        showAirPayDate:false,
         FixedAssetsMsg:{
           BaseFinanceId:0,
           RelevanceFrId2:0,
@@ -1471,6 +1490,11 @@
         this.FixedAssetsMsg.CreateDate= item.PICPayDate;
         this.showPICPayDate=true;
       },
+      showAirPayDateDialog(item){
+        this.FixedAssetsMsg.BaseFinanceId = item.FrID;
+        this.FixedAssetsMsg.CreateDate= item.PICPayDate;
+        this.showAirPayDate=true;
+      },
       // 确定垫付对象
       setFixedAssets() {
         if (this.transTax.loading) return;
@@ -1538,6 +1562,30 @@
           this.Error(this.$t('objFill.v101.FinancialModule.qingxzxzdrq')) ;
         }
       },
+      setAirPayDate(){
+        if (this.transTax.loading) return;
+        this.transTax.loading = true;
+        if (this.FixedAssetsMsg.BaseFinanceId && this.FixedAssetsMsg.CreateDate) {
+          this.apipost(
+            "Financial_post_SetPICPayDate", {BaseFinanceId:this.FixedAssetsMsg.BaseFinanceId,CreateDate:this.FixedAssetsMsg.CreateDate,Type:23},res => {
+              if (res.data.resultCode == 1) {
+                this.Success(this.$t('objFill.v101.FinancialModule.gengxincg')) ;
+                this.showAirPayDate = false;
+                this.getPageList()
+              }else{
+                this.Error(res.data.message);
+              }
+              this.transTax.loading = false;
+            },
+            err => {
+              this.transTax.loading = false;
+            }
+          );
+        } else {
+          this.transTax.loading = false;
+          this.Error(this.$t('objFill.v101.FinancialModule.qingxzxzdrq')) ;
+        }
+      },
       showHelpBranch(item) {
         //弹出付款对象修改
         this.HelpBranchMsg.FrId = item.FrID;

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -3535,7 +3535,9 @@ export default {
             let BranchStatus=res.data.data.IsBranchButton;
             if(BranchStatus==-2){
               BranchStatus = -1;
+              if(this.userId!=380){
                 this.shujuType = true;
+              }
               this.apipost("line_post_GetList", {}, res => {
                 if (res.data.resultCode == 1) {
                   this.LineList = res.data.data;

src/components/FinancialModule/components/ClientBankAccount.vue

@@ -250,6 +250,28 @@
         </div>
       </div>
     </div>
+    <div class="OrderReceivablesAccount-center" v-if="GetDetail.TemplateId==2&&IsAdminOrFinance">
+      <div class="border-b">
+      </div>
+      <div v-if="IsEditAirPayDate==false">
+          <el-tooltip class="item" effect="dark" content="用于机票每日查看可付款单据" placement="top"><span>预付款日：</span></el-tooltip>
+        {{picMsg.CreateDate}}
+        <el-tooltip effect="dark" :content="$t('pub.updateMsg')" placement="top">
+            <i class="edit el-icon-edit" @click="IsEditAirPayDate=true"></i>
+          </el-tooltip>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <el-tooltip effect="dark" content="删除" placement="top">
+            <i v-if="picMsg.CreateDate!=null && picMsg.CreateDate!=''" class="edit el-icon-delete" @click="DelAirPayDate()"></i>
+          </el-tooltip>
+      </div>
+      <div v-else>
+        <el-tooltip class="item" effect="dark" content="用于PIC每日查看可付款单据" placement="top"><span>预付款日：</span></el-tooltip>
+        <div>          
+          <el-date-picker v-model="picMsg.CreateDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
+          <el-button size="mini" type="success" icon="el-icon-check" circle @click="SaveAirPayDate()"></el-button>
+        </div>
+      </div>
+    </div>
     <div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.JapanPayMark && clientBankAccountData.JapanPayMark.length>0">
       <div v-if="clientBankAccountData.AccountCreateTime" class="border-b">
       </div>
@@ -429,6 +451,7 @@
       return {
         IsEditTravelRemark:false,
         IsEditPICPayDate:false,
+        IsEditAirPayDate:false,
        // clientBankAccountData: {},
        tableData: [],
        msg:{
@@ -445,6 +468,7 @@
        activeIndx: null,
        FDList: [],
        IsExpensesMonthlyShare:false,
+       IsAdminOrFinance:false,
        saveMsg: {
         FrId: 0,
         Remark: '',
@@ -493,6 +517,9 @@
       if (ActionMenuCode.indexOf('Finance_Inner') != -1) {
         this.isFinance_ExpenseType=true;
       }
+      if(ActionMenuCode.indexOf('isManageFinance') != -1 || ActionMenuCode.indexOf('Finance_ExpenseType') != -1){
+        this.IsAdminOrFinance=true;
+      }
 
       this.picMsg.BaseFinanceId = this.GetDetail.FrID
       this.picMsg.CreateDate = this.GetDetail.PICPayDate
@@ -713,6 +740,37 @@
           }, err => {})
         }).catch(() => {
           
+        });
+      },
+      SaveAirPayDate(){
+        this.picMsg.Type=23;
+        this.apipost('Financial_post_SetPICPayDate', this.picMsg, res => {
+          if (res.data.resultCode == 1) {            
+            this.IsEditAirPayDate=false;
+            this.$message.success(res.data.message);
+          } else {
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
+      },
+      DelAirPayDate(){
+        this.$confirm("确认要删除机票付款日期吗？", this.$t('tips.tips'), {
+          confirmButtonText: this.$t('pub.yes'),
+          cancelButtonText: this.$t('pub.no'),
+          type: 'warning'
+        }).then(() => {
+          this.picMsg.Type=23;
+          this.apipost('Financial_post_CancelPICPayDate', this.picMsg, res => {
+            if (res.data.resultCode == 1) {   
+              this.picMsg.CreateDate ='';
+              this.IsEditAirPayDate=false;       
+              this.$message.success(res.data.message);
+            } else {
+              this.$message.error(res.data.message);
+            }
+          }, err => {})
+        }).catch(() => {
+          
         });
       }
     },

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -552,10 +552,11 @@
         }
         this.queryCommonData.loading = true;
         this.queryMsg.uid = this.getLocalStorage().EmployeeId;
+        var fileName="简易计划表.xls";
         this.GetLocalFile(
           "travel_get_DownTravelPriceOrderStatistics",
           this.queryMsg,
-          this.$t('objFill.v101.Rest.baomintj') + ".xls",
+          fileName,
           res => {
             if (this.queryMsg.TicketStartNum == 0) {
               this.queryMsg.TicketStartNum = "";

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -464,10 +464,11 @@
       DownLoadFile() {
         this.Info(this.$t('objFill.v101.Rest.zhengzaixzwj'))
         this.queryMsg.uid = this.getLocalStorage().EmployeeId;
+        var fileName = "简易计划表.xls";
         this.GetLocalFile(
           "travel_get_DownTravelPriceOrderStatistics",
           this.queryMsg,
-          this.$t('objFill.v101.Rest.baomintj') + ".xls"
+          fileName
         );
       },
       goUrl(path, id, title) {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -234,8 +234,8 @@
       //线路筛选
       getLineList() {
         var chooseLineList = [];
-        //散拼
-        if (this.postData.TeamType == 0 || this.postData.TeamType == 5) {
+        //散拼、PAK、切位
+        if (this.postData.TeamType == 0 || this.postData.TeamType == 4 || this.postData.TeamType == 5) {
           chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 2);
         } //小包团
         else if (this.postData.TeamType == 1) {
@@ -452,9 +452,6 @@
         this.postData.LineId = 0;
         this.postData.LineteamId = 0;
         this.postData.PriceTeamType = '';
-        if (this.postData.TeamType == 0) {
-          this.postData.PriceTeamType = 1;
-        }
       },
       //获取所有币种
       getAllCurrency() {

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -159,12 +159,6 @@
                 <div class="p20">
                   <div class="mb title"><i
                       class="iconfont icon-hangban1"></i><span>{{$t('salesModule.FlighInfo')}}</span></div>
-                  <!-- <div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
-                    <div> {{subItem.Flight_number}}
-                      {{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
-                      {{subItem.Arrival_time}}</div>
-                  </div> -->
-
                   <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
                       <tr class="_color_666" style="text-align:center;">
@@ -238,8 +232,6 @@
                       <font>{{$t("visa.v_houbu")}}:{{item.WatingNum}}</font>
                     </span>
                   </div>
-
-
                   <div class="mb bold"><span class="item-title">{{$t('leader.leader_registraNum')}}:</span><span>
                       {{item.OrderGuestNum}} </span></div>
                   <div class="mb bold"><span class="item-title">{{$t('ground.lddaoyou')}}:</span><span>
@@ -301,12 +293,6 @@
               </div>
               <div class="el-col w_20">
                 <div class="p20">
-                  <!-- <div class="mb title"><i class="iconfont icon-jiage"></i><span>{{$t('Operation.Op_PriceInfo')}}</span></div>
-                  <div class="mb"><span>{{$t('objFill.v101.zhongxinjia')}}: {{item.MiddlePrice}}</span></div>
-                  <div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
-                  <div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
-                  <div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> -->
-
                   <div>
                     <p>
                       <i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
@@ -502,28 +488,22 @@
                   }}</span>
                       </el-popover>
                     </p>
+
+                    <p v-if="item.OfferId && item.OfferId > 0" style="margin-top: 5px; font-size: 13px">
+                      <span style="cursor: pointer; text-decoration: underline; color: blue"
+                        @click="showDialog(item.ConfigID, item.OfferId)">{{ $t("objFill.baojiaxiangqing") }}</span>
+                    </p>
+                    <p v-if="item.OfferId == 0" style="margin-top: 5px; font-size: 13px">
+                      <span style="cursor: pointer; text-decoration: underline; color: red"
+                        @click="NewCopyPriceSheet(item, 0)">{{ $t("objFill.xingzbjd") }}</span>
+                    </p>
+                    <p style="margin-top: 5px; font-size: 13px;color:red;"
+                      v-if=" item.OfferId > 0 &&item.OfferStatusName">
+                      {{ item.OfferStatusName }}
+                    </p>
                   </div>
                 </div>
               </div>
-              <!-- <div class="el-col w_20">
-                <div class="p20">
-                  <div class="mb title"><i
-                      class="iconfont icon-tuandui"></i><span>{{$t('objFill.v101.hezuohuoban')}}:</span></div>
-                  <template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
-                    <span :key="subIndex+10000">
-                      <span v-if="subItem.SaleInfoList && subItem.SaleInfoList.length">
-                        <el-popover trigger="hover"
-                          :content="subItem.SaleInfoList && subItem.SaleInfoList.length ?subItem.SaleInfoList.map(item => item.EmName).join(',') : ''">
-                          <el-tag size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">
-                            {{subItem.CustomerName}}</el-tag>
-                        </el-popover>
-                      </span>
-                      <el-tag v-else size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">
-                        {{subItem.CustomerName}}</el-tag>
-                    </span>
-                  </template>
-                </div>
-              </div> -->
               <div class="el-col w_20">
                 <div class="p20">
                   <div class="mb title"><i
@@ -536,7 +516,11 @@
               <div class="el-col w_8">
                 <div class="p20">
                   <el-button class="mb" @click.native='editTeam(item)' type="primary" size="small"
-                    style="background:#00C6FF; border-color:#00C6FF;width:80px;">{{$t('pub.updateMsg')}}
+                    style="background:#00C6FF; border-color:#00C6FF;width:95px;">{{$t('pub.updateMsg')}}
+                  </el-button>
+                  <br />
+                  <el-button class="mb" @click.native='goTonowTeam(item)' type="primary" size="small"
+                    style="background:#00C6FF; border-color:#00C6FF;width:95px;">{{$t("objFill.dangtuanxbm") }}
                   </el-button>
                   <el-dropdown trigger="click">
                     <span class="el-dropdown-link" type="primary">{{$t('pub.more')}}
@@ -575,10 +559,16 @@
       :close-on-click-modal="false">
       <editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
     </el-dialog>
+    <div v-if="dialog.show">
+      <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>
+    </div>
   </div>
 </template>
 <script>
   import editTeamInfo from "../TravelTeam/editTeamInfo"; //新增修改包机团
+  import priceDialog from "../TravelNewQuotation/priceDialog.vue";
   export default {
     provide() {
       return {
@@ -586,7 +576,8 @@
       }
     },
     components: {
-      editTeamInfo
+      editTeamInfo,
+      priceDialog
     },
     data() {
       return {
@@ -636,6 +627,11 @@
             return startTime.getTime() >= time.getTime();
           }
         },
+        dialog: {
+          show: false,
+          ConfigId: "",
+          OfferId: "",
+        },
       };
     },
     //监听器
@@ -664,6 +660,53 @@
 
     },
     methods: {
+      //复制、新增报价单
+      NewCopyPriceSheet(item, type) {
+        this.gotoOffer(item, 1);
+      },
+      //跳转到报价单
+      gotoOffer(item) {
+        let query = {
+          TCID: item.TCID,
+          blank: "y",
+          tab: "报价单",
+        };
+        this.$router.push({
+          path: "QuotationNewPrice",
+          query,
+        });
+      },
+      showDialog(ConfigId, OfferId) {
+        this.dialog = {
+          show: true,
+          ConfigId,
+          OfferId,
+        };
+        this.$nextTick(() => {
+          this.$refs.dialog.getPostData();
+        });
+      },
+      //当团修改
+      goTonowTeam(item) {
+        var that = this;
+        var path = 'TravelManager';
+        var ttMsg = {
+          configId: item.ConfigID,
+          offerId: item.OfferId,
+          openState: 1,
+          tcid: item.TCID,
+          TCNUM: item.TCNUM,
+          blank: "y",
+          tab: "团期配置",
+        };
+        that.gotoUrl(path, ttMsg);
+      },
+      gotoUrl(path, query) {
+        this.$router.push({
+          name: path,
+          query: query
+        });
+      },
       priceFormat2(value) {
         if (value == null) {
           return this.$t('objFill.yibaohan');

src/components/dmc/manager/dmcTotalTable.vue

@@ -139,8 +139,8 @@
           </span>
         </li>
         <li>
-          <span><em>团队类型</em></span>
-          <el-select class="w150" v-model="msg.QTeamType" filterable :placeholder="$t('pub.pleaseSel')">
+          <span><em>团队类型</em>
+            <el-select v-model="msg.QTeamType" filterable :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
               <el-option label="常规团" :value="0" :key="0"></el-option>
               <el-option label="小包团" :value="1" :key="1"></el-option>
@@ -148,8 +148,17 @@
               <el-option label="PAK" :value="4" :key="4"></el-option>
               <el-option label="切位团" :value="5" :key="5"></el-option>
             </el-select>
+          </span>
         </li>
         <li>
+          <span><em>评价状态</em>
+            <el-select v-model="msg.PriceCommentStatus" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0" :key="0"></el-option>
+              <el-option label="已评价" :value="1" :key="1"></el-option>
+              <el-option label="待评价" :value="2" :key="2"></el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
           <input type="button" class="normalBtn" :value="$t('adm.adm_download')" @click="DownLoad.ShowDownLoad=true" />
@@ -390,98 +399,71 @@
                   <div v-if="tcnDatas">
                     <div class="tcnDatasBox">
                       <div class="tcnDatasText">
-                        <div>地接团号</div>
+                        <div>地接团号：</div>
                         <div>{{ tcnDatas.DMCNum }}</div>
                       </div>
                       <div class="tcnDatasText">
-                        <div>系列</div>
-                        <div>{{ inforDatas.LtName }}</div>
-                      </div>
-                      <div class="tcnDatasText">
-                        <div>线路</div>
-                        <div>{{ inforDatas.LineName }} <span>（{{ inforDatas.StartDate }}出团）</span></div>
+                        <div>领队/导游：</div>
+                        <div>{{ inforDatas.LeaderName }}/{{ inforDatas.GuideName }}</div>
                       </div>
                       <div class="tcnDatasText">
-                        <div>领队</div>
-                        <div>{{ inforDatas.LeaderName }}</div>
+                        <div>线路：</div>
+                        <div>{{ inforDatas.LineName }}</div>
                       </div>
                       <div class="tcnDatasText">
-                        <div>导游</div>
-                        <div>{{ inforDatas.GuideName }}</div>
-                      </div>
-                      <div class="tcnDatasText">
-                        <div>人数</div>
-                        <div>{{ inforDatas.OrderNum }}</div>
-                      </div>
-                      <div class="tcnDatasText">
-                        <div>团号</div>
-                        <div>({{ inforDatas.TCID }}){{inforDatas.TCNUM }}</div>
-                      </div>
-                      <div class="tcnDatasText">
-                        <div>出团公司</div>
-                        <div>{{ inforDatas.OutBranchName }}</div>
-                      </div>
-                      <div class="tcnDatasText">
-                        <div>集合时间</div>
-                        <div>{{ inforDatas.GatherTime }}</div>
-                      </div>
-                      <div class="tcnDatasText">
-                        <div>航班信息</div>
-                        <div>{{ flightInfor.Flight_number }}-{{flightInfor.AlName}}</div>
-                      </div>
-                      <div class="tcnDatasText">
-                        <div>航班时间</div>
-                        <div>{{flightInfor.FlightDate}} {{ flightInfor.Departure_time }}</div>
+                        <div>系列：</div>
+                        <div>{{ inforDatas.LtName }}</div>
                       </div>
                     </div>
                     <div class="daysTitle-box">
-                      <div class="daysTitle"
-                      :class="[current==item.Id?'active':'']"
-                      v-for="(item, index) in days" 
-                      :key="index"
-                      @click="getDay(item.Id,index)">
-                        <span>{{ item.Name }}</span>
+                      <div class="daysTitle" :class="[current==item.Id?'active':'']" v-for="(item, index) in days"
+                        :key="index" @click="getDay(item.Id,index)">
+                        <span>{{ item.Name }}
+                          <span style="color: #4BCA81;" v-if="item.DayFinishStatus==2">√</span>
+                          <span class="colorE95252" v-else>{{item.DayFinishStatus==0?"x":"O"}}</span>
+                        </span>
                       </div>
                     </div>
                     <div class="daysInforBox" v-loading="tcnLoading">
-                      <div class="daysInforFor"
-                       v-for="(item,index) in daysInfor" :key="index">
+                      <div class="daysInforFor" v-for="(item,index) in daysInfor" :key="index">
                         <div class="daysInforTitle">{{item.CommentName}}</div>
                         <div class="daysInforCenter">
                           <div class="daysInforCBox" v-for="(child,childIndex) in item.SourceList" :key="childIndex">
                             <div class="daysInforCBox-left">
-                              <el-image 
-                              :src="child.CommentImg" 
-                              :preview-src-list="[child.CommentImg]">
+                              <el-image :src="child.CommentImg" :preview-src-list="[child.CommentImg]">
                               </el-image>
                             </div>
                             <div class="daysInforCBox-right">
-                              <div class="daysInforCBox-r-title">资源名：{{ child.SourceName?child.SourceName:'-' }}</div>
-                              <div class="daysInforCBox-r-addr">地址：{{ child.Address?child.Address:'-' }}</div>
+                              <div class="daysInforCBox-r-title">
+                                {{ child.SourceName?child.SourceName:'-' }}
+                                <span style="color: #4BCA81;" v-if="child.DetailsId>0">√</span>
+                                <span class="colorE95252" v-else>x</span>
+                              </div>
+                              <div class="daysInforCBox-r-addr">
+                                <template v-if="child.CommentType!=4">
+                                  地址：
+                                </template>
+                                {{ child.Address?child.Address:'-' }}</div>
                               <div v-if="child.Score" class="daysInforCBox-r-score">
                                 <span class="daysInforCBox-r-scoret">评分：</span>
-                                <el-rate
-                                  v-model="child.Score"
-                                  disabled
-                                  text-color="#ff9900">
+                                <el-rate v-model="child.Score" disabled text-color="#ff9900">
                                 </el-rate>
+<<<<<<< HEAD
                                 <span style="color: #ff9900;">{{child.Score.toFixed(1)}}</span>
+=======
+                                <span style="color: #ff9900;">{{child.Score}}</span>
+>>>>>>> dbee8aa041ab9b2ea29599754eb7ca6c23776354
                               </div>
                             </div>
                             <div class="daysInforCBox-right">
                               <div class="daysInforCBox-r-info">评价：{{ child.Info?child.Info:'-' }}</div>
                               <div class="ImgListBox">
                                 <div v-for="(items,indexs) in child.ImgList" :key="indexs">
-                                  <el-image v-if="checkFileType(items)==1"
-                                  style="width: 50px; height: 50px"
-                                  :src="items" 
-                                  :preview-src-list="[items]">
+                                  <el-image v-if="checkFileType(items)==1" style="width: 50px; height: 50px"
+                                    :src="items" :preview-src-list="[items]">
                                   </el-image>
-                                  <video v-else
-                                  style="width: 50px; height: 50px" :id="`myVideo_${indexs}`" 
-                                  :src="items" 
-                                  :controls="true"
-                                  :show-fullscreen-btn="true"></video>
+                                  <video v-else style="width: 50px; height: 50px" :id="`myVideo_${indexs}`" :src="items"
+                                    :controls="true" :show-fullscreen-btn="true"></video>
                                 </div>
                               </div>
                             </div>
@@ -489,10 +471,8 @@
                         </div>
                       </div>
                     </div>
-                   
                   </div>
-                  <span slot="reference" class="price"
-                      style="cursor:pointer;text-decoration:underline;"
+                  <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;"
                     @click="getData(item)">评价信息</span>
                 </el-popover>
               </td>
@@ -792,6 +772,7 @@
           LeaderType: 0, //领队导游类型
           QLeaderId: 0, //领队导游编号
           HotelStatus: 0, //酒店状态
+          PriceCommentStatus: 0, //评价状态(1-已评价，2-待评价)
         },
         CheckedVaule: 1,
         UnCheckedVaule: 0,
@@ -907,7 +888,7 @@
         daysInfor: [],
         tcnIndex: 0,
         current: 1,
-        types:{
+        types: {
           CommentType: 1,
           CommentName: '酒店',
           CoverImg: null,
@@ -946,37 +927,39 @@
         }
         return fileType
       },
-      getDay(e,index){
+      getDay(e, index) {
         this.current = e
         this.tcnIndex = index
         this.daysInfor = []
         this.AssemblyData(index)
       },
-      AssemblyData(index){
+      AssemblyData(index) {
         let DayList = this.inforDatas.DayList[index]
         for (let i = 0; i < DayList.SourceList.length; i++) {
           let Source = DayList.SourceList[i]
-					let findIndex = this.daysInfor.findIndex(item=>{return item.CommentType == Source.CommentType})
-					if(findIndex==-1){
+          let findIndex = this.daysInfor.findIndex(item => {
+            return item.CommentType == Source.CommentType
+          })
+          if (findIndex == -1) {
             let types = JSON.parse(JSON.stringify(this.types))
-						if(Source.CommentType==1){
+            if (Source.CommentType == 1) {
               types.CommentType = 1
               types.CommentName = '酒店'
-						}else if(Source.CommentType==2){
+            } else if (Source.CommentType == 2) {
               types.CommentType = 2
               types.CommentName = '餐'
-						}else if(Source.CommentType==3){
+            } else if (Source.CommentType == 3) {
               types.CommentType = 3
               types.CommentName = '景点'
-						}else if(Source.CommentType==4){
+            } else if (Source.CommentType == 4) {
               types.CommentType = 4
-							types.CommentName = '车'
+              types.CommentName = '车服务'
             }
             types.CoverImg = DayList.CoverImg
             types.DayNum = DayList.DayNum
             types.SourceList.push(Source)
             this.daysInfor.push(types)
-					}else{
+          } else {
             this.daysInfor[findIndex].SourceList.push(Source)
           }
         }
@@ -990,23 +973,32 @@
         this.days = []
         this.daysInfor = []
         this.tcnLoading = true
-				this.apipost("survey_post_GetPriceCommentInfo", msg,(res) => {
-					if(res.data.resultCode == 1 ) {
+        this.apipost("survey_post_GetPriceCommentInfo", msg, (res) => {
+          if (res.data.resultCode == 1) {
             this.tcnLoading = false
-						this.tcnDatas= res.data.data
-						this.inforDatas = res.data.data.priceList[0]
+            this.tcnDatas = res.data.data
+            this.inforDatas = res.data.data.priceList[0];
             this.AssemblyData(this.tcnIndex)
             this.flightInfor = this.inforDatas.flightList[0]
             for (let i = 0; i < this.inforDatas.DayNum; i++) {
-							let name = i + 1>9? i + 1: "0" + (i + 1)
+              let name = i + 1 > 9 ? i + 1 : "0" + (i + 1);
+              var DayFinishStatus = 0;
+              if (this.inforDatas && this.inforDatas.DayList && this.inforDatas.DayList.length > 0) {
+                var dayObj = this.inforDatas.DayList.find((qitem) => {
+                  return qitem.DayNum == (i + 1);
+                })
+                if (dayObj && dayObj.DayFinishStatus) {
+                  DayFinishStatus = dayObj.DayFinishStatus;
+                }
+              }
               this.days.push({
                 Name: name,
-								Id: i+1,
+                Id: i + 1,
+                DayFinishStatus: DayFinishStatus,
               })
             }
-            console.log(this.days,'---daysInfor')
           }
-				},(err)=>{
+        }, (err) => {
           this.tcnLoading = false
         })
       },
@@ -1862,25 +1854,34 @@
     border-top: 25px solid #ff0000;
     border-right: 50px solid transparent;
   } */
- .tcnDatasBox,.tcnDatasText,.daysTitle-box,.ImgListBox{
+  .tcnDatasBox,
+  .tcnDatasText,
+  .daysTitle-box,
+  .ImgListBox {
     display: flex;
     flex-direction: row;
   }
- .tcnDatasBox,.tcnDatasText{
+
+  .tcnDatasBox,
+  .tcnDatasText {
     flex-wrap: wrap;
   }
- .tcnDatasText{
+
+  .tcnDatasText {
     width: 25%;
   }
- .tcnDatasText div:first-child{
+
+  .tcnDatasText div:first-child {
     margin-right: 5px;
     font-weight: bold;
   }
- .daysTitle-box{
+
+  .daysTitle-box {
     flex-wrap: nowrap;
     padding: 10px 0 10px 0;
   }
-  .daysTitle{
+
+  .daysTitle {
     font-weight: bold;
     font-size: 14px;
     border-radius: 29px;
@@ -1892,69 +1893,87 @@
     margin-right: 10px;
     cursor: pointer;
   }
-	.daysTitle.active{
+
+  .daysTitle.active {
     color: #33B3FF;
     border: 1px solid #33B3FF;
     background: #fff;
   }
-  .ImgListBox .el-image{
+
+  .ImgListBox .el-image {
     margin-right: 10px;
   }
-  .daysInforBox{
+
+  .daysInforBox {
     height: 200px;
     overflow: auto;
   }
-  /deep/.daysInforBox .el-table .el-table__cell{
+
+  /deep/.daysInforBox .el-table .el-table__cell {
 
     padding: 3px 0;
   }
-  /deep/.daysInforBox .el-table tr th{
+
+  /deep/.daysInforBox .el-table tr th {
     background: #f6f6f6;
   }
-  .daysInforFor{
+
+  .daysInforFor {
     border-bottom: 1px solid #ccc;
     margin-top: 10px;
     margin-bottom: 10px;
   }
-  .daysInforTitle{
+
+  .daysInforTitle {
     font-size: 16px;
     font-weight: bold;
     margin-bottom: 10px;
   }
-  .daysInforCBox{
+
+  .daysInforCBox {
     display: flex;
     flex-direction: row;
     align-items: center;
     margin-bottom: 10px;
   }
-  .daysInforCBox-left{
+
+  .daysInforCBox-left {
     width: 70px;
     height: 70px;
     background: #eee;
   }
+
   .daysInforCBox-left .el-image {
     width: 100%;
     height: 100%;
   }
-  .daysInforCBox-right{
+
+  .daysInforCBox-right {
     flex: 1;
     margin-left: 10px;
   }
-  .daysInforCBox-r-title{
+
+  .daysInforCBox-r-title {
     font-size: 14px;
     font-weight: bold;
   }
-  .daysInforCBox-r-addr,.daysInforCBox-r-info{
+
+  .daysInforCBox-r-addr,
+  .daysInforCBox-r-info {
     font-size: 13px;
     color: #757776;
   }
-  .daysInforCBox-r-score{
+
+  .daysInforCBox-r-score {
     display: flex;
   }
-  .ImgListBox{
+
+  .ImgListBox {
     margin-top: 10px;
   }
-  .daysInforCBox-r-scoret{
+
+  .daysInforCBox-r-scoret {
     font-size: 13px;
   }
+
 </style>

src/components/index.vue

@@ -2266,9 +2266,9 @@
       testApi() {
         var postMsg = {};
         var cmd = "";
-        cmd = "dmc_post_GetDidaHotelInfo";
+        cmd = "";
         postMsg = {
-          hotelId:"1080427"
+          hotelId:""
         }
         if (cmd != '') {
           this.apipost(

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -590,14 +590,24 @@
                 //提交按钮和另存模板跳转团控列表
                 else if (SaveType == 2 || SaveType == 3) {
                   let path = "TravelControlList";
-                  //OP开团和地接开团
-                  if (TeamType == 3) {
-                    path = "TravelControlList2";
-                  } else if (TeamType == 1) {
+                  //小包团
+                  if (TeamType == 1) {
                     path = "TravelControlListSale";
-                  } else if (TeamType == 2) {
+                  }
+                  //当地游 
+                  else if (TeamType == 2) {
                     path = "oneDayTrip";
-                  } else {
+                  }
+                  //地接团 
+                  else if (TeamType == 3) {
+                    path = "TravelControlList2";
+                  }
+                  //PAK团 
+                  else if (TeamType == 4) {
+                    path = 'TravelTeam'
+                  }
+                  //常规散拼 
+                  else {
                     path = "TravelControlList";
                   }
                   this.$router.push({