修改禅道bug

src/router/views/index.js

@@ -565,5 +565,47 @@ export default [
             },
             component: () => import( /* webpackChunkName: "views" */ '@/views/inventory/detail.vue')
         }]
+    },
+    {
+        path: '/saleOrder/index',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: '/saleOrder/index',
+            name: '销售订单',
+            meta: {
+                i18n: '/saleOrder/index',
+                keepAlive: true,
+            },
+            component: () => import( /* webpackChunkName: "views" */ '@/views/saleOrder/index.vue')
+        }]
+    },
+    {
+        path: '/outboundWorkOrder/index',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: '/outboundWorkOrder/index',
+            name: '出库工单',
+            meta: {
+                i18n: '/outboundWorkOrder/index',
+                keepAlive: true,
+            },
+            component: () => import( /* webpackChunkName: "views" */ '@/views/outboundWorkOrder/index.vue')
+        }]
+    },
+    {
+        path: '/warehouseEntryOrder/index',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: '/warehouseEntryOrder/index',
+            name: '入库工单',
+            meta: {
+                i18n: '/warehouseEntryOrder/index',
+                keepAlive: true,
+            },
+            component: () => import( /* webpackChunkName: "views" */ '@/views/warehouseEntryOrder/index.vue')
+        }]
     }
 ];

src/views/listingManagement/index.vue

@@ -376,7 +376,7 @@ export default {
           },
           {
             label: "库存",
-            prop: "inventory",
+            prop: "balanceQuantity",
             disabled: true,
             overHidden: true,
           },

src/views/outboundWorkOrder/detailsPage.vue

@@ -272,12 +272,11 @@ export default {
           {
             label: "业务日期",
             prop: "businesDate",
-            searchProp: "businesDateList",
             disabled: false,
-            type: "datetime",
-            value: dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss"),
-            format: "yyyy-MM-dd HH:mm",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            type: "date",
+            value: dateFormat(new Date(), "yyyy-MM-dd"),
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
             rules: [
               {
                 required: true,

src/views/outboundWorkOrder/index.vue

@@ -837,6 +837,9 @@ export default {
       }
     },
     generate() {
+      if(this.generateData.filter((item) => item.sendNum > 0).length==0){
+        return this.$message.error("发货数量不能为0");
+      }
       let obj = {
         ...this.generateForm,
         shipItemsList: this.generateData.filter((item) => item.sendNum > 0),

src/views/saleOrder/detailsPage.vue

@@ -54,6 +54,7 @@
           撤销订单确认
         </el-button>
         <el-button
+          v-if="form.id"
           class="el-button--small-yh"
           style="margin-left: 6px"
           type="info"

src/views/saleOrder/index.vue

@@ -6,27 +6,27 @@
         @expand-change="expandChange" @refresh-change="refreshChange"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 269)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 269)" :page.sync="page">
-        <template slot-scope="{ row }" slot="status">
+        <!-- <template slot-scope="{ row }" slot="status">
           <span v-for="(item, index) in orderStatusList" :key="index">
             <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
               {{ item.dictValue }}
             </span>
           </span>
-        </template>
-        <template slot-scope="{ row }" slot="actualPaymentStatus">
+        </template> -->
+        <!-- <template slot-scope="{ row }" slot="actualPaymentStatus">
           <span v-for="(item, index) in actualStatusList" :key="index">
             <span v-if="item.dictKey == row.actualPaymentStatus" :style="{ background: item.colour }" class="bottomBox">
               {{ item.dictValue }}
             </span>
           </span>
-        </template>
-        <template slot-scope="{ row }" slot="returnsStatus">
+        </template> -->
+        <!-- <template slot-scope="{ row }" slot="returnsStatus">
           <span v-for="(item, index) in returnStatusList" :key="index">
             <span v-if="item.dictKey == row.returnsStatus" :style="{ background: item.colour }" class="bottomBox">
               {{ item.dictValue }}
             </span>
           </span>
-        </template>
+        </template> -->
         <!--actualPaymentStatus-->
         <template slot-scope="{ row }" slot="expand">
           <avue-crud :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading" :cell-style="cellStyle"
@@ -244,11 +244,12 @@ export default {
             label: "dictValue",
             value: "dictKey"
           }
-        }, {
-          label: '所属公司',
-          prop: "salesCompanyName",
-          overHidden: true,
-        },
+        }, 
+        // {
+        //   label: '所属公司',
+        //   prop: "salesCompanyName",
+        //   overHidden: true,
+        // },
         {
           label: '店铺名称',
           prop: "customerName",