生成财务单据，新增汇率为0判断

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -23,6 +23,12 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>合团号</em>
+            <el-input v-model='msg.CombinationNum'></el-input>
+          </span>
+        </li>
         <li>
           <span>
             <em>团号</em>
@@ -80,7 +86,7 @@
                     {{subItem.StartCityNames}}
                   </td>
                   <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
-                    {{subItem.TCNUMS}}
+                    {{subItem.TCNUMS}}({{subItem.TCID}})
                   </td>
                   <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
                     {{subItem.LeaderName}}
@@ -94,7 +100,7 @@
                     {{subItem.StartCityNames}}
                   </td>
                   <td>
-                    {{subItem.TCNUMS}}
+                    {{subItem.TCNUMS}}({{subItem.TCID}})
                   </td>
                   <td>
                     {{subItem.LeaderName}}
@@ -147,7 +153,8 @@
                   </div>
                 </td>
                 <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
-                  <p style="cursor: pointer;color:blue;" @click="isShowFinaceDailog=true,CurrentOutItem=outItem">生成单据</p>
+                  <p style="cursor: pointer;color:blue;" @click="isShowFinaceDailog=true,CurrentOutItem=outItem">生成单据
+                  </p>
                   <p style="cursor: pointer;color:blue;margin-top:5px;"
                     @click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)">
                     选择购物店</p>
@@ -210,14 +217,15 @@
       <template>
         <el-form label-width="100px">
           <el-form-item label="付款方式">
-              <el-select v-model="PayType">
-                 <el-option label="常规付款" :value="1" :key="1"></el-option>
-                 <el-option label="资金池付款" :value="2" :key="2"></el-option>
-              </el-select>
+            <el-select v-model="PayType">
+              <el-option label="常规付款" :value="1" :key="1"></el-option>
+              <el-option label="资金池付款" :value="2" :key="2"></el-option>
+            </el-select>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <button class="hollowFixedBtn" @click="isShowFinaceDailog=false,CurrentOutItem={}">{{$t('pub.cancelBtn')}}</button>
+          <button class="hollowFixedBtn"
+            @click="isShowFinaceDailog=false,CurrentOutItem={}">{{$t('pub.cancelBtn')}}</button>
           <button class="normalBtn" type="primary" @click="CreateBill()">{{$t('pub.sureBtn')}}</button>
         </div>
       </template>
@@ -229,7 +237,7 @@
     data() {
       return {
         loading: false,
-        PayType:1,//付款方式
+        PayType: 1, //付款方式
         msg: {
           pageIndex: 1,
           pageSize: 8,
@@ -241,16 +249,18 @@
           EndDate: '',
           currentPage: 1,
           total: 0,
+          CombinationNum:"",//合团号
+          TCNUM:"",//团号
         },
         LineList: [],
         LineTeamList: [],
         shopDataList: [],
         CreateHandBillList: [],
         zhuanjiaoBox: false,
-        isShowFinaceDailog:false,//是否显示生成财务单据对话框
+        isShowFinaceDailog: false, //是否显示生成财务单据对话框
         CreateHandBillID: '',
         CreateHandObj: {},
-        CurrentOutItem:{}//当前选中的团
+        CurrentOutItem: {} //当前选中的团
       }
     },
     methods: {
@@ -425,17 +435,27 @@
 
           var nMsg = {
             TCIDs: that.CurrentOutItem.TCIDs,
-            PayType:that.PayType,
+            PayType: that.PayType,
             uid: that.getLocalStorage().EmployeeId
           };
-          let fileName = "生成[" + that.CurrentOutItem.NewCombinationNum + "]购物店数据.xls";
-          that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
-            res => {
-              that.loading = false;
-              this.isShowFinaceDailog=false;
-              that.Success("导入成功!");
-              that.getList();
-            });
+          that.apipost("dmcstatistics_post_CheckShopDetailsDMCRate", nMsg, res => {
+            if (res.data.resultCode == 1) {
+              if (res.data.data == 0) {
+                that.Error("请检查汇率有为0的数据,请先在【操作】里面修改汇率再生成财务单据!");
+                that.loading = false;
+                that.isShowFinaceDailog = false;
+              } else {
+                let fileName = "生成[" + that.CurrentOutItem.NewCombinationNum + "]购物店数据.xls";
+                that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
+                  res => {
+                    that.loading = false;
+                    this.isShowFinaceDailog = false;
+                    that.Success("导入成功!");
+                    that.getList();
+                  });
+              }
+            }
+          });
         });
       },
     },
@@ -448,8 +468,8 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      // this.msg.StartDate='';
-      // this.msg.TCNUM='NRTCA08190613A';
+      // this.msg.StartDate = '';
+      // this.msg.TCNUM = 'NRTCA07190704A';
       this.getLineList();
       this.getList();
     },
@@ -464,7 +484,6 @@
 
   .more_td>div {
     height: 40px;
-    /*line-height: 40px;*/
     border-bottom: 1px solid rgb(204, 204, 204);
   }
 

src/components/ShoppingStore/ShoppingReimbursementDetails.vue

@@ -10,14 +10,14 @@
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; ">
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading="loading">
         <tr>
-          <th colspan="6">导游操作</th>
+          <th colspan="5">导游操作</th>
           <th colspan="8">地接OP</th>
         </tr>
         <tr>
           <th width="120" style="display:none;">进店团号</th>
           <th width="180">店名</th>
           <th width="90">公司</th>
-          <th width="120">进店时间</th>
+          <th width="120" style="display:none">进店时间</th>
           <th width="80">进店人数</th>
           <th width="100">总金额</th>
           <th width="100">佣金领取状况</th>
@@ -49,7 +49,7 @@
               {{subItem.BName}} &nbsp;
               <span @click="DeleteItem(subItem)" style="color:blue;cursor:pointer;text-decoration:underline;">删除</span>
             </td>
-            <td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
+            <td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length" style="display:none">
               <el-input v-model="item.ShopDetailsList[0].EnterTime" placeholder="2019-01-01"
                 @change="formatDateTime(item.ShopDetailsList[0].EnterTime,item)"></el-input>
               <!--EnterTime 进店时间-->