Browse Source

销售报表修改

lucky 2 years ago
parent
commit
53165bc5fe

+ 8 - 10
src/apis/service/reportQuery/saleReport/index.js

@@ -64,20 +64,18 @@ export default {
   saleexportsalediff: (data, params) => http(api + "saleexportsalediff", data, "post", params),
   //工差明细表导出
   saleexportsalediffexport: (data, params) => http(api + "saleexportsalediffexport", data, "post", params),
-
-
-
-
-
-
   //退货明细表
-  reportgoodonlinelist: (data, params) => http(api + "reportgoodonlinelist", data, "post", params),
+  saleexportthdata: (data, params) => http(api + "saleexportthdata", data, "post", params),
   //退货明细表导出
-  reportgoodonlineexport: (data, params) => http(api + "reportgoodonlineexport", data, "post", params),
+  saleexportthdataexport: (data, params) => http(api + "saleexportthdataexport", data, "post", params),
   //售后明细表
-  reportgoodofflinelist: (data, params) => http(api + "reportgoodofflinelist", data, "post", params),
+  seord: (data, params) => http(api + "seord", data, "post", params),
   //售后明细表导出
-  reportgoodofflineexport: (data, params) => http(api + "reportgoodofflineexport", data, "post", params),
+  seorde: (data, params) => http(api + "seorde", data, "post", params),
+
+
+
+
   //议价明细表
   reportchangeloglist: (data, params) => http(api + "reportchangeloglist", data, "post", params),
   //议价明细表导出

+ 47 - 53
src/views/reportQuery/saleReport/components/columns.js

@@ -1050,16 +1050,6 @@ const table11 = [
 
 ]
 
-
-
-//__________________________________下方数据没更新
-
-
-
-
-
-
-
 //退货明细表
 const table12 = [
   // {
@@ -1074,92 +1064,92 @@ const table12 = [
     _noset_: true
   },
   {
-    prop: "updatetime",
+    prop: "return_time",
     label: "退货时间",
     minWidth: "155px",
   },
   {
-    prop: "company_name",
+    prop: "thCode",
     label: "退货单号",
     minWidth: "155px",
   },
   {
-    prop: "creater",
+    prop: "outCode",
     label: "发货申请单编码",
     minWidth: "155px",
   },
   {
-    prop: "skuCode",
+    prop: "status",
     label: "退货单状态",
     minWidth: "155px",
   },
   {
-    prop: "spuCode",
+    prop: "apply_name",
     label: "创建人",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
-    label: "部门",
+    prop: "apply_company",
+    label: "创建人所属部门",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "orderCode",
     label: "确认单编号",
     minWidth: "155px",
   },
   {
-    prop: "spuCode",
+    prop: "addtime",
     label: "下单日期",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
+    prop: "companyName",
     label: "客户名称",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "good_name",
     label: "产品名称",
     minWidth: "155px",
   },
   {
-    prop: "spuCode",
+    prop: "sale_price",
     label: "单价",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
+    prop: "wsend_num",
     label: "未发货数量",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "th_num",
     label: "退货数量",
     minWidth: "155px",
   },
   {
-    prop: "spuCode",
+    prop: "th_fee",
     label: "退货销售货款",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
+    prop: "contactor",
     label: "发货单联系人",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "mobile",
     label: "发货单联系人电话",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "addr",
     label: "发货单地址",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "result_desc",
     label: "退货原因",
     minWidth: "155px",
   },
@@ -1184,105 +1174,109 @@ const table13 = [
     minWidth: "155px",
   },
   {
-    prop: "company_name",
+    prop: "returnCode",
     label: "售后申请编号",
     minWidth: "155px",
   },
   {
-    prop: "creater",
+    prop: "apply_name",
     label: "申请人",
     minWidth: "155px",
   },
   {
-    prop: "code",
+    prop: "apply_company",
     label: "部门",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
+    prop: "outCode",
     label: "发货申请编号",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "total_num",
     label: "发货数量",
     minWidth: "155px",
   },
   {
-    prop: "code",
+    prop: "status",
     label: "处理状态",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
+    prop: "orderCode",
     label: "订单号",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "first_customer_org",
     label: "一级组织",
     minWidth: "155px",
   },
   {
-    prop: "code",
+    prop: "second_customer_org",
     label: "二级组织",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
+    prop: "companyName",
     label: "客户名称",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "good_name",
     label: "商品名称",
     minWidth: "155px",
   },
   {
-    prop: "code",
+    prop: "sale_price",
     label: "销售单价",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
+    prop: "error_total_price",
     label: "异常金额",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "is_receive",
     label: "收货情况",
     minWidth: "155px",
   },
   {
-    prop: "code",
+    prop: "error_num",
     label: "异常数量",
     minWidth: "155px",
   },
   {
-    prop: "good_name",
+    prop: "result_desc",
     label: "异常原因",
     minWidth: "155px",
   },
   {
-    prop: "name",
+    prop: "error_remark",
     label: "异常备注",
     minWidth: "155px",
   },
   {
-    prop: "code",
+    prop: "except_code",
     label: "期望意愿",
     minWidth: "155px",
   },
-  {
-    prop: "good_name",
-    label: "状态(是否完结)",
-    minWidth: "155px",
-  },
  
-  
 ]
 
 
+
+//__________________________________下方数据没更新
+
+
+
+
+
+
+
+
 //议价明细表
 const table14 = [
   // {

+ 11 - 10
src/views/reportQuery/saleReport/components/table12.vue

@@ -70,12 +70,13 @@
                   "
                 >
                     <el-option label="待业务审批" value="1"></el-option>
-                    <el-option label="待专员审批" value="2"></el-option>
-                    <el-option label="待主管审批" value="3"></el-option>
-                    <el-option label="退货完成" value="4"></el-option>
-                    <el-option label="业务驳回" value="5"></el-option>
-                    <el-option label="采购驳回" value="6"></el-option>
-                    <el-option label="专员审批不通过" value="7"></el-option>
+                    <el-option label="待采购审核" value="2"></el-option>
+                    <el-option label="待设置仓库" value="3"></el-option>
+                    <el-option label="待客户退货" value="4"></el-option>
+                    <el-option label="售后已完成" value="5"></el-option>
+                    <el-option label="业务已驳回" value="6"></el-option>
+                    <el-option label="采购已驳回" value="7"></el-option>
+                    <el-option label="申请已取消" value="8"></el-option>
                 </el-select>
               </el-col>
               
@@ -155,7 +156,7 @@ export default {
     };
   },
   mounted() {
-    alert("从这里开始之后的报表,导出名称、接口、未更新")
+    
     this.searchList();
   },
 
@@ -172,7 +173,7 @@ export default {
       // return;
       this.loading = true;
       
-      const res = await asyncRequest.reportconsultinfobidssumnot(this.parmValue);
+      const res = await asyncRequest.saleexportthdata(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
@@ -252,7 +253,7 @@ export default {
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/reportconsultinfobidssumnotexport",
+          url: this.fileUrl + "admin/saleexportthdataexport",
           responseType: "blob",
           data: model,
           headers: {
@@ -275,7 +276,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "未采反信息.zip";
+              let excelName = "退货明细表.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

+ 12 - 8
src/views/reportQuery/saleReport/components/table13.vue

@@ -69,10 +69,14 @@
                     searchList();
                   "
                 >
-                    <el-option label="待审核" value="0"></el-option>
-                    <el-option label="待物流反馈" value="1"></el-option>
-                    <el-option label="待退货" value="2"></el-option>
-                    <el-option label="已退货" value="3"></el-option>
+                    <el-option label="待业务审批" value="1"></el-option>
+                    <el-option label="待采购审核" value="2"></el-option>
+                    <el-option label="待设置仓库" value="3"></el-option>
+                    <el-option label="待客户退货" value="4"></el-option>
+                    <el-option label="售后已完成" value="5"></el-option>
+                    <el-option label="业务已驳回" value="6"></el-option>
+                    <el-option label="采购已驳回" value="7"></el-option>
+                    <el-option label="申请已取消" value="8"></el-option>
                 </el-select>
               </el-col>
               
@@ -152,7 +156,7 @@ export default {
     };
   },
   mounted() {
-    // alert("未采反信息:接口暂无数据,以此提示")
+    
     this.searchList();
   },
 
@@ -169,7 +173,7 @@ export default {
       // return;
       this.loading = true;
       
-      const res = await asyncRequest.reportconsultinfobidssumnot(this.parmValue);
+      const res = await asyncRequest.seord(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
@@ -249,7 +253,7 @@ export default {
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/reportconsultinfobidssumnotexport",
+          url: this.fileUrl + "admin/seorde",
           responseType: "blob",
           data: model,
           headers: {
@@ -272,7 +276,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "未采反信息.zip";
+              let excelName = "售后明细表.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

+ 1 - 1
src/views/reportQuery/saleReport/components/table14.vue

@@ -165,7 +165,7 @@ export default {
     };
   },
   mounted() {
-
+alert("从这里开始之后的报表,导出名称、接口、未更新")
     this.searchList();
   },