Merge branch 'dhy' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/suzhouyingjiPC

src/views/components/myPagination/index.vue

@@ -63,12 +63,12 @@ export default {
       // } else 
       if (
         this.total >
-        this.current * this.size
+        this.pageNum * this.pageSize
       ) {
-        return this.current * this.size;
+        return this.pageNum * this.pageSize;
       } else if (
-        this.total < this.current * this.size ||
-        this.total == this.current * this.size
+        this.total < this.pageNum * this.pageSize ||
+        this.total == this.pageNum * this.pageSize
       ) {
         return this.total;
       }

src/views/yingji/enforcing.vue

@@ -23,9 +23,9 @@
         </div>
         <div class="select-input">
           <div class="select-span">区划:</div>
-
           <el-cascader
-            v-model="form.district"
+            size="small"
+            v-model="district"
             :options="compartment"
             :show-all-levels="false"
             :props="{
@@ -38,8 +38,8 @@
         <div class="my-checkbox">
           <el-checkbox-group v-model="checkList" @change="setmealSelect">
             <el-checkbox label="全部"></el-checkbox>
-            <el-checkbox label="已执法"></el-checkbox>
-            <el-checkbox label="未执法"></el-checkbox>
+            <el-checkbox label="已检查"></el-checkbox>
+            <el-checkbox label="未检查"></el-checkbox>
           </el-checkbox-group>
         </div>
       </div>
@@ -83,8 +83,8 @@
           header-align="center"
         >
         </el-table-column>
-        <el-table-column prop="state" label="状态" header-align="center">
-        </el-table-column>
+        <!-- <el-table-column prop="state" label="状态" header-align="center">
+        </el-table-column> -->
         <el-table-column label="操作" header-align="center">
           <template slot-scope="scope">
             <div class="tabs-btns">
@@ -151,6 +151,8 @@ export default {
       loads: true,
       total: 0,
       options: [],
+      //这个是点击搜索之前的值
+      district:'',
       form: {
         district: "",
         plannedYear: "",
@@ -310,11 +312,11 @@ export default {
           this.filterComparment(value.children);
         } else {
           delete value.children;
-          return
+          return;
         }
       });
     },
-  
+
     shutDownDetail() {
       this.addShow = false;
     },
@@ -337,7 +339,7 @@ export default {
       );
     },
     searchList() {
-      this.form.district = this.form.district[this.form.district.length-1]
+      this.form.district = this.district[this.district.length - 1];
       this.searchBefore = Object.assign(this.searchBefore, this.form);
       this.getList();
     },

src/views/yingji/focusEnter.vue

@@ -67,6 +67,9 @@
       >
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="year" label="计划年份" header-align="center">
+          <template slot-scope="scope">
+            {{ scope.row.year }}
+          </template>
         </el-table-column>
         <el-table-column
           prop="enterpriseName"
@@ -128,7 +131,6 @@
               label-width="100px"
               class="demo-ruleForm"
               ref="form1"
-              :rules="rules"
             >
               <el-row>
                 <el-col :span="24">
@@ -295,17 +297,17 @@ export default {
       addShow: false,
       //详情
       details: {},
-      rules: {
-        enterpriseName: [
-          { required: true, message: "请输入企业名称", trigger: "blur" },
-        ],
-        entCode: [
-          { required: true, message: "请输入企业代码", trigger: "blur" },
-        ],
-        remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
-        type: [{ required: true, message: "请输入大类", trigger: "blur" }],
-        year: [{ required: true, message: "请选择年份", trigger: "blur" }],
-      },
+      // rules: {
+      //   enterpriseName: [
+      //     { required: true, message: "请输入企业名称", trigger: "blur" },
+      //   ],
+      //   entCode: [
+      //     { required: true, message: "请输入企业代码", trigger: "blur" },
+      //   ],
+      //   remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      //   type: [{ required: true, message: "请输入大类", trigger: "blur" }],
+      //   year: [{ required: true, message: "请选择年份", trigger: "blur" }],
+      // },
       //总数
       total: 0,
       fileList: [],