Merge branch 'sit' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into sit

src/apis/service/goodStore/goodsCost/index.js

@@ -33,5 +33,7 @@ export default {
 
    //同一个spuCode下所有的商品都下线
    goodupoffline: (data, params) => http(api + "goodupoffline", data, "post", params),
+   // 异常原因列表
+  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
 
 };

src/apis/service/goodStore/goodsOnline/index.js

@@ -42,6 +42,8 @@ export default {
   //商品上线审核时、驳回重新审核
 
   goodupreject: (data, params) => http(api + "goodupreject", data, "post", params),
+  // 异常原因列表
+  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
 
  
 

src/views/goodStore/goodsCost/index.vue

@@ -146,9 +146,8 @@
                   <el-option label="商品编号" value="1" />
                   <el-option label="商品名称" value="2" />
                   <el-option label="业务企业编号" value="3" />
-                  <el-option label="供应商编号" value="4" /> 
-                  <el-option label="创建人部门" value="5" /> 
-                  </el-select
+                  <el-option label="供应商编号" value="4" />
+                  <el-option label="创建人部门" value="5" /> </el-select
               ></el-input>
             </el-col>
 
@@ -240,8 +239,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            
-            @click="getRouter('goodsCostDetail', scope.row.spuCode )"
+            @click="getRouter('goodsCostDetail', scope.row.spuCode)"
           ></i>
         </el-tooltip>
         <el-tooltip
@@ -256,7 +254,6 @@
             class="el-icon-download tb-icon"
             @click="showDonlineDlg(scope.row.spuCode)"
           ></i>
-          
         </el-tooltip>
         <el-tooltip
           v-if="
@@ -361,18 +358,22 @@
         class="demo-ruleForm"
         label-width="80px"
       >
-        
-        <el-form-item label="下线原因" prop="offline_remark">
+        <el-form-item label="下线原因" prop="offline_reason">
           <el-select
-            v-model="donline_form.offline_remark"
+            v-model="donline_form.offline_reason"
             placeholder="请选择下线原因"
           >
-            <el-option :label="item.label" :value="item.value" v-for="item in donline_formStOps" :key="item.value"></el-option>
+            <el-option
+              :label="item.result"
+              :value="item.result_code"
+              v-for="item in donline_formStOps"
+              :key="item.result_code"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="下线备注" prop="offline_reason">
+        <el-form-item label="下线备注" prop="offline_remark">
           <el-input
-            v-model="donline_form.offline_reason"
+            v-model="donline_form.offline_remark"
             type="textarea"
             placeholder="请输入下线备注"
             autocomplete="off"
@@ -432,18 +433,19 @@ export default {
     };
     return {
       dialogFormVisible: false,
-      donline_formStOps:[
-        {value:"1",label:"库存不足"},
-        {value:"2",label:"商品原因"},
-      ],
+      donline_formStOps: [],
       donline_form: {
         offline_reason: "",
         offline_remark: "",
         spuCode: "",
       },
       donline_rules: {
-        offline_reason: [{ validator: validate, required: true, trigger: "blur" }],
-        offline_remark: [{ validator: validate, required: true, trigger: "change" }],
+        offline_reason: [
+          { validator: validate, required: true, trigger: "blur" },
+        ],
+        offline_remark: [
+          { validator: validate, required: true, trigger: "blur" },
+        ],
       },
       statusList: [
         {
@@ -543,53 +545,69 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue)
-      const {page,size}=this.parmValue;
+      console.log(this.parmValue);
+      const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
-      if(this.parmValue.brandid.length>0){
-        this.brandid = [this.parmValue.brandid] ;
+      if (this.parmValue.brandid.length > 0) {
+        this.brandid = [this.parmValue.brandid];
       }
-      
-       this.pageInfo= {
+
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
       //多选条件
-    this.select = this.parmValue.select;
-    // this.sselect = this.parmValue.sselect;
-    this.sinput = this.parmValue.sinput
-
-    }else{
-       this.select = "1";
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.sinput = this.parmValue.sinput;
+    } else {
+      this.select = "1";
       //  this.sselect = "创建时间"
     }
     this.select = "1";
     this.supplierNo = [];
-    
+
     this.searchList();
   },
   methods: {
-    getRouter(toRouter, queryId){
+    // 获取异常原因下拉列表
+    async getresultlist() {
+      const res = await asyncRequest.resultlist({
+        page: 1,
+        size: 100,
+        type: "8",
+        status: "3",
+      });
+      if (res && res.code === 0 && res.data) {
+        const { list } = res.data;
+        this.donline_formStOps = list;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+    getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
           id: queryId,
-          type: 'view',
+          type: "view",
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select ;
+        this.parmValue.select = this.select;
         // this.parmValue.sselect = this.sselect ;
-        this.parmValue.sinput= this.sinput;
+        this.parmValue.sinput = this.sinput;
         //
-        console.log(this.parmValue)
-         let routerModel = {
+        console.log(this.parmValue);
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程！");
@@ -597,7 +615,7 @@ export default {
     },
     restSearch() {
       this.select = "1";
-      this.sinput = ""
+      this.sinput = "";
       this.supplierNo = [];
       this.brandid = [];
       // 表格 - 分页
@@ -670,7 +688,6 @@ export default {
     },
     //商品品牌选择
     async brandidsearchChange(e) {
-     
       const { id, code, label } = e;
       if (id) {
         this.brandid = [id];
@@ -827,6 +844,7 @@ export default {
         this.tableData = [];
         this.pageInfo.total = 0;
       }
+      this.getresultlist();
       this.loading = false;
     },
     //商品分类选择
@@ -857,7 +875,7 @@ export default {
       }
       this.showModel = true;
     },
-//点击下线
+    //点击下线
     async showDonlineDlg(spuCode) {
       this.dialogFormVisible = true;
       this.donline_form.spuCode = spuCode;
@@ -876,44 +894,51 @@ export default {
       });
     },
 
-   async get_donline(spuCode){
-      await this.$confirm(`本次操作会下线本条SKU下的所有商品`, "提示",{
+    async get_donline(spuCode) {
+      await this.$confirm(`本次操作会下线本条SKU下的所有商品`, "提示", {
         // cancelButtonClass:"lzx_BtnErr",
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
         center: true,
-      }).then(async()=>{
-        await this.$confirm(`确定要下线商品？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
       })
         .then(async () => {
-          this.loading = true;
-          const model = this.donline_form;
-          const res = await asyncRequest.goodupoffline(model);
-          if (res && res.code === 0) {
-            this.loading = false;
-            this.$notify.success({
-              title: res.message,
-              message: "",
+          await this.$confirm(`确定要下线商品？`, {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(async () => {
+              this.loading = true;
+              const model = this.donline_form;
+              const res = await asyncRequest.goodupoffline(model);
+              if (res && res.code === 0) {
+                this.loading = false;
+                this.$notify.success({
+                  title: res.message,
+                  message: "",
+                });
+                await this.searchList();
+              } else if (res && res.code >= 100 && res.code <= 104) {
+                await this.logout();
+              } else {
+                this.loading = false;
+                this.$message.warning(res.message);
+              }
+              this.donline_form = {
+                offline_reason: "",
+                offline_remark: "",
+                skuCode: "",
+              };
+            })
+            .catch(() => {
+              console.log("取消1");
             });
-            await this.searchList();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.loading = false;
-            this.$message.warning(res.message);
-          }
         })
-        .catch(() => {
-          console.log("取消1");
+        .catch(async () => {
+          console.log("取消");
         });
-      }).catch(async()=>{
-        console.log("取消");
-      })
-    }
+    },
   },
 };
 </script>

src/views/goodStore/goodsOnline/index.vue

@@ -293,18 +293,22 @@
         class="demo-ruleForm"
         label-width="80px"
       >
-        
-        <el-form-item label="下线原因" prop="offline_remark">
+        <el-form-item label="下线原因" prop="offline_reason">
           <el-select
-            v-model="donline_form.offline_remark"
+            v-model="donline_form.offline_reason"
             placeholder="请选择下线原因"
           >
-            <el-option :label="item.label" :value="item.value" v-for="item in donline_formStOps" :key="item.value"></el-option>
+            <el-option
+              :label="item.result"
+              :value="item.result_code"
+              v-for="item in donline_formStOps"
+              :key="item.result_code"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="下线备注" prop="offline_reason">
+        <el-form-item label="下线备注" prop="offline_remark">
           <el-input
-            v-model="donline_form.offline_reason"
+            v-model="donline_form.offline_remark"
             type="textarea"
             placeholder="请输入下线备注"
             autocomplete="off"
@@ -418,20 +422,20 @@ export default {
       }
     };
     return {
-      
       dialogFormVisible: false,
-      donline_formStOps:[
-        {value:"1",label:"库存不足"},
-        {value:"2",label:"商品原因"},
-      ],
+      donline_formStOps: [],
       donline_form: {
         offline_reason: "",
         offline_remark: "",
         skuCode: "",
       },
       donline_rules: {
-        offline_reason: [{ validator: validate, required: true, trigger: "blur" }],
-        offline_remark: [{ validator: validate, required: true, trigger: "change" }],
+        offline_reason: [
+          { validator: validate, required: true, trigger: "blur" },
+        ],
+        offline_remark: [
+          { validator: validate, required: true, trigger: "blur" },
+        ],
       },
       fileUrl: urlConfig.baseURL,
       ruleForm: {
@@ -532,6 +536,23 @@ export default {
     this.searchList();
   },
   methods: {
+    // 获取异常原因下拉列表
+    async getresultlist() {
+      const res = await asyncRequest.resultlist({
+        page: 1,
+        size: 100,
+        type: "8",
+        status: "3",
+      });
+      if (res && res.code === 0 && res.data) {
+        const { list } = res.data;
+        this.donline_formStOps = list;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
     // 时间函数
     async time(e) {
       this.ruleForm.start_date = e.startTime || "";
@@ -783,10 +804,9 @@ export default {
             skuCode: skuCode,
             exam_status: "8",
           };
-          let model = {...this.donline_form,...obj}
-          console.log("aaaaa",model)
-  
-    
+          let model = { ...this.donline_form, ...obj };
+          console.log("aaaaa", model);
+
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
             this.loading = false;
@@ -801,6 +821,11 @@ export default {
             this.loading = false;
             this.$message.warning(res.message);
           }
+          this.donline_form = {
+            offline_reason: "",
+            offline_remark: "",
+            skuCode: "",
+          };
         })
         .catch(() => {
           console.log("取消");
@@ -907,6 +932,7 @@ export default {
         this.tableData = [];
         this.pageInfo.total = 0;
       }
+      this.getresultlist();
       this.loading = false;
     },
     //商品分类选择

src/views/process/columns.js

@@ -61,6 +61,12 @@ const routerList = [
     toRouter: "/goodStore/goodsOnlineDetail",
     to: "code",
   },
+  {
+    name: "商品下线流程",
+    type: "GOL",
+    toRouter: "/goodStore/goodsOfflineDetail",
+    to: "id",
+  },
   {
     name: "活动流程",
     type: "HD",

src/views/process/oing/index.vue

@@ -176,7 +176,7 @@ export default {
     }
     this.searchList();
 
-    // this.searchProList();
+    this.searchProList();
   },
   methods: {
     getRouter(row) {

src/views/process/unRead/index.vue

@@ -281,6 +281,8 @@ export default {
     },
 
     async wentRead(item) {
+      // console.log(item)
+      // return;
       const { toRouter, queryId, id } = item;
       const { code, data, message } = await asyncRequest.detail({ id: id });
       if (code === 0) {
@@ -299,6 +301,8 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
+              // console.log("2222222222",this.tableData)
+
         this.tableData.forEach((v, i) => {
           let index = this.process_router_list.findIndex(
             (y) => y.type === v.order_type
@@ -309,12 +313,15 @@ export default {
             this.tableData[i].toRouter = toRouter;
             this.tableData[i].queryId =
               to == "code" ? v.order_code : v.order_id;
+
+             
           } else {
             this.tableData[i].process_name = "";
             this.tableData[i].toRouter = "";
             this.tableData[i].queryId = "";
           }
         });
+        //  console.log("1111111111",this.process_router_list)
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/reportQuery/test/columns.js

@@ -1,4 +1,11 @@
+//筛选数据
 const schTahead = [
+  // {
+  //  这个不做筛选、列表渲染需要这个字段
+  //   prop: "xiugai",
+  //   label: "流程编号",
+  //   t1:"方便统一修改、留存",
+  // },
   {
     prop: "xiugai1",
     label: "采购单号",
@@ -62,174 +69,85 @@ const schTahead = [
 
 ]
 
-
-
-//日报
-const table1 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "creater",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "creater_company",
-    label: "创建人部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "consult_num",
-    label: "当日竞价单数量",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "consult_money",
-    label: "当日竞价单金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_num",
-    label: "当日下单数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_money",
-    label: "当日下单金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "receipt_num",
-    label: "当日签收数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "receipt_money",
-    label: "当日签收金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "invoice_num",
-    label: "当日申报发票数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "invoice_money",
-    label: "当日申报发票金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "after_sales_num",
-    label: "单日售后单数",
-    minWidth: "155px",
-  },
-  {
-    prop: "after_sales_money",
-    label: "单日售后金额",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "payment_num",
-    label: "当日回款单数",
-    minWidth: "155px",
-  },
-  {
-    prop: "payment_money",
-    label: "当日回款金额",
-    minWidth: "155px",
-  },
-
-]
-//竞价单报表
-const table2 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    prop: "creater",
-    label: "创建人",
-    minWidth: "155px",
-  },
+//列表
+const columns = [
   {
-    prop: "creater_company",
-    label: "创建人部门",
-    minWidth: "155px",
+    prop: "xiugai",
+    label: "流程编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "addtime",
-    label: "竞价时间",
-    minWidth: "155px",
+    prop: "xiugai1",
+    label: "采购单号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
-
   {
-    prop: "zxNo",
-    label: "竞价单号",
-    minWidth: "155px",
+    prop: "xiugai2",
+    label: "供应商编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "first_customer_org",
-    label: "一级企业",
-    minWidth: "155px",
+    prop: "xiugai3",
+    label: "对账编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "second_customer_org",
-    label: "二级企业",
-    minWidth: "155px",
+    prop: "xiugai4",
+    label: "付款编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "companyName",
-    label: "客户名称",
-    minWidth: "155px",
+    prop: "xiugai5",
+    label: "回票编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
+    prop: "xiugai6",
+    label: "订单编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "num",
-    label: "数量",
-    minWidth: "155px",
+    prop: "xiugai7",
+    label: "企业客户编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "unit",
-    label: "单位",
-    minWidth: "155px",
+    prop: "xiugai8",
+    label: "发票申请编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "budget_price",
-    label: "单价",
-    minWidth: "155px",
+    prop: "xiugai9",
+    label: "发票编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "total_fee",
-    label: "金额",
-    minWidth: "155px",
+    prop: "xiugai10",
+    label: "退票编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
-
   {
-    prop: "is_bids",
-    label: "是否采反",
-    minWidth: "155px",
+    prop: "xiugai11",
+    label: "资金编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
-    prop: "is_zhuandan",
-    label: "订单转单",
-    minWidth: "155px",
+    prop: "xiugai12",
+    label: "退款编号",
+    t1:"方便统一修改、留存",
+    minWidth:155,
   },
   {
     prop:"",
@@ -241,1754 +159,103 @@ const table2 = [
 
   }
 ]
-//订单报表
-const table3 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "apply_name",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "creater_company",
-    label: "创建人部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "addtime",
-    label: "下单时间",
-    minWidth: "155px",
-  },
 
+//采购单号——详情
+const cgdList =  [
   {
-    prop: "orderCode",
-    label: "订单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "first_customer_org",
-    label: "一级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "second_customer_org",
-    label: "二级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "companyName",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_num",
-    label: "产品数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_price",
-    label: "单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_price",
-    label: "金额",
-    minWidth: "155px",
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
   },
-
   {
-    prop: "is_stock",
-    label: "是否库存",
-    minWidth: "155px",
+    prop: "status",
+    label: "采购单状态",
+    _slot_: "status",
+    span: 6
   },
   {
     prop: "order_type",
-    label: "订单类型",
-    minWidth: "155px",
-  },
-]
-//未发货报表
-const table4 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "apply_name",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "creater_company",
-    label: "创建人部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "addtime",
-    label: "下单时间",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "orderCode",
-    label: "订单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "first_customer_org",
-    label: "一级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "second_customer_org",
-    label: "二级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "companyName",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_num",
-    label: "数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: "155px",
+    label: "采购单来源",
+    _slot_: "order_type",
+    span: 6
   },
   {
-    prop: "sale_price",
-    label: "单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_price",
-    label: "金额",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "arrive_time",
-    label: "承诺发货时间",
-    minWidth: "155px",
-  },
-]
-
-//未签收报表
-const table5 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "apply_name",
-    label: "创建人",
-    minWidth: "155px",
+    prop: "lasttime",
+    label: "要求入库时间",
+    span: 6
   },
+ 
   {
-    prop: "creater_company",
-    label: "创建人部门",
-    minWidth: "155px",
+    prop: "supplier_name",
+    label: "销售方公司",
+    _slot_: "supplier_name",
   },
   {
-    prop: "addtime",
-    label: "下单时间",
-    minWidth: "155px",
+    prop: "company",
+    label: "购买方公司",
+    _slot_: "company",
   },
 
   {
-    prop: "orderCode",
-    label: "订单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "first_customer_org",
-    label: "一级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "second_customer_org",
-    label: "二级企业",
-    minWidth: "155px",
+    prop: "wsm",
+    label: "仓库信息",
+    _slot_: "wsm",
   },
+ 
+ 
+ 
   {
-    prop: "companyName",
-    label: "客户名称",
-    minWidth: "155px",
+    prop: "total_fee",
+    label: "采购总成本",
+    span: 6
   },
   {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
+    prop: "good_price",
+    label: "采购单价",
+    span: 6
   },
   {
     prop: "good_num",
-    label: "数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_price",
-    label: "单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_price",
-    label: "金额",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "sendtime",
-    label: "发货时间",
-    minWidth: "155px",
-  },
-]
-
-//售后报表
-const table6 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
+    label: "采购总数量",
+    span: 6
   },
   {
-    prop: "apply_name",
-    label: "创建人",
-    minWidth: "155px",
+    prop: "send_num",
+    label: "已发货数量",
+    span: 6
   },
   {
-    prop: "creater_company",
-    label: "创建人部门",
-    minWidth: "155px",
+    prop: "wsend_num",
+    label: "未发货数量",
+    span: 6
   },
   {
     prop: "addtime",
-    label: "售后时间",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "orderCode",
-    label: "订单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "first_customer_org",
-    label: "一级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "second_customer_org",
-    label: "二级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "companyName",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_num",
-    label: "数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_price",
-    label: "单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_price",
-    label: "金额",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "updatetime",
-    label: "签收时间",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "result",
-    label: "异常原因",
-    minWidth: "155px",
-  },
-  {
-    prop: "status",
-    label: "处理状态",
-    minWidth: "155px",
-  },
-]
-
-
-//产品热销排行
-const table7 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "cat",
-    label: "产品品类",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  // {
-  //   prop: "supplierNo",
-  //   label: "下单时间",
-  //   minWidth: "155px",
-  // },
-  {
-    prop: "total_num",
-    label: "数量",
-    minWidth: "155px",
+    label: "创建时间",
+    span: 6
   },
   {
-    prop: "total_price",
-    label: "金额",
-    minWidth: "155px",
+    prop: "gold_price",
+    label: "当前实时金价",
+    _slot_: "gold_price",
+    span: 12
   },
   {
-    prop: "first_customer_org",
-    label: "一级企业",
-    minWidth: "110px",
+    prop: "customer",
+    label: "订单客户名称",
+    _slot_: "customer",
+    span: 12
   },
   {
-    prop: "second_customer_org",
-    label: "二级企业",
-    minWidth: "100px",
+    prop: "addr_info",
+    label: "收货信息",
+    _slot_: "addr_info",
+    span: 24
   },
-
 ]
 
-
-//未开票报表___________暂时不做
-const table8 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "addtime",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "name",
-    label: "发票申请单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "下单时间",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "total",
-    label: "订单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "一级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "二级企业",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "单位",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "金额",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "total",
-    label: "承诺回款时间",
-    minWidth: "155px",
-  },
-]
-
-
-//订单导出表
-const table9 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "addtime",
-    label: "确认单下单时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "orderCode",
-    label: "订单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "order_type",
-    label: "订单类型",
-    minWidth: "155px",
-  },
-  {
-    prop: "status",
-    label: "订单状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "apply_name",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "name",
-    label: "创建人所属部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "company",
-    label: "销售方公司",
-    minWidth: "125px",
-  },
-  {
-    prop: "first_customer_org",
-    label: "一级组织",
-    minWidth: "155px",
-  },
-  {
-    prop: "second_customer_org",
-    label: "二级组织",
-    minWidth: "155px",
-  },
-  {
-    prop: "companyName",
-    label: "购买方公司(客户名称)",
-    minWidth: "155px",
-  },
-  {
-    prop: "platform_name",
-    label: "所属平台",
-    minWidth: "155px",
-  },
-  {
-    prop: "platform_order",
-    label: "平台订单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "poNo",
-    label: "其他单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "paytime",
-    label: "承诺回款时间",
-    minWidth: "125px",
-  },
-  {
-    prop: "order_use",
-    label: "订单用途",
-    minWidth: "155px",
-  },
-  {
-    prop: "activity_type",
-    label: "活动类型",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "first_cat_name",
-    label: "一级分类",
-    minWidth: "155px",
-  },
-  {
-    prop: "tax",
-    label: "税率",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_price",
-    label: "销售单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_num",
-    label: "下单数量",
-    minWidth: "125px",
-  },
-  {
-    prop: "total_price",
-    label: "销售总额",
-    minWidth: "155px",
-  },
-  {
-    prop: "cgder",
-    label: "采购人",
-    minWidth: "155px",
-  },
-  {
-    prop: "customized",
-    label: "工期时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "arrive_time",
-    label: "要求到货时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "remark",
-    label: "备注",
-    minWidth: "155px",
-  },
-  {
-    prop: "is_stock",
-    label: "是否库存",
-    minWidth: "155px",
-  },
-
-
-]
-
-
-//竞价单导出明细
-const table10 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "addtime",
-    label: "竞价时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "salesman",
-    label: "业务员",
-    minWidth: "155px",
-  },
-  {
-    prop: "name",
-    label: "业务部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "zxNo",
-    label: "竞价单号",
-    minWidth: "155px",
-  },
-
-  // {
-  //   prop: "",
-  //   label: "竞价类型",
-  //   minWidth: "155px",
-  // },
-
-  {
-    prop: "first_customer_org",
-    label: "一级组织",
-    minWidth: "105px",
-  },
-  
-  {
-    prop: "second_customer_org",
-    label: "二级组织",
-    minWidth: "150px",
-  },
-  {
-    prop: "companyName",
-    label: "客户名称",
-    minWidth: "105px",
-  },
-  {
-    prop: "use_desc",
-    label: "产品用途",
-    minWidth: "115px",
-  },
-  {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "115px",
-  },
-  {
-    prop: "brand_name",
-    label: "品牌",
-    minWidth: "155px",
-  },
-  {
-    prop: "model",
-    label: "型号",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "产品编码",
-    minWidth: "155px",
-  },
-  {
-    prop: "first_cat_name",
-    label: "一级分类",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_price",
-    label: "单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "budget_price",
-    label: "预算单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: "105px",
-  },
-  {
-    prop: "num",
-    label: "需求数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "budget_total_price",
-    label: "预算总价",
-    minWidth: "155px",
-  },
-
-  // {
-  //   prop: "",
-  //   label: "产品单价（定价）",
-  //   minWidth: "155px",
-  // },
-
-  {
-    prop: "arrival_time",
-    label: "要求到货时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "is_addrs",
-    label: "是否一地",
-    minWidth: "155px",
-  },
-  {
-    prop: "is_custom",
-    label: "定制",
-    minWidth: "105px",
-  },
-  {
-    prop: "remark",
-    label: "竞价备注",
-    minWidth: "155px",
-  },
-  {
-    prop: "status",
-    label: "竞单状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "bargain_code",
-    label: "上次竞价单单号",
-    minWidth: "155px",
-  },
- 
-]
-
-//工差明细表
-const table11 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "addtime",
-    label: "发起时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "diffCode",
-    label: "工差单号",
-    minWidth: "125px",
-  },
-  {
-    prop: "orderCode",
-    label: "关联确认单",
-    minWidth: "155px",
-  },
-  {
-    prop: "apply_name",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "apply_company",
-    label: "部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "poaddtime",
-    label: "确认单下单日期",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "company",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "noble_metal",
-    label: "贵金属种类",
-    minWidth: "105px",
-  },
-  {
-    prop: "good_num",
-    label: "下单数量",
-    minWidth: "115px",
-  },
-  {
-    prop: "sale_price",
-    label: "单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_price",
-    label: "总额",
-    minWidth: "105px",
-  },
-  {
-    prop: "good_weight",
-    label: "商品总重量",
-    minWidth: "115px",
-  },
-  {
-    prop: "diff_weight",
-    label: "工差重量",
-    minWidth: "155px",
-  },
-  {
-    prop: "diff_price",
-    label: "销售工差总费用",
-    minWidth: "105px",
-  },
-  {
-    prop: "is_update_sale",
-    label: "是否修改销售额",
-    minWidth: "115px",
-  },
-
-]
-
-//退货明细表
-const table12 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "return_time",
-    label: "退货时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "thCode",
-    label: "退货单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "outCode",
-    label: "发货申请单编码",
-    minWidth: "155px",
-  },
-  {
-    prop: "status",
-    label: "退货单状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "apply_name",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "apply_company",
-    label: "创建人所属部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "orderCode",
-    label: "确认单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "addtime",
-    label: "下单日期",
-    minWidth: "155px",
-  },
-  {
-    prop: "companyName",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_price",
-    label: "单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "wsend_num",
-    label: "未发货数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "th_num",
-    label: "退货数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "th_fee",
-    label: "退货销售货款",
-    minWidth: "155px",
-  },
-  {
-    prop: "contactor",
-    label: "发货单联系人",
-    minWidth: "155px",
-  },
-  {
-    prop: "mobile",
-    label: "发货单联系人电话",
-    minWidth: "155px",
-  },
-  {
-    prop: "addr",
-    label: "发货单地址",
-    minWidth: "155px",
-  },
-  {
-    prop: "result_desc",
-    label: "退货原因",
-    minWidth: "155px",
-  },
-]
-
-//售后明细表
-const table13 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "addtime",
-    label: "售后时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "returnCode",
-    label: "售后申请编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "apply_name",
-    label: "申请人",
-    minWidth: "155px",
-  },
-  {
-    prop: "apply_company",
-    label: "部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "outCode",
-    label: "发货申请编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "total_num",
-    label: "发货数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "status",
-    label: "处理状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "orderCode",
-    label: "订单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "first_customer_org",
-    label: "一级组织",
-    minWidth: "155px",
-  },
-  {
-    prop: "second_customer_org",
-    label: "二级组织",
-    minWidth: "155px",
-  },
-  {
-    prop: "companyName",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "商品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "sale_price",
-    label: "销售单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "error_total_price",
-    label: "异常金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "is_receive",
-    label: "收货情况",
-    minWidth: "155px",
-  },
-  {
-    prop: "error_num",
-    label: "异常数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "result_desc",
-    label: "异常原因",
-    minWidth: "155px",
-  },
-  {
-    prop: "error_remark",
-    label: "异常备注",
-    minWidth: "155px",
-  },
-  {
-    prop: "except_code",
-    label: "期望意愿",
-    minWidth: "155px",
-  },
- 
-]
-
-
-
-//__________________________________下方数据没更新
-
-
-
-
-
-
-
-
-//议价明细表
-const table14 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "date",
-    label: "议价时间",
-    minWidth: "115px",
-  },
-  {
-    prop: "total",
-    label: "议价编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "竞价单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "议价单状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "采返商品编号",
-    minWidth: "115px",
-  },
-  {
-    prop: "total",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "商品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "申请人",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "申请人所属部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "议价前售价",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "期望售价",
-    minWidth: "155px",
-  },
-  {
-    prop: "total",
-    label: "议价原因",
-    minWidth: "115px",
-  },
-  {
-    prop: "total",
-    label: "议价备注",
-    minWidth: "115px",
-  },
-
-
-]
-
-//无地址待发货订单
-const table15 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "spuCode",
-    label: "下单时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "订单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "采购单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "公司名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "申请人",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "出库总数",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "商品分类",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "商品编码",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "商品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "未发货数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "应发货日期（下单日期+工期）",
-    minWidth: "155px",
-  },
-  
-  
-]
-
-//有地址待发货订单
-const table16 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "spuCode",
-    label: "下单日期",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "订单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "发货时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "发货申请单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "发货申请单状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "商品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "产品单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "发货数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "发货申请单总价",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "申请人",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "申请人所属部门",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "采购",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "快递公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "快递单号",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "spuCode",
-    label: "收货人",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "收货电话",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "收货地址",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "备注",
-    minWidth: "155px",
-  },
-  
-  
-]
-//开票明细表
-const table17 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "spuCode",
-    label: "订单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "销售方公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "分公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "购买方公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "所属平台",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "PO编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "税率",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "销售单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "单位",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "下单数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "销售总额",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "开票金额",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "spuCode",
-    label: "未开金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "开票类型",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "发票号码",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "物流公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "物流单号",
-    minWidth: "155px",
-  },
-
-  
-  
-]
-
-//待开票列表
-const table18 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "spuCode",
-    label: "订单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "销售方公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "分公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "购买方公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "所属平台",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "PO编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "产品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "税率",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "销售单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "单位",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "下单数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "销售总额",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "开票金额",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "spuCode",
-    label: "未开金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "开票类型",
-    minWidth: "155px",
-  },
-
-  
-  
-]
-//待回款列表
-const table19 = [
-  // {
-  //   type: "expand",
-  //   _slot_: "expand",
-  //   fixed: "left",
-  //   _noset_: true,
-  // },
-  {
-    type: "selection",
-    fixed: "left",
-    _noset_: true
-  },
-  {
-    prop: "spuCode",
-    label: "创建时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "订单编号",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "平台订单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "业管单号",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "订单类型",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "所属平台",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "销售方公司",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "企业客户名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "创建人",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "商品名称",
-    minWidth: "155px",
-  },
-  {
-    prop: "brandid",
-    label: "商品分类",
-    minWidth: "155px",
-  },
-  {
-    prop: "brand_id",
-    label: "商品数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "销售单价",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "总价",
-    minWidth: "155px",
-  },
-
-  {
-    prop: "spuCode",
-    label: "承诺回款时间",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "已回款金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "未回款金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "good_name",
-    label: "已开票金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "未开票金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "开票状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "发货状态",
-    minWidth: "155px",
-  },
-  {
-    prop: "spuCode",
-    label: "账期",
-    minWidth: "155px",
-  },
-
-  
-  
-]
-
-
-
-
-
-
-
 export {
-  table1,
-  table2,
-  table3,
-  table4,
-  table5,
-  table6,
-  table7,
-  table8,
-  table9,
-  table10,
-  table11,
-  table12,
-  table13,
-  table14,
-  table15,
-  table16,
-  table17,
-  table18,
-  table19,
   schTahead,
+  columns,
+  cgdList,
 }

src/views/reportQuery/test/detail.vue

@@ -38,14 +38,21 @@ export default {
   },
   data() {
     return {
+      newTime: "",
       // row:this.$router.query.row
     };
   },
   mounted() {
     // console.log(11111,this.row)
+    this.initData();
   },
   methods: {
-   
+   getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+   async initData(){
+      this.getNewTime()
+    }
 
 
   },

src/views/reportQuery/test/index.vue

@@ -1,10 +1,10 @@
 <template>
-  <div>
+  <div class="pagePadding">
     <ex-table
       v-loading="loading"
       :table="table"
       :data="tableData"
-      :columns="table2"
+      :columns="columns"
       :page="pageInfo"
       :size="size"
       @page-curr-change="handlePageChange"
@@ -86,7 +86,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/reportQuery/saleReport";
-import { table2,schTahead } from "./columns";
+import { columns,schTahead } from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
@@ -138,13 +138,23 @@ export default {
         total: 0,
       },
       // 表格表头 - 列参数
-      table2: table2,
+      columns: columns,
 
       //筛选相关
       schTahead:schTahead,
     };
   },
   mounted() {
+    const { back } = this.$route.query;
+    if (back) {
+      this.parmValue = JSON.parse(back);
+      const { page, size } = this.parmValue;
+      this.pageInfo = {
+        size: size,
+        curr: page,
+        total: 0,
+      };
+    }
     this.searchList();
   },
 

src/views/serviceParam/unusualReason/addEdit.vue

@@ -101,6 +101,8 @@ export default {
         { id: "5", label: "销售退换货" },
         { id: "6", label: "售后未收到货异常" },
         { id: "7", label: "议价申请原因" },
+        { id: "8", label: "商品下线原因" },
+
       ],
 
       rules: {

src/views/serviceParam/unusualReason/index.vue

@@ -222,6 +222,7 @@ export default {
         { id: "5", label: "销售退换货" },
         { id: "6", label: "售后未收到货异常" },
         { id: "7", label: "议价申请原因" },
+        { id: "8", label: "商品下线原因" },
       ],
       statusList: statusList,
       loading: true,