Merge branch 'v3.0' into company

src/views/dataReport/table4.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="padding:10px">
     <ex-table
-       v-if="powers.some((i) => i == '001')"
+      v-if="powers.some((i) => i == '001')"
       v-loading="loading"
       :table="table"
       :data="tableData"
@@ -25,15 +25,14 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 0 80px">
-
             <el-col :span="6" style="width: 363px;">
               <periodDatePickerActive
-                :start="parmValue.start_day"
-                :end="parmValue.end_day"
-                :placeholder="'竞价'"
-                :width="'165px'"
-                :size="searchSize"
+                :start="parmValue.order_order_start_day"
+                :end="parmValue.order_end_day"
+                :placeholder="'下单'"
                 @timeReturned="time"
+                :size="searchSize"
+                :width="'165px'"
               />
             </el-col>
 
@@ -50,9 +49,13 @@
               />
             </el-col>
             <el-col :span="4" style="width: 66px; float: right">
-              <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
-                导出
-              </el-button>
+              <el-button
+                type="primary"
+                style="margin-left:30px;"
+                :size="searchSize"
+                class="fr"
+                @click="download"
+              >导出</el-button>
             </el-col>
             <el-col :span="3" style="width: 66px; float: right">
               <el-button
@@ -60,19 +63,10 @@
                 type="primary"
                 style="float: right; margin-left: 5px"
                 @click="searchList"
-              >
-                刷新
-              </el-button>
+              >刷新</el-button>
             </el-col>
             <el-col :span="4" style="width: 66px; float: right">
-              <el-button
-                type="warning"
-                class="fr"
-                :size="searchSize"
-                @click="restSearch"
-              >
-                重置
-              </el-button>
+              <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
             </el-col>
           </el-row>
 
@@ -91,51 +85,52 @@
         </div>
       </template>
 
-      <template #order_type="{scope}">
-        {{ xs_order_type_options.find(({id}) => id === String(scope.row.order_type)).label }}
-      </template>
+      <template
+        #order_type="{scope}"
+      >{{ xs_order_type_options.find(({id}) => id === String(scope.row.order_type)).label }}</template>
 
-      <template #order_source="{scope}">
-        {{ xs_order_source_options.find(({id}) => id === String(scope.row.order_source)).label }}
-      </template>
+      <template
+        #order_source="{scope}"
+      >{{ xs_order_source_options.find(({id}) => id === String(scope.row.order_source)).label }}</template>
 
-      <template #status="{scope}">
-        {{ statusOptions.find(({value}) => value === String(scope.row.status)).label }}
-      </template>
+      <template
+        #status="{scope}"
+      >{{ statusOptions.find(({value}) => value === String(scope.row.status)).label }}</template>
 
-      <template #platform_type="{scope}">
-        {{ String(scope.row.platform_type) === '1' ? 'ToB' : String(scope.row.platform_type) === '2' ? 'ToC' : '--' }}
-      </template>
+      <template
+        #platform_type="{scope}"
+      >{{ String(scope.row.platform_type) === '1' ? 'ToB' : String(scope.row.platform_type) === '2' ? 'ToC' : '--' }}</template>
     </ex-table>
 
     <div v-else>
       <no-auth></no-auth>
     </div>
   </div>
-
 </template>
 <script>
-import mixinPage from '@/mixins/elPaginationHandle'
-import resToken from '@/mixins/resToken'
-import urlConfig from '@/apis/url-config'
-import asyncRequest from '@/apis/service/reportQuery/newReport'
-import periodDatePickerActive from './period-date-picker/main.vue'
-import { xs_order_type_options, xs_order_source_options } from '@/assets/js/statusList'
-import { table4 } from './columns'
-import { mapGetters } from 'vuex'
-import dayjs from 'dayjs'
+import periodDatePickerActive from "./period-date-picker/main.vue";
+import asyncRequest from "@/apis/service/reportQuery/newReport";
+import mixinPage from "@/mixins/elPaginationHandle";
+import urlConfig from "@/apis/url-config";
+import resToken from "@/mixins/resToken";
+import { table4 } from "./columns";
+import { mapGetters } from "vuex";
+import {
+  xs_order_type_options,
+  xs_order_source_options
+} from "@/assets/js/statusList";
 
 export default {
-  name: 'SaleReport',
+  name: "SaleReport",
   components: {
     periodDatePickerActive
   },
   mixins: [mixinPage, resToken],
   computed: {
-    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableFour") || {};
+      const { btnList } = this.$store.getters;
+      const tran = btnList.find(i => i.menu_route == "reportTableFour") || {};
       const { action } = tran ?? {};
       return action ?? [];
     }
@@ -152,21 +147,20 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
-        companyNo: '',
-        supplierNo: '',
-        start_day: '', // 起始时间
-        end_day: '', // 结束时间
+        companyNo: "",
+        supplierNo: "",
+        order_start_day: "", // 起始时间
+        order_end_day: "", // 结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15 // 每页显示条数
-
       },
       statusOptions: [
         { value: "1", label: "待发货" },
         { value: "2", label: "发货完成" },
         // { value: "3", label: "已收货" },
         // { value: "4", label: "已全部收货" },
-        { value: "5", label: "已取消" },
+        { value: "5", label: "已取消" }
       ],
       // 表格 - 数据集合
       tableData: [],
