旅客名单新增身份证接口，发票增加预计到账时间选择和详情的展示

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -124,11 +124,11 @@
       <!-- <tr>
         <td>应收总额</td>
         <td class="w600  font-weight cursorpointer">
-          <span @click="goUrlO(orderList.OrderId)">{{orderList.PreferPrice}}</span> 
+          <span @click="goUrlO(orderList.OrderId)">{{orderList.PreferPrice}}</span>
         </td>
         <td>待收金额</td>
         <td class="w600  font-weight cursorpointer">
-          <span @click="goUrlO(orderList.OrderId)">{{orderList.DueInMoney}}</span> 
+          <span @click="goUrlO(orderList.OrderId)">{{orderList.DueInMoney}}</span>
         </td>
       </tr> -->
       <tr class="page_iisMgadd_bank">
@@ -146,14 +146,23 @@
         <td>到账日期</td>
         <td>{{orderList.TradeDateStr}}</td>
       </tr>
+
       <tr>
         <td>团号</td>
-        <td colspan="3" class="w600 text-align-left">{{msg.TCID}}</td>
-      </tr>
-      <tr>
+        <td>{{msg.TCID}}</td>
         <td>订单号</td>
-        <td colspan="3" class="w600 text-align-left">{{msg.OrderId}}</td>
+        <td>{{msg.OrderId}}</td>
       </tr>
+<!--      <tr>-->
+<!--        <td>团号</td>-->
+<!--        <td colspan="3" class="w600 text-align-left">{{msg.TCID}}</td>-->
+<!--      </tr>-->
+<!--      <tr>-->
+<!--        <td>订单号</td>-->
+<!--        <td colspan="3" class="w600 text-align-left">{{msg.OrderId}}</td>-->
+<!--      </tr>-->
+
+
       <tr>
         <td rowspan="6">开具内容</td>
         <td>
@@ -216,12 +225,25 @@
           <el-input placeholder type="number" v-model="msg.BankNo"></el-input>
         </td>
       </tr>
+
       <tr>
         <td>备注</td>
-        <td colspan="3">
+        <td>
           <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>
         </td>
+        <td>预计到账时间</td>
+        <td>
+            <el-date-picker v-model='msg.AccountingDate' class="w230" value-format="yyyy-MM-dd" type="date"
+                            placeholder="选择日期"></el-date-picker>
+        </td>
       </tr>
+<!--      <tr>-->
+<!--        <td>备注</td>-->
+<!--        <td colspan="3">-->
+<!--          <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>-->
+<!--        </td>-->
+<!--      </tr>-->
+
     </table>
     <div>
       <div>
@@ -289,6 +311,7 @@ export default {
         IsDefaultInfo: 1,
         ApplyPics: [],
         ID: 0,
+        AccountingDate:''
       },
       DepartName: "",
       emName: "",

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -246,11 +246,11 @@
       <tr>
         <td>应收总额</td>
         <td class="w600  font-weight cursorpointer">
-          <span @click="goUrlO(detail.OrderId)">{{detail.PreferPrice}}</span> 
+          <span @click="goUrlO(detail.OrderId)">{{detail.PreferPrice}}</span>
         </td>
         <td>待收金额</td>
         <td class="w600  font-weight cursorpointer">
-          <span @click="goUrlO(detail.OrderId)">{{detail.DueInMoney}}</span> 
+          <span @click="goUrlO(detail.OrderId)">{{detail.DueInMoney}}</span>
         </td>
       </tr>
       <tr class="page_iisMgdetail_bank">
@@ -271,21 +271,21 @@
       </tr>
       <tr>
         <td>{{$t('ios.tuanhao')}}</td>
-        <td colspan="3" class="w600 text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
+        <td  class="text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
           {{detail.TCNUM}}({{detail.TCID}})
         </td>
-      </tr>
-      <tr>
+
         <td>{{$t('ios.ddanhao')}}</td>
-        <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
-          <span @click="goUrlO(detail.OrderId)">{{detail.OrderId}}</span> 
+        <td  class="text-align-left font-weight cursorpointer">
+          <span @click="goUrlO(detail.OrderId)">{{detail.OrderId}}</span>
         </td>
       </tr>
