修改发货单名称

src/apis/service/reportQuery/saleReport/index.js

@@ -95,13 +95,13 @@ export default {
   sebo: (data, params) => http(api + "sebo", data, "post", params),
   //议价明细表导出
   seboe: (data, params) => http(api + "seboe", data, "post", params),
-  //延时发货申请单
+  //延时发货单
   seoona: (data, params) => http(api + "seoona", data, "post", params),
-  //延时发货申请单导出
+  //延时发货单导出
   seoonae: (data, params) => http(api + "seoonae", data, "post", params),
-  //直接发货申请单
+  //直接发货单
   seooa: (data, params) => http(api + "seooa", data, "post", params),
-  //直接发货申请单导出
+  //直接发货单导出
   seooae: (data, params) => http(api + "seooae", data, "post", params),
   //无地址销售订单统计
   sna: (data, params) => http(api + "sna", data, "post", params),

src/apis/service/sellOut/salesOrder/detail.js

@@ -17,11 +17,11 @@ export default {
     http(api + 'checkflist', data, 'post', params),
   // 采购反馈物流费用
   salefee: (data, params) => http(api + 'salefee', data, 'post', params),
-  // 新建发货申请单
+  // 新建发货单
   saleout: (data, params) => http(api + 'saleoutadd', data, 'post', params),
   // 延时发货追加地址
   saleaddr: (data, params) => http(api + 'saleaddr', data, 'post', params),
-  // 发货申请单列表
+  // 发货单列表
   orderOut: (data, params) => http(api + 'xsaleout', data, 'post', params),
 
   supplierOrderOut: (data, params) => http(api + 'supplierOutList', data, 'post', params),

src/apis/service/youzan/othOrder/detail.js

@@ -16,7 +16,7 @@ export default {
   getGoodStock: (data, params) => http(api + "checkflist", data, "post", params),
   // 采购反馈物流费用
   salefee: (data, params) => http(api + "salefee", data, "post", params),
-  // 新建发货申请单
+  // 新建发货单
   saleout: (data, params) => http(api + "saleoutadd", data, "post", params),
   //延时发货追加地址
   saleaddr: (data, params) => http(api + "saleaddr", data, "post", params),

src/assets/js/btnList.js

@@ -46,7 +46,7 @@ const btnList = [
   { code: "045", name: "填写物流" },
   { code: "046", name: "供应商反馈" },
   { code: "047", name: "退货验收记录" },
-  { code: "048", name: "添加发货申请单" },
+  { code: "048", name: "添加发货单" },
   { code: "049", name: "添加售后申请" },
   { code: "050", name: "添加售后退货" },
   { code: "051", name: "添加未发货退货" },
@@ -79,7 +79,7 @@ const btnList = [
   { code: "078", name: "再次发起上线" },
   { code: "079", name: "下线商品" },
   { code: "080", name: "库管发货" },
-  { code: "081", name: "添加发货申请" },
+  { code: "081", name: "添加发货单" },
   { code: "082", name: "添加工差" },
   { code: "083", name: "设置退货仓库" },
   { code: "084", name: "BOSS审批" },

src/router/data.js

@@ -1,471 +0,0 @@
-const baseName = 'supplier'
-
-const baseRouteRecord = [
-  {
-    is_display: '1',
-    menu_img: 'el-icon-aim',
-    menu_name: '招标工作台',
-    menu_route: 'Workbench',
-    status: '1',
-    child: [
-      {
-        is_display: '1',
-        is_private: '0',
-        menu_img: 'el-icon-aim',
-        menu_name: '招标工作台',
-        menu_route: 'index',
-        menu_url: 'Workbench/workbench/index',
-        status: '1'
-      },
-      {
-        is_display: '0',
-        is_private: '0',
-        menu_img: 'el-icon-aim',
-        menu_name: '招标任务详情',
-        menu_route: 'wDetail',
-        menu_url: 'Workbench/workbench/detail',
-        status: '1'
-      }
-    ]
-  },
-  {
-    is_display: 1,
-    menu_img: 'el-icon-sold-out',
-    menu_name: '采购业务管理',
-    menu_route: 'PurchaseIn',
-    status: 1,
-    child: [
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-d-arrow-right',
-        menu_name: '采购单管理',
-        menu_route: 'purchaseOrder',
-        menu_url: 'PurchaseIn/purchaseOrder/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-guide',
-        menu_name: '采购单详情',
-        menu_route: 'purchaseOrderDetail',
-        menu_url: 'PurchaseIn/purchaseOrder/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-arrow-right',
-        menu_name: '采购入库单管理',
-        menu_route: 'wsmInOrder',
-        menu_url: 'PurchaseIn/wsmInOrder/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-video-pause',
-        menu_name: '采购入库单详情',
-        menu_route: 'wsmInOrderDetail',
-        menu_url: 'PurchaseIn/wsmInOrder/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-s-custom',
-        menu_name: '采购退货单',
-        menu_route: 'purchaseReturn',
-        menu_url: 'PurchaseIn/purchaseReturn/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-message-solid',
-        menu_name: '采购退货单详情',
-        menu_route: 'purchaseReturnDetail',
-        menu_url: 'PurchaseIn/purchaseReturn/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-message-solid',
-        menu_name: '采购工差单管理',
-        menu_route: 'purchaseDiffOrder',
-        menu_url: 'PurchaseIn/purchaseDiffOrder/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-sort',
-        menu_name: '采购工差单详情',
-        menu_route: 'purchaseDiffOrderDetail',
-        menu_url: 'PurchaseIn/purchaseDiffOrder/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-thumb',
-        menu_name: '竞标反馈查询',
-        menu_route: 'recovery',
-        menu_url: 'PurchaseIn/recovery/index',
-        status: 1
-      }
-    ]
-  },
-  {
-    is_display: 1,
-    menu_img: 'el-icon-sell',
-    menu_name: '销售业务管理',
-    menu_route: 'SellOut',
-    status: 1,
-    child: [
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-sell',
-        menu_name: '销售订单管理',
-        menu_route: 'salesOrder',
-        menu_url: 'SellOut/salesOrder/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-warning-outline',
-        menu_name: '订单详情',
-        menu_route: 'salesOrderDetail',
-        menu_url: 'SellOut/salesOrder/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-video-camera',
-        menu_name: '发货申请管理',
-        menu_route: 'sellOutOrder',
-        menu_url: 'SellOut/sellOutOrder/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-s-finance',
-        menu_name: '发货申请详情',
-        menu_route: 'sellOutOrderDetail',
-        menu_url: 'SellOut/sellOutOrder/detail',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-truck',
-        menu_name: '订单批量发货',
-        menu_route: 'sendOutOrder',
-        menu_url: 'SellOut/sellOutOrder/sendOutOrder',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-ship',
-        menu_name: '售后申请单',
-        menu_route: 'sellAfterApply',
-        menu_url: 'SellOut/sellAfterApply/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-circle-close',
-        menu_name: '售后申请单详情',
-        menu_route: 'sellAfterApplyDetail',
-        menu_url: 'SellOut/sellAfterApply/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-s-help',
-        menu_name: '售后退货单',
-        menu_route: 'returnOrder',
-        menu_url: 'SellOut/returnOrder/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-help',
-        menu_name: '售后退货单详情',
-        menu_route: 'returnOrderDetail',
-        menu_url: 'SellOut/returnOrder/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-circle-close',
-        menu_name: '未发货退货单',
-        menu_route: 'sellReturn',
-        menu_url: 'SellOut/sellReturn/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-video-camera',
-        menu_name: '退货单详情',
-        menu_route: 'sellReturnDetail',
-        menu_url: 'SellOut/sellReturn/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-c-scale-to-original',
-        menu_name: '工差单管理',
-        menu_route: 'zxDiffOrder',
-        menu_url: 'SellOut/zxDiffOrder/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-c-scale-to-original',
-        menu_name: '工差单详情',
-        menu_route: 'zxDiffOrderDetail',
-        menu_url: 'sellOut/zxDiffOrder/detail',
-        status: 1
-      }
-    ]
-  },
-  {
-    is_display: 1,
-    menu_img: 'el-icon-s-finance',
-    menu_name: '商品管理',
-    menu_route: 'goodStore',
-    status: 1,
-    child: [
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-s-shop',
-        menu_name: '商品单位',
-        menu_route: 'unit',
-        menu_url: 'goodStore/unit/index',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-s-flag',
-        menu_name: '商品规格',
-        menu_route: 'specs',
-        menu_url: 'goodStore/specs/index',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-takeaway-box',
-        menu_name: '商品品牌',
-        menu_route: 'brand',
-        menu_url: 'goodStore/brand/index',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-suitcase-1',
-        menu_name: '商品成本管理',
-        menu_route: 'goodsCost',
-        menu_url: 'goodStore/goodsCost/index',
-        status: 1
-      },
-      {
-        is_display: 0,
-        is_private: 0,
-        menu_img: 'el-icon-c-scale-to-original',
-        menu_name: '商品成本详情',
-        menu_route: 'goodsCostDetail',
-        menu_url: 'goodStore/goodsCost/detail',
-        status: 1
-      },
-      {
-        is_display: 1,
-        is_private: 0,
-        menu_img: 'el-icon-paperclip',
-        menu_name: '专属类型管理',
-        menu_route: 'exclusive',
-        menu_url: 'serviceParam/exclusive/index',
-        status: 1
-      }
-    ]
-  }
-  // {
-  //   is_display: "1",
-  //   menu_img: "el-icon-thumb",
-  //   menu_name: "竞标反馈查询",
-  //   menu_route: "recovery",
-  //   status: "1",
-  //   child: [
-  //     {
-  //       is_display: "1",
-  //       is_private: "0",
-  //       menu_img: "el-icon-thumb",
-  //       menu_name: "竞标反馈查询",
-  //       menu_route: "index",
-  //       menu_url: "recovery/index",
-  //       status: "1",
-  //     },
-  //   ],
-  // },
-
-  // {
-  //   is_display: "1",
-  //   menu_img: "el-icon-sold-out",
-  //   menu_name: "销售订单管理",
-  //   menu_route: "purchaseOrder",
-  //   status: "1",
-  //   child: [
-  //     {
-  //       is_display: "1",
-  //       is_private: "0",
-  //       menu_img: "el-icon-d-arrow-right",
-  //       menu_name: "销售订单管理",
-  //       menu_route: "index",
-  //       menu_url: "purchaseOrder/index",
-  //       status: "1",
-  //       alwaysShow: false,
-  //     },
-  //     {
-  //       is_display: "0",
-  //       is_private: "0",
-  //       menu_img: "el-icon-guide",
-  //       menu_name: "销售订单详情",
-  //       menu_route: "pDetail",
-  //       menu_url: "purchaseOrder/detail",
-  //       status: "1",
-  //       alwaysShow: false,
-  //     },
-  //   ],
-  // },
-  // {
-  //   is_display: "1",
-  //   menu_img: "el-icon-sell",
-  //   menu_name: "发货申请管理",
-  //   menu_route: "sellOutOrder",
-  //   status: "1",
-  //   child: [
-  //     {
-  //       is_display: "1",
-  //       is_private: "0",
-  //       menu_img: "el-icon-video-camera",
-  //       menu_name: "发货申请管理",
-  //       menu_route: "index",
-  //       menu_url: "sellOutOrder/index",
-  //       status: "1",
-  //       alwaysShow: false,
-  //     },
-  //     {
-  //       is_display: "0",
-  //       is_private: "0",
-  //       menu_img: "el-icon-s-finance",
-  //       menu_name: "发货申请详情",
-  //       menu_route: "sDetail",
-  //       menu_url: "sellOutOrder/detail",
-  //       status: "1",
-  //       alwaysShow: false,
-  //     },
-  //   ],
-  // },
-  // {
-  //   is_display: "1",
-  //   menu_img: "el-icon-sell",
-  //   menu_name: "发货申请批量发货",
-  //   menu_route: "sendOutOrder",
-  //   status: "1",
-  //   child: [
-  //     {
-  //       is_display: "1",
-  //       is_private: "1",
-  //       menu_img: "el-icon-truck",
-  //       menu_name: "发货申请批量发货",
-  //       menu_route: "index",
-  //       menu_url: "sendOutOrder/index",
-  //       status: "1",
-  //       alwaysShow: false,
-  //     },
-  //   ],
-  // } ,
-  // {
-  //   is_display: "1",
-  //   menu_img: "el-icon-s-finance",
-  //   menu_name: "商品管理",
-  //   menu_route: "goodsCost",
-  //   status: "1",
-  //   child: [
-  //     {
-  //       is_display: "1",
-  //       is_private: "0",
-  //       menu_img: "el-icon-suitcase-1",
-  //       menu_name: "商品管理",
-  //       menu_route: "index",
-  //       menu_url: "goodsCost/index",
-  //       status: "1",
-  //     },
-  //     {
-  //       is_display: "0",
-  //       is_private: "0",
-  //       menu_img: "el-icon-c-scale-to-original",
-  //       menu_name: "商品详情",
-  //       menu_route: "gDetail",
-  //       menu_url: "goodsCost/detail",
-  //       status: "1",
-  //     },
-  //   ],
-  // },
-  // {
-  //   is_display: "1",
-  //   menu_img: "el-icon-s-order",
-  //   menu_name: "报备单管理",
-  //   menu_route: "report",
-  //   status: "1",
-  //   child: [
-  //     {
-  //       is_display: "1",
-  //       is_private: "0",
-  //       menu_img: "el-icon-s-order",
-  //       menu_name: "报备单管理",
-  //       menu_route: "index",
-  //       menu_url: "report/index",
-  //       status: "1",
-  //       alwaysShow: false,
-  //     },
-  //     {
-  //       is_display: "0",
-  //       is_private: "0",
-  //       menu_img: "el-icon-s-order",
-  //       menu_name: "报备单详情",
-  //       menu_route: "detail",
-  //       menu_url: "report/detail",
-  //       status: "1",
-  //       alwaysShow: false,
-  //     },
-  //   ]
-  // },
-]
-function createSupplierRouteRecord() {
-  const format = str => baseName + str.slice(0, 1).toUpperCase() + str.slice(1)
-  return baseRouteRecord.map(record => ({
-    ...record, menu_route: format(record.menu_route),
-    child: record.child.map(childRecord => ({ ...childRecord, menu_url: format(childRecord.menu_url) }))
-  }))
-}
-
-export default createSupplierRouteRecord()

src/views/businessReportQuery/businessSaleReport/components/columns.js

@@ -1094,7 +1094,7 @@ const table12 = [
   },
   {
     prop: "outCode",
-    label: "发货申请单编码",
+    label: "发货单编码",
     minWidth: "155px",
   },
   {
@@ -1209,7 +1209,7 @@ const table13 = [
   },
   {
     prop: "outCode",
-    label: "发货申请编号",
+    label: "发货编号",
     minWidth: "155px",
   },
   {
@@ -1367,7 +1367,7 @@ const table14 = [
 
 ]
 
-//延时发货申请单
+//延时发货单
 const table15 = [
   // {
   //   type: "expand",
@@ -1471,7 +1471,7 @@ const table15 = [
 
 
 
-//直接发货申请单
+//直接发货单
 const table16 = [
   // {
   //   type: "expand",
@@ -1507,12 +1507,12 @@ const table16 = [
   },
   {
     prop: "outCode",
-    label: "发货申请单号",
+    label: "发货单号",
     minWidth: "155px",
   },
   {
     prop: "status",
-    label: "发货申请单状态",
+    label: "发货单状态",
     minWidth: "155px",
   },
   {
@@ -1532,7 +1532,7 @@ const table16 = [
   },
   {
     prop: "send_total_price",
-    label: "发货申请单总价",
+    label: "发货单总价",
     minWidth: "155px",
   },
   {
@@ -1926,7 +1926,7 @@ const table19 = [
 ]
 
 
-//直接发货申请单
+//直接发货单
 const table20 = [
   // {
   //   type: "expand",

src/views/businessReportQuery/businessSaleReport/components/table15.vue

@@ -40,7 +40,7 @@
                 :size="searchSize"
                 filterable
                 clearable
-                placeholder="发货申请单状态"
+                placeholder="发货单状态"
                 style="width: 100%"
                 @change="
                   pageInfo.curr = 1;
@@ -339,7 +339,7 @@ export default {
               const link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              const excelName = '延时发货申请单.zip'
+              const excelName = '延时发货单.zip'
               link.setAttribute('download', excelName)
               document.body.appendChild(link)
               link.click()

src/views/businessReportQuery/businessSaleReport/components/table16.vue

@@ -40,7 +40,7 @@
                 :size="searchSize"
                 filterable
                 clearable
-                placeholder="发货申请单状态"
+                placeholder="发货单状态"
                 style="width: 100%"
                 @change="
                   pageInfo.curr = 1;
@@ -381,7 +381,7 @@ export default {
               const link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              const excelName = '直接发货申请单.zip'
+              const excelName = '直接发货单.zip'
               link.setAttribute('download', excelName)
               document.body.appendChild(link)
               link.click()

src/views/businessReportQuery/businessSaleReport/index.vue

@@ -42,10 +42,10 @@
         <el-tab-pane label="议价明细表" name="table14">
           <table14 v-if="activeName == 'table14'"></table14>
         </el-tab-pane>
-        <el-tab-pane label="延时发货申请单" name="table15">
+        <el-tab-pane label="延时发货单" name="table15">
           <table15 v-if="activeName == 'table15'"></table15>
         </el-tab-pane>
-        <el-tab-pane label="直接发货申请单" name="table16">
+        <el-tab-pane label="直接发货单" name="table16">
           <table16 v-if="activeName == 'table16'"></table16>
         </el-tab-pane>
         <!-- <el-tab-pane label="开票明细表" name="table17"><table17 v-if="activeName == 'table17'"></table17></el-tab-pane> -->

src/views/process/columns.js

@@ -118,7 +118,7 @@ const routerList = [
     to: "id",
   },
   {
-    name: "发货申请单流程",
+    name: "发货单流程",
     type: "CKD",
     toRouter: "/sellOut/sellOutOrderDetail",
     to: "code",

src/views/purchaseIn/purchaseOrder/components/order-out-table.vue

@@ -11,7 +11,7 @@
       <!-- <el-table-column
         show-overflow-tooltip
         prop="outCode"
-        label="发货申请单号"
+        label="发货单号"
         width="160"
       />
 

src/views/reportQuery/saleReport/components/columns.js

@@ -1094,7 +1094,7 @@ const table12 = [
   },
   {
     prop: "outCode",
-    label: "发货申请单编码",
+    label: "发货单编码",
     minWidth: "155px",
   },
   {
@@ -1209,7 +1209,7 @@ const table13 = [
   },
   {
     prop: "outCode",
-    label: "发货申请编号",
+    label: "发货编号",
     minWidth: "155px",
   },
   {
@@ -1367,7 +1367,7 @@ const table14 = [
 
 ]
 
-//延时发货申请单
+//延时发货单
 const table15 = [
   // {
   //   type: "expand",
@@ -1471,7 +1471,7 @@ const table15 = [
 
 
 
-//直接发货申请单
+//直接发货单
 const table16 = [
   // {
   //   type: "expand",
@@ -1507,12 +1507,12 @@ const table16 = [
   },
   {
     prop: "outCode",
-    label: "发货申请单号",
+    label: "发货单号",
     minWidth: "155px",
   },
   {
     prop: "status",
-    label: "发货申请单状态",
+    label: "发货单状态",
     minWidth: "155px",
   },
   {
@@ -1532,7 +1532,7 @@ const table16 = [
   },
   {
     prop: "send_total_price",
-    label: "发货申请单总价",
+    label: "发货单总价",
     minWidth: "155px",
   },
   {
@@ -1926,7 +1926,7 @@ const table19 = [
 ]
 
 
-//直接发货申请单
+//直接发货单
 const table20 = [
   // {
   //   type: "expand",

src/views/reportQuery/saleReport/components/table15.vue

@@ -40,7 +40,7 @@
                 :size="searchSize"
                 filterable
                 clearable
-                placeholder="发货申请单状态"
+                placeholder="发货单状态"
                 style="width: 100%"
                 @change="
                   pageInfo.curr = 1;
@@ -331,7 +331,7 @@ export default {
               const link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              const excelName = '延时发货申请单.zip'
+              const excelName = '延时发货单.zip'
               link.setAttribute('download', excelName)
               document.body.appendChild(link)
               link.click()

src/views/reportQuery/saleReport/components/table16.vue

@@ -40,7 +40,7 @@
                 v-model="parmValue.status"
                 filterable
                 clearable
-                placeholder="发货申请单状态"
+                placeholder="发货单状态"
                 style="width: 100%"
                 @change="
                   pageInfo.curr = 1;
@@ -373,7 +373,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();

src/views/reportQuery/saleReport/index.vue

@@ -42,10 +42,10 @@
         <el-tab-pane label="议价明细表" name="table14">
           <table14 v-if="activeName == 'table14'"></table14>
         </el-tab-pane>
-        <el-tab-pane label="延时发货申请单" name="table15">
+        <el-tab-pane label="延时发货单" name="table15">
           <table15 v-if="activeName == 'table15'"></table15>
         </el-tab-pane>
-        <el-tab-pane label="直接发货申请单" name="table16">
+        <el-tab-pane label="直接发货单" name="table16">
           <table16 v-if="activeName == 'table16'"></table16>
         </el-tab-pane>
         <!-- <el-tab-pane label="开票明细表" name="table17"><table17 v-if="activeName == 'table17'"></table17></el-tab-pane> -->

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -194,7 +194,7 @@
                     <el-option label="确认单编号" value="orderCode" />
                     <el-option label="发货工单编号" value="outChildCode" />
                     <el-option label="商品成本编号" value="spuCode" />
-                    <el-option label="发货申请编号" value="outCode" />
+                    <el-option label="发货编号" value="outCode" />
                     <el-option label="商品上线编号" value="skuCode" />
                     <el-option label="申请人" value="apply_name" />
                   </el-select>

src/views/sellOut/filing/cpns/shipment-request.vue

@@ -1,7 +1,7 @@
 <template>
   <el-table v-loading="loading" size="mini" border :data="list" max-height="300px">
     <el-table-column
-      label="发货申请编号"
+      label="发货编号"
       width="160px"
       prop="orderCode"
       show-overflow-tooltip

src/views/sellOut/filing/detail.vue

@@ -14,15 +14,12 @@
               @change-status="handleChangeStatus"
               @change-num="handleChangeNum"
               @change-order-code="handleChangeOrderCode"
-              @change-detail="det => sitem = det"
+              @change-detail="(det) => (sitem = det)"
             />
           </template>
 
           <template v-if="(status == '0' || status == '2') && !isSupertube">
-            <el-collapse-item
-              title="审批"
-              name="2"
-            >
+            <el-collapse-item title="审批" name="2">
               <exam-forms
                 v-if="newTime !== ''"
                 :new-time="newTime"
@@ -39,7 +36,7 @@
           </tempalte> -->
 
           <template v-if="status === '3'">
-            <el-collapse-item name="4" title="发货申请">
+            <el-collapse-item name="4" title="发货单">
               <shipment-request :order-code="orderCode" />
             </el-collapse-item>
           </template>
@@ -51,12 +48,12 @@
 
 <script>
 // import WaitTransferred from './cpns/wait-transferred.vue'
-import ShipmentRequest from './cpns/shipment-request.vue'
-import baseDetail from './cpns/baseDetail.vue'
-import BaseForm from './cpns/baseForm.vue'
-import ExamForms from './cpns/exam-form.vue'
-import asyncRequest from '@/apis/service/sellOut/filing'
-import { mapGetters } from 'vuex'
+import ShipmentRequest from "./cpns/shipment-request.vue";
+import baseDetail from "./cpns/baseDetail.vue";
+import BaseForm from "./cpns/baseForm.vue";
+import ExamForms from "./cpns/exam-form.vue";
+import asyncRequest from "@/apis/service/sellOut/filing";
+import { mapGetters } from "vuex";
 
 export default {
   components: {
@@ -64,64 +61,64 @@ export default {
     ExamForms,
     baseDetail,
     // WaitTransferred,
-    ShipmentRequest
+    ShipmentRequest,
   },
   data() {
     return {
       loading: false,
-      activeTabs: '1',
-      collapses: ['1', '2', '3', '4'],
-      status: '',
+      activeTabs: "1",
+      collapses: ["1", "2", "3", "4"],
+      status: "",
       sitem: {},
-      orderCode: '',
-      num: '0'
-    }
+      orderCode: "",
+      num: "0",
+    };
   },
   computed: {
-    ...mapGetters(['isSupertube']),
+    ...mapGetters(["isSupertube"]),
     title() {
-      return this.id && this.id !== 'add' ? '报备单详情' : '新建报备单'
+      return this.id && this.id !== "add" ? "报备单详情" : "新建报备单";
     },
     type() {
-      return this.id && this.id !== 'add' ? 'view' : 'add'
+      return this.id && this.id !== "add" ? "view" : "add";
     },
     id() {
-      return this.$route.query.id
+      return this.$route.query.id;
     },
     getNewTime() {
-      this.newTime = new Date().valueOf()
-    }
+      this.newTime = new Date().valueOf();
+    },
   },
   methods: {
     async examFormSubmit({ companyCode, ...rest } = {}) {
-      const { id } = this.$route.query
-      this.loading = true
+      const { id } = this.$route.query;
+      this.loading = true;
       await asyncRequest.status({
         ...rest,
         id,
-        companyCode: Array.isArray(companyCode) ? companyCode[0] : companyCode
-      })
-      await this.$refs.baseForm.initData()
-      this.loading = false
-      console.log(this.loading)
+        companyCode: Array.isArray(companyCode) ? companyCode[0] : companyCode,
+      });
+      await this.$refs.baseForm.initData();
+      this.loading = false;
+      console.log(this.loading);
       // this.handleRefresh()
     },
     handleChangeStatus(status) {
-      this.status = status
+      this.status = status;
     },
     handleChangeOrderCode(orderCode) {
-      this.orderCode = orderCode
+      this.orderCode = orderCode;
     },
     async handleRefresh() {
-      this.loading = true
-      this.$refs.baseForm.initData()
-      this.loading = false
+      this.loading = true;
+      this.$refs.baseForm.initData();
+      this.loading = false;
     },
     handleChangeNum(num) {
-      this.num = num
-    }
-  }
-}
+      this.num = num;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/views/sellOut/filing/source/order-out-table.vue

@@ -13,7 +13,7 @@
       <el-table-column
         show-overflow-tooltip
         prop="outCode"
-        label="发货申请单号"
+        label="发货单号"
         width="160"
       />
 

src/views/sellOut/hawbWorkbench/columns.js

@@ -1,7 +1,7 @@
 const showColumns = [
   {
     prop: 'outCode',
-    label: '发货申请单号',
+    label: '发货单号',
     span: 6
   },
   {
@@ -11,7 +11,7 @@ const showColumns = [
   },
   {
     prop: 'status',
-    label: '发货申请单状态',
+    label: '发货单状态',
     _slot_: 'status',
     span: 6
   },
@@ -119,7 +119,7 @@ const showColumns = [
 
   // {
   //   prop: 'remark',
-  //   label: '发货申请备注',
+  //   label: '发货备注',
   //   span: 24
   // }
   // {

src/views/sellOut/hawbWorkbench/index.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading" class="hawbWorkbench">
     <div class="hawbWorkbench-slider">
       <div style="display:flex;justify-content:space-between;align-items: center;margin-bottom:5px">
-        <h4 style="margin-top:15px;margin-bottom:15px">发货申请单</h4>
+        <h4 style="margin-top:15px;margin-bottom:15px">发货单</h4>
         <el-button
           type="primary"
           size="mini"
@@ -49,7 +49,7 @@
 
     <div class="hawbWorkbench-main">
       <el-collapse v-if="this.activeKey" v-model="collapseValues">
-        <el-collapse-item v-loading="loadings.detail" title="发货申请详情" name="1">
+        <el-collapse-item v-loading="loadings.detail" title="发货详情" name="1">
           <show-data-table
             v-if="newTime"
             :new-time="newTime"
@@ -155,7 +155,7 @@
 
       <div v-else-if="!currentCompany" class="hawb-error">
         <i class="el-icon-warning" />
-        <p>请选择发货申请单</p>
+        <p>请选择发货单</p>
       </div>
 
       <search-modal :visible.sync="visible" @change="handleSearchChange" />

src/views/sellOut/hawbWorkbench/search-modal.vue

@@ -19,7 +19,7 @@
               placeholder="关键字类型"
             >
               <el-option label="销售订单编号" value="orderCode" />
-              <el-option label="发货申请单编号" value="outCode" />
+              <el-option label="发货单编号" value="outCode" />
               <el-option label="商品编号" value="good_code" />
               <el-option label="商品名称" value="good_name" />
               <el-option label="申请人部门" value="company_name" />
@@ -31,7 +31,7 @@
 
         <el-col :span="8">
           <el-form-item>
-            <el-select v-model="formData.status" size="mini" placeholder="发货申请单状态" style="width:100%">
+            <el-select v-model="formData.status" size="mini" placeholder="发货单状态" style="width:100%">
               <el-option
                 v-for="opt in statusOptions"
                 :key="opt.id"

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -17,7 +17,7 @@ export default [
   },
   {
     prop: 'outCode',
-    label: '发货申请编号',
+    label: '发货编号',
     width: '160'
   },
   {

src/views/sellOut/returnOrder/ShowDataTableColumns.js

@@ -23,7 +23,7 @@ export default [
   },
   {
     prop: "outCode",
-    label: "发货申请单编号",
+    label: "发货单编号",
     span: 6
   },
 

src/views/sellOut/returnOrder/columns.js

@@ -12,7 +12,7 @@ export default [
   // },
   // {
   //   prop: "outCode",
-  //   label: "发货申请单编号",
+  //   label: "发货单编号",
   //   width: "160"
   // },
 

src/views/sellOut/returnOrder/index.vue

@@ -186,7 +186,7 @@
                   >
                     <el-option label="售后退货单编号" value="returnNo" />
                     <el-option label="售后申请单编号" value="serviceNo" />
-                    <el-option label="发货申请单编号" value="outOrderNo" />
+                    <el-option label="发货单编号" value="outOrderNo" />
                     <el-option label="销售订单编号" value="orderNo" />
                     <el-option label="快递单号" value="expressNo" />
                   </el-select>

src/views/sellOut/salesOrder/components/addReturnAllModel.vue

@@ -118,7 +118,7 @@ export default {
         good_num: '',
         thnum: '',
         return_type: '1',
-        orderCode: '', // 发货申请单编号
+        orderCode: '', // 发货单编号
         remark: '', // 退货备注
         errorCode: '', // 退货原因
         returnT: ''
@@ -209,7 +209,7 @@ export default {
           } = this.sitem
           this.ruleForm = {
             thnum: thnum || '0',
-            orderCode, // 发货申请单编号
+            orderCode, // 发货单编号
             remark, // 退货备注
             errorCode, // 退货原因
             returnT: returnT || '0'

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -13,7 +13,7 @@
       <el-table-column
         show-overflow-tooltip
         prop="outCode"
-        label="发货申请单号"
+        label="发货单号"
         width="160"
       />
 
@@ -484,9 +484,9 @@ export default {
         });
         console.log(tol, send_num);
         if (this.multipleSelection.length == 0) {
-          this.$message.warning("请选择发货申请单！");
+          this.$message.warning("请选择发货单！");
         } else if (tol !== 0) {
-          this.$message.warning("不能已发货的发货申请单！");
+          this.$message.warning("不能已发货的发货单！");
         } else {
           // const { addrid, send_num, outCode } = e;
           this.resModel = {

src/views/sellOut/salesOrder/components/out-order-add-model.vue

@@ -178,7 +178,7 @@ export default {
     return {
       roleList: [],
       loading: false,
-      title: '新建发货申请单',
+      title: '新建发货单',
       showModelThis: this.showModel,
       rulesThis: {},
       rules: {

src/views/sellOut/salesOrder/detail.vue

@@ -82,16 +82,18 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>购买方公司编号：</span><span>{{ sitem.customer_code }}</span>
+                        <span>购买方公司编号：</span
+                        ><span>{{ sitem.customer_code }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                 </template>
                 <template slot="is_active">
-                  <span v-if="sitem.order_type + '' === '1' || sitem.order_type + '' === '2'"
+                  <span
+                    v-if="sitem.order_type + '' === '1' || sitem.order_type + '' === '2'"
                     ><span
-                      >{{ sitem.is_activity + '' === "1" ? "参与活动" : "不参与活动" }}/{{
+                      >{{ sitem.is_activity + "" === "1" ? "参与活动" : "不参与活动" }}/{{
                         (
                           goodtype_options.find(
                             (item) => item.value == sitem.good_type
@@ -139,9 +141,9 @@
                 </template>
                 <template slot="send_type">
                   <el-tag :size="'mini'">{{
-                    sitem.send_type + '' === "1"
+                    sitem.send_type + "" === "1"
                       ? "有地址下单"
-                      : sitem.send_type + '' === "2"
+                      : sitem.send_type + "" === "2"
                       ? "无地址下单"
                       : "--"
                   }}</el-tag>
@@ -157,7 +159,7 @@
                 :spucode="sitem.good_code"
               />
             </el-collapse-item>
-            <el-collapse-item title="发货申请" name="3">
+            <el-collapse-item title="发货单" name="3">
               <order-out-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -179,10 +181,9 @@
 
         <el-tab-pane label="流程图" name="3" v-if="queryType !== 'add'">
           <flow-chart process_id="4" type="XSQRD" :orderCode="queryId" />
-       </el-tab-pane>
+        </el-tab-pane>
       </el-tabs>
 
-
       <!-- <edit-add
         :id="modelId"
         :sitem="sitem"
@@ -293,7 +294,7 @@ export default {
         type: "warning",
       })
         .then(async () => {
-          if (status + '' === "-1") {
+          if (status + "" === "-1") {
             await this.deleteById(message);
           } else {
             await this.setStatus(status, message);
@@ -345,7 +346,7 @@ export default {
     },
     async examForm(e) {
       if (!this.loading) {
-        let type = e.state + '' === "1" ? "2" : "0";
+        let type = e.state + "" === "1" ? "2" : "0";
         await this.setStatus(type, "提交入库方审核", e.remark);
       }
     },

src/views/sellOut/sellAfterApply/columns.js

@@ -26,7 +26,7 @@ const columns = [
   // },
   {
     prop: 'outCode',
-    label: '发货申请单编号',
+    label: '发货单编号',
     width: '160'
   },
   {
@@ -172,7 +172,7 @@ const sellshowColumns = [
   },
   {
     prop: 'outCode',
-    label: '发货申请单编号',
+    label: '发货单编号',
     span: 6
   },
   {
@@ -282,7 +282,7 @@ const sellshowColumns = [
   // },
   // {
   //   prop: "total_price",
-  //   label: "发货申请单总价",
+  //   label: "发货单总价",
   // },
 
   // {

src/views/sellOut/sellAfterApply/components/set-work-order.vue

@@ -3,7 +3,7 @@
     <el-form ref="formRef" :model="list">
       <el-table size="mini" border :data="list">
         <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
-        <el-table-column prop="outCode" label="发货申请单" width="160px" show-overflow-toolti />
+        <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
         <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
         <el-table-column label="发货仓库所在供应商名称" prop="supplierName" width="170px" show-overflow-tooltip />
         <el-table-column label="发货仓库所在供应商编码" prop="supplierNo" width="170px" show-overflow-tooltip />

src/views/sellOut/sellAfterApply/components/wait-stockman.vue

@@ -3,7 +3,7 @@
     <el-form>
       <el-table size="mini" border :data="list">
         <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
-        <el-table-column prop="outCode" label="发货申请单" width="160px" show-overflow-tooltip />
+        <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-tooltip />
         <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
         <el-table-column label="发货仓库所在供应商名称" prop="send_supplierName" width="170px" show-overflow-tooltip />
         <el-table-column label="发货仓库所在供应商编码" prop="send_supplierNo" width="170px" show-overflow-tooltip />

src/views/sellOut/sellAfterApply/index.vue

@@ -103,7 +103,7 @@
                     placeholder="关键字类型"
                   >
                     <el-option label="售后申请编号" value="serviceNum"></el-option>
-                    <el-option label="发货申请单编号" value="sellOutNum"></el-option>
+                    <el-option label="发货单编号" value="sellOutNum"></el-option>
 
                     <el-option label="销售订单编号" value="sellOrderNum"></el-option>
                     <el-option label="商品编号" value="goodsNum"></el-option>

src/views/sellOut/sellOutOrder/columns.js

@@ -6,7 +6,7 @@ const columns = [
   },
   {
     prop: 'outCode',
-    label: '发货申请单编号',
+    label: '发货单编号',
     width: '156'
   },
 
@@ -151,12 +151,12 @@ const columns = [
 const showColumns = [
   {
     prop: 'outCode',
-    label: '发货申请单号',
+    label: '发货单号',
     span: 6
   },
   {
     prop: 'status',
-    label: '发货申请单状态',
+    label: '发货单状态',
     _slot_: 'status',
     span: 6
   },
@@ -252,7 +252,7 @@ const showColumns = [
 
   {
     prop: 'remark',
-    label: '发货申请备注',
+    label: '发货备注',
     span: 24
   },
   {
@@ -324,7 +324,7 @@ const rshowColumns = [
   },
   {
     prop: 'total_price',
-    label: '发货申请单总价',
+    label: '发货单总价',
     span: 6
   },
   {
@@ -358,7 +358,7 @@ const sendOutOrderColumns = [
   },
   {
     prop: 'value25',
-    label: '发货申请单号',
+    label: '发货单号',
     width: '156px'
   },
 
@@ -410,22 +410,22 @@ const sendOutOrderColumns = [
   },
   {
     prop: 'value27',
-    label: '发货申请单物流公司',
+    label: '发货单物流公司',
     width: '150px'
   },
   {
     prop: 'value28',
-    label: '发货申请单物流单号',
+    label: '发货单物流单号',
     width: '150px'
   },
   {
     prop: 'value29',
-    label: '发货申请单物流费用',
+    label: '发货单物流费用',
     width: '140px'
   },
   {
     prop: 'value30',
-    label: '发货申请单备注',
+    label: '发货单备注',
     'min-width': '150px'
   }
 ]
@@ -456,12 +456,12 @@ const head = [
   '联系方式',
   '收货地址',
   '到货时间',
-  '发货申请单号',
+  '发货单号',
   '平台订单号',
-  '发货申请单物流公司',
-  '发货申请单物流单号',
-  '发货申请单物流费用',
-  '发货申请单备注',
+  '发货单物流公司',
+  '发货单物流单号',
+  '发货单物流费用',
+  '发货单备注',
   '申请人',
   '商品分类'
 ]

src/views/sellOut/sellOutOrder/components/addEditFormA.vue

@@ -207,7 +207,7 @@ export default {
         send_num: "",
         order_type: "",
         outCode: "", //
-        stock_out_numbers: "", //发货申请单编号
+        stock_out_numbers: "", //发货单编号
         num: "", //异常数量
         errorCode: "", //异常原因
         except_code: "", //期望意愿
@@ -339,7 +339,7 @@ export default {
             error_code,
           } = console.log(res.data);
           this.ruleForm = {
-            stock_out_numbers: "", //发货申请单编号
+            stock_out_numbers: "", //发货单编号
             num: error_num, //异常数量
             errorCode: error_code, //异常原因
             except_code: except_code, //期望意愿

src/views/sellOut/sellOutOrder/components/addEdit_sellForm.vue

@@ -178,7 +178,7 @@ export default {
       ruleForm: {
         send_num: "",
         order_type: "",
-        outCode: "", //发货申请单编号
+        outCode: "", //发货单编号
         error_num: "", //异常数量
         error_img: [], //异常图片
         error_remark: "", //异常备注
@@ -305,7 +305,7 @@ export default {
           } = this.sitem;
 
           this.ruleForm = {
-            outCode: outCode || "", //发货申请单编号
+            outCode: outCode || "", //发货单编号
             error_num: error_num || "", //异常数量
             error_code: error_code || "", //异常原因
             except_code: except_code || "", //期望意愿

src/views/sellOut/sellOutOrder/detail.vue

@@ -2,7 +2,7 @@
   <div class="sellOutOrderDetail pagePadding">
     <div style="width: 100%; padding: 0 0 200px 0" v-if="powers.some((i) => i == '007')">
       <div class="detail-page-title">
-        <span>发货申请单编号：</span><span v-if="sitem">{{ sitem.outCode }}</span>
+        <span>发货单编号：</span><span v-if="sitem">{{ sitem.outCode }}</span>
         <el-button
           class="fr"
           v-if="
@@ -49,7 +49,7 @@
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="发货申请单详情" name="1">
+            <el-collapse-item title="发货单详情" name="1">
               <show-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -370,7 +370,7 @@ import { mapGetters } from "vuex";
 import { shareWebUrl } from "@/config";
 import returnExpress from "./components/returnExpress";
 import wantDeliver from "./components/want-deliver";
-import addEditForm from "./components/addEditForm"; //发货申请单详情
+import addEditForm from "./components/addEditForm"; //发货单详情
 import addEditA from "./components/addEditA";
 import privateField from "@/mixins/privateField";
 

src/views/sellOut/sellOutOrder/index.vue

@@ -216,7 +216,7 @@
                     placeholder="关键字类型"
                   >
                     <el-option label="销售订单编号" value="orderCode" />
-                    <el-option label="发货申请单编号" value="outCode" />
+                    <el-option label="发货单编号" value="outCode" />
                     <!-- <el-option label="供应商名称" value="supplier_name" /> -->
                     <el-option label="商品编号" value="good_code" />
                     <el-option label="商品名称" value="good_name" />
@@ -547,7 +547,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();

src/views/sellOut/sellOutOrder/sendOutOrder.vue

@@ -205,7 +205,7 @@ export default {
           this.$notify.warning({
             title: "以下单号不能为空!",
             message:
-              "发货申请单号/发货申请单物流公司/发货申请单物流单号/发货申请单物流费用/发货申请单备注",
+              "发货单号/发货单物流公司/发货单物流单号/发货单物流费用/发货单备注",
           });
           this.loading = false;
           return;

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

@@ -91,7 +91,7 @@ const showColumns = [
   },
   {
     prop: 'addrinfo',
-    label: '发货申请信息',
+    label: '发货信息',
     _slot_: 'addrinfo',
     span: 24
   }

src/views/sellOut/sellReturn/components/addForm.vue

@@ -132,7 +132,7 @@ export default {
       loading: false,
       showModelThis: this.showModel,
       ruleForm: {
-        orderCode: '', // 发货申请单编号
+        orderCode: '', // 发货单编号
         remark: '', // 退货备注
         errorCode: '' // 退货原因
       },

src/views/sellOut/sellReturn/components/addModel.vue

@@ -228,7 +228,7 @@ export default {
         good_num: '',
         thnum: '',
         return_type: '1',
-        orderCode: '', // 发货申请单编号
+        orderCode: '', // 发货单编号
         remark: '', // 退货备注
         errorCode: '', // 退货原因
         returnT: ''
@@ -351,7 +351,7 @@ export default {
             good_num,
             thnum,
             return_type,
-            orderCode, // 发货申请单编号
+            orderCode, // 发货单编号
             remark, // 退货备注
             errorCode, // 退货原因
             returnT,

src/views/sellOut/sellReturn/components/comExamForm.vue

@@ -103,7 +103,7 @@ export default {
       return_company: '',
       ruleForm: {
         is_th: '1',
-        returnCode: '', // 发货申请单编号
+        returnCode: '', // 发货单编号
         remark: '', // 退货备注
         return_company: [],
         return_wsm: [] // 退货原因

src/views/sellOut/sellReturn/components/set-work-order.vue

@@ -4,7 +4,7 @@
       <el-form ref="formRef" :model="list">
         <el-table size="mini" border :data="list">
           <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
-          <el-table-column prop="outCode" label="发货申请单" width="160px" show-overflow-toolti />
+          <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
           <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
           <el-table-column label="发货仓库所在供应商名称" prop="supplierName" width="170px" show-overflow-tooltip />
           <el-table-column label="发货仓库所在供应商编码" prop="supplierNo" width="170px" show-overflow-tooltip />

src/views/sellOut/sellReturn/detail.vue

@@ -88,7 +88,7 @@
                       max-height="300px"
                     >
                       <el-table-column
-                        label="发货申请单号"
+                        label="发货单号"
                         prop="outCode"
                         width="160"
                         show-overflow-tooltip

src/views/sellOut/zixunOrder/ShowDataTableColumns.js

@@ -10,7 +10,7 @@ export default [
   },
   {
     prop: "outCode",
-    label: "发货申请单编号"
+    label: "发货单编号"
   },
 
   // {
@@ -63,7 +63,7 @@ export default [
   // },
   {
     prop: "total_price",
-    label: "发货申请单总价",
+    label: "发货单总价",
   },
 
   {

src/views/standingBook/columns.js

@@ -56,7 +56,7 @@ const schTahead = [
   },
   // {
   //   prop: "outCode",
-  //   label: "发货申请单",
+  //   label: "发货单",
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },
@@ -178,7 +178,7 @@ const columns = [
   },
   // {
   //   prop: "outCode",
-  //   label: "发货申请单编号",
+  //   label: "发货单编号",
   //   t1:"方便统一修改、留存",
   //   minWidth:155,
   // },

src/views/standingBook/components/detail11/columns.js

@@ -2,12 +2,12 @@
 const columns = [
   {
     prop: "outCode",
-    label: "发货申请单号",
+    label: "发货单号",
     span: 6
   },
   {
     prop: "status",
-    label: "发货申请单状态",
+    label: "发货单状态",
     _slot_: "status",
     span: 6
   },
@@ -61,7 +61,7 @@ const columns = [
   },
   {
     prop: "total_price",
-    label: "发货申请单总价",
+    label: "发货单总价",
     _slot_: "total_price",
     span: 6
   },
@@ -104,7 +104,7 @@ const columns = [
 
   {
     prop: "remark",
-    label: "发货申请备注",
+    label: "发货备注",
     span: 24
   },
 
@@ -127,7 +127,7 @@ const listColumns = [
   // },
   {
     prop: "outCode",
-    label: "发货申请单编号",
+    label: "发货单编号",
     width: "156"
   },
 

src/views/standingBook/components/detail11/main.vue

@@ -20,7 +20,7 @@
         </template>
         <template slot="order_type">
           <el-tag :size="'mini'" :type="''">{{
-            sitem.status + '' === "1" ? "发货申请单" : "竞价发货申请单"
+            sitem.status + '' === "1" ? "发货单" : "竞价发货单"
           }}</el-tag>
         </template>
         <template slot="sale_price">

src/views/standingBook/components/detail12/columns.js

@@ -12,7 +12,7 @@ const columns = [
   },
   {
     prop: 'outCode',
-    label: '发货申请单编号',
+    label: '发货单编号',
     span: 6
   },
 
@@ -88,7 +88,7 @@ const columns = [
   // },
   // {
   //   prop: "total_price",
-  //   label: "发货申请单总价",
+  //   label: "发货单总价",
   // },
 
   // {
@@ -124,7 +124,7 @@ const listColumns = [
   // },
   {
     prop: 'outCode',
-    label: '发货申请单编号',
+    label: '发货单编号',
     width: '160'
   },
   {

src/views/standingBook/components/detail13/columns.js

@@ -23,7 +23,7 @@ const columns = [
   },
   {
     prop: "outCode",
-    label: "发货申请单编号",
+    label: "发货单编号",
     span: 6
   },
 
@@ -84,7 +84,7 @@ const listColumens = [
   // },
   // {
   //   prop: "outCode",
-  //   label: "发货申请单编号",
+  //   label: "发货单编号",
   //   minWidth: "160"
   // },
  

src/views/standingBook/components/detail14/columns.js

@@ -155,7 +155,7 @@ const columns = [
   },
   {
     prop: 'addrinfo',
-    label: '发货申请信息',
+    label: '发货信息',
     _slot_: 'addrinfo',
     span: 24
   }

src/views/standingBook/detail.vue

@@ -77,7 +77,7 @@
 
             <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
             <div id="detail11" v-if="tableData.orderCode">
-              <el-collapse-item title="发货申请单" name="11" v-if="newTime !== ''">
+              <el-collapse-item title="发货单" name="11" v-if="newTime !== ''">
                 <detail11 :queryId="tableData.orderCode"> </detail11>
               </el-collapse-item>
             </div>
@@ -212,7 +212,7 @@ export default {
         // { tar: "#detail8", title: "销售：议价单" },
         // { tar: "#detail9", title: "销售：备货申请单" },
         // { tar: "#detail10", title: "销售：销售订单" },
-        // { tar: "#detail11", title: "销售：发货申请单" },
+        // { tar: "#detail11", title: "销售：发货单" },
         // { tar: "#detail12", title: "销售：售后申请单" },
         // { tar: "#detail13", title: "销售：售后退货单" },
         // { tar: "#detail14", title: "销售：退货单" },
@@ -319,7 +319,7 @@ export default {
         : (flag = false);
       //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
       (orderCode ?? "") != ""
-        ? arr.push({ tar: "#detail11", title: "销售发货申请单" })
+        ? arr.push({ tar: "#detail11", title: "销售发货单" })
         : (flag = false);
       //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
       (orderCode ?? "") != ""

src/views/supplierPurchaseIn/supplierPurchaseOrder/components/order-out-table.vue

@@ -11,7 +11,7 @@
       <!-- <el-table-column
         show-overflow-tooltip
         prop="outCode"
-        label="发货申请单号"
+        label="发货单号"
         width="160"
       />
 

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -175,7 +175,7 @@
                       <el-option label="确认单编号" value="orderCode" />
                       <el-option label="发货工单编号" value="outChildCode" />
                       <el-option label="商品成本编号" value="spuCode" />
-                      <el-option label="发货申请编号" value="outCode" />
+                      <el-option label="发货编号" value="outCode" />
                       <el-option label="商品上线编号" value="skuCode" />
                       <el-option label="申请人" value="apply_name" />
                     </el-select>

src/views/supplierSellOut/supplierFiling/cpns/shipment-request.vue

@@ -1,7 +1,7 @@
 <template>
   <el-table v-loading="loading" size="mini" border :data="list" max-height="300px">
     <el-table-column
-      label="发货申请编号"
+      label="发货编号"
       width="160px"
       prop="orderCode"
       show-overflow-tooltip

src/views/supplierSellOut/supplierFiling/detail.vue

@@ -14,7 +14,7 @@
               @change-status="handleChangeStatus"
               @change-num="handleChangeNum"
               @change-order-code="handleChangeOrderCode"
-              @change-detail="det => sitem = det"
+              @change-detail="(det) => (sitem = det)"
             />
           </template>
 
@@ -39,7 +39,7 @@
           </tempalte>
 
           <template v-if="status === '3'">
-            <el-collapse-item name="4" title="发货申请">
+            <el-collapse-item name="4" title="发货单">
               <shipment-request :order-code="orderCode" />
             </el-collapse-item>
           </template>
@@ -50,13 +50,13 @@
 </template>
 
 <script>
-import WaitTransferred from './cpns/wait-transferred.vue'
-import ShipmentRequest from './cpns/shipment-request.vue'
-import baseDetail from './cpns/baseDetail.vue'
-import BaseForm from './cpns/baseForm.vue'
+import WaitTransferred from "./cpns/wait-transferred.vue";
+import ShipmentRequest from "./cpns/shipment-request.vue";
+import baseDetail from "./cpns/baseDetail.vue";
+import BaseForm from "./cpns/baseForm.vue";
 // import ExamForms from './cpns/exam-form.vue'
-import asyncRequest from '@/apis/service/sellOut/filing'
-import { mapGetters } from 'vuex'
+import asyncRequest from "@/apis/service/sellOut/filing";
+import { mapGetters } from "vuex";
 
 export default {
   components: {
@@ -64,63 +64,63 @@ export default {
     // ExamForms,
     baseDetail,
     WaitTransferred,
-    ShipmentRequest
+    ShipmentRequest,
   },
   data() {
     return {
       loading: false,
-      activeTabs: '1',
-      collapses: ['1', '2', '3', '4'],
-      status: '',
+      activeTabs: "1",
+      collapses: ["1", "2", "3", "4"],
+      status: "",
       sitem: {},
-      orderCode: '',
-      num: '0'
-    }
+      orderCode: "",
+      num: "0",
+    };
   },
   computed: {
-    ...mapGetters(['isSupertube']),
+    ...mapGetters(["isSupertube"]),
     title() {
-      return this.id && this.id !== 'add' ? '报备单详情' : '新建报备单'
+      return this.id && this.id !== "add" ? "报备单详情" : "新建报备单";
     },
     type() {
-      return this.id && this.id !== 'add' ? 'view' : 'add'
+      return this.id && this.id !== "add" ? "view" : "add";
     },
     id() {
-      return this.$route.query.id
+      return this.$route.query.id;
     },
     getNewTime() {
-      this.newTime = new Date().valueOf()
-    }
+      this.newTime = new Date().valueOf();
+    },
   },
   methods: {
     async examFormSubmit({ companyCode, ...rest } = {}) {
-      const { id } = this.$route.query
-      this.loading = true
+      const { id } = this.$route.query;
+      this.loading = true;
       await asyncRequest.status({
         ...rest,
         id,
-        companyCode: Array.isArray(companyCode) ? companyCode[0] : companyCode
-      })
+        companyCode: Array.isArray(companyCode) ? companyCode[0] : companyCode,
+      });
 
-      await this.$refs.baseForm.initData()
-      this.loading = false
+      await this.$refs.baseForm.initData();
+      this.loading = false;
     },
     handleChangeStatus(status) {
-      this.status = status
+      this.status = status;
     },
     handleChangeOrderCode(orderCode) {
-      this.orderCode = orderCode
+      this.orderCode = orderCode;
     },
     async handleRefresh() {
-      this.loading = true
-      await this.$refs.baseForm.initData()
-      this.loading = false
+      this.loading = true;
+      await this.$refs.baseForm.initData();
+      this.loading = false;
     },
     handleChangeNum(num) {
-      this.num = num
-    }
-  }
-}
+      this.num = num;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/views/supplierSellOut/supplierFiling/source/order-out-table.vue

@@ -13,7 +13,7 @@
       <el-table-column
         show-overflow-tooltip
         prop="outCode"
-        label="发货申请单号"
+        label="发货单号"
         width="160"
       />
 

src/views/supplierSellOut/supplierReturnOrder/ShowDataTableColumns.js

@@ -23,7 +23,7 @@ export default [
   },
   {
     prop: "outCode",
-    label: "发货申请单编号",
+    label: "发货单编号",
     span: 6
   },
 

src/views/supplierSellOut/supplierReturnOrder/columns.js

@@ -12,7 +12,7 @@ export default [
   // },
   // {
   //   prop: "outCode",
-  //   label: "发货申请单编号",
+  //   label: "发货单编号",
   //   width: "160"
   // },
 

src/views/supplierSellOut/supplierReturnOrder/index.vue

@@ -121,7 +121,7 @@
                   >
                     <el-option label="售后退货单编号" value="returnNo" />
                     <el-option label="售后申请单编号" value="serviceNo" />
-                    <el-option label="发货申请单编号" value="outOrderNo" />
+                    <el-option label="发货单编号" value="outOrderNo" />
                     <el-option label="销售订单编号" value="orderNo" />
                     <el-option label="快递单号" value="expressNo" />
                   </el-select>

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -17,7 +17,7 @@ export default [
   },
   {
     prop: 'outCode',
-    label: '发货申请编号',
+    label: '发货编号',
     width: '160'
   },
   // {

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -12,7 +12,7 @@ const columns = [
   // },
   {
     prop: "outCode",
-    label: "发货申请单编号",
+    label: "发货单编号",
     width: "160",
   },
   {
@@ -133,7 +133,7 @@ const sellshowColumns = [
   },
   {
     prop: "outCode",
-    label: "发货申请单编号",
+    label: "发货单编号",
     span: 6,
   },
 
@@ -214,7 +214,7 @@ const sellshowColumns = [
   // },
   // {
   //   prop: "total_price",
-  //   label: "发货申请单总价",
+  //   label: "发货单总价",
   // },
 
   // {

src/views/supplierSellOut/supplierSellAfterApply/components/set-work-order.vue

@@ -3,8 +3,8 @@
     <el-form ref="formRef" :model="list">
       <el-table size="mini" border :data="list">
         <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
-        <el-table-column prop="outCode" label="发货申请单" width="160px" show-overflow-toolti />
-        <!-- <el-table-column label="提退时发货申请单状态" prop="order_out_status" width="150px" show-overflow-tooltip /> -->
+        <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
+        <!-- <el-table-column label="提退时发货单状态" prop="order_out_status" width="150px" show-overflow-tooltip /> -->
         <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
         <el-table-column label="发货仓库所在供应商名称" prop="supplierName" width="170px" show-overflow-tooltip />
         <el-table-column label="发货仓库所在供应商编码" prop="supplierNo" width="170px" show-overflow-tooltip />

src/views/supplierSellOut/supplierSellAfterApply/components/wait-stockman.vue

@@ -2,7 +2,7 @@
   <div class="work-order__wrapper">
     <el-table size="mini" border :data="list">
       <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
-      <el-table-column prop="outCode" label="发货申请单" width="160px" show-overflow-tooltip />
+      <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-tooltip />
       <!-- <el-table-column label="发货单状态" prop="order_out_status" width="150px" show-overflow-tooltip /> -->
       <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
       <el-table-column label="发货仓库所在供应商名称" prop="send_supplierName" width="170px" show-overflow-tooltip />

src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -139,7 +139,7 @@
                       value="serviceNum"
                     ></el-option>
                     <el-option
-                      label="发货申请单编号"
+                      label="发货单编号"
                       value="sellOutNum"
                     ></el-option>
 

src/views/supplierSellOut/supplierSellOutOrder/columns.js

@@ -6,7 +6,7 @@ const columns = [
   },
   {
     prop: 'outCode',
-    label: '发货申请单编号',
+    label: '发货单编号',
     width: '156'
   },
 
@@ -143,12 +143,12 @@ const columns = [
 const showColumns = [
   {
     prop: 'outCode',
-    label: '发货申请单号',
+    label: '发货单号',
     span: 6
   },
   {
     prop: 'status',
-    label: '发货申请单状态',
+    label: '发货单状态',
     _slot_: 'status',
     span: 6
   },
@@ -244,7 +244,7 @@ const showColumns = [
 
   {
     prop: 'remark',
-    label: '发货申请备注',
+    label: '发货备注',
     span: 24
   },
   {
@@ -316,7 +316,7 @@ const rshowColumns = [
   },
   {
     prop: 'total_price',
-    label: '发货申请单总价',
+    label: '发货单总价',
     span: 6
   },
   {
@@ -350,7 +350,7 @@ const sendOutOrderColumns = [
   },
   {
     prop: 'value25',
-    label: '发货申请单号',
+    label: '发货单号',
     width: '156px'
   },
 
@@ -402,22 +402,22 @@ const sendOutOrderColumns = [
   },
   {
     prop: 'value27',
-    label: '发货申请单物流公司',
+    label: '发货单物流公司',
     width: '150px'
   },
   {
     prop: 'value28',
-    label: '发货申请单物流单号',
+    label: '发货单物流单号',
     width: '150px'
   },
   {
     prop: 'value29',
-    label: '发货申请单物流费用',
+    label: '发货单物流费用',
     width: '140px'
   },
   {
     prop: 'value30',
-    label: '发货申请单备注',
+    label: '发货单备注',
     'min-width': '150px'
   }
 ]
@@ -448,12 +448,12 @@ const head = [
   '联系方式',
   '收货地址',
   '到货时间',
-  '发货申请单号',
+  '发货单号',
   '平台订单号',
-  '发货申请单物流公司',
-  '发货申请单物流单号',
-  '发货申请单物流费用',
-  '发货申请单备注',
+  '发货单物流公司',
+  '发货单物流单号',
+  '发货单物流费用',
+  '发货单备注',
   '申请人',
   '商品分类'
 ]

src/views/supplierSellOut/supplierSellOutOrder/components/addEditFormA.vue

@@ -198,7 +198,7 @@ export default {
         send_num: "",
         order_type: "",
         outCode: "", //
-        stock_out_numbers: "", //发货申请单编号
+        stock_out_numbers: "", //发货单编号
         num: "", //异常数量
         errorCode: "", //异常原因
         except_code: "", //期望意愿
@@ -330,7 +330,7 @@ export default {
             error_code,
           } = console.log(res.data);
           this.ruleForm = {
-            stock_out_numbers: "", //发货申请单编号
+            stock_out_numbers: "", //发货单编号
             num: error_num, //异常数量
             errorCode: error_code, //异常原因
             except_code: except_code, //期望意愿

src/views/supplierSellOut/supplierSellOutOrder/components/addEdit_sellForm.vue

@@ -178,7 +178,7 @@ export default {
       ruleForm: {
         send_num: "",
         order_type: "",
-        outCode: "", //发货申请单编号
+        outCode: "", //发货单编号
         error_num: "", //异常数量
         error_img: [], //异常图片
         error_remark: "", //异常备注
@@ -305,7 +305,7 @@ export default {
           } = this.sitem;
 
           this.ruleForm = {
-            outCode: outCode || "", //发货申请单编号
+            outCode: outCode || "", //发货单编号
             error_num: error_num || "", //异常数量
             error_code: error_code || "", //异常原因
             except_code: except_code || "", //期望意愿

src/views/supplierSellOut/supplierSellOutOrder/detail.vue

@@ -2,7 +2,7 @@
   <div class="sellOutOrderDetail pagePadding">
     <div style="width: 100%; padding: 0 0 200px 0" v-if="powers.some((i) => i == '007')">
       <div class="detail-page-title">
-        <span>发货申请单编号：</span><span v-if="sitem">{{ sitem.outCode }}</span>
+        <span>发货单编号：</span><span v-if="sitem">{{ sitem.outCode }}</span>
         <!-- <el-button
           class="fr"
           v-if="
@@ -49,7 +49,7 @@
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="发货申请单详情" name="1">
+            <el-collapse-item title="发货单详情" name="1">
               <show-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -369,7 +369,7 @@ import { mapGetters } from "vuex";
 import { shareWebUrl } from "@/config";
 import returnExpress from "./components/returnExpress";
 import wantDeliver from "./components/want-deliver";
-import addEditForm from "./components/addEditForm"; //发货申请单详情
+import addEditForm from "./components/addEditForm"; //发货单详情
 import addEditA from "./components/addEditA";
 import privateField from "@/mixins/privateField";
 

src/views/supplierSellOut/supplierSellOutOrder/index.vue

@@ -185,7 +185,7 @@
                     placeholder="关键字类型"
                   >
                     <el-option label="销售订单编号" value="orderCode" />
-                    <el-option label="发货申请单编号" value="outCode" />
+                    <el-option label="发货单编号" value="outCode" />
                     <!-- <el-option label="供应商名称" value="supplier_name" /> -->
                     <el-option label="商品编号" value="good_code" />
                     <el-option label="商品名称" value="good_name" />
@@ -481,7 +481,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();

src/views/supplierSellOut/supplierSellOutOrder/supplierSendOutOrder.vue

@@ -205,7 +205,7 @@ export default {
           this.$notify.warning({
             title: "以下单号不能为空!",
             message:
-              "发货申请单号/发货申请单物流公司/发货申请单物流单号/发货申请单物流费用/发货申请单备注",
+              "发货单号/发货单物流公司/发货单物流单号/发货单物流费用/发货单备注",
           });
           this.loading = false;
           return;

src/views/supplierSellOut/supplierSellReturn/components/ShowDataTableColumns.js

@@ -91,7 +91,7 @@ const showColumns = [
   },
   {
     prop: 'addrinfo',
-    label: '发货申请信息',
+    label: '发货信息',
     _slot_: 'addrinfo',
     span: 24
   }

src/views/supplierSellOut/supplierSellReturn/components/addForm.vue

@@ -132,7 +132,7 @@ export default {
       loading: false,
       showModelThis: this.showModel,
       ruleForm: {
-        orderCode: '', // 发货申请单编号
+        orderCode: '', // 发货单编号
         remark: '', // 退货备注
         errorCode: '' // 退货原因
       },

src/views/supplierSellOut/supplierSellReturn/components/addModel.vue

@@ -228,7 +228,7 @@ export default {
         good_num: '',
         thnum: '',
         return_type: '1',
-        orderCode: '', // 发货申请单编号
+        orderCode: '', // 发货单编号
         remark: '', // 退货备注
         errorCode: '', // 退货原因
         returnT: ''
@@ -351,7 +351,7 @@ export default {
             good_num,
             thnum,
             return_type,
-            orderCode, // 发货申请单编号
+            orderCode, // 发货单编号
             remark, // 退货备注
             errorCode, // 退货原因
             returnT,

src/views/supplierSellOut/supplierSellReturn/components/comExamForm.vue

@@ -103,7 +103,7 @@ export default {
       return_company: '',
       ruleForm: {
         is_th: '1',
-        returnCode: '', // 发货申请单编号
+        returnCode: '', // 发货单编号
         remark: '', // 退货备注
         return_company: [],
         return_wsm: [] // 退货原因

src/views/supplierSellOut/supplierSellReturn/components/set-work-order.vue

@@ -4,7 +4,7 @@
       <el-form ref="formRef" :model="list">
         <el-table size="mini" border :data="list">
           <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
-          <el-table-column prop="outCode" label="发货申请单" width="160px" show-overflow-toolti />
+          <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
           <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
           <el-table-column label="发货仓库所在供应商名称" prop="supplierName" width="170px" show-overflow-tooltip />
           <el-table-column label="发货仓库所在供应商编码" prop="supplierNo" width="170px" show-overflow-tooltip />

src/views/supplierSellOut/supplierSellReturn/detail.vue

@@ -92,7 +92,7 @@
                       max-height="300px"
                     >
                       <el-table-column
-                        label="发货申请单号"
+                        label="发货单号"
                         prop="outCode"
                         width="160"
                         show-overflow-tooltip

src/views/youzan/othOrder/detail.vue

@@ -147,7 +147,7 @@
                 :spucode="sitem.good_code"
               />
             </el-collapse-item>
-            <el-collapse-item title="发货申请" name="3">
+            <el-collapse-item title="发货" name="3">
               <order-out-table
                 :newTime="newTime"
                 v-if="newTime !== ''"