Эх сурвалжийг харах

设置作业票和sop名称和code必填

pm 11 сар өмнө
parent
commit
fcfb2bc0af

+ 8 - 8
src/views/mes/job/jobm/NewOperations.vue

@@ -41,7 +41,7 @@
             <el-tabs v-model="activeName" @tab-click="handleClick">
               <el-tab-pane label="作业票信息" name="first">
                 <!--                  新增作业票信息-->
-                <el-form ref="form" :model="form" label-width="90px">
+                <el-form ref="form" :rules="rules" :model="form" label-width="100px">
 <!--                 getVisibleSopSelect是vuex判断新增是自定义还是建SOP作业票 第二个是编辑的时候如果有sopId就渲染 -->
 
                   <el-form-item label="选择SOP" prop="sop" v-if="this.getVisibleSopSelect&&this.form.sopId!==null">
@@ -517,6 +517,8 @@ export default {
           // }
         ], //所选择的用户
       },
+
+
       dialogForm: {
         nickName: '',
         username: ''
@@ -563,15 +565,13 @@ export default {
       jobProps: [], //正向传递给车间components
       // 表单校验
       rules: {
-        teamCode: [
-          { required: true, message: "班组编号不能为空", trigger: "blur" },
+        ticketName: [
+          { required: true, message: "作业票名称不能为空", trigger: "blur" },
         ],
-        teamName: [
-          { required: true, message: "班组名称不能为空", trigger: "blur" },
-        ],
-        calendarType: [
-          { required: true, message: "清选择班组类型", trigger: "blur" },
+        ticketCode: [
+          { required: true, message: "作业票编码不能为空", trigger: "blur" },
         ],
+
       },
       newticketUserDTOList: [], //为了上锁人单独传递数据
       prePointIdOptions: [],//前置节点的下拉选项

+ 10 - 1
src/views/mes/sop/sopm/NewSop.vue

@@ -49,7 +49,7 @@
             <el-tabs v-model="activeName" @tab-click="handleClick">
               <el-tab-pane label="SOP信息" name="first">
                 <!-- 新增作业票信息-->
-                <el-form ref="form" :model="form" label-width="70px">
+                <el-form ref="form" :rules="rules" :model="form" label-width="70px">
                   <el-form-item label="SOP名称" prop="sopName">
                     <el-input
                       :disabled="this.getSopLook"
@@ -536,6 +536,15 @@ export default {
         nickName: '',
         username: ''
       },
+      rules: {
+        sopName: [
+          { required: true, message: "sop名称不能为空", trigger: "blur" },
+        ],
+        sopCode: [
+          { required: true, message: "sop编码不能为空", trigger: "blur" },
+        ],
+
+      },
       listLockerOption: null,//上锁人下拉数据
       listCoLockerOption: null,//共锁人下拉数据
       OutSideUserTableData: [],//添加外部人员多个表格