From 21c2f4ecf864e6c288e4b3da3dc95e91688cd8c8 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Mon, 25 Dec 2023 13:21:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/yingji/enforcing.vue  | 94 +++++++++++++++++----------------
 src/views/yingji/enterprise.vue | 11 ++--
 2 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index 2b189a3..aa5e448 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -10,53 +10,54 @@
   <div class="container-main" ref="main">
     <div class="enforce-the-law-title">
       <div class="filtrate-condition">
-        <div class="select-input">
-          <div class="select-span">年份:</div>
-          <el-date-picker
-            v-model="form.plannedYear"
-            type="year"
-            placeholder="请选择"
-            value-format="yyyy"
-            size="small"
-          >
-          </el-date-picker>
-        </div>
-        <div class="select-input">
-          <div class="select-span">月份:</div>
-          <el-select
-            v-model="plannedMonth"
-            multiple
-            collapse-tags
-            style="margin-left: 20px"
-            placeholder="请选择"
-            @change="multipleChange"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+        >
+          <el-form-item label="年份" prop="">
+            <el-date-picker
+              v-model="form.plannedYear"
+              type="year"
+              placeholder="请选择"
+              value-format="yyyy"
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="月份" prop="">
+            <el-select
+              v-model="plannedMonth"
+              multiple
+              collapse-tags
+              style="margin-left: 20px"
+              placeholder="请选择"
+              @change="multipleChange"
             >
-            </el-option>
-          </el-select>
-        </div>
-        <div class="select-input">
-          <div class="select-span" style="width: 85px">企业名称:</div>
-          <el-input
-            v-model="form.enterpriseName"
-            size="small"
-            placeholder="请输入企业名称"
-          ></el-input>
-        </div>
-        <div class="select-input">
-          <div class="select-span">行政区划:</div>
-          <executive
-            @quhua="quhua"
-            @quhuadizhi="quhuadizhi"
-            :none="true"
-            ref="executive"
-          ></executive>
-        </div>
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="企业名称" prop="">
+            <el-input
+              v-model="form.enterpriseName"
+              size="small"
+              placeholder="请输入企业名称"
+            />
+          </el-form-item>
+          <el-form-item label="行政区划" prop="">
+            <executive
+              @quhua="quhua"
+              @quhuadizhi="quhuadizhi"
+              :none="true"
+              ref="executive"
+            ></executive>
+          </el-form-item>
+        </el-form>
       </div>
     </div>
     <div class="enforce-the-law-title">
@@ -248,6 +249,7 @@ export default {
   name: "Article",
   data() {
     return {
+      queryParams: {},
       options: [
         {
           value: "1",
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index ae8f32d..59f4ea2 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -418,15 +418,14 @@ export default {
     handleInfo(row) {
       getNew(row.id).then((res) => {
         this.addShow = true;
-        console.log(res);
+        // console.log(res);
         let infoObj = res.data;
         infoObj.district = this.componendDistrict(infoObj.district) || "/";
         this.infoData = infoObj;
       });
-      return;
-      getByUuto(row.enterpriseId.trim()).then((res) => {
+      // getByUuto(row.enterpriseId.trim()).then((res) => {
         //  console.log(res.data);
-        let infoObj = res.data;
+        // let infoObj = res.data;
         // 查看弹窗
         // infoObj["aboveDesignated"] =
         //   infoObj.aboveDesignated == 1 ? "规上" : "规下";
@@ -454,8 +453,8 @@ export default {
         //   "yyyy-MM-DD"
         // );
 
-        this.infoData = infoObj;
-      });
+        // this.infoData = infoObj;
+      // });
     },
     supervisionLarge(value) {
       // console.log(value.split(","));