Parcourir la source

luowei修改bug

luowei il y a 2 ans
Parent
commit
432e5ce19a
2 fichiers modifiés avec 21 ajouts et 7 suppressions
  1. 2 2
      src/views/system/bind/index.vue
  2. 19 5
      src/views/system/check/index.vue

+ 2 - 2
src/views/system/bind/index.vue

@@ -18,8 +18,8 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="区域名称" prop="areaId">
-            <el-input v-model="queryParams.areaId" placeholder="请输入区域" clearable @keyup.enter.native="handleQuery" />
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model="queryParams.areaName" placeholder="请输入区域" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
 
           <el-form-item label="标签编号" prop="code">

+ 19 - 5
src/views/system/check/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="采集点名称" prop="checkName">
         <el-input v-model="queryParams.checkName" placeholder="请输入采集点名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="区域" prop="areaId">
+      <el-form-item label="区域名称" prop="areaId">
         <el-select v-model="queryParams.areaId" placeholder="请选择">
           <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
@@ -43,8 +43,8 @@
       <el-table-column type="selection" width="55" align="center" />
 
       <el-table-column label="采集点名称" align="center" prop="checkName" />
-      <el-table-column label="区域" align="center" prop="areaName" />
-      <el-table-column label="机构" align="center" prop="orgName" />
+      <el-table-column label="区域名称" align="center" prop="areaName" />
+      <el-table-column label="归属部门" align="center" prop="orgName" />
       <el-table-column label="修改人" align="center" prop="updateBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -64,7 +64,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="16">
-            <el-form-item label="区域名称">
+            <el-form-item label="区域名称" prop="areaId">
               <el-select v-model="form.areaId" placeholder="请选择区域名称">
                 <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -108,6 +108,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      names:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -142,7 +143,17 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
+ 
       rules: {
+        areaId: [
+            { required: true,message: '请选择区域', trigger: 'blur' },
+          ],
+          orgId:[
+            { required: true,message: '请选择归属部门', trigger: 'blur' },
+          ],
+          checkName: [
+            { required: true,message: '请输入采集点名称', trigger: 'change' }
+          ],
       },
       defaultKeys: []
     };
@@ -218,6 +229,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.names=selection.map(item => item.checkName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -237,6 +249,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
+     
       getCheck(id).then(response => {
         this.form = response.data;
         this.roleOptions = response.areas;
@@ -267,7 +280,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除区域采集点编号为"' + ids + '"的数据项?').then(function () {
+      const names=row.checkName || this.names
+      this.$modal.confirm('是否确认删除区域采集点名称为"' + names + '"的数据项?').then(function () {
         return delCheck(ids);
       }).then(() => {
         this.getList();