build

src/views/login/index.vue

@@ -330,11 +330,7 @@ export default {
         .dispatch('user/getMenuList', this)
         .then((res) => {
           window.vm.$router.push({
-            path: this.redirect
-              ? this.redirect
-              : res === 'success-dataV'
-                ? '/bigScreen/datavScr'
-                : '/welcome/dashboard/',
+            path: '/welcome/dashboard/',
             query: this.otherQuery
           })
           this.loading = false

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

@@ -112,26 +112,14 @@ export default {
       },
       tableFormThis: config.tableFormThis,
       statusOptions: [
-        {
-          value: "1",
-          label: "待库管验货",
-        },
-        {
-          value: "2",
-          label: "待仓库主管审核",
-        },
-        {
-          value: "4",
-          label: "入库完成",
-        },
-        {
-          value: "5",
-          label: "待填写物流",
-        },
-        {
-          value: "6",
-          label: "退货完成",
-        },
+         {
+          value: '1',
+          label: '待库管验货'
+         },
+         {
+           value: '2',
+           label: '入库完成'
+         }
       ],
       columns: config.columns,
     };

src/views/purchaseIn/wsmInOrder/columns.js

@@ -1,37 +1,37 @@
 const columns = [
   {
-    prop: "wsm_in_code",
-    label: "入库单编号",
-    width: "155",
+    prop: 'wsm_in_code',
+    label: '入库单编号',
+    width: '155'
   },
   {
-    prop: "cgdNo",
-    label: "采购单编号",
-    width: "155px",
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '155px'
   },
   {
-    prop: "has_account",
-    label: "供应商端",
-    _slot_: "has_account",
-    width: "120px",
+    prop: 'has_account',
+    label: '供应商端',
+    _slot_: 'has_account',
+    width: '120px'
   },
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "110px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '110px'
   },
   {
-    prop: "order_source",
-    label: "订单来源",
-    _slot_: "order_source",
-    width: "118px",
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '118px'
   },
   {
-    prop: "order_type",
-    label: "商品类型",
-    _slot_: "order_type",
-    width: "118px",
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '118px'
   },
 
   // {
@@ -51,26 +51,26 @@ const columns = [
   // },
 
   {
-    prop: "spuCode",
-    label: "商品成本编号",
-    width: "145px",
+    prop: 'spuCode',
+    label: '商品成本编号',
+    width: '145px'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    "min-width": "145px",
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    'min-width': '145px'
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    width: "95px",
+    prop: 'brand_name',
+    label: '品牌',
+    width: '95px'
   },
 
   {
-    prop: "send_num",
-    label: "发货数量",
-    width: "80px",
+    prop: 'send_num',
+    label: '发货数量',
+    width: '80px'
   },
   // {
   //   prop: "post_company",
@@ -83,9 +83,9 @@ const columns = [
   //   width: "140px",
   // },
   {
-    prop: "post_fee",
-    label: "物流费用",
-    width: "100px",
+    prop: 'post_fee',
+    label: '物流费用',
+    width: '100px'
   },
 
   // {
@@ -141,24 +141,24 @@ const columns = [
   //   width: "145px",
   // },
   {
-    prop: "companyNo",
-    label: "业务公司编码",
-    width: "155px",
+    prop: 'companyNo',
+    label: '业务公司编码',
+    width: '155px'
   },
   {
-    prop: "companyName",
-    label: "业务公司名称",
-    width: "155px",
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '155px'
   },
   {
-    prop: "supplierNo",
-    label: "供应商编码",
-    width: "155px",
+    prop: 'supplierNo',
+    label: '供应商编码',
+    width: '155px'
   },
   {
-    prop: "supplier_name",
-    label: "供应商名称",
-    width: "155px",
+    prop: 'supplier_name',
+    label: '供应商名称',
+    width: '155px'
   },
   // {
   //   prop: 'wsm_supplier',
@@ -171,9 +171,9 @@ const columns = [
   //   width: '172px'
   // },
   {
-    prop: "wsm_name",
-    label: "仓库名称",
-    width: "80px",
+    prop: 'wsm_name',
+    label: '仓库名称',
+    width: '80px'
   },
   // {
   //   prop: "company_name",
@@ -181,19 +181,19 @@ const columns = [
   //   minWidth: "150px",
   // },
   {
-    prop: "cgder",
-    label: "供应商负责人",
-    width: "95",
+    prop: 'cgder',
+    label: '供应商负责人',
+    width: '95'
   },
   {
-    prop: "good_creater",
-    label: "商品创建人",
-    width: "85px",
+    prop: 'good_creater',
+    label: '商品创建人',
+    width: '85px'
   },
   {
-    prop: "sendtime",
-    label: "发货时间",
-    width: "145px",
+    prop: 'sendtime',
+    label: '发货时间',
+    width: '145px'
   },
   // {
   //   prop: "addtime",
@@ -201,23 +201,23 @@ const columns = [
   //   width: "145px",
   // },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
-    _slot_: "operation",
-  },
-];
+    width: '50px',
+    _slot_: 'operation'
+  }
+]
 
 const statusOptions = [
   {
-    value: "1",
-    label: "待库管验货",
+    value: '1',
+    label: '待库管验货'
   },
   {
-    value: "2",
-    label: "入库完成",
-  },
-];
-export { columns, statusOptions };
+    value: '2',
+    label: '入库完成'
+  }
+]
+export { columns, statusOptions }