【修改】bug

src/layout/components/Navbar.vue

@@ -236,6 +236,7 @@ export default {
       // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
 
       this.$router.push(`/login`);
+
     },
     initNotice() {
       getNoticeListCount().then((res) => {

src/permission.js

@@ -88,7 +88,8 @@ router.beforeEach(async (to, from, next) => {
           // remove token and go to login page to re-login
           await store.dispatch("user/resetToken");
           Message.error(error || "Has Error");
-          next(`/login?redirect=${to.path}`);
+          next('/login')
+          // next(`/login?redirect=${to.path}`);
           NProgress.done();
         }
       }
@@ -101,7 +102,8 @@ router.beforeEach(async (to, from, next) => {
       next();
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`);
+      // next(`/login?redirect=${to.path}`);
+      next('/login')
       NProgress.done();
     }
   }

src/views/setting/other.vue

@@ -326,15 +326,22 @@ export default {
         eigth: "POWER_CATEGORY",
       };
       getDictList({ sysDictEnum: MAP[type] }).then((res) => {
+
         let data = res.data.map((item) => {
+
           return {
             sysDictId: item.sysDictId,
             dictValue: item.dictValue,
+            dictType:item.dictType,
+            dictCode:item.dictCode
           };
         });
         if (type != "fourth") {
+
           this[type + "Form"].input1 = data[0];
+             console.log(777);
         } else {
+
           this[type + "Form"].input1 = data[0];
           this[type + "Form"].input2 = data[1];
           this[type + "Form"].input3 = data[2];
@@ -391,4 +398,4 @@ export default {
   margin-bottom: 0;
   width: 100%;
 }
-</style>
+</style>

src/views/supply/deliver/components/sum_print.vue

@@ -7,14 +7,14 @@
     </div> -->
 
     <div id="printMe">
-      
+
       <PrintCommon :detailData="detailData" :company="company" v-if="currentType === 0" />
       <PrintFoshan :detailData="detailData" :company="company" v-if="currentType === 1" />
       <PrintGuangzhou :detailData="detailData" :company="company" v-if="currentType === 2" />
       <PrintShaoguan :detailData="detailData" :company="company" v-if="currentType === 3" />
 
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button  type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button>
@@ -110,12 +110,19 @@ export default {
 }
 </script>
 
+<style>
+  html,body{
+    height: auto !important;
+  }
+</style>
+
 <style scoped lang="scss">
+
   .detail-container {
     width: 100%;
-    height: 100%;
+
   }
   .top-container {
     margin-bottom: 20px;
   }
-</style>
+</style>

src/views/supply/deliver/sum_list.vue

@@ -86,7 +86,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -107,16 +107,16 @@
           </div>
         </div>
         <div class="table">
-          <el-table 
+          <el-table
             ref="table"
-            v-loading="listLoading" 
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
-            @select="handleSelect" 
+            @select="handleSelect"
             @select-all="handleSelectAll"
             show-summary
             :summary-method="$getSummaries">
@@ -187,6 +187,16 @@
                 {{scope.row.totalDiscAmount | numToFixed}}
               </template>
             </el-table-column>
+               <el-table-column align="right" label="含税单价" prop="price" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.price | numToFixed}}
+              </template>
+            </el-table-column>
+              <el-table-column align="right" label="含税总额" prop="price" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.price | numToFixed}}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="政策单号" prop="policyCode" min-width="100" show-overflow-tooltip></el-table-column>
@@ -392,7 +402,7 @@ export default {
       this.isShowPrint = false;
     },
 
-    
+
   }
 }
 </script>

src/views/supply/implement/implement_list.vue

@@ -156,7 +156,7 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="钱包" prop="walletName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="钱包" prop="walletName" min-width="250" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>