Merge remote-tracking branch 'origin/master'

src/views/device/item/index.vue

@@ -14,6 +14,7 @@
           placeholder="请输入检查项编码"
           clearable
           @keyup.enter.native="handleQuery"
+          style="width: 200px"
         />
       </el-form-item>
       <el-form-item label="部位" prop="itemName">
@@ -22,6 +23,7 @@
           placeholder="请输入部位"
           clearable
           @keyup.enter.native="handleQuery"
+          style="width: 200px"
         />
       </el-form-item>
       <el-form-item label="检查项方法" prop="itemMethod">
@@ -30,6 +32,7 @@
           placeholder="请输入检查项方法"
           clearable
           @keyup.enter.native="handleQuery"
+          style="width: 200px"
         />
       </el-form-item>
       <el-form-item label="检查项工具" prop="itemMethod">
@@ -38,10 +41,12 @@
           placeholder="请输入检查项工具"
           clearable
           @keyup.enter.native="handleQuery"
+          style="width: 200px"
         />
       </el-form-item>
       <el-form-item label="维护类型" prop="itemType">
         <el-select
+          style="width: 200px"
           v-model="queryParams.itemType"
           placeholder="请选择维护类型"
           clearable
@@ -56,6 +61,7 @@
       </el-form-item>
       <el-form-item label="周期" prop="itemLoopType">
         <el-select
+          style="width: 200px"
           v-model="queryParams.itemLoopType"
           placeholder="请选择周期类型"
           clearable
@@ -132,6 +138,17 @@
           placeholder="请输入创建人"
           clearable
           @keyup.enter.native="handleQuery"
+          style="width: 200px"
+        />
+      </el-form-item>
+      <el-form-item label="更新人" prop="updateBy">
+        <el-input
+          class="my-select-input"
+          v-model="queryParams.updateBy"
+          placeholder="请输入更新人"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 200px"
         />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -148,15 +165,6 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="更新人" prop="updateBy">
-        <el-input
-          class="my-select-input"
-          v-model="queryParams.updateBy"
-          placeholder="请输入更新人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="更新时间" prop="updateTime">
         <el-date-picker
           v-model="queryParams.updateTimeArray"
@@ -422,7 +430,7 @@
             <!-- 第一行 -->
             <el-row>
               <!-- 第一列 -->
-              <el-col :span="10">
+              <el-col :span="12">
                 <el-form-item label="检查项">
                   <el-input
                     v-model="form.itemName"
@@ -449,7 +457,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="10">
+              <el-col :span="12">
                 <el-form-item label="方法">
                   <el-input
                     v-model="form.itemMethod"
@@ -475,8 +483,8 @@
                   ></el-input-number>
                 </el-form-item>
               </el-col>
-              <el-col :span="2">
+              <el-col :span="4">
-                <el-select v-model="form.itemLoopType" placeholder="周期">
+                <el-select v-model="form.itemLoopType" placeholder="请选择周期类型">
                   <el-option
                     v-for="dict in dict.type.device_loop_type"
                     :key="dict.value"
@@ -921,7 +929,7 @@ export default {
       this.reset();
       this.setTransfer();
       this.form.itemLoop = 1;
-      this.form.itemLoopType = "day";
+      //this.form.itemLoopType = "day";
       this.activePage = "check";
       this.open = true;
       this.title = "新增检查项";