页面修改

src/components/FinancialModule/ReportForm/OrderProfitLossList.vue

@@ -11,8 +11,8 @@
     <div class="content">
       <div style="display: flex;flex-direction: row;align-items: center">
         <span>供应商</span>
-        <el-select class="w150" style="margin-left: 10px;" v-model="msg.SupplierId" filterable size="small" placeholder="请选择"
-          @change="msg.pageIndex=1,getDateList()">
+        <el-select class="w150" style="margin-left: 10px;" v-model="msg.SupplierId" filterable size="small"
+          placeholder="请选择" @change="msg.pageIndex=1,getDateList()">
           <el-option :key="0" :value="0" label="全部"></el-option>
           <el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID">
           </el-option>
@@ -24,26 +24,14 @@
           </el-date-picker>
         </div>
         <span style="margin:0 10px">订单号</span>
-         <el-input v-model="msg.OrderNo" placeholder="请输入订单号" @blur='msg.pageIndex=1,getDateList()' style="width:200px" @keyup.enter.native = 'search' clearable></el-input>
+        <el-input v-model="msg.OrderNo" placeholder="请输入订单号" @blur='msg.pageIndex=1,getDateList()' style="width:200px"
+          @keyup.enter.native='search' clearable></el-input>
         <span style="margin:0 10px">商品名称</span>
-        <el-autocomplete
-        style="width:350px"
-          v-model="GoodsIDs"
-          :fetch-suggestions="remoteMethod"
-          placeholder="请输入"
-          @select="forceUpdate"
-          @blur="spget()"
-          :trigger-on-focus="false"
-        ></el-autocomplete>
+        <el-autocomplete style="width:350px" v-model="GoodsIDs" :fetch-suggestions="remoteMethod" placeholder="请输入"
+          @select="forceUpdate" @blur="spget()" :trigger-on-focus="false"></el-autocomplete>
         <span style="margin:0 10px">代理</span>
-        <el-autocomplete
-          v-model="OneUserId"
-          :fetch-suggestions="querySearchAsync"
-          placeholder="请输入"
-          @select="handleSelect"
-           @blur="dlget()"
-          :trigger-on-focus="false"
-        ></el-autocomplete>
+        <el-autocomplete v-model="OneUserId" :fetch-suggestions="querySearchAsync" placeholder="请输入"
+          @select="handleSelect" @blur="dlget()" :trigger-on-focus="false"></el-autocomplete>
 
       </div>
     </div>
@@ -53,7 +41,7 @@
         <div class="Subtotal_item" style="margin:15px">
           <div style='width:100%;border-bottom:1px solid #f2f2f2'>
             <i class="iconfont icon-qian groupTourOrder_count_green" style="font-size:12px"></i>
-            <span class='Subtotal_t' >营业收入</span>
+            <span class='Subtotal_t'>营业收入</span>
           </div>
           <div><span class='Subtotal_t'>结算款：</span>￥{{OrderProfitLoss.TotalFinal_Price}}</div>
           <div><span class='Subtotal_t'>运费：</span>￥{{OrderProfitLoss.TotalFreightMoney }}</div>
@@ -64,7 +52,7 @@
         <div class="Subtotal_item" style="margin:15px">
           <div style='width:100%;border-bottom:1px solid #f2f2f2'>
             <i class="iconfont icon-qian groupTourOrder_count_green" style="font-size:12px"></i>
-              <span class='Subtotal_t' >营业成本</span>
+            <span class='Subtotal_t'>营业成本</span>
           </div>
           <div class="ProfitLoss">
             <div class="ProfitLoss_xbox">
@@ -98,7 +86,7 @@
     </div>
     <el-table :data="tableData" v-loading="loading" header-cell-class-name="headClass" style="width: 100%" border>
       <el-table-column label="商品信息" align="center">
-          <el-table-column label="订单号" prop="OrderNo" width="150" :show-overflow-tooltip='true' ></el-table-column>
+        <el-table-column label="订单号" prop="OrderNo" width="150" :show-overflow-tooltip='true'></el-table-column>
         <el-table-column label="规格" width="100" :show-overflow-tooltip='true'>
           <template slot-scope="scope">
             {{scope.row.GoodsName}}{{scope.row.Specification}}
@@ -110,7 +98,7 @@
         <el-table-column label="供应商" prop="SupplierName" width="150" :show-overflow-tooltip='true'></el-table-column>
       </el-table-column>
 
