新增地接op分房

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1271,7 +1271,9 @@ export default {
                         this.detailList.CostTypeId = this.orderObj.CostType?this.orderObj.CostType: '';
                         this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
                         this.detailList.Number = this.orderObj.CostType ? 1 : 0
-                        this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
+                        if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
+                            this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
+                        }
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
@@ -1370,7 +1372,7 @@ export default {
                                     })
                                 })
                                
-                                this.companyList = data;   
+                                this.companyList = data;
                             }
                         }
                         console.log('this.companyList', this.companyList)

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1394,7 +1394,9 @@ export default {
                         this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
                         this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
-                        this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
+                        if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
+                            this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
+                        }
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{

src/components/SalesModule/investigationDetail.vue

@@ -15,11 +15,17 @@
           :texts="texts"
           show-text>
         </el-rate>
-        <template v-else-if="item.SurveyType === 2">
-          <el-radio v-for="(r, i) in item.SurveyOptionsList" v-model="item.lable" :label="r.ID" disabled="disabled" :key="i">{{r.OptionsName}}</el-radio>
+        <template v-else-if="item.SurveyType === 2"> 
+          <template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'">
+            <span>{{r.OptionsName}}</span>
+          </template>
+          <!-- <el-radio v-for="(r, i) in item.SurveyOptionsList" v-model="item.lable" :label="r.ID" disabled="disabled" :key="i"></el-radio> -->
         </template>
         <template v-else-if="item.SurveyType === 3">
-          <el-checkbox  v-for="(r, i) in item.SurveyOptionsList" v-model="item.ckeckList" :label="r.ID" disabled="disabled" :key="i">{{r.OptionsName}}</el-checkbox >
+          <template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'">
+            <span>{{r.OptionsName}}</span>
+          </template>
+          <!-- <el-checkbox  v-for="(r, i) in item.SurveyOptionsList" v-model="item.ckeckList" :label="r.ID" disabled="disabled" :key="i">{{r.OptionsName}}</el-checkbox > -->
         </template>
         <template v-else-if="item.SurveyType === 4"> 
           <span>{{item.TextContent}}</span> 

src/components/dmc/manager/dmcTotalTable.vue

@@ -271,7 +271,7 @@
                 </div>
               </td>
               <td>
-                <div class="fz16 fbold linkspan" @click="goUrlT('TravelPassengerList',item.TCID,'旅客名单')">
+                <div class="fz16 fbold linkspan" @click="goUrlT('TravelPassengerList2',item.TCID,'旅客名单')">
                   <span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
                 </div>

src/components/leaderPay2.vue

@@ -980,54 +980,49 @@ export default {
         return
       }
       // type 1 零件地 自动生成  2 领队人头费 跳转
+      let BType = 3,
+        AccountId = 1,
+        IsRelevanceTravel = 1,
+        TemplateId = 71,
+        RB_Branch_Id = userinfo.RB_Branch_id,
+        OrderSource = 6;
       if (obj.Type == 2) {
-        let id = [72, 73];
-        let TCIDARR = [obj.TCIDs];
-        let orderObj = {
-          OrderID: 0,
-          OrderSource: 6,
-          Obj: {},
-          SourceID: 0,
-          CostType: 180,
-          TCIDList: TCIDARR,
-          Money: inputPrice,
-          TCNUMS: ''
-        };
-        let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${JSON.stringify(id)}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
-        let dom = document.querySelector("#blankLink");
-        dom.href = `http://${window.location.host}/#${fullPath}`;
-        dom.click();
-      } else {
-        // 自动生成
-        let msg = {
-          TemplateId: 71,
-          RB_Branch_Id: userinfo.RB_Branch_id,
-          IsPublic: 0,
-          BType: 4,
-          AccountId: 14,
-          CostTypeID: 180,
-          WBMoney: obj.price,
-          Remark: "",
-          TCID: obj.TCIDs,
-          IsRelevanceTravel: 1,
-          OrderID: 0,
-          vorcherInos: [{FrIdStr:''}],
-          Description: "",
-          RemitterName: obj.LeaderOrGuidName,
-          TradeDate: new Date().Format("yyyy-MM-dd"),
-          OrderSource: 6,
-        }
-        this.apipost('Financial_post_SetFinanceInfoCommonForIn', msg, res=>{
-          if (res.data.resultCode == 1) {
-            obj.FrId.push(res.data.data)
-            this.listCost[index] = obj
-            this.$forceUpdate()
-            this.$message.success("制单成功")
-          } else {
-            this.$message.error(res.data.message)
-          }
-        }, null)
+        BType = 1;
+        AccountId = 7;
+        IsRelevanceTravel = 0;
+        TemplateId = obj.OutBranchId === 0 ? 72 : 73; 
+        RB_Branch_Id = obj.OutBranchId;
+        OrderSource = 8;
+      }
+      // 自动生成
+      let msg = {
+        TemplateId: 71,
+        RB_Branch_Id: RB_Branch_Id,
+        IsPublic: 0,
+        BType: BType,
+        AccountId: AccountId,
+        CostTypeID: 180,
+        WBMoney: obj.price,
+        Remark: "",
+        TCID: obj.TCIDs,
+        IsRelevanceTravel: IsRelevanceTravel,
+        OrderID: 0,
+        vorcherInos: [{FrIdStr:''}],
+        Description: "",
+        RemitterName: obj.LeaderOrGuidName,
+        TradeDate: new Date().Format("yyyy-MM-dd"),
+        OrderSource: OrderSource,
       }
+      this.apipost('Financial_post_SetFinanceInfoCommonForIn', msg, res=>{
+        if (res.data.resultCode == 1) {
+          obj.FrId.push(res.data.data)
+          this.listCost[index] = obj
+          this.$forceUpdate()
+          this.$message.success("制单成功")
+        } else {
+          this.$message.error(res.data.message)
+        }
+      }, null)
     },
     goZhiDan: function(obj) { 
       let id = [59];
@@ -1277,7 +1272,7 @@ export default {
                       DiningID: ai.DiningID,
                       data: [ai]
                   });
-                  Diningmap[ai.PlanDateStr] = ai;
+                  Diningmap[ai.UseTimeStr] = ai;
               }else{
                   for(var j = 0; j < Diningdest.length; j++){
                       var dj = Diningdest[j];
@@ -1306,7 +1301,7 @@ export default {
                       TicketID: ai.TicketID,
                       data: [ai]
                   });
-                  Scenicmap[ai.PlanDateStr] = ai;
+                  Scenicmap[ai.UseTimeStr] = ai;
               }else{
                   for(var j = 0; j < Scenicdest.length; j++){
                       var dj = Scenicdest[j];

src/router/config.js

@@ -1816,6 +1816,14 @@ export default {
                                 title: '旅客名单'
                             },
                         },
+                        {
+                            path: '/TravelPassengerList2', //旅客名单
+                            name: 'TravelPassengerList2',
+                            component: resolve => require(['@/components/TravelManager/TravelList/TravelPassengerList2'], resolve),
+                            meta: {
+                                title: '旅客名单'
+                            },
+                        },
                         {
                             path: '/RegistrationList',
                             name: 'RegistrationList',