Merge remote-tracking branch 'origin/newprotect' into newprotect

src/views/processManagement/basicProcessManagement/index.vue

@@ -48,7 +48,7 @@
         :data="processList"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="index" label="序号" width="50"/>
+        <el-table-column type="index" label="序号" width="50" />
         <el-table-column label="工序名称" prop="processName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.processName || '-' }}
@@ -105,13 +105,13 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
         <el-form-item label="名称" prop="processName">
-          <el-input v-model.trim="form.processName" show-word-limit :maxlength="30" placeholder="请输入工序名称"/>
+          <el-input v-model.trim="form.processName" show-word-limit :maxlength="30" placeholder="请输入工序名称" />
         </el-form-item>
         <el-form-item label="工厂车间" prop="workshop">
-          <el-input v-model.trim="form.workshop" show-word-limit :maxlength="30" placeholder="请输入工厂车间"/>
+          <el-input v-model.trim="form.workshop" show-word-limit :maxlength="30" placeholder="请输入工厂车间" />
         </el-form-item>
         <el-form-item label="操作人" prop="createBy">
-          <el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入操作人"/>
+          <el-input v-model.trim="form.createBy" :maxlength="30" show-word-limit placeholder="请输入操作人" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -124,10 +124,10 @@
     <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body>
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-form-item label="名称：" prop="processName">
-          <el-input v-model.trim="singleDetails.processName" :readonly="isReadOnly"/>
+          <el-input v-model.trim="singleDetails.processName" :readonly="isReadOnly" />
         </el-form-item>
         <el-form-item label="工厂车间：" prop="workshop">
-          <el-input v-model.trim="singleDetails.workshop" :readonly="isReadOnly"/>
+          <el-input v-model.trim="singleDetails.workshop" :readonly="isReadOnly" />
         </el-form-item>
         <el-form-item label="操作时间：" prop="createTime">
           <!--
@@ -137,7 +137,7 @@
           {{ singleDetails.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
         </el-form-item>
         <el-form-item label="操作人：" prop="createBy">
-          <el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly"/>
+          <el-input v-model.trim="singleDetails.createBy" :readonly="isReadOnly" />
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -148,6 +148,7 @@
 <script>
 // TODO: 导入外部已经封装好的button组件
 import Coolbutton from '@/components/coolbutton'
+
 export default {
   name: 'Role',
   components: { Coolbutton },
@@ -253,11 +254,11 @@ export default {
       // TODO: 表单校验
       rules: {
         processName: [
-          {required: true, message: '请输入工序名称', trigger: 'blur'},
-          {min: 2, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur'}
+          { required: true, message: '请输入工序名称', trigger: 'blur' },
+          { min: 2, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur' }
         ],
         workshop: [
-          {required: true, message: '请输入车间名称', trigger: 'blur'}
+          { required: true, message: '请输入车间名称', trigger: 'blur' }
         ],
         createBy: [
           { required: true, message: '请输入创建人姓名', trigger: 'blur' }