tongshanglei před 3 roky
rodič
revize
f1192582ab

+ 13 - 2
src/views/device/hydraulic/formModel.vue

@@ -57,6 +57,7 @@ export default {
         supplier:"",
         max_pressure:"",
         min_pressure:"",
+        effective_period:"",
         out_date:"",
         remark: ""
       },
@@ -118,20 +119,30 @@ export default {
             required: true,
             label: "最小压力"
           },
+          effective_period: {
+            type: "input",
+            required: true,
+            label: "有效周期"
+          },
           out_date: {
             type: "date",
             label: "出厂日期"
           },
           remark: {
             type: "textarea",
-            label: "显示信息"
+            label: "显示信息",
+            attrs: {
+              autosizeType: "switch",
+              autosize: false,
+              rows: 2
+            }
           }
         },
         rules: {
           max_pressure:  { validator: validateMaxPressure, trigger: 'blur' } ,
           min_pressure:  { validator: validateMinPressure, trigger: 'blur' } ,
         },
-        order: ["department_id","number", "imei","name","min_pressure","max_pressure", "model","brand","supplier","out_date","remark"]
+        order: ["department_id","number", "imei","name","min_pressure","max_pressure", "effective_period","model","brand","supplier","out_date","remark"]
       }
     };
   },

+ 34 - 6
src/views/device/hydraulic/index.vue

@@ -148,7 +148,7 @@
         align="center"
         v-if="showColumn.net_state"
         :show-overflow-tooltip="true"
-        width="120"
+        width="80"
       >
         <template slot-scope="record">
           <el-tag type="success" v-if="record.row.net_state == '0'" >在线</el-tag >
@@ -200,7 +200,7 @@
         align="center"
         v-if="showColumn.supplier"
         :show-overflow-tooltip="true"
-        width="120"
+  
       />
       <el-table-column
         prop="model_name"
@@ -237,7 +237,7 @@
         align="center"
         v-if="showColumn.is_used"
         :show-overflow-tooltip="true"
-        width="120"
+ 
       >
         <template slot-scope="record">
           <el-switch
@@ -257,7 +257,31 @@
         label="在线时间"
         align="center"
         v-if="showColumn.online_time"
-        width="200"
+        width="130"
+        sortable
+      />
+       <el-table-column
+        prop="check_time"
+        label="校准日期"
+        align="center"
+        v-if="showColumn.check_time"
+        width="130"
+        sortable
+      />
+      <el-table-column
+        prop="effective_period"
+        label="有效周期"
+        align="center"
+        v-if="showColumn.effective_period"
+        width="100"
+        sortable
+      />
+      <el-table-column
+        prop="effective_time"
+        label="有效截止时间"
+        align="center"
+        v-if="showColumn.effective_time"
+        width="130"
         sortable
       />
       <el-table-column
@@ -273,7 +297,7 @@
         align="center"
         v-if="showColumn.created_at"
         :show-overflow-tooltip="true"
-        width="200"
+        width="130"
         sortable
       />
        <el-table-column
@@ -281,7 +305,7 @@
         label="显示信息"
         align="center"
         v-if="showColumn.remark"
-        width="100"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="操作"
@@ -337,6 +361,9 @@
             <el-checkbox v-model="checkList.out_date">出厂日期</el-checkbox>
             <el-checkbox v-model="checkList.is_used">启用状态</el-checkbox>
             <el-checkbox v-model="checkList.online_time">在线时间</el-checkbox>
+            <el-checkbox v-model="checkList.check_time">校准日期</el-checkbox>
+            <el-checkbox v-model="checkList.effective_period">有效周期</el-checkbox>
+            <el-checkbox v-model="checkList.effective_time">有效截止时间</el-checkbox>
             <el-checkbox v-model="checkList.creator_user">导入用户</el-checkbox>
             <el-checkbox v-model="checkList.created_at">添加时间</el-checkbox>
             <el-checkbox v-model="checkList.remark">显示信息</el-checkbox>
@@ -695,6 +722,7 @@ export default {
          max_pressure:true,
         min_pressure:true,
         is_used:true,
+        check_time:true,
         model: true,
         online_time: true
       };