-        <el-table-column label="营业收入" align="center" >
+      <el-table-column label="营业收入" align="center">
         <el-table-column label="结算款" prop="Final_Price" width="70"></el-table-column>
         <el-table-column label="运费" prop="FreightMoney" width="70"></el-table-column>
         <el-table-column label="已收" prop="AllPrice" width="70"></el-table-column>
@@ -131,7 +119,7 @@
         <el-table-column label="商品运费摊销" prop="GoodsFreight" width="70"></el-table-column>
 
         <el-table-column label="总公司返佣" prop="GeneralAgentCommission" width="70"></el-table-column>
-          <el-table-column label="总公司名称" prop="GeneralAgentName"   :show-overflow-tooltip='true' ></el-table-column>
+        <el-table-column label="总公司名称" prop="GeneralAgentName" :show-overflow-tooltip='true'></el-table-column>
         <el-table-column label="分公司返佣" prop="BranchCommission" width="70"></el-table-column>
         <el-table-column label="分公司名称" prop="BranchName" :show-overflow-tooltip='true'></el-table-column>
         <el-table-column label="特一级返佣" prop="SpecialCommission" width="70"></el-table-column>
@@ -170,19 +158,19 @@
           SupplierId: 0,
           StartDate: '',
           EndDate: '',
-          OrderNo:'',//订单号
-          GoodsID:0,
-          OneUserId:0,
+          OrderNo: '', //订单号
+          GoodsID: 0,
+          OneUserId: 0,
         },
 
         options: [],
         tableData: [],
-        searchList:[],
+        searchList: [],
         count: 0,
         loading: false,
-        GoodsIDs:'',//商品id
-        OneUserId:'',//代理
-        OrderProfitLoss:{},//小计
+        GoodsIDs: '', //商品id
+        OneUserId: '', //代理
+        OrderProfitLoss: {}, //小计
       }
     },
     created() {
@@ -216,7 +204,7 @@
           }
         });
       },
