Merge branch 'master' of http://git.ycjcjy.com/hazard/management-web

src/views/hazard/RiskClassification/edit.vue

@@ -255,6 +255,7 @@ export default {
       this.$refs['elForm'].validate(valid => {
         if (!valid) return
         // TODO 提交表单
+        this.$router.back()
       })
     },
     resetForm() {

src/views/hazard/RiskClassification/index.vue

@@ -1,17 +1,12 @@
 <template>
   <div :style="{ padding: '32px' }">
     <el-card style="text-align: left">
-      <el-button type="primary" size="medium"> 新增 </el-button>
+      <el-button type="primary" size="medium" @click="()=>handleEdit()"> 新增 </el-button>
       <el-button size="medium" plain> 导出 </el-button>
     </el-card>
     <el-card :style="{ marginTop: '16px' }">
       <el-row :gutter="15">
-        <el-form
-          ref="elForm"
-          :model="formData"
-          size="medium"
-          label-width="120px"
-        >
+        <el-form ref="elForm" size="medium" label-width="120px">
           <el-col :span="24">
             <el-row type="flex" justify="start" align="top">
               <el-col :span="24">
@@ -75,15 +70,20 @@
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
-              <el-col :span="7">
-                <el-form-item label-width="0" prop="field113">
-                  <el-button size="medium" plain> 查询 </el-button>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item label-width="0" prop="field112">
-                  <el-button size="medium" plain> 重置 </el-button>
-                </el-form-item>
+
+              <el-col :span="24">
+                <el-row type="flex" justify="end" align="top">
+                  <el-col :span="7">
+                    <el-form-item label-width="0">
+                      <el-button plain size="medium"> 查询 </el-button>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="4">
+                    <el-form-item label-width="0">
+                      <el-button plain size="medium"> 重置 </el-button>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
               </el-col>
             </el-row>
           </el-col>
@@ -115,10 +115,10 @@
             width="280"
           >
             <template slot-scope="scope">
-              <el-button type="text" @click="toggleState(scope.row)"
+              <el-button type="text" @click="()=>handleEdit()"
                 >修改</el-button
               >
-              <el-button type="text" @click="toggleState(scope.row)"
+              <el-button type="text" @click="()=>handleEdit()"
                 >查看</el-button
               >
               <!-- <el-link
@@ -268,7 +268,10 @@ export default {
   methods: {
     handleSizeChange() { },
     handleCurrentChange() { },
-    toggleState() { }
+    toggleState() { },
+    handleEdit(val){
+      this.$router.push({name:'riskclassification.edit',query:{id:val}});
+    }
   }
 }