@@ -174,7 +168,7 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ['setcol']
+        _defaultHeader_: ["setcol"]
       },
       // 表格 - 分页
       pageInfo: {
@@ -184,186 +178,206 @@ export default {
       },
       // 表格表头 - 列参数
       table4: table4
-    }
+    };
   },
   mounted() {
-    // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.searchList()
+    // this.parmValue.order_start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    // this.parmValue.order_end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    this.searchList();
   },
 
   methods: {
     company_idsearchChange(e) {
-      const { code } = e
-      this.parmValue.companyNo = code || ''
-      this.searchList()
+      const { code } = e;
+      this.parmValue.companyNo = code || "";
+      this.searchList();
     },
     // 初始化http请求
     async searchList() {
       if (
-        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
-        (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+        (this.parmValue.order_start_day !== "" &&
+          this.parmValue.order_end_day === "") ||
+        (this.parmValue.order_start_day === "" &&
+          this.parmValue.order_end_day !== "")
       ) {
-        this.$message.warning('时间区间不完整！')
-        return
+        this.$message.warning("时间区间不完整！");
+        return;
       }
 
-      const start_day = new Date(this.parmValue.start_day).valueOf()
-      const end_day = new Date(this.parmValue.end_day).valueOf()
-      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+      const order_start_day = new Date(
+        this.parmValue.order_start_day
+      ).valueOf();
+      const order_end_day = new Date(this.parmValue.order_end_day).valueOf();
+      const flag = order_end_day - order_start_day > 31 * 24 * 60 * 60 * 1000;
 
-      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+      if (
+        this.parmValue.order_start_day != "" &&
+        this.parmValue.order_end_day != ""
+      ) {
         if (flag) {
-          this.$message.warning('筛选的时间区间不能超过31天')
-          return
+          this.$message.warning("筛选的时间区间不能超过31天");
+          return;
         }
       }
 
-      this.loading = true
+      this.loading = true;
 
       const res = await asyncRequest.ocl({
         ...this.parmValue,
-        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
-      })
+        supplierNo: Array.isArray(this.parmValue.supplierNo)
+          ? this.parmValue.supplierNo[0]
+          : this.parmValue.supplierNo
+      });
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list
-        this.pageInfo.total = Number(res.data.count)
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout()
+        await this.logout();
       } else {
-        this.$message.warning(res.message)
-        this.tableData = []
-        this.pageInfo.total = 0
+        this.$message.warning(res.message);
+        this.tableData = [];
+        this.pageInfo.total = 0;
       }
-      this.loading = false
+      this.loading = false;
     },
 
     async supplierChange(e) {
-      const { code, label } = e
-      this.parmValue.supplierNo = code ? [code] : []
-      this.searchList()
+      const { code, label } = e;
+      this.parmValue.supplierNo = code ? [code] : [];
+      this.searchList();
     },
 
     // 重置
     restSearch() {
       this.parmValue = {
-        companyNo: '',
-        supplierNo: '',
-        start_day: '', // 新建起始时间
-        end_day: '', // 新建结束时间
+        companyNo: "",
+        supplierNo: "",
+        order_start_day: "", // 新建起始时间
+        order_end_day: "", // 新建结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15 // 每页显示条数
-      }
+      };
 
-      // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-      // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      // this.parmValue.order_start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      // this.parmValue.order_end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
         total: 0
