Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/views/production/mrp/modules/TraRequirements.vue

@@ -61,7 +61,7 @@
                 {
                     title: '转入仓库',
                     align:"center",
-                    dataIndex: 'inWarehouse;',
+                    dataIndex: 'inWarehouseName',
                     ellipsis: true,
                 },
                 {
@@ -243,7 +243,7 @@
                     ellipsis: true,
                 },
                 {
-                    title: '同步状态',
+                    title: '同步（杂发）',
                     align:"center",
                     dataIndex: 'sync',
                     ellipsis: true,
@@ -253,7 +253,20 @@
                     align:"center",
                     dataIndex: 'syncInfo',
                     ellipsis: true,
-                    width:460,
+                    width:260,
+                },
+                {
+                    title: '同步（杂收）',
+                    align:"center",
+                    dataIndex: 'sync1',
+                    ellipsis: true,
+                }, 
+                {
+                    title: '同步信息',
+                    align:"center",
+                    dataIndex: 'syncInfo1',
+                    ellipsis: true,
+                    width:260,
                 },
           ],
       }

src/views/production/mrp/modules/TraRequirementsDeatail.vue

@@ -55,7 +55,7 @@
                 {
                     title: '转入仓库',
                     align:"center",
-                    dataIndex: 'inWarehouse;',
+                    dataIndex: 'inWarehouseName',
                     ellipsis: true,
                 },
                 {
@@ -237,7 +237,7 @@
                     ellipsis: true,
                 },
                 {
-                    title: '同步状态',
+                    title: '同步（杂发）',
                     align:"center",
                     dataIndex: 'sync',
                     ellipsis: true,
@@ -247,7 +247,20 @@
                     align:"center",
                     dataIndex: 'syncInfo',
                     ellipsis: true,
-                    width:460,
+                    width:260,
+                },
+                {
+                    title: '同步（杂收）',
+                    align:"center",
+                    dataIndex: 'sync1',
+                    ellipsis: true,
+                }, 
+                {
+                    title: '同步信息',
+                    align:"center",
+                    dataIndex: 'syncInfo1',
+                    ellipsis: true,
+                    width:260,
                 },
           ],
       }