Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

src/views/wind/fan/formModel.vue

@@ -49,6 +49,9 @@ export default {
         wind_id: "",
         number_rules: "",
         fan_model:"",
+        supplier:"",
+        out_date:"",
+        address:"",
         info: "",
         mul_number:'',
       },
@@ -65,6 +68,20 @@ export default {
               value: 'id'
             }
           },
+          supplier: {
+            type: "input",
+            label: "供应商",
+             required: true,
+          },
+          out_date: {
+            type: "date",
+            label: "出厂日期",
+             required: true,
+          },
+          address: {
+            type: "input",
+            label: "地址",
+          },
           fan_model: {
             type: "select",
             label: "型号",
@@ -88,7 +105,7 @@ export default {
           },
          
         },
-        order: ["wind_id","fan_model", "number_rules","mul_number","info"]
+        order: ["wind_id","fan_model","supplier","out_date","address", "number_rules","mul_number","info"]
       }
     };
   },

src/views/wind/fan/index.vue

@@ -102,6 +102,28 @@
         :show-overflow-tooltip="true"
       />
        <el-table-column
+        prop="supplier"
+        label="供应商"
+        align="center"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+       <el-table-column
+        prop="out_date"
+        label="出厂日期"
+        align="center"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+       <el-table-column
+        prop="address"
+        label="地址"
+        align="center"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+
+       <el-table-column
         prop="info"
         label="备注"
         align="center"

src/views/wind/fan/updateModel.vue

@@ -29,6 +29,9 @@ export default {
         wind_id: "",
         fan_model:"",
         info: "",
+        supplier:"",
+        out_date:"",
+        address:"",
         number:"",
       },
       formConfig: {
@@ -46,7 +49,20 @@ export default {
             required:true,
             options: [],
           },
-         
+           supplier: {
+            type: "input",
+            label: "供应商",
+            
+          },
+          out_date: {
+            type: "date",
+            label: "出厂日期",
+        
+          },
+          address: {
+            type: "input",
+            label: "地址",
+          },
           number: {
             type: "input",
             label: "机位号",
@@ -57,7 +73,7 @@ export default {
           },
          
         },
-        order: ["wind_id","fan_model", "number","info"]
+        order: ["wind_id","fan_model","supplier","out_date","address", "number","info"]
       }
     };
   },