-      }
-      this.searchList()
+      };
+      this.searchList();
     },
 
     // 时间函数
     async time(e) {
-      this.parmValue.start_day = e.startTime || ''
-      this.parmValue.end_day = e.endTime || ''
+      this.parmValue.order_start_day = e.startTime || "";
+      this.parmValue.order_end_day = e.endTime || "";
       if (
-        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
-      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+        (this.parmValue.order_start_day !== "" &&
+          this.parmValue.order_end_day === "") ||
+        (this.parmValue.order_start_day === "" &&
+          this.parmValue.order_end_day !== "")
       ) {
-        this.$message.warning('时间区间不完整！')
-        return
+        this.$message.warning("时间区间不完整！");
+        return;
       }
-      this.pageInfo.curr = 1
-      this.parmValue.page = 1
-      await this.searchList()
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      await this.searchList();
     },
 
     // 选中触发函数
     selection_change(e) {
-      const { list } = e
+      const { list } = e;
       // 选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
     // 导出文件
     async download() {
-    // if(this.changeList.length<=0){
-    //   this.$message.warning("请选择有效数据")
-    //   return;
-    // }
-      const model = JSON.parse(JSON.stringify({
-        ...this.parmValue,
-        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
-      }))
-      delete model['page']
-      delete model['size']
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+      const model = JSON.parse(
+        JSON.stringify({
+          ...this.parmValue,
+          supplierNo: Array.isArray(this.parmValue.supplierNo)
+            ? this.parmValue.supplierNo[0]
+            : this.parmValue.supplierNo
+        })
+      );
+      delete model["page"];
+      delete model["size"];
       // model.is_export = 1;
-      const start_day = new Date(this.parmValue.start_day).valueOf()
-      const end_day = new Date(this.parmValue.end_day).valueOf()
-      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
-      
-      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+      const order_start_day = new Date(
+        this.parmValue.order_start_day
+      ).valueOf();
+      const order_end_day = new Date(this.parmValue.order_end_day).valueOf();
+      const flag = order_end_day - order_start_day > 31 * 24 * 60 * 60 * 1000;
+
+      if (
+        this.parmValue.order_start_day != "" &&
+        this.parmValue.order_end_day != ""
+      ) {
         if (flag) {
-          this.$message.warning('导出文件的时间区间不能超过31天')
-          return
+          this.$message.warning("导出文件的时间区间不能超过31天");
+          return;
         }
       }
 
       if (!this.loading) {
-        this.loading = true
-        const httpType = `aplication/zip`
+        this.loading = true;
+        const httpType = `aplication/zip`;
         axios({
-          method: 'post',
-          url: this.fileUrl + 'admin/oce',
-          responseType: 'blob',
+          method: "post",
+          url: this.fileUrl + "admin/oce",
+          responseType: "blob",
           data: model,
           headers: {
             Accept: httpType
           }
         })
-          .then((res) => {
+          .then(res => {
             if (res && res.status == 200 && res.data) {
               const url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   type: httpType
                 })
-              )
-              const link = document.createElement('a')
-              link.style.display = 'none'
-              link.href = url
-              const excelName = '待库管发货.zip'
-              link.setAttribute('download', excelName)
-              document.body.appendChild(link)
-              link.click()
-              link.remove()
-              window.URL.revokeObjectURL(url) // 释放掉blob对象
-              this.$message.success(`导出成功！`)
+              );
+              const link = document.createElement("a");
+              link.style.display = "none";
+              link.href = url;
+              const excelName = "待库管发货.zip";
+              link.setAttribute("download", excelName);
+              document.body.appendChild(link);
+              link.click();
+              link.remove();
+              window.URL.revokeObjectURL(url); // 释放掉blob对象
+              this.$message.success(`导出成功！`);
               setTimeout(() => {
-                this.loading = false
-              }, 500)
+                this.loading = false;
+              }, 500);
             } else {
-              this.$message.error(res.data.message)
+              this.$message.error(res.data.message);
               setTimeout(() => {
-                this.loading = false
-              }, 500)
+                this.loading = false;
+              }, 500);
             }
           })
-          .catch((error) => {
-            console.log(error)
-            this.loading = false
-          })
+          .catch(error => {
+            console.log(error);
+            this.loading = false;
+          });
       }
     }
   }
-}
+};
 </script>
  <style lang="scss" scoped>
 .purchaseOrder {
-// text-align: right;
+  // text-align: right;
 }
 </style>
 

src/views/purchaseIn/deliveryWorkOrder/components/ShowDataTableColumns.js

@@ -11,6 +11,7 @@ const showColumns = [
     _slot_: 'status',
     span: 5
   },
+  // 
   {
     prop:'platform_order',
     label:'平台订单号',

src/views/sellOut/deliveryWorkOrder/components/ShowDataTableColumns.js

@@ -11,6 +11,7 @@ const showColumns = [
     _slot_: 'status',
     span: 5
   },
+  // 
   {
     prop:'platform_order',
     label:'平台订单号',

src/views/sellOut/sellOutOrder/columns.js

@@ -270,9 +270,10 @@ const showColumns = [
     span: 6,
   },
   {
-    prop: "platform_order",
-    label: "平台订单编号",
-    span: 6,
+    // 
+    prop: 'platform_order',
+    label: '平台订单编号',
+    span: 6
   },
   {
     prop: "status",
@@ -298,24 +299,37 @@ const showColumns = [
     span: 6,
   },
   {
-    prop: "send_num",
-    label: "发货数量",
-    span: 4,
+    prop: 'send_num',
+    label: '发货数量',
+    span: 4
   },
   {
-    prop: "check_num",
-    label: "验收数量",
-    span: 4,
+    prop: 'check_num',
+    label: '验收数量',
+    span: 4
+  },
+  {
+    prop: 'error_num',
+    label: '异常数量',
+    span: 4
   },
   {
     prop: "error_num",
     label: "异常数量",
     span: 4,
   },
+
   {
-    prop: "sendtime",
-    label: "发货时间",
-    span: 6,
+    prop: 'sale_price',
+    label: '商品单价',
+    _slot_: 'sale_price',
+    span: 6
+  },
+  {
+    prop: 'total_price',
+    label: '总价',
+    _slot_: 'total_price',
+    span: 6
   },
 
   {
@@ -324,13 +338,12 @@ const showColumns = [
     _slot_: "sale_price",
     span: 6,
   },
+
   {
-    prop: "total_price",
-    label: "总价",
-    _slot_: "total_price",
-    span: 6,
+    prop: 'post_code',
+    label: '快递公司',
+    span: 6
   },
-
   {
     prop: "addtime",
     label: "创建时间",
@@ -353,20 +366,26 @@ const showColumns = [
     span: 12,
   },
   {
-    prop: "contactor",
-    label: "收货联系人",
-    span: 6,
+    prop: 'post_code',
+    label: '物流编号',
+    span: 12
   },
+
   {
-    prop: "mobile",
-    label: "收货联系人电话",
-    span: 6,
+    prop: 'contactor',
+    label: '收货联系人',
+    span: 6
   },
   {
-    prop: "addr",
-    label: "收货地址",
-    span: 12,
+    prop: 'mobile',
+    label: '收货联系人电话',
+    span: 6
   },
+  {
+    prop: 'addr',
+    label: '收货地址',
+    span: 12
+  }
   // {
   //   prop: 'remark',
   //   label: '发货备注',

src/views/stock/allot/components/addForm.vue

@@ -11,8 +11,8 @@
         class="demo-ruleForm"
       >
         <el-row>
-          <el-col :span="12">
-            <div class="label-title-model">出库仓库信息：</div>
+          <el-col :span="24" v-if="!desc">
+            <!-- <div class="label-title-model">出库仓库信息：</div> -->
             <!-- !(
                   id === 'add' ||
                   (status + '' === '0' && powers.some((i) => i == '005'))
@@ -40,7 +40,10 @@
                 @searchChange="selectSupplierOut"
               />
             </el-form-item> -->
-            <el-form-item label="仓库" prop="stock_code">
+          </el-col>
+
+          <el-col :span="12" v-if="!desc">
+            <el-form-item label="出库仓库" prop="stock_code">
               <search-stock
                 :value="ruleForm.stock_code"
                 :isDetail="id !== 'add'"
@@ -59,24 +62,26 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <div class="label-title-model">入库仓库信息：</div>
-            <el-form-item label="业务公司" prop="in_companyNo">
-              <search-work-company
-                :value="ruleForm.in_companyNo"
-                :names="''"
-                :size="'mini'"
-                :disabled="
+         
+          <el-col :span="12" v-if="!desc">
+            <!-- <div class="label-title-model">入库仓库信息：</div> -->
+            <!-- :disabled="
                   !(
                     id === 'add' ||
                     (status + '' === '0' && powers.some((i) => i == '005'))
                   )
-                "
+                " -->
+            <!-- <el-form-item label="业务公司" prop="in_companyNo">
+              <search-work-company
+                :value="ruleForm.in_companyNo"
+                :names="''"
+                :size="'mini'"
                 :is-detail="id !== 'add'"
+                disabled
                 :placeholder="'业务公司'"
                 @searchChange="supplierChange($event, 'in_companyNo')"
               /> 
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="公司" prop="supplier_in_code">
               <search-supplier
                 :value="ruleForm.supplier_in_code"
@@ -90,7 +95,7 @@
                 @searchChange="selectSupplierIn"
               />
             </el-form-item> -->
-            <el-form-item label="仓库" prop="stock_in_code">
+            <el-form-item label="入库仓库" prop="stock_in_code" v-if="!desc">
               <search-stock
                 :value="ruleForm.stock_in_code"
                 :isDetail="id !== 'add'"
@@ -110,6 +115,50 @@
               />
             </el-form-item>
           </el-col>
+
+          <el-col :span="24" v-if="desc" style="margin-bottom:10px">
+            <show-data-table
+              :sitem="sitem"
+              :columns="cols"
+              :border="true"
+            >
+              <template #in_company="{scope}">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'入库方业务公司编码 : ' + sitem.in_code" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{sitem.wsm_in_name}}</p>
+                </div>
+              </template>
+
+              <template #out_company="{scope}">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'出库方业务公司编码 : ' + sitem.out_code" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{sitem.wsm_out_name}}</p>
+                </div>
+              </template>
+
+              <template #in_stock="{scope}">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'出库仓库编码 : ' + sitem.wsm_out" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{sitem.ckc_name}}</p>
+                </div>
+              </template>
+
+              <template #out_stock="{scope}">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'出库仓库编码 : ' + sitem.wsm_in" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{sitem.ckr_name}}</p>
+                </div>
+              </template>
+            </show-data-table>
+          </el-col>
         </el-row>
       </el-form>
     </el-col>
@@ -281,7 +330,7 @@ import { isnumber } from "@/utils/validate";
 import config from "./columns"; //表格列参数
 export default {
   name: "allot",
-  props: ["showModel", "id", "sitem", "newTime"],
+  props: ["showModel", "id", "sitem", "newTime", "desc"],
   mixins: [resToken, companyHelper],
   components: { searchStockGoodModal },
   computed: {
@@ -296,6 +345,32 @@ export default {
   data() {
     return {
       showGoodsModel: false,
+      cols:[
+      {
+          prop:'wsm_out_name',
+          label:'出库方业务公司',
+          _slot_:"out_company",
+          span:12
+        },
+        {
+          prop:'ckc_name',
+          label:'出库方仓库',
+          _slot_:'in_stock',
+          span:12
+        },
+        {
+          prop:'wsm_in_name',
+          label:'入库方业务公司',
+          _slot_:"in_company",
+          span:12
+        },
+        {
+          prop:'ckr_name',
+          label:'入库方仓库',
+          span:12,
+          _slot_:'out_stock'
+        },
+      ],
       status: "",
       supplier_code: "",
       supplier_name: "",
@@ -464,7 +539,10 @@ export default {
           };
 
           
-          if(this.id === 'add') this.ruleForm.out_companyNo = this.currentCompany
+          if(this.id === 'add') {
+            this.ruleForm.out_companyNo = this.currentCompany
+            this.ruleForm.in_companyNo = this.currentCompany
+          }
 
           // this.ruleForm .out_companyNo = 
         }

src/views/stock/allot/detail.vue

@@ -26,6 +26,7 @@
             <el-collapse-item title="调拨详情" name="-1">
               <add-form
                 :newTime="newTime"
+                :desc="true"
                 v-if="newTime !== ''"
                 :sitem="sitem"
                 :id="queryId"

src/views/supplierPurchaseIn/supplierDeliveryWorkOrder/components/ShowDataTableColumns.js

@@ -11,6 +11,7 @@ const showColumns = [
     _slot_: 'status',
     span: 5
   },
+  // 
   {
     prop:'platform_order',
     label:'平台订单号',

src/views/supplierSellOut/supplierSellOutOrder/columns.js

@@ -274,6 +274,7 @@ const showColumns = [
     label: '发货单号',
     span: 6
   },
+  // 
   {
     prop: 'platform_order',
     label: '平台订单编号',