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

src/components/FinancialModule/CostSharing.vue

@@ -72,18 +72,25 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item :label="$t('objFill.remarkquery')">
                 <el-input v-model="msg.Remark"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item label="">
                 <el-checkbox  v-model="msg.IsSelectRemain" :true-label='1' :false-label='0'>
                   {{$t('fnc.onlyseebalance')}}
                </el-checkbox>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item label="摊销月份">
+                <el-date-picker class="h34" v-model="msg.QMonth" type="month" style="width: 100%"
+                  value-format="yyyy-MM">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
             
         </el-row>
       </el-form>
@@ -94,6 +101,22 @@
         </li>
       </ul>
     </div>
+    <!-- 统计版块 -->
+    <div class="groupTourOrder_count" v-if="DataNum">
+      <div class="groupTourOrder_count_item HT_total">
+        <div>
+          <span></span>
+        </div>
+        <p>
+          <span>月摊销：
+            <span :style="{'color': DataNum.Month?'red':''}">{{  DataNum.Month }}</span>
+          </span>
+          <span style="margin-left: 20px;">摊销余额：
+            <span :style="{'color': DataNum.Remain<=0?'red':''}">{{  DataNum.Remain }}</span>
+          </span>
+        </p>
+      </div>
+    </div>
     <div class="_fnDm_content" v-loading='loading'>
       <el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%"
       row-key="Id">
@@ -250,6 +273,7 @@
           Remark: '', //备注查询
           CostTypeID: '',
           IsSelectRemain:0,
+          QMonth: '',
         },
         getCompanyMsg: { // 公司
           RB_Group_Id: '0',
@@ -293,6 +317,7 @@
         isBatchPrinting: false,
         ShowFixedAssets: false,
         showUpdateCreate:false,
+        DataNum: null
       }
     },
     created() {
@@ -309,6 +334,7 @@
         this.msg.sTradeDate = this.$route.query.StartDate;
         this.msg.eTradeDate = this.$route.query.StartDate;
       }
+      this.msg.QMonth = this.getBeforeDate(30, new Date().Format("yyyy-MM-dd"),'yyyy-MM');
     },
     components: {
     
@@ -388,12 +414,13 @@
         this.apipost('Financial_post_GetFinanceRelevancePageList', this.msg, res => {
           if (res.data.resultCode == 1) {
             let data = res.data.data.pageData;
+            this.DataNum = data;
             let userInfo = this.getLocalStorage();
             this.total = res.data.data.count;
             if (this.total == 0) {
               this.DataList = [];
             } else {
-              this.DataList = data;
+              this.DataList = data.list;
             }
             this.loading = false;
           } else {

src/components/FinancialModule/accDetail/AccountNewCollectingOrPay.vue

@@ -174,6 +174,7 @@
                     <th>{{$t('fnc.djleixing')}}</th>
                     <th>{{$t('fnc.danhao')}}</th>
                     <th width="100">{{$t('objFill.v101.FinancialModule.guanljsd')}}</th>
+                    <th>团号</th>
                     <th>{{$t('fnc.feiyongleixing')}}</th>
                     <th width="340">{{$t('objFill.v101.FinancialModule.shoufkdx')}}</th>
                     <th>{{$t('hotel.hotel_Currency')}}</th>
@@ -183,7 +184,7 @@
                     <th>{{$t('objFill.daishou')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="10">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
+                    <td :colspan="11">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
                     <td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
                     <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
                 </tr>
@@ -198,6 +199,7 @@
                       <span class="cursorpointer" :class="item.FType === 1 ? 'CAcc_bg_green' :item.FType === 2 ? 'CAcc_bg_red':'CAcc_bg_bule'" @click="goUrlNew(item.FType,item.FrID)">{{item.FrID}}</span>
                     </td>
                     <td>{{item.CallBackReFrId>0?item.CallBackReFrId:item.IsSpecial==1?'结算单':''}}</td>
+                    <td>{{ item.TCNUM?item.TCNUM:'' }}</td>
                     <td>{{item.CostTypeIdStr}}</td>
                     <td>{{item.RemitterName}}</td>
                     <td>{{item.CurrencyName}}</td>

src/components/SalesModule/addPassenger.vue

@@ -1546,7 +1546,8 @@
             // 单个字母开头（E或G）后跟8位数字
             const pattern1 = /^[EGH][0-9]{8}$/;
             // 两个字母开头（E开头，第二个字母不能是I或O）后跟7位数字
-            const pattern2 = /^E[A-HJ-NP-Z][0-9]{7}$/;
+           // const pattern2 = /^E[A-HJ-NP-Z][0-9]{7}$/;
+           const pattern2 = /^[EP][A-HJ-NP-Z][0-9]{7}$/;
             this.PassportNoSure = pattern1.test(this.addMsg.PassportNo) || pattern2.test(this.addMsg.PassportNo);
             if (!this.PassportNoSure) {
               this.$message.error("护照格式不正确")