+
       <tr>
         <td>{{$t('ios.cwdanju')}}</td>
         <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
           <template v-for="item in orderList.FrIDs">
-            <span @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)">{{item}}</span> 
+            <span @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)">{{item}}</span>
           </template>
           <span v-if="orderList.FrIDs && orderList.FrIDs.length<1">{{$t('ios.zanwu')}}</span>
         </td>
@@ -329,9 +329,13 @@
       </tr>
       <tr>
         <td>{{$t('hotel.hotel_remark')}}</td>
-        <td colspan="3">
+        <td>
           {{detail.Remarks}}
         </td>
+        <td>预计到账时间</td>
+        <td style="width: 190px;">
+          {{detail.AccountingDate}}
+        </td>
       </tr>
     </table>
     <el-dialog :title="$t('pub.hintMsg')" width="400px" :visible.sync="dialogFormVisible2" center :before-close="closeChangeMachie" >
@@ -422,7 +426,7 @@
             </div>
             <div class="shangchuanfujian"><button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button></div>
           </div>
-        </div> 
+        </div>
         <div class="querenhan">
           <p >确认函</p>
           <div style="width:100%;" >
@@ -462,7 +466,7 @@
 <script>
 export default {
   data() {
-    return { 
+    return {
       detail: {},
       orderList: {},
       loading: true,
@@ -518,7 +522,7 @@ export default {
       let path = "/Upload/Temporary/"
       this.$message.info('上传中...')
       this.UploadSelfFileT(path, newArr, x => {
-        let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0); 
+        let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
         this.saveMsg.push({
           Type: fileTypeNumber,
           Content: x.data.FilePath,
@@ -569,7 +573,7 @@ export default {
         this.$router.push({ name: 'enrollTotal', query: { id: OrderId, blank: 'y', tab: '报名统计'} });
     },
     goUrlT: function (path, obj, title){  // 跳转团页面
-	 	   this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}}) 
+	 	   this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})
 		},
     goSaleFinacial: function () {  // 跳转销售财务单据
       let obj = {
@@ -604,7 +608,7 @@ export default {
               });
             },1000)
           }
-          
+
         }
       }, null)
     },

src/components/SalesModule/addPassenger.vue

@@ -140,6 +140,12 @@
          element-loading-background="rgba(0, 0, 0, 0.7)">
       <div class="contForm">
         <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px">
+          <li>
+            <el-form-item label="身份证号码" prop="IdCard">
+              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
+              </el-input>
+            </el-form-item>
+          </li>
           <li>
             <el-form-item label="中文姓" prop="SurName">
               <el-input v-model='addMsg.SurName' class="w230" @input="Transformation(addMsg.SurName,'SurName')"
@@ -235,12 +241,7 @@
               </el-input>
             </el-form-item>
           </li>
-          <li>
-            <el-form-item label="身份证号码" prop="IdCard">
-              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写">
-              </el-input>
-            </el-form-item>
-          </li>
+
 
           <li>
             <el-form-item label="家庭详细地址" prop="AddressDetail">
@@ -1904,7 +1905,36 @@
           err => {}
         );
       },
+      authentication() {
+        if (this.$route.query.guestId == 0) {
+          this.apipost(
+            "sellorder_post_GetGusetByIDCard",
+            {IdCard: this.addMsg.IdCard,},
+            res => {
+              if (res.data.resultCode == 1) {
+                let obj = res.data.data;
+                this.addMsg = obj;
+                this.addMsg.Sex = obj.Sex.toString();
+                this.addMsg.Marriage = obj.Marriage.toString();
+                if (this.addMsg.Marriage == "0") {
+                  this.addMsg.Marriage = "";
+                }
+                this.addMsg.IsCriminalRecord = obj.IsCriminalRecord === null ? '' : obj.IsCriminalRecord.toString();
+                this.addMsg.IsDepartureRecord = obj.IsDepartureRecord.toString();
+                this.addMsg.Id = this.$route.query.guestId;
+                this.addMsg.TCID = this.$route.query.TCID;
+                this.addMsg.OrderId = this.$route.query.orderId;
+                this.Roominformation()  //调取下房间信息
 
+              } else {
+                this.$message.error(res.data.message);
+              }
+            },
+            err => {
+            }
+          );
+        }
+      }
     },
     mounted() {
       this.getCountry();