20241106

src/views/modules/fanuc/labor.vue

@@ -230,16 +230,14 @@
 
     <!-- 成本新增和修改  -->
     <el-dialog title="成本" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="500px">
-      <el-form :inline="true" label-position="top" :model="modalData1" :rules="rules1" style="margin-top: -5px;">
-        <el-form-item label="单位人工成本:" prop="unitCost">
+      <el-form :inline="true" ref="costForm" label-position="top" :model="modalData1" :rules="rules1" style="margin-top: -5px;">
+        <el-form-item label="单位人工成本:" prop="unitCost" :show-message="false">
           <el-input-number :controls="false" :step="0" min="0" v-model="modalData1.unitCost" style="width: 225px"></el-input-number>
         </el-form-item>
-        <el-form-item label="单位制造费用成本:" prop="overheadCost">
+        <el-form-item label="单位制造费用成本:" prop="overheadCost" :show-message="false">
           <el-input-number :controls="false" :step="0" min="0" v-model="modalData1.overheadCost" style="width: 225px"></el-input-number>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData1" :rules="rules1">
-        <el-form-item :label="'启用日期'" prop="beginDate">
+        <el-form-item :label="'启用日期'" prop="beginDate" :show-message="false">
           <el-date-picker
             style="width: 225px"
             v-model="modalData1.beginDate"
@@ -658,21 +656,21 @@ export default {
         overheadCost: [
           {
             required: true,
-            message: ' ',
+            message: '单位制造费用成本不能为空',
             trigger: ['blur', 'change']
           }
         ],
         unitCost: [
           {
             required: true,
-            message: ' ',
+            message: '单位人工成本不能为空',
             trigger: ['blur', 'change']
           }
         ],
         beginDate: [
           {
             required: true,
-            message: ' ',
+            message: '启用日期不能为空',
             trigger: ['blur', 'change']
           }
         ]
@@ -986,47 +984,56 @@ export default {
 
     // 新增/修改方法
     saveData1 () {
-      if (this.modalData1.beginDate === '' || this.modalData1.beginDate == null) {
-        this.$message.warning('请选择启动日期！')
-        return
-      }
-      if (this.modalData1.flag1 === '1') { // 新增
-        appendByLaborClass(this.modalData1).then(({data}) => {
-          if (data && data.code === 0) {
-            this.refreshCurrentTabTable2()
-            this.modalFlag1 = false
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
+      this.$refs.costForm.validate((valid,obj) => {
+        if (valid){
+          if (this.modalData1.flag1 === '1') { // 新增
+            appendByLaborClass(this.modalData1).then(({data}) => {
+              if (data && data.code === 0) {
+                this.refreshCurrentTabTable2()
+                this.modalFlag1 = false
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                  }
+                })
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
               }
             })
-          } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
-          }
-        })
-      } else { // 修改
-        amendByLaborClass(this.modalData1).then(({data}) => {
-          if (data && data.code === 0) {
-            this.refreshCurrentTabTable2()
-            this.modalFlag1 = false
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
+          } else { // 修改
+            amendByLaborClass(this.modalData1).then(({data}) => {
+              if (data && data.code === 0) {
+                this.refreshCurrentTabTable2()
+                this.modalFlag1 = false
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                  }
+                })
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定'
+                })
               }
             })
-          } else {
-            this.$alert(data.msg, '错误', {
-              confirmButtonText: '确定'
-            })
           }
-        })
-      }
+        }else {
+          let i = 1;
+          Object.keys(obj).forEach((key)=>{
+            if (i === 1){
+              this.$message.warning(obj[key][0].message)
+            }
+            i++;
+          })
+        }
+      })
+
     },
 
     // 删除方法