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

src/views/equipment/equipmentAbandonment.vue

@@ -213,6 +213,9 @@
     <!-- 废弃表单 -->
     <el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px">
+        <el-form-item label="fq_yy" prop="fq_yy">
+          <el-input v-model.trim="abandonFrom.fq_yy"  :maxlength="30" placeholder="请输入fq_yy" />
+        </el-form-item>
         <el-form-item label="fq_bz" prop="fq_bz">
           <el-input v-model.trim="abandonFrom.fq_bz"  :maxlength="30" placeholder="请输入fq_bz" />
         </el-form-item>
@@ -228,9 +231,7 @@
         <el-form-item label="fq_dbxi" prop="fq_dbxi">
           <el-input v-model.trim="abandonFrom.fq_dbxi"  :maxlength="30" placeholder="请输入fq_dbxi" />
         </el-form-item>
-        <el-form-item label="fq_yy" prop="fq_yy">
-          <el-input v-model.trim="abandonFrom.fq_yy"  :maxlength="30" placeholder="请输入fq_yy" />
-        </el-form-item>
+        
 
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -276,7 +277,9 @@ export default {
 
       },
       abandonFromRules: {
-        fq_ys: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }]
+        fq_ys: [{ pattern: /^\d+$/, message: '仅能输入数字', trigger: 'change' }],
+        fq_yy: [{  required: true, message: '请输入fq_yy', trigger: 'change' }],
+        fq_bz: [{  required: true, message: '请输入fq_yy', trigger: 'change' }]
       },
       // TODO: 表单里的单项详情参数
       singleDetails: {
@@ -435,19 +438,22 @@ export default {
   methods: {
     
     abandonsubmitForm() {
-      console.log('abandonFrom',this.abandonFrom)
+  this.$refs.form.validate((valid) => {
+    if (valid) {
+      console.log('abandonFrom', this.abandonFrom);
+    
       abandon(this.abandonFrom).then(res => {
-        console.log('res',res)
-        if(res.code === 200) {
-          this.abandonOpen = false
-                this.$message.success('操作成功')
-                this.getList()
-                this.reFrom() 
+        console.log('res', res);
+        if (res.code === 200) {
+          this.abandonOpen = false;
+          this.$message.success('操作成功');
+          this.getList();
+          this.reFrom();
         }
-      })
-      
-      
-    },
+      });
+    }
+  });
+},
     reFrom() {
       this.form = {
         businessId: '',
@@ -584,7 +590,7 @@ export default {
         row.flag = row.flag === '0' ? '1' : '0'
       })
     },
-    // 取消按钮
+    // 废弃表单取消按钮
     cancel() {
       this.abandonOpen = false
       this.reset()