Переглянути джерело

Merge branch 'develop_yh14' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh14

chenrui 2 роки тому
батько
коміт
7f03fa958e

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677138925220
+  "version": 1677146386431
 }

+ 48 - 48
src/config/router.config.js

@@ -2408,6 +2408,54 @@ export const asyncRouterMap = [
                 }
               }
             ]
+          },
+          {
+            path: '/chainReportData/chainTransferReport',
+            redirect: '/chainReportData/chainTransferReport/index',
+            name: 'chainTransferReport',
+            component: BlankLayout,
+            meta: {
+              title: '连锁调入报表',
+              icon: 'profile',
+              permission: 'M_chainTransferReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'chainTransferReportIndex',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/chainReportData/chainTransferReport/index.vue'),
+                meta: {
+                  title: '连锁调入报表列表',
+                  icon: 'profile',
+                  hidden: true
+                }
+              }
+            ]
+          },
+          {
+            path: '/chainReportData/chainCallReport',
+            redirect: '/chainReportData/chainCallReport/index',
+            name: 'chainCallReport',
+            component: BlankLayout,
+            meta: {
+              title: '连锁调出报表',
+              icon: 'profile',
+              permission: 'M_chainCallReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'chainCallReportIndex',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/chainReportData/chainCallReport/index.vue'),
+                meta: {
+                  title: '连锁调出报表列表',
+                  icon: 'profile',
+                  hidden: true
+                }
+              }
+            ]
           }
         ]
       },
@@ -2669,54 +2717,6 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/chainReportData/chainTransferReport',
-            redirect: '/chainReportData/chainTransferReport/index',
-            name: 'chainTransferReport',
-            component: BlankLayout,
-            meta: {
-              title: '连锁调入报表',
-              icon: 'profile',
-              permission: 'M_chainTransferReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'chainTransferReportIndex',
-                component: () => import(/* webpackChunkName: "chainReportData" */ '@/views/chainReportData/chainTransferReport/index.vue'),
-                meta: {
-                  title: '连锁调入报表列表',
-                  icon: 'profile',
-                  hidden: true
-                }
-              }
-            ]
-          },
-          {
-            path: '/chainReportData/chainCallReport',
-            redirect: '/chainReportData/chainCallReport/index',
-            name: 'chainCallReport',
-            component: BlankLayout,
-            meta: {
-              title: '连锁调出报表',
-              icon: 'profile',
-              permission: 'M_chainCallReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'chainCallReportIndex',
-                component: () => import(/* webpackChunkName: "chainReportData" */ '@/views/chainReportData/chainCallReport/index.vue'),
-                meta: {
-                  title: '连锁调出报表列表',
-                  icon: 'profile',
-                  hidden: true
-                }
-              }
-            ]
-          }
         ]
       },
       // 客户管理

+ 3 - 3
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -210,8 +210,8 @@ export default {
       productTypeList: [], //  产品类别下拉数据
       productType: [],
       columns: [
-        { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 50, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productCode', width: 120, align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '产品名称', dataIndex: 'productName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'brandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
@@ -395,7 +395,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 190
+      this.tableHeight = window.innerHeight - tableSearchH - 180
     }
   },
   watch: {