-      getTotalOrderProfitLoss(){
+      getTotalOrderProfitLoss() {
         this.mallapipost("/api/LiveHouse/GetTotalOrderProfitLoss", {}, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
@@ -237,83 +225,83 @@
           "损益核算.xls"
         );
       },
-       remoteMethod(query,cb) {
-         let results=[]
-            if (query !== '' && query.length>=2) {
-
-                this.mallapipost("/api/LiveHouse/GetGoodsList",{ Name:query },res => {
+      remoteMethod(query, cb) {
+        let results = []
+        if (query !== '' && query.length >= 2) {
+          this.mallapipost("/api/LiveHouse/GetGoodsList", {
+            Name: query
+          }, res => {
             if (res.data.resultCode == 1) {
-                      console.log(res)
               res.data.data.forEach(x => {
-                        let obj={
-                          value:x.Name,
-                          Id:x.Id
+                let obj = {
+                  value: x.Name,
+                  Id: x.Id
                 }
                 results.push(obj)
               });
 
             }
-                },err => {});
-            }else{
-                this.msg.GoodsID=0
-                this.msg.pageIndex=1
+          }, err => {});
+        } else {
+          this.msg.GoodsID = 0
+          this.msg.pageIndex = 1
           this.getDateList();
         }
         cb(results);
       },
-        forceUpdate(item){
-               if(item){
+      forceUpdate(item) {
+        if (item) {
           this.msg.GoodsID = item.Id;
-                  }else{
-                  this.msg.GoodsID=0
+        } else {
+          this.msg.GoodsID = 0
         }
-            this.msg.pageIndex=1
+        this.msg.pageIndex = 1
         this.getDateList();
       },
-        spget(){
-          console.log(this.GoodsIDs)
-            if(this.GoodsIDs==''){
-              this.msg.GoodsID=0
-                this.msg.pageIndex=1
+      spget() {
+        if (this.GoodsIDs == '') {
+          this.msg.GoodsID = 0
+          this.msg.pageIndex = 1
           this.getDateList();
         }
       },
-        querySearchAsync(queryString,cb){
-          let results=[]
-           if (queryString !== '' && queryString.length>=1) {
-                this.mallapipost("/api/LiveHouse/GetDistributorInfoList",{ Name:queryString },res => {
+      querySearchAsync(queryString, cb) {
+        let results = []
+        if (queryString !== '' && queryString.length >= 1) {
+          this.mallapipost("/api/LiveHouse/GetDistributorInfoList", {
+            Name: queryString
+          }, res => {
             if (res.data.resultCode == 1) {
 
-                          res.data.data.forEach((x)=>{
+              res.data.data.forEach((x) => {
                 let obj = {
-                                value:x.Name,
-                                UserId:x.UserId,
+                  value: x.Name,
+                  UserId: x.UserId,
                 }
                 results.push(obj)
               })
             }
-                },err => {});
-           }else{
-              this.msg.OneUserId=0
-              this.msg.pageIndex=1
+          }, err => {});
+        } else {
+          this.msg.OneUserId = 0
+          this.msg.pageIndex = 1
           this.getDateList();
         }
         cb(results);
       },
-        handleSelect(item){
-           if(item){
+      handleSelect(item) {
+        if (item) {
           this.msg.OneUserId = item.UserId;
-           }else{
-             this.msg.OneUserId=0
+        } else {
+          this.msg.OneUserId = 0
         }
-            this.msg.pageIndex=1
+        this.msg.pageIndex = 1
         this.getDateList();
       },
-        dlget(){
-           console.log(this.OneUserId)
-            if(this.OneUserId==''){
-              this.msg.OneUserId=0
-                this.msg.pageIndex=1
+      dlget() {
+        if (this.OneUserId == '') {
+          this.msg.OneUserId = 0
+          this.msg.pageIndex = 1
           this.getDateList();
         }
       },
@@ -327,7 +315,7 @@
           this.msg.StartDate = '';
           this.msg.EndDate = '';
         }
-        this.msg.pageIndex=1;
+        this.msg.pageIndex = 1;
         this.getDateList();
       },
     }
@@ -397,23 +385,29 @@
   .OrderProfitLossList .el-input__icon {
     line-height: 24px;
   }
-.OrderProfitLossList .el-table td, .el-table th{
+
+  .OrderProfitLossList .el-table td,
+  .el-table th {
     padding: 3px 0;
-}
-.OrderProfitLossList .el-table{
+  }
+
+  .OrderProfitLossList .el-table {
     font-size: 13px;
-}
-.OrderProfitLossList .el-select__tags-text {
+  }
+
+  .OrderProfitLossList .el-select__tags-text {
     display: inline-block;
     width: 40px;
     overflow: hidden;
-      text-overflow:ellipsis;
+    text-overflow: ellipsis;
     white-space: nowrap;
-}
-.OrderProfitLossList .el-select__tags{
+  }
+
+  .OrderProfitLossList .el-select__tags {
     max-width: 400px;
-}
-.OrderProfitLossList .Subtotal{
+  }
+
+  .OrderProfitLossList .Subtotal {
     width: 100%;
     margin: 10px 0;
     display: flex;
@@ -421,32 +415,37 @@
     align-items: center;
     background: #f2f2f2;
     font-size: 12px;
-}
-.OrderProfitLossList .Subtotal_item{
+  }
+
+  .OrderProfitLossList .Subtotal_item {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     margin-left: 50px;
     background: #fff;
     padding: 20px;
-}
-.OrderProfitLossList .Subtotal_item .Subtotal_t{
+  }
+
+  .OrderProfitLossList .Subtotal_item .Subtotal_t {
     margin: 3px 0;
     font-size: 12px;
     width: 90px;
     display: inline-block;
-}
-.OrderProfitLossList .ProfitLoss{
+  }
+
+  .OrderProfitLossList .ProfitLoss {
     display: flex;
     flex-direction: row;
     align-items: center;
     background: #fff;
-}
-.OrderProfitLossList .ProfitLoss_xbox{
+  }
+
+  .OrderProfitLossList .ProfitLoss_xbox {
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     align-items: flex-start;
     background: #fff;
-}
+  }
+
 </style>

src/components/WebSet/WebSiteService.vue

@@ -287,7 +287,6 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data.pageData;
-              console.log("this.data", this.dataList);
               this.total = res.data.data.count
             } else {
               this.loading = false;

src/components/WebSet/WebSiteUpdate.vue

@@ -70,7 +70,6 @@
       },
       //新增、修改广告
       saveData() {
-          console.log("post",this.postMsg);
         this.apipost(
           "ws_post_SetPage", this.postMsg,
           res => {