Merge tag 'Hotfix-mo-123' into develop

Finish Hotfix-mo-123

src/api/dashboard.js

@@ -55,3 +55,12 @@ export function getRebateOrderMsg() {
     method: "get",
   });
 }
+
+// 路由
+export function getRouter(params) {
+  return request({
+    url: `/admin/user/module/list`,
+    method: "get",
+    params,
+  });
+}

src/components/Common/print-common.vue

@@ -42,7 +42,7 @@
           <div v-for="(it, idx) in item.invoicePickBeans" :key="idx">
             <el-row :gutter="20">
               <el-col :span="2">{{ it.salesId }}</el-col>
-              <el-col :span="2">{{ it.id ? item.id : '' }}</el-col>
+              <el-col :span="2">{{ it.invoiceId }}</el-col>
               <el-col :span="2">{{ it.id ? dateToDayFilter(item.orderTime) : '' }}</el-col>
               <el-col :span="2">{{ it.mainOrderId }}</el-col>
               <el-col :span="2">{{ it.refEnginRecordNo }}</el-col>

src/views/dashboard/index.vue

@@ -1,10 +1,26 @@
 <template>
-  <div class="dashboard-container">
-    <el-row :gutter="10" class="top-container">
-      <el-col :xs="24" :sm="12" :lg="12">
-        <div class="today-content">欢迎登入供应链管理系统</div>
-      </el-col>
-    </el-row>
+  <div class="app-container">
+    <div class="menu-list">
+      <div class="group" v-for="(item, index) in menuList" :key="index">
+        <div v-if="item.moduleName != '首页'">
+          <div class="main-title">
+            <div class="title">{{item.moduleName}}</div>
+          </div>
+          <div class="child" v-if="item.children && item.children.length">
+            <el-row :gutter="20">
+              <el-col class="item" :span="4" v-for="(it, idx) in item.children" :key="idx">
+                <el-link class="link" :underline="false" @click="clickMenu(it.fullUrl)">{{it.moduleName}}</el-link>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="child" v-else>
+            <div class="item">
+              <el-link class="link" :underline="false" @click="clickMenu(item.fullUrl + '/index')">{{item.moduleName}}</el-link>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
 
     <!-- 弹窗 -->
     <el-dialog title="消息" :visible.sync="showMessages" width="50%" :show-close="false" :close-on-click-modal="false">
@@ -115,6 +131,7 @@ import {
   getNoticeDetail,
   confirmCheck,
   getRebateOrderList,
+  getRouter,
 } from "@/api/dashboard";
 import { getFileUrl } from "@/api/common";
 import { mapGetters } from "vuex";
@@ -129,9 +146,16 @@ export default {
       pageNum: this.currentPage,
       readFlag: false,
     });
+
+    getRouter({
+      flag: 'index',
+      adminUserId: this.userid
+    }).then(res => {
+      this.menuList = res.data;
+    })
   },
   computed: {
-    ...mapGetters(["showMessages"]),
+    ...mapGetters(["showMessages", 'userid']),
   },
   data() {
     return {
@@ -147,6 +171,7 @@ export default {
       detailData: [],
       rebateList: [],
       isCustomer: JSON.parse(localStorage.getItem("supply_user")).isCustomer,
+      menuList: [],
     };
   },
 
@@ -314,6 +339,13 @@ export default {
     closeFn() {
       this.$store.commit("user/showMessage", "no");
     },
+
+    // 点击菜单
+    clickMenu(path) {
+      this.$router.push({
+        path
+      })
+    }
   },
 };
 </script>
@@ -335,4 +367,28 @@ export default {
     background-color: #f5f7fa;
   }
 }
+.menu-list {
+  .main-title {
+    margin: 10px 0 0;
+  }
+  .group {
+    margin-bottom: 20px;
+    .child {
+      display: flex;
+      flex-wrap: wrap;
+      padding-left: 10px;
+      .el-row {
+        width: 100%;
+      }
+      .item {
+        margin-top: 16px;
+      }
+    }
+  }
+  ::v-deep .el-link--inner {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
 </style>

src/views/login/index.vue

@@ -392,7 +392,7 @@ $back: #333;
     color: $cursor;
   }
 }
-.el-link--inner {
+.info-item .el-link--inner {
   color: #ffffff;
 }
 /* reset element-ui css */

src/views/supply/apply/apply_list.vue

@@ -202,7 +202,9 @@
             </el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" 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>
-            <el-table-column align="left" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/apply/components/apply_detail.vue

@@ -122,7 +122,9 @@
           <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip v-if="detailData.type !== 2"></el-table-column>
-          <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
 

src/views/supply/apply/components/engin_detail.vue

@@ -158,7 +158,9 @@
           </el-table-column>
           <el-table-column align="right" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
 

src/views/supply/apply/engin_list.vue

@@ -209,7 +209,9 @@
               </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="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/deliver/commerce_list.vue

@@ -173,7 +173,9 @@
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审单人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>

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

@@ -160,7 +160,9 @@
               {{scope.row.refundStatus | refundStatusFilter}}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="厂产品代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
 

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

@@ -161,7 +161,9 @@
               {{scope.row.refundStatus | refundStatusFilter}}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="厂产品代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
 

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

@@ -161,7 +161,9 @@
               {{scope.row.refundStatus | refundStatusFilter}}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="厂产品代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
 

src/views/supply/deliver/deliver_list.vue

@@ -163,7 +163,9 @@
             </el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="200" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>

src/views/supply/deliver/home_list.vue

@@ -180,7 +180,9 @@
             </el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemarck" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="200" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>

src/views/supply/reserve/components/reserve_form.vue

@@ -117,7 +117,7 @@
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="规格型号" prop="specification" min-width="200" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="原预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column align="center" label="原预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column> -->
         <el-table-column align="center" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.reservedNum" size="small"></el-input>
@@ -237,7 +237,7 @@
               {{scope.row.orderType | orderTypeFilter}}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="订单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>

src/views/supply/retail/components/retail_examine.vue

@@ -77,7 +77,7 @@
         <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.price | numToFixed }}
+            {{ scope.row.totalAmount | numToFixed }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>

src/views/supply/retail/retail_list.vue

@@ -202,6 +202,7 @@
                 {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
             </el-table-column>
+            <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>