save

src/components/dev/payroll.vue

@@ -61,6 +61,11 @@
                     {{scope.row.ProfitMoney}}
                     </template>
                 </el-table-column>
+                <el-table-column label="总销售额">
+                    <template slot-scope="scope">
+                    {{scope.row.SalesMoney?scope.row.SalesMoney:'-'}}
+                    </template>
+                </el-table-column>
                 <el-table-column label="引流数量">
                     <template slot-scope="scope">
                     {{scope.row.EmpType == 1 ? '-' : scope.row.LureNum}}

src/components/myOrdersAllType/components/allList.vue

@@ -70,7 +70,7 @@
             <div class="tools">
                 <h1> {{pagesTitle=='销售'?'订单管理':'订单统计管理'}}</h1>
                 <div class="rightmenu">
-                    <!-- <el-button size="mini" type="primary" @click="downLoadExcel">导出</el-button> -->
+                    <el-button size="mini" type="primary" @click="downLoadExcel">导出</el-button>
                 </div>
             </div>
             <div class="query-box">
@@ -537,10 +537,13 @@
               .catch(() => {});
             return;
           }
-          this.GetLocalFile(
-            "/api/Order/GetGuestOrderStatisticsToExcel",
-            this.msg,
-            "订单表.xls"
+          let userInfo = this.getLocalStorage();
+          let msg = JSON.parse(JSON.stringify(this.msg))
+          msg.uid = userInfo.EmployeeId
+          this.GetLocalFile2(
+            "GuestOrder_post_GetDownLodGuestOrderStatisticsList",
+            msg,
+            "订单统计表.xls"
           );
         },
         // 清空下拉

src/components/myOrdersAllType/components/orderList.vue

@@ -57,6 +57,16 @@
             label="引流"
             show-overflow-tooltip>
         </el-table-column>
+        <el-table-column
+            label="提成"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span :class="{'red font-color-link':pagesTitle!='详情'&&scope.row.Commission>0}"  
+                @click="pagesTitle!='详情'&&scope.row.Commission>0?commissionDetails(scope.row):''">
+                {{scope.row.Commission>0?scope.row.Commission:'-'}}
+              </span>
+            </template>
+        </el-table-column>
         <el-table-column 
             label="商品名称"
             show-overflow-tooltip>

src/plugins/index.js

@@ -11,7 +11,51 @@ export default {
                 return process.env.NODE_ENV !== 'development';
             },
             //域名管理对象
+<<<<<<< HEAD
             Vue.prototype.domainManager = domainManager,
+=======
+            Vue.prototype.domainManager = function() {
+                //CRM API
+                let domainUrl = "";
+                // domainUrl = "http://192.168.10.128:8500";
+                domainUrl = "http://192.168.10.9:8098";
+                // domainUrl = "http://192.168.10.226";
+                // domainUrl = "http://crm.oytour.com"
+                //domainUrl = "http://localhost:5003";
+                let locationName = window.location.hostname;
+                //旅游ERPApi
+                let domainPostUrl = ""
+                domainPostUrl = "http://192.168.10.9:8083";
+                // domainPostUrl = "http://192.168.10.226";
+                // domainPostUrl = "http://192.168.10.128";
+                if (this.isOnline()) {
+                    if (window.location.host.indexOf('fcrmyx.oytour.com') != -1) {
+                        domainUrl = "http://crm.oytour.com"
+                        domainPostUrl = "http://reborn.oytour.com"
+                    } else {
+                        domainUrl = "http://testcrm.oytour.com"
+                        domainPostUrl = "http://testapi.oytour.com"
+                    }
+                }
+                var obj = {
+                    //主地址
+                    DomainUrl: domainUrl,
+                    DownLoadContractUrl: domainPostUrl,
+                    //阿里服务器地址
+                    AliUrl: "https://reborndev.oss-cn-hangzhou.aliyuncs.com",
+                    //CRMApi地址 
+                    PostUrl: domainUrl,
+                    //旅游ERPApi地址
+                    ERPApiUrl: domainPostUrl + "/api/common/post",
+                    ERPApiUrlFile: domainPostUrl + "/api/file/GetFileFromWebApi",
+                    javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.10.215:9000",
+                    ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130',
+                    UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.10.214:8120",
+                    erpRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://yx.oytour.com/#/" : "http://localhost:8080/#/"// "http://www.test.com:8081/#/",
+                };
+                return obj;
+            },
+>>>>>>> 4769089d22bbfc75e9251c430b64c85c4493d5aa
 
             //消息成功提示
             Vue.prototype.Success = function(msg) {
@@ -316,5 +360,53 @@ export default {
                     console.log("GetLocalFile", res);
                 });
             }
+            //erp下载文件
+            Vue.prototype.GetLocalFile2 = function(cmd, msg, fileName, callBack) {
+                if (msg == null || msg == "") {
+                    msg = {}
+                }
+                var apiurl = this.domainManager().ERPApiUrlFile;
+                var timestamp = (new Date()).valueOf();
+                var token = "";
+                var key = "";
+                if (this.getLocalStorage() != null) {
+                    token = this.getLocalStorage().token;
+                    key = this.getLocalStorage().SecretKey;
+                }
+                var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+                var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+                var postData = {
+                    "cmd": cmd,
+                    "msg": msg,
+                    "timestamp": timestamp,
+                    "token": token,
+                    "sign": md5Str
+                }
+                this.$http.post(apiurl, postData, {
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Referer-Viitto': this.$route.path,
+                    },
+                    responseType: 'blob'
+                }).then((res) => {
+                    let blob = new Blob([res.data], {
+                        type: "application/vnd.ms-excel"
+                    })
+                    let url = URL.createObjectURL(blob);
+                    let link = document.createElement('a');
+                    link.href = url;
+                    link.setAttribute("download", fileName);
+                    document.body.appendChild(link);
+                    link.click();
+                    if (callBack) {
+                        var result = {
+                            Code: 1
+                        };
+                        callBack(result);
+                    }
+                }).catch(function(res) {
+                    console.log("GetLocalFile", res);
+                });
+            }
     }
 }
\ No newline at end of file