111

src/assets/css/UpgradedVersion.css

@@ -63,9 +63,9 @@ html, body{
   display: none;
 }
 
-img {
+/* img {
   pointer-events: none;
-}
+} */
 .bjE6{
   background: #e6e6e6;
 }

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -137,8 +137,7 @@
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==7">收支相抵</span>
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==10">虚拟结算</span>
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==11">电商结算</span>
-
-
+                  <span class="_r_name _r_IsPublic" v-if="GetDetail.KingdeeClientName && !isPrintPage">（垫付：{{GetDetail.KingdeeClientName}}）</span>
                 </p>
                 <p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p>
             </div>

src/components/FinancialModule/Kingdee/RecPayQuery.vue

@@ -677,7 +677,7 @@
               </el-form>
             </div>
       <div>
-        <span style="font-size: 13px; color:coral">*注意: 1、团费对接系统抓取'所有订单相关'和'客户预存与抵用'单据 </span>
+        <span style="font-size: 13px; color:coral">*注意: 1、团费对接系统抓取'所有订单相关'和'客户预存与抵用'单据   &nbsp;&nbsp;&nbsp; 2、团成本对接系统抓取团队所有的成本单据,不包含‘月结单’与‘多账户合并付款’与‘多币种账户付款’单据 </span>
       </div>
       <div class="query-box" style="padding: 0;border: 0;">
         <ul class="clearfix">

src/components/FinancialModule/RecPayQuery.vue

@@ -534,6 +534,22 @@
                         outline: none;" class="iconfont icon-zhifupeizhiguanli" @click="showjiaoyi(scope.row.FrID)">
               </i>
             </el-tooltip>
+
+            <el-tooltip class="item" content="修改垫付对象" placement="top" v-if="IsUpdatePayment == true && scope.row.Type==2">
+              <i style="width: 30px;
+                        height: 30px;
+                        display: inline-block;
+                        color: white !important;
+                        border-radius: 50%;
+                        text-align: center;
+                        line-height: 30px;
+                        margin-right: 10px;
+                        cursor: pointer;
+                        background-color: #47BF8C;
+                        outline: none;" class="iconfont icon-bianji" @click="showPayment(scope.row.FrID)">
+              </i>
+            </el-tooltip>
+
           </template>
         </el-table-column>
       </el-table>
@@ -633,6 +649,32 @@
     <template v-if="transactionTax">
       <shouxufei :transTax="transTax" @success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
     </template>
+    <!--修改付款对象-->>
+    <el-dialog title="修改垫付对象" width="300px" :visible.sync="PaymentSync" center >
+      <el-form class="cdForm" label-width="90px">
+        <el-form-item label="客户类型" prop="ClientType">
+          <el-select filterable v-model='transTax.ClientType' :placeholder="$t('fnc.khleixing')"
+            @change="GetClientAccountList(transTax.ClientType)" class="w135 _border_b_1">
+            <el-option v-for='item in ClientTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户名称" prop="ClientID">
+          <template>
+            <el-select filterable v-model='transTax.ClientID' :placeholder="$t('fnc.khmingcheng')"
+              class="w135 _border_b_1">
+              <el-option v-for='item in ClientAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
+              </el-option>
+            </el-select>
+          </template>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="hollowFixedBtn" @click="PaymentSync=false">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="handlingSurePayment" :loading="transTax.loading">
+          {{$t('pub.sureBtn')}}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -656,6 +698,8 @@
           ClientID: ''
         },
         transactionTax: false,
+        PaymentSync: false,//修改垫付对象
+
         showID: false,
         active: 1,
         userId: 0,
@@ -774,7 +818,8 @@
         istransaction: false,
         isJapanCommission: false,
         isManageFinance: false,
-        loadingTranMode: false
+        loadingTranMode: false,
+        IsUpdatePayment: false,
       }
     },
     created() {
@@ -795,6 +840,9 @@
       if (ActionMenuCode.indexOf("isManageFinance") != -1) {
         this.isManageFinance = true
       }
+      if (ActionMenuCode.indexOf("F_AccountantFinanceMerge") != -1) {
+        this.IsUpdatePayment = true
+      }
       if (this.$route.query.returnCode) {
         this.active = this.$route.query.returnCode;
         this.msg.Conditon = this.$route.query.returnCode;
@@ -905,6 +953,13 @@
         );
       },
 
+      showPayment(FrId) {
+        //弹出付款对象修改
+        this.transTax.FrId = FrId;
+        this.financeinfo_post_GetClientTypeList();
+        this.PaymentSync =true;
+      },
+
       getExchange(rowData, index) {
         this.MsgBus.$emit('getRecQuery', rowData.FrID);
       },
@@ -1120,6 +1175,16 @@
           }
         }, err => {})
       },
