Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/Kingdee/RecPayQuery.vue

@@ -686,7 +686,7 @@
               <em style="cursor: pointer;" @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo q-mr-lg"></i></em>
             </span>
             <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
-            <button class="normalBtn" @click="method5()">导出</button>
+            <button class="normalBtn" @click="method5()">导出</button>
             <button v-if="DataList&&DataList.length>0" class="hollowFixedBtn" @click="Markers">标记</button>
           </li>
         </ul>
@@ -702,6 +702,7 @@
             <el-table :data="DataList" border style="width: 100%;font-size: 12px;" height="550">
           <el-table-column prop="FrID" label="单号" width="100">
             <template slot-scope='scope'>
+              <el-checkbox v-model="scope.row.checked" ></el-checkbox>&nbsp;
               <span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row)">{{ scope.row.FrID }}</span>
             </template>
           </el-table-column>
@@ -773,8 +774,10 @@
         </div>
 
         <div style="padding-bottom:15px">
-          <el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper"
-            :page-size="pageSize" :total='total'>
+          <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChanges" layout="total,sizes,prev, pager, next, jumper"
+            :page-sizes="[8,20,50,70,100]"
+            :current-page.sync="currentPage"
+            :page-size="msg.pageSize" :total='total'>
           </el-pagination>
         </div>
       </div>
@@ -904,6 +907,7 @@
             ColorType:1,//和平
             ImportType:1,
             KingdeeMark: '2',
+            ReFinanceIds: ''
           },
           BranchIds:[],
           getCompanyMsg: { // 公司
@@ -1083,7 +1087,21 @@
           }
         },
         Markers(){
-          this.$confirm('是否确认标记此查询条件的下所有财务单据以导入至金蝶？', '提示', {
+          let refinanceIdList = [];
+          this.DataList.forEach(x=>{
+            if(x.checked){
+              if(refinanceIdList.indexOf(x.FrID)===-1){
+                refinanceIdList.push(x.FrID)
+              }
+            }
+          })
+          let cmsg='是否确认标记此查询条件的下所有财务单据以导入至金蝶？';
+          if(refinanceIdList){
+            this.msg.ReFinanceIds = refinanceIdList.join(',');
+            cmsg ='是否确认标记勾选的'+refinanceIdList.length+'张财务单据以导入至金蝶？';
+          }
+          
+          this.$confirm(cmsg, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -1244,6 +1262,11 @@
           this.pageIndex = this.msg.pageIndex = val;
           this.getPageList();
         },
+        handleSizeChange(val) {
+        this.msg.pageSize = val
+        this.msg.pageIndex = 1;
+        this.getPageList();
+      },
         AccountType_post_GetList() { //获取账户类型下拉
           this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
             if (res.data.resultCode == 1) {
@@ -1258,6 +1281,7 @@
         },
         getPageList() { // 获取列表数据
           this.loading = true;
+          this.ReFinanceIds ='';
           if(this.msg.FrID===''){
             this.msg.FrID = 0
           }
@@ -1288,6 +1312,32 @@
           }, err => {})
         },
         method5: function (type) {
+          let refinanceIdList = [];
+          this.DataList.forEach(x=>{
+            if(x.checked){
+              if(refinanceIdList.indexOf(x.FrID)===-1){
+                refinanceIdList.push(x.FrID)
+              }
+            }
+          })
+          if(refinanceIdList){
+            this.msg.ReFinanceIds = refinanceIdList.join(',');
+          }
+          if(this.msg.ReFinanceIds){
+            this.$confirm('确认对勾选的单据进行导出吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+            }).then(() => {
+              this.downLoadFinanceToKingdee(type);
+            }).catch(() => {
+              
+            });
+          }else{
+            this.downLoadFinanceToKingdee(type);
+          }
+        },
+        downLoadFinanceToKingdee(type){          
           if (!this.msg.FinanceName) this.msg.FinanceName = '记';
           if (!this.msg.ClientID) this.msg.ClientID = 0;
           if (!this.msg.ClientType) this.msg.ClientType = 0;

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -5,7 +5,7 @@
         style="display: flex;align-items: start; justify-content: space-between;"
       >
         <div style="display: flex;flex-wrap: wrap; flex-grow: 1;">
-          <div v-for="(x, index) in TripMapList" ::key="x.Id" class="row-aic">
+          <div v-for="(x, index) in TripMapList" :key="x.Id" class="row-aic">
             <el-select
               class="w100"
               size="mini"
@@ -747,6 +747,7 @@ export default {
       marker.addTo(this.map);
       marker.on("dragend", function() {
         let currentMarkerLngLat = marker.getLngLat();
+        console.log(currentMarkerLngLat,'------currentMarkerLngLat')
         that.citiesData[i].Lng = currentMarkerLngLat.lng;
         that.citiesData[i].Lat = currentMarkerLngLat.lat;
         that.setCitiesPosition()