Merge branch 'feature/Feature-copy' into develop

src/layout/components/Navbar.vue

@@ -68,14 +68,16 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="到货通知" :modal="false" :visible.sync="hasNotice" center @close="handleNotice(false)">
-      <el-table :data="noticeList" v-loading="listLoading">
-        <el-table-column property="materialOldNumber" label="产品编号" ></el-table-column>
-        <el-table-column property="materialNumber" label="物料编码" ></el-table-column>
-        <el-table-column property="materialName" label="产品名称"></el-table-column>
-        <el-table-column property="specification" label="规格型号"></el-table-column>
-        <el-table-column property="stockName" label="到货仓库"></el-table-column>
-        <el-table-column property="updateTime" label="到货通知时间"></el-table-column>
+    <el-dialog title="到货通知" :modal="false" width="70%" :visible.sync="hasNotice" center @close="handleNotice(false)">
+      <div class="mymain-container">
+      <div class="table">
+      <el-table :data="noticeList" v-loading="listLoading"  border>
+        <el-table-column property="materialOldNumber" align="left" min-width="120" label="产品编号" show-overflow-tooltip ></el-table-column>
+        <el-table-column property="materialNumber" align="left" min-width="100" label="物料编码" show-overflow-tooltip></el-table-column>
+        <el-table-column property="materialName" align="left" min-width="250" label="产品名称" show-overflow-tooltip></el-table-column>
+        <el-table-column property="specification" align="left" min-width="350" label="规格型号" show-overflow-tooltip></el-table-column>
+        <el-table-column property="stockName" align="left" min-width="100" label="到货仓库" show-overflow-tooltip></el-table-column>
+        <el-table-column property="updateTime" align="left" min-width="200" label="到货通知时间" show-overflow-tooltip></el-table-column>
       </el-table>
       <div class="flex">
         <div></div>
@@ -92,6 +94,8 @@
           </el-pagination>
         </div>
       </div>
+      </div>
+      </div>
   </el-dialog>
     <!--    工程机多帐号-->
     <!--    <el-dialog-->