+      GetClientAccountList(i) { //获取客户名称并且根据费用类型和付款对象获取客户账号
+        this.msg.AccountNumber = '';
+        this.transTax.ClientID = ''
+        this.ClientTypeList.forEach(x => {
+          if (x.ID == i) {
+            // this.msg.RemitterName = x.Name;
+            this.financeinfo_post_GetClientAccountList(this.transTax.ClientType);
+          }
+        })
+      },
       financeinfo_post_GetClientAccountList(t) { // 获取对象类型
         let msg = {
           Type: t,
@@ -1142,6 +1207,36 @@
           }
         }, err => {})
       },
+      // 确定垫付对象
+      handlingSurePayment() {
+        if (this.transTax.loading) return;
+        this.transTax.loading = true;
+        if (this.transTax.ClientType && this.transTax.ClientType != "" && this.transTax.ClientID && this.transTax
+          .ClientID != "") {
+          this.apipost(
+            "Financial_post_SetKingdeeClientID", {
+              FrId: this.transTax.FrId,
+              KingdeeClientID: this.transTax.ClientID
+            },
+            res => {
+              if (res.data.resultCode == 1) {
+                this.Success("修改成功");
+                this.PaymentSync = false;
+                this.transTax.FrId = ''
+                this.transTax.ClientType = ''
+                this.transTax.ClientID = ''
+              }
+              this.transTax.loading = false;
+            },
+            err => {
+              this.transTax.loading = false;
+            }
+          );
+        } else {
+          this.transTax.loading = false;
+          this.Error("请选择垫付对象");
+        }
+      },
       getAccountList(i, t) { //收款账户
         let accountList = [];
         if (t == 1) { // 银行

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -57,7 +57,7 @@
           <div class="mapImg-Img marginT20">
             <div v-if="PostConfig&&PostConfig.MapUrl">
               <el-image
-                style="width: 100%; height: auto"
+                style="width: 100%; height: auto;"
                 :src="PostConfig.MapUrl"
                 :preview-src-list="[PostConfig.MapUrl]">
               </el-image>

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -65,13 +65,13 @@
           <div>
             <span class="MapImgButtom CancelMapImg" @click="Cancel">取消</span>
           </div>
-          <!-- <div style="margin-left: 20px;">
+          <div style="margin-left: 20px;">
             <span
               class="MapImgButtom setMapImg"
               @click="SavePositionStr"
               >保存坐标</span
             >
-          </div> -->
+          </div>
           <div style="margin-left: 20px;">
             <span
               class="MapImgButtom setMapImg"
@@ -427,26 +427,38 @@ export default {
         });
       }
     },
-
-    // 保存标记坐标
-    SavePositionStr() {
+    // 更新城市标记坐标
+    setCitiesPosition(){
       this.TripMapList.forEach(x => {
         x.CityList.forEach(y => {
           this.citiesData.forEach(z => {
-          if (y.MName == z.name) {
-            y.Lng = z.Lng;
-            y.Lat = z.Lat;
-          }
+            if (y.MName == z.name) {
+              y.Lng = z.Lng;
+              y.Lat = z.Lat;
+            }
+          });
         });
       });
-      // this.countriesData.forEach(y => {
-      //   if (x.MName == y.name) {
-      //     x.Lng = y.Lng;
-      //       x.Lat = y.Lat;
-      //     }
-      //   });
-      });
+    },
+    // 保存标记坐标
+    SavePositionStr() {
       this.dataAll.TripMapList = JSON.parse(JSON.stringify(this.TripMapList));
+      // this.TripMapList.forEach(x => {
+      //   x.CityList.forEach(y => {
+      //     this.citiesData.forEach(z => {
+        //   if (y.MName == z.name) {
+        //       y.Lng = z.Lng;
+        //       y.Lat = z.Lat;
+        //     }
+        //   });
+        // });
+        // this.countriesData.forEach(y => {
+        //   if (x.MName == y.name) {
+        //     x.Lng = y.Lng;
+        //     x.Lat = y.Lat;
+        //   }
+        // });
+      // });
     },
     // 导出地图片
     getResultImg() {
@@ -645,17 +657,17 @@ export default {
         if(x.MId!=651&&x.MId!=891){
           source = "word-source"
         }else{
-          if(x.MId==651)
-          { source = "word-source-japan";
-          paintBgObj = {
-            "fill-color": {
-            'property': 'cartodb_id',
-            stops: that.paintRbBgList
-            },
-            "fill-outline-color": "#4f4f4f",
-            "fill-opacity": 0.5
+          if(x.MId==651){ source = "word-source-japan";
+            paintBgObj = {
+              "fill-color": {
+              'property': 'cartodb_id',
+              stops: that.paintRbBgList
+              },
+              "fill-outline-color": "#4f4f4f",
+              "fill-opacity": 0.5
             }
-          }else { source = "word-source-Korea";
+          }else {
+            source = "word-source-Korea";
             paintBgObj = that.paintHgBgObj
           }
         }
@@ -693,29 +705,6 @@ export default {
 
       });
     },
-    // 编辑国家和城市
-    async EditCountryCity(end){
-      const query = await fetch(
-        `https://api.mapbox.com/directions/v5/mapbox/cycling/${start[0]},${start[1]};${end[0]},${end[1]}?steps=true&geometries=geojson&access_token=${mapboxgl.accessToken}`,
-        { method: 'GET' }
-      );
-      const json = await query.json();
-      const data = json.routes[0];
-      const route = data.geometry.coordinates;
-      const geojson = {
-        type: 'Feature',
-        properties: {},
-        geometry: {
-          type: 'LineString',
-          coordinates: route
-        }
-      };
-      this.countriesData.forEach((x, i) => {
-        if (this.map.getSource('world-layer-'+x.MId)) {
-          this.map.getSource('route').setData(geojson);
-        }
-      })
-    },
     clearCitiesMarkersHandler() {
       if (this.deviceMarkers && this.deviceMarkers.length > 0) {
         this.deviceMarkers.forEach(x => {
@@ -730,7 +719,6 @@ export default {
         var marker = new mapboxgl.Marker({ color: "#d73b33", scale: 0.5 })
           .setLngLat([item.longitude, item.latitude])
           .addTo(this.map);
-          console.log(item.Lng,'=====')
         if (item.Lng && item.Lat) {
           this.addLabel(item, i, item);
         } else {
@@ -758,7 +746,7 @@ export default {
         let currentMarkerLngLat = marker.getLngLat();
         that.citiesData[i].Lng = currentMarkerLngLat.lng;
         that.citiesData[i].Lat = currentMarkerLngLat.lat;
-        that.SavePositionStr()
+        that.setCitiesPosition()
       });
 
       this.deviceMarkers.push(marker);
@@ -950,6 +938,15 @@ export default {
             });
             marker.setLngLat(result);
             marker.addTo(this.map);
+            const geojson = {
+              type: 'Feature',
+              properties: {},
+              geometry: {
+                type: 'LineString',
+                coordinates: route
+              }
+            };
+
             let currentMarkerLngLat = marker.getLngLat();
             let TripMapList = that.TripMapList.filter(y=> y.MName==x.MName)
             TripMapList[0].Lng = currentMarkerLngLat.lng;
@@ -959,7 +956,6 @@ export default {
               TripMapList = that.TripMapList.filter(y=> y.MName==x.MName)
               TripMapList[0].Lng = currentMarkerLngLat.lng;
               TripMapList[0].Lat = currentMarkerLngLat.lat;
-              that.SavePositionStr()
             });
             this.countriesMarkers.push(marker);
           }

src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue

@@ -147,7 +147,7 @@
                 <el-input type="textarea" :autosize="{minRows: 1, maxRows: 8 }" resize="none"
                   placeholder="请输入行程大点信息" v-model="dayObj.TitleObj.Title"></el-input>
               </el-form-item>
-               <el-form-item>
+               <el-form-item class="marginT10">
                 <el-input placeholder="请输入公里数" class="w120" v-model="dayObj.TitleObj.KMNumber">
                   <template slot="append">KM</template>
                 </el-input>
@@ -217,7 +217,8 @@
                 filterable
                 @change="getScenicArray">
                   <el-option v-for="(item,index) in dayObj.ScenicArray" :label="item.CouponsName" :value="item.CouponsId" :key="index">
-               
+                    <span style="float: left">{{ item.CouponsName }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
                   </el-option>
                 </el-select>
               </div>
@@ -225,7 +226,7 @@
           </div>
         </div>
         <!-- 行程景点信息 -->
- 
+
         <div class="TC-warmTips TC-Comtitlediv" v-if="!dayObj.isRead" :class="{'showOther':TeamType==3}">
           <div class="TC-SpecialInstruction clearfix column">
             <div class="TC-leftTitle" style="height: 20px;">温馨提示</div>
@@ -316,12 +317,17 @@
     methods: {
       // 默认需要展示的图
       getScenicArray(){
+        let i = 1
+        let list = []
+
         this.dayObj.ScenicArray.forEach(x=>{
-          x.DefaultNum = 0;
+          x.Rank = 0
           if(x.CouponsId===this.ScenicArraySingle){
-            x.DefaultNum = 1;
+            x.Rank = 1
           }
         })
+        this.dayObj.ScenicArrayImg = this.ScenicArraySingle;
+        this.dayObj.ScenicArray = this.dayObj.ScenicArray.sort((a, b)=>{return b.Rank - a.Rank});
       },
       //非直采切换
       NoDirectScenicCheck(number) {
@@ -371,7 +377,9 @@
             this.dayObj.ScenicArray = newArray.sort((a, b)=>{return b.Rank - a.Rank});
           }
         }
- 
+        this.dayObj.ScenicArray.forEach(x => {
+          //  x.ScenicJson.y=0;
+        });
       },
       //是否有景点切换
       hasScenicChange() {
@@ -778,11 +786,11 @@
     },
     mounted() {},
     components: {
-      
+
       hotelTrip,
-      
-    
-   
+
+
+
       trifficTrip,
       noScenic,
       "my-edit": MyEdit,