lilei 3 éve
szülő
commit
e014c7f775

+ 1 - 1
src/components/GlobalHeader/GlobalHeader.vue

@@ -21,7 +21,7 @@
           </div>
         </div>
       </a-layout-header>
-      <!-- <multi-tab :class="[fixedHeader ? 'ant-header-fixedMultiTab' : 'ant-header-multiTab',sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',]" v-if="multiTab"></multi-tab> -->
+      <multi-tab :class="[fixedHeader ? 'ant-header-fixedMultiTab' : 'ant-header-multiTab',sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',]" v-if="multiTab"></multi-tab>
     </div>
   </transition>
 </template>

+ 4 - 2
src/config/router.config.js

@@ -88,7 +88,8 @@ export const asyncRouterMap = [
                 component: () => import('@/views/numsGoodsShelves/goodsShelvesAdministration/goodsAllocationSet.vue'),
                 meta: {
                   title: '货位设置',
-                  hidden: true
+                  hidden: true,
+                  replaceTab: true
                   // permission: 'M_salesNew'
                 }
               },
@@ -98,7 +99,8 @@ export const asyncRouterMap = [
                 component: () => import('@/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue'),
                 meta: {
                   title: '结算设置',
-                  hidden: true
+                  hidden: true,
+                  replaceTab: true
                   // permission: 'M_salesNew'
                 }
               }

+ 5 - 4
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -95,7 +95,7 @@
                       id="settlementSet-creditLimit"
                       v-model="form.creditLimit"
                       :precision="2"
-                      :min="0.01"
+                      :min="0"
                       :max="999999"
                       placeholder="请输入正数(最多允许两位小数)"
                       style="width: 100%;display: inline-block;" />
@@ -146,8 +146,8 @@
                       id="settlementSet-creditWarnLimit"
                       v-model="form.creditWarnLimit"
                       :precision="2"
-                      :min="0.01"
-                      :max="form.creditLimit-0.1"
+                      :min="0"
+                      :max="form.creditLimit"
                       placeholder="请输入正数(最多允许两位小数)"
                       style="width: 100%;display: inline-block;" />
                   </a-form-model-item>
@@ -303,7 +303,8 @@ export default {
         { title: '保证金金额', dataIndex: 'bondAmount', width: '30%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '支付时间', width: '20%', align: 'center', dataIndex: 'payDate' }
-      ]
+      ],
+      loadData: []
     }
   },
   methods: {