merge fix

src/views/home/component/dash.vue

@@ -211,12 +211,27 @@ export default {
           {
             label: '子项目数量',
             prop: 'lot',
-            width: 180
+            width: 120
+          },
+          {
+            label: '是否入库',
+            prop: 'isStorage',
+            width: 120,
+            dicData: [
+              {
+                label: '否',
+                value: 0
+              },
+              {
+                label: '是',
+                value: 1
+              }
+            ]
           },
           {
             label: '是否开工',
             prop: 'isStart',
-            width: 180,
+            width: 120,
             dicData: [
               {
                 label: '否',