From 918fdaa17904a595ebc63dc485592b645cddd6aa Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Fri, 20 Oct 2023 15:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                       |  10 +-
 src/views/components/dialog/index.vue |  18 ++-
 src/views/yingji/enforcing.vue        |  28 ++--
 src/views/yingji/enterprise.vue       |   9 ++
 src/views/yingji/planManage.vue       | 195 +++-----------------------
 5 files changed, 65 insertions(+), 195 deletions(-)

diff --git a/.env.production b/.env.production
index c1d16e7..685bd77 100644
--- a/.env.production
+++ b/.env.production
@@ -8,18 +8,18 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.105:9033'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9033'
 VUE_APP_BASE_API = 'http://180.108.205.123:13002'
-
+n
 # 统一登录-内网
-# VUE_APP_SSO_LOGIN = 'http://2.46.4.197:8090/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
+VUE_APP_SSO_LOGIN = 'http://2.46.4.197:8090/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
 
 # 退出登录-内网
-# VUE_APP_SSO_LOGOUT ='http://2.46.4.197:8090/sso-server/oauth2/logout?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F'
+VUE_APP_SSO_LOGOUT ='http://2.46.4.197:8090/sso-server/oauth2/logout?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F'
 
 # 统一登录-外网
-VUE_APP_SSO_LOGIN = 'http://180.108.205.123:8090/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
+# VUE_APP_SSO_LOGIN = 'http://180.108.205.123:8090/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
 
 # 退出登录-外网
-VUE_APP_SSO_LOGOUT ='http://180.108.205.123:8090/sso-server/oauth2/logout?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F'
+# VUE_APP_SSO_LOGOUT ='http://180.108.205.123:8090/sso-server/oauth2/logout?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index 07f25dd..e2545d4 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -95,7 +95,12 @@
                 </el-select>
               </div>
 
-              <!-- <div class="bottom"> -->
+              <div class="input-input">
+                <el-input
+                  v-model="form.enterpriseName"
+                  placeholder="请输入企业名称"
+                ></el-input>
+              </div>
               <div class="input-input">
                 <el-input
                   v-model="form.uuitNo"
@@ -106,7 +111,6 @@
                 <div class="select-btn" @click="filtrate">搜索</div>
                 <div class="select-btn reset" @click="reset">重置</div>
               </div>
-              <!-- </div> -->
             </div>
             <div class="tables" v-loading="loading">
               <el-table
@@ -333,6 +337,7 @@ export default {
         majorHazardLevel: "",
         entprColor: "",
         uuitNo: "",
+        enterpriseName: "",
       },
       form2: {
         plannedYear: "",
@@ -520,6 +525,7 @@ export default {
         majorHazardLevel: "",
         entprColor: "",
         uuitNo: "",
+        enterpriseName: "",
       };
       this.pages.pageNum = 1;
       this.pages.pageSize = 10;
@@ -984,7 +990,7 @@ export default {
       flex-wrap: wrap;
       padding-bottom: 10px;
       .select-input {
-        margin-right: 10px;
+        margin-right: 0;
         margin-top: 20px;
         display: flex;
         align-items: center;
@@ -994,7 +1000,7 @@ export default {
           font-weight: 400;
           color: #525966;
           line-height: 40px;
-          margin-right: 10px;
+          margin-right: 0;
         }
         ::v-deep .el-select {
           background-color: transparent;
@@ -1059,8 +1065,8 @@ export default {
       //
       // }
       .input-input {
-        margin: 20px 40px 0 0;
-        width: 250px;
+        margin: 20px 2px 0 0;
+        width: 160px;
         ::v-deep .el-input {
           .el-input__inner {
             height: 33px;
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index 3d41259..532643c 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -21,6 +21,14 @@
           >
           </el-date-picker>
         </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
@@ -30,13 +38,15 @@
             ref="executive"
           ></executive>
         </div>
-        <div class="my-checkbox">
-          <el-checkbox-group v-model="checkList" @change="setmealSelect">
-            <el-checkbox label="">全部</el-checkbox>
-            <el-checkbox label="1">已检查</el-checkbox>
-            <el-checkbox label="2">未检查</el-checkbox>
-          </el-checkbox-group>
-        </div>
+      </div>
+    </div>
+    <div class="enforce-the-law-title">
+      <div class="my-checkbox">
+        <el-checkbox-group v-model="checkList" @change="setmealSelect">
+          <el-checkbox label="">全部</el-checkbox>
+          <el-checkbox label="1">已检查</el-checkbox>
+          <el-checkbox label="2">未检查</el-checkbox>
+        </el-checkbox-group>
       </div>
       <div style="display: flex">
         <div class="export" @click="searchList" style="margin-right: 10px">
@@ -185,6 +195,7 @@ export default {
         plannedYear: "",
         //检测状态
         checkStatus: "",
+        enterpriseName: "",
       },
       checkList: [""],
       checkListTwo: [],
@@ -345,6 +356,7 @@ export default {
         district: "",
         plannedYear: "",
         checkStatus: "",
+        enterpriseName: "",
       };
       this.$refs.executive.district = [];
       this.searchBefore = {
@@ -621,7 +633,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 31px 0 12px 0;
+    padding: 10px 0 0 0;
     .filtrate-condition {
       display: flex;
       align-items: center;
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index 1835300..54996e2 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -10,6 +10,14 @@
             ref="executive"
           ></executive>
         </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>
           <el-select v-model="form.majorHazardLevel" placeholder="请选择">
@@ -402,6 +410,7 @@ export default {
         majorHazardLevel: "",
         entprColor: "",
         uuitNo: "",
+        enterpriseName: "",
       };
       this.searchBefore = {
         pageSize: 10,
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 33cb1aa..ed5c7a5 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -23,7 +23,14 @@
           </el-date-picker>
         </div>
         <div class="area">
-          <!-- <div class="area-span">执法计划情况统计表</div> -->
+          <div class="area-span" style="width: 85px">企业名称:</div>
+          <el-input
+            v-model="form.enterpriseName"
+            size="small"
+            placeholder="请输入企业名称"
+          ></el-input>
+        </div>
+        <div class="area">
           <div class="area-span">行政区划:</div>
           <el-cascader
             v-model="form.district"
@@ -71,8 +78,7 @@
             label="计划年月"
             width="180"
             header-align="center"
-          >
-          </el-table-column>
+          />
           <el-table-column
             prop="district"
             label="行政区划"
@@ -85,17 +91,10 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="entprName"
+            prop="enterpriseName"
             label="企业名称"
             header-align="center"
-          >
-          </el-table-column>
-          <!-- <el-table-column
-              prop="keyCount"
-              label="省重点数"
-              header-align="center"
-            >
-            </el-table-column> -->
+          />
           <el-table-column
             prop="createTime"
             label="创建时间"
@@ -128,41 +127,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <!-- <el-table
-            v-if="refreshTable"
-            v-loading="loading"
-            :data="tableData"
-            :height="484"
-            :border="false"
-            tooltip-effect="light"
-            row-key="id"
-            :default-expand-all="isExpandAll"
-            :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-          >
-            <el-table-column prop="district" label="行政区划" header-align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="amount" label="企业总数" header-align="center"></el-table-column>
-            <el-table-column prop="planNumb" label="已计划数" header-align="center"></el-table-column>
-            <el-table-column prop="keyCount" label="已计划省重点数" header-align="center"></el-table-column>
-            <el-table-column prop="keyCount" label="剩余重点数" header-align="center"></el-table-column>
-            <el-table-column label="查看计划明细" align="center" width="200" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
-                <div class="tabs-btns">
-                  <div class="look" @click="look(scope.row)">
-                    <img src="@/assets/images/look.png" alt="">
-                    <span>查看</span>
-                  </div>
-                  <div class="change" @click="change(scope.row)">
-                    <img src="@/assets/images/change.png" alt="">
-                    <span>修改</span>
-                  </div>
-                  <div class="delete" @click="deleteItem(scope.row)">
-                    <img src="@/assets/images/delete.png" alt="">
-                    <span>删除</span>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table> -->
       </div>
       <div class="pagination">
         <my-pagination
@@ -194,6 +158,7 @@ export default {
       form: {
         district: [],
         plannedYear: "",
+        enterpriseName: "",
       },
       district: [],
       mydistrict: "",
@@ -202,46 +167,7 @@ export default {
         label: "institutionName",
         checkStrictly: true,
       },
-      tableData: [
-        //   {
-        //   id: 1,
-        //   amount: '260',
-        //   district: '苏州市',
-        //   planNumb: '200',
-        //   keyCount:10,
-        //   children: [{
-        //       id: 31,
-        //       amount: '220',
-        //       district: '吴中区',
-        //       planNumb: '30',
-        //       keyCount:10,
-        //     }, {
-        //       id: 32,
-        //       amount: '200',
-        //       district: '姑苏区',
-        //       planNumb: '20',
-        //       keyCount:10,
-        //   }]
-        // }, {
-        //   id: 2,
-        //   amount: '330',
-        //   district: '木渎镇',
-        //   planNumb: '200',
-        //   keyCount:10,
-        // }, {
-        //   id: 256,
-        //   amount: '350',
-        //   district: '东山镇',
-        //   planNumb: '200',
-        //   keyCount:10,
-        // }, {
-        //   id: 257,
-        //   amount: '300',
-        //   district: '吴江区',
-        //   planNumb: '200',
-        //   keyCount:10,
-        // }
-      ],
+      tableData: [],
       pages: {
         pageSize: 10,
         pageNum: 1,
@@ -260,7 +186,6 @@ export default {
   computed: {
     ...mapState({
       dept: (state) => state.user.dept,
-      // district: (state) => state.user.district,
     }),
   },
   watch: {
@@ -270,7 +195,7 @@ export default {
         this.pages.pageSize = 10;
         this.$refs.mypagination.defaultPages();
         let obj;
-        // console.log(newForm,'newForm')
+        console.log(newForm, "newForm");
         // 如果是苏州市或者是某个区
         if (!this.disabled) {
           if (Array.isArray(newForm.district)) {
@@ -296,14 +221,8 @@ export default {
           }
         } else {
           // 不是苏州市是乡镇
-          // if(this.dept.ancestors.split(',').length == 2) {
-          //   this.subdistrict = this.form.subdistrict.slice(1, 8);
-          //   obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
-          // } else if(this.dept.ancestors.split(',').length == 3){
-          // let district = this.form.district.slice(1, 11);
           this.district = this.form.district;
           obj = { ...this.pages, ...this.form, district: this.district };
-          // }
         }
         // console.log(obj,'obj')
         this.getList(obj);
@@ -335,23 +254,6 @@ export default {
       // console.log('123123页码发生变化')
       this.pages = pages;
       let district;
-      // if(this.dept.ancestors.split(',').length == 2){
-      //   if(Array.isArray(this.form.district)) {
-      //     if(this.form.district.length == 2) {
-      //       district = this.form.district[1].slice(0, 10);
-      //     }
-      //   } else {
-      //     district = this.form.district.slice(0, 7);
-      //   }
-      // } else if(this.dept.ancestors.split(',').length == 3){
-      //   district = this.form.district[1].slice(0, 10);
-      // } else {
-      //   if(this.form.district.length == 2) {
-      //     district = this.form.district[1].slice(0, 10);
-      //   } else if(this.form.district.length == 1){
-      //     district = this.form.district[0].slice(0, 7);
-      //   }
-      // }
       this.getList({ ...pages, ...this.form, district: this.district });
     },
     // 选中的数据
@@ -361,17 +263,6 @@ export default {
     },
     // 导出
     exportFile() {
-      // let arr = []
-      // this.multipleSelection.map((item)=>{
-      //   arr.push(item.enterpriseId)
-      // })
-      // this.download(
-      //   "/pharmaceuticals/bPlanEnterprise/exportplan",
-      //   {
-      //     enterpriseId:arr.join(',')
-      //   },
-      //   `计划管理.xlsx`
-      // );
       //  this.multipleSelection.length > 0 ? `确认导出选中的数据吗？` :
       this.$confirm(`确认根据您的搜索条件导出搜索之后的数据吗?`, "警告", {
         confirmButtonText: "确定",
@@ -379,16 +270,6 @@ export default {
         type: "warning",
       })
         .then(() => {
-          // let district
-          // if(Array.isArray(this.form.district)){
-          //   if(this.form.district.length == 1){
-          //     district = this.form.district[0];
-          //   } else if(this.form.district.length == 2){
-          //     district = this.form.district[1];
-          //   }
-          // } else {
-          //   district = this.form.district;
-          // }
           this.download(
             "/pharmaceuticals/bPlanEnterprise/exportplan",
             {
@@ -406,20 +287,19 @@ export default {
     },
     // 重置筛选
     reset() {
-      // this.pages.pageNum = 1;
-      // this.pages.pageSize = 10;
-      // this.$refs.mypagination.defaultPages();
       // let obj
       this.district = [];
       if (this.dept.ancestors.split(",").length == 1) {
         this.form = {
           plannedYear: "",
           district: "",
+          enterpriseName: "",
         };
         // obj = this.pages
       } else {
         let { district } = this.form;
         this.form.plannedYear = "";
+        this.form.enterpriseName = "";
         this.form.district = this.mydistrict;
         // obj = {...this.pages,district}
       }
@@ -487,14 +367,7 @@ export default {
       // this.getList(this.pages);
     },
     // 区划级联选择器选择触发
-    handleChange(value) {
-      // console.log(value)
-      // if(value.length == 2) {
-      //   this.form.district = value[1]
-      // } else {
-      //   this.form.district = value[0]
-      // }
-    },
+    handleChange(value) {},
     // 查看
     look(row) {
       this.$refs.tempDialog.open(row, 2);
@@ -573,14 +446,7 @@ export default {
       }
     },
     commentData(item, dept) {
-      // if(dept.ancestors.split(',').length == 3) {
       item.map((item) => {
-        // if(item.children instanceof Array && item.children.length == 0){
-        //   item.county = item.subdistrict
-        //   delete item.children;
-        // } else {
-        //   this.commentData(item.children,this.dept)
-        // }
         item.children.map((itemTwo) => {
           if (itemTwo.children.length == 0) {
             delete itemTwo.children;
@@ -599,22 +465,15 @@ export default {
             this.form.district = item.subdistrict;
             this.mydistrict = item.subdistrict;
             this.county = true;
-            // delete item.children
           }
         });
-        // this.disabled = true;
       } else if (dept.ancestors.split(",").length == 3) {
-        // console.log(this.options)
         this.options.map((item) => {
-          // console.log(item.children,'item.children')
           item.children.map((itemTwo) => {
             if (itemTwo.institutionName == dept.deptName) {
               this.form.district = itemTwo.subdistrict;
-              // this.form.district.push(item.county,itemTwo.subdistrict);
-              // console.log(this.form.district,'item.institutionName')
               this.mydistrict = itemTwo.subdistrict;
               this.county = false;
-              // delete itemTwo.children
             }
           });
         });
@@ -623,17 +482,6 @@ export default {
     },
   },
   async created() {
-    // console.log(this.dept)
-    // console.log(this.myDistrict)
-    // this.checkListTwo = this.checkList;
-    // this.$nextTick(()=>{
-    // let dom = document.getElementsByClassName('tables');
-    // let height = dom[0].getBoundingClientRect();
-    // let windowHeight = window.innerHeight;
-    // let relativeHeight = windowHeight - height.top
-    // this.main.height = relativeHeight - 80
-    // console.log(this.main.height)
-    // })
     let data = await this.$api.yingji.tree();
     this.myDistrict = data.data;
     this.commentData(data.data, this.dept);
@@ -676,12 +524,7 @@ export default {
         // justify-content: center;
         // flex: 1;
         .area-span {
-          // font-size: 20px;
-          // font-family: 'Alibaba PuHuiTi';
-          // font-weight: bold;
-          // color: #525966;
-          // line-height: 40px;
-          margin-left: 40px;
+          margin-left: 10px;
           font-size: 14px;
           font-family: "Alibaba PuHuiTi";
           font-weight: 400;
@@ -691,7 +534,7 @@ export default {
         }
         ::v-deep .el-cascader {
           background-color: transparent;
-          width: 276px;
+          width: 180px;
           .el-input__inner {
             height: 33px;
           }