xiaodai2022 2 years ago
parent
commit
b80de0be1d

BIN
dist/static/C端订单导入模板.xlsx


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 1 - 1
src/views/orderEntry/orderEnter/columns.js

@@ -140,7 +140,7 @@ const listCol = [{
     label: "操作",
     fixed: "right",
     _noset_: true,
-    width: "80px",
+    width: "50px",
     _slot_: "operation",
   },
 ]

+ 2 - 16
src/views/orderEntry/orderEnter/index.vue

@@ -205,27 +205,13 @@
             <i
               class="el-icon-view tb-icon"
               @click="
-                routeGoto('goodsCostDetail', {
-                  id: scope.row.spuCode,
+                routeGoto('orderConfirm', {
+                  id: scope.row.id,
                   type: 'view',
                 })
               "
             ></i>
           </el-tooltip>
-
-          <el-tooltip effect="dark" content="确认订单信息" placement="top">
-            <i
-              class="el-icon-c-scale-to-original tb-icon"
-              @click="
-                wantto(
-                  scope.row.is_online,
-                  scope.row.spuCode,
-                  scope.row.status,
-                  '2'
-                )
-              "
-            ></i>
-          </el-tooltip>
         </template>
       </ex-table>
 

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

@@ -244,7 +244,7 @@ export default {
       statusOptions: [
         { id: "0", label: "待公司采购" },
         { id: "1", label: "待库管发货" },
-        { id: "2", label: "待收货" },
+        { id: "2", label: "已发货待收货" },
         { id: "3", label: "已收货" },
         { id: "4", label: "已全部退货" },
       ],

+ 1 - 1
src/views/sellOut/sellOutOrder/detail.vue

@@ -379,7 +379,7 @@ export default {
       statusOptions: [
         { value: "0", label: "待采购备货" },
         { value: "1", label: "待库管发货" },
-        { value: "2", label: "待收货" },
+        { value: "2", label: "已发货待收货" },
         { value: "3", label: "已收货" },
         { value: "4", label: "已全部退货" },
       ],

+ 1 - 1
src/views/sellOut/sellOutOrder/index.vue

@@ -227,7 +227,7 @@ export default {
       statusOptions: [
         { id: "0", label: "待发货" },
         { id: "1", label: "待库管发货" },
-        { id: "2", label: "待收货" },
+        { id: "2", label: "已发货待收货" },
         { id: "3", label: "已收货" },
         { id: "4", label: "已全部退货" },
       ],

Some files were not shown because too many files changed in this diff