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

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -142,14 +142,12 @@
                     {{subItem.Remarks}}
                 </td>
                 <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' style="">
-                  <!-- style="display:none;" -->
                   <div >
-                    <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p>
                     <p style="cursor: pointer;color:blue;margin-top:10px;" @click="CreateHandBill(outItem)">手动生成单据</p>
                   </div>
                 </td>
-
-                <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">   
+                  <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList,outItem)">生成单据</p>
                   <p style="cursor: pointer;color:blue;margin-top:5px;"
                     @click="goHuiZhi(outItem.TCIDs, item.LeaderName, item.GuideName, item.StartCityNames, item.TCNUMS)">
                     选择购物店</p>
@@ -381,32 +379,44 @@
         var that = this;
         this.Confirm('是否生成财务单据？', function () {
           that.loading = true;
-          var array = [];
-          ShopDetailsList.forEach(subItem => {
-            var obj = {
-              LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0,
-              LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "",
-              TCID: subItem.TCID,
-              GuideId: subItem.GuideId != null ? subItem.GuideId : 0,
-              GuideName: subItem.GuideName != null ? subItem.GuideName : "",
-              TCNUM: subItem.TCNUMS,
-            }
-            array.push(obj)
-          });
-          var billMsg = {
-            ShopDetailsList: ShopDetailsList,
-            LeaderGuide: array
+          // var array = [];
+          // ShopDetailsList.forEach(subItem => {
+          //   var obj = {
+          //     LeaderId: subItem.LeaderId != null ? subItem.LeaderId : 0,
+          //     LeaderName: subItem.LeaderName != null ? subItem.LeaderName : "",
+          //     TCID: subItem.TCID,
+          //     GuideId: subItem.GuideId != null ? subItem.GuideId : 0,
+          //     GuideName: subItem.GuideName != null ? subItem.GuideName : "",
+          //     TCNUM: subItem.TCNUMS,
+          //   }
+          //   array.push(obj)
+          // });
+          // var billMsg = {
+          //   ShopDetailsList: ShopDetailsList,
+          //   LeaderGuide: array
+          // };
+          // that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
+          //   that.loading = false;
+          //   if (res.data.resultCode == 1) {
+          //     that.Success(res.data.message);
+          //   } else {
+          //     that.Error(res.data.message);
+          //   }
+          // }, err => {})
+          
+          var nMsg={
+            TCIDs:outItem.TCIDs,
+            uid: that.getLocalStorage().EmployeeId
           };
-          that.apipost('dmcstatistics_post_ShopCreateBill', billMsg, res => {
-            that.loading = false;
-            if (res.data.resultCode == 1) {
-              that.Success(res.data.message);
-            } else {
-              that.Error(res.data.message);
-            }
-          }, err => {})
-        });
+          let fileName = "生成[" + outItem.NewCombinationNum + "]购物店数据.xls";
+           that.GetLocalFile("dmcstatistics_post_ShopCreateBillAndExport", nMsg, fileName,
+            res => {
+              that.loading = false;
+              that.Success("导入成功!");
+              that.getList();
+            });
 
+        });
       },
     },
     mounted() {

src/components/ShoppingStore/ShoppingStore.vue

@@ -1269,13 +1269,28 @@
             uid: that.getLocalStorage().EmployeeId
           };
           let fileName = "生成购物店数据" + that.$commonUtils.getCurrentDate() + ".xls";
-          that.GetLocalFile("ShoppingInfo_Post_ImportAndExport", qMsg, fileName,
+          // that.GetLocalFile("ShoppingInfo_Post_ImportAndExport", qMsg, fileName,
+          //   res => {
+          //     that.tabLoading = false;
+          //     that.fillShow = false;
+          //     that.Success("导入成功!");
+          //     that.getList();
+          //   });
+          that.apipost(
+            "ShoppingInfo_Post_ImportAndExport_V2",
+            qMsg,
             res => {
-              that.tabLoading = false;
-              that.fillShow = false;
-              that.Success("导入成功!");
-              that.getList();
-            });
+              if (res.data.resultCode == 1) {
+                that.tabLoading = false;
+                that.fillShow = false;
+                that.Success("导入成功!");
+                that.getList();
+              } else {
+                that.Error(res.data.message);
+              }
+            },
+            err => {}
+          );
         });
       },
       getDownList() {