From 638e4d774d2e3df42bba64ebfd2b4a29eaea5567 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 25 Sep 2023 16:31:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yingji/index.js                  |  10 +-
 src/views/components/dialog/index.vue    | 209 +++++++++++++----------
 src/views/components/dialogTwo/index.vue |  54 +++++-
 src/views/yingji/planManage.vue          | 188 ++++++++++++++++----
 vue.config.js                            |   4 +-
 5 files changed, 336 insertions(+), 129 deletions(-)

diff --git a/src/api/yingji/index.js b/src/api/yingji/index.js
index c6c9d4e..e1ea78a 100644
--- a/src/api/yingji/index.js
+++ b/src/api/yingji/index.js
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-11 15:38:21
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-19 15:27:12
+ * @LastEditTime: 2023-09-25 13:17:19
  */
 import request from '@/utils/request'
 
@@ -55,10 +55,12 @@ export default {
       params
     });
   },
-  bPlanEnterprise(){
+  bPlanEnterprise(method,data = null, params = null, id){
     return request({
-      url: `/pharmaceuticals/bPlanEnterprise`,
-      method:'get',
+      url: `/pharmaceuticals/bPlanEnterprise${id ? `/${id}` : ''}`,
+      method,
+      data,
+      params
     });
   },
 };
\ No newline at end of file
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index d35041f..ffba86e 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -31,12 +31,12 @@
           <div class="filtrate">
             <div class="select-input">
               <div class="select-span">行政区划:</div>
-
               <el-cascader
                 v-model="form.subdistrict"
                 placeholder="请选择"
                 :options="listOne"
                 :props="props"
+                :disabled="disabled"
                 @change="handleChange"
               >
               </el-cascader>
@@ -136,7 +136,7 @@
                 type="selection"
                 reserve-selection
                 :selectable="checkSelectable"
-                width="55"
+                width="45"
                 header-align="center"
               >
               </el-table-column>
@@ -147,25 +147,47 @@
                 header-align="center"
               >
               </el-table-column>
-              <!-- <el-table-column
+              <el-table-column
                 prop="subdistrict"
                 label="行政区划"
                 show-overflow-tooltip
-                width="180"
+                width="150"
+                header-align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="ecoTypeLarge"
+                label="经济类型"
+                show-overflow-tooltip
+                header-align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="indusTypeClass"
+                label="行业类型"
+                show-overflow-tooltip
+                header-align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="majorHazardLevel"
+                label="重大危险源等级"
+                show-overflow-tooltip
                 header-align="center"
               >
-              </el-table-column> -->
-              <!-- <el-table-column
-                prop="address"
-                label="企业类型"
+              </el-table-column>
+              <el-table-column
+                prop="entprColor"
+                label="企业分色"
                 show-overflow-tooltip
                 header-align="center"
               >
-              </el-table-column> -->
+              </el-table-column>
               <el-table-column
                 prop="uscCode"
                 label="统一社会信用代码"
                 show-overflow-tooltip
+                width="150"
                 header-align="center"
               >
               </el-table-column>
@@ -188,13 +210,9 @@
           </div>
           <div class="pagination">
             <my-pagination :total="total" @pagesChange="pagesChange">
-              <div>
-                重点企业数：<span
-                  :class="
-                    count == unCount ? 'selectedNumber' : 'unselectedNumber'
-                  "
-                  >{{ unCount }}</span
-                >/<span class="sum">{{ count }}</span>
+              <div>重点企业数：
+                <span :class=" count == unCount ? 'selectedNumber' : 'unselectedNumber'">{{ unCount }}</span>/
+                <span class="sum">{{ count }}</span>
               </div>
             </my-pagination>
           </div>
@@ -286,6 +304,8 @@ export default {
       selected: 0,
       nextStep: false,
       nextText: "下一步",
+      workingArea:'',
+      subdistrict:'',
       form: {
         subdistrict: [],
         frimType: "",
@@ -313,6 +333,7 @@ export default {
       unCount: 0,
       unselected: 0,
       selectList: [],
+      disabled:false,
     };
   },
   computed: {
@@ -324,15 +345,26 @@ export default {
     // 搜索
     filtrate() {
       if (this.form.subdistrict) {
-        this.form.subdistrict = this.form.subdistrict[1];
+        this.subdistrict = this.trimTrailingZeros(this.form.subdistrict);
       }
+      // let obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
       let obj = { ...this.pages, ...this.form };
-      this.getTable(obj);
+      this.getTable(this.pages);
+    },
+    // 处理搜索行政区划
+    trimTrailingZeros(str) {
+      for (let i = str.length - 1; i >= 0; i--) {
+        if (str.charAt(i) !== '0') {
+          return str.slice(0, i + 1);
+        }
+      }
+      // 如果字符串全是零，直接返回原字符串
+      return str;
     },
     // 重置
     reset() {
       this.form= {
-        subdistrict: [],
+        subdistrict: this.workingArea,
         frimType: "",
         indusTypeClass: "",
         isPoint: "",
@@ -356,35 +388,40 @@ export default {
       return row.unselected;
     },
     // 选中企业的获取
-    async bPlanEnterprise() {
-      let count = 0;
-      let data = await this.$api.yingji.bPlanEnterprise();
-      this.selectList = data.data;
-      data.data.map((item) => {
-        item["uscCode"] = item.enterpriseId;
-        this.$nextTick(() => {
-          this.$refs.multipleTable.toggleRowSelection(item, false);
-        });
-        if (item.isPoint == 1) {
-          count += 1;
-        }
-      });
-      // console.log(count,'count')
-      this.unselected = count;
-    },
+    // async bPlanEnterprise() {
+    //   let count = 0;
+    //   let data = await this.$api.yingji.bPlanEnterprise();
+    //   this.selectList = data.data;
+    //   console.log(data)
+    //   data.data.map((item) => {
+    //     item["uscCode"] = item.enterpriseId;
+    //     this.$nextTick(() => {
+    //       this.$refs.multipleTable.toggleRowSelection(item, false);
+    //     });
+    //     if (item.isPoint == 1) {
+    //       count += 1;
+    //     }
+    //   });
+    //   console.log(count,'count')
+    //   this.unselected = count;
+    // },
     // 打开
-    async open(item) {
+    async open(item,dept) {
       this.dialogVisible = true;
+      // this.dept = dept
+      let data = await this.$api.yingji.tree(); // 行政区划
+      this.commentData(data.data,dept);
+      this.filtrate()
       if (item == "newlyIncreased") {
-        if (this.dept.deptName !== "市局") {
-          this.bPlanEnterprise();
-        }
-        this.getTable(this.pages);
+        // if (this.dept.deptName !== "市局") {
+        // this.bPlanEnterprise();
+        // }
+        // this.getTable(this.pages);
       } else {
         this.amendId = item.id;
         this.isamend = true;
         this.getList(item);
-        this.getTable(this.pages);
+        // this.getTable(this.pages);
       }
     },
     // 关闭
@@ -429,6 +466,7 @@ export default {
       this.loading = true;
       let data = await this.$api.yingji.basicList(pages);
       // console.log(data.data.count, '重点企业总数');
+      console.log(this.unCount,'this.unCount')
       this.count = data.data.count;
       data.data.count == this.unselected
         ? (this.unCount = data.data.count)
@@ -436,6 +474,7 @@ export default {
         ? (this.unCount = 0)
         : (this.unCount = data.data.count - this.unselected);
       this.total = data.data.total;
+      console.log(this.unselected,'this.unselected')
       if (data.code == 200) {
         this.loading = false;
       }
@@ -455,36 +494,12 @@ export default {
     getData() {
       var myDate = new Date();
       var year = myDate.getFullYear(); //获取当前年var mon = myDate.getMonth() + 1; //获取当前月
-      var mon =
-        myDate.getMonth() + 1 < 10
-          ? "0" + (myDate.getMonth() + 1)
-          : myDate.getMonth() + 1 == 0
-          ? "00"
-          : myDate.getMonth() + 1;
-      var date =
-        myDate.getDate() < 10 ? "0" + myDate.getDate() : myDate.getDate(); //获取当前日
-      var hours =
-        myDate.getHours() < 10 ? "0" + myDate.getHours() : myDate.getHours(); //获取当前小时
-      var minutes =
-        myDate.getMinutes() < 10
-          ? "0" + myDate.getMinutes()
-          : myDate.getMinutes(); //获取当前分钟
-      var seconds =
-        myDate.getSeconds() < 10
-          ? "0" + myDate.getSeconds()
-          : myDate.getSeconds(); //获取当前秒var now = year + "_" + mon + "_" + date + " "+ hours + ":" + minutes + ":" + seconds;
-      var now =
-        year +
-        "-" +
-        mon +
-        "-" +
-        date +
-        " " +
-        hours +
-        ":" +
-        minutes +
-        ":" +
-        seconds;
+      var mon = myDate.getMonth() + 1 < 10 ? "0" + (myDate.getMonth() + 1) : myDate.getMonth() + 1 == 0 ? "00" : myDate.getMonth() + 1;
+      var date = myDate.getDate() < 10 ? "0" + myDate.getDate() : myDate.getDate(); //获取当前日
+      var hours = myDate.getHours() < 10 ? "0" + myDate.getHours() : myDate.getHours(); //获取当前小时
+      var minutes = myDate.getMinutes() < 10 ? "0" + myDate.getMinutes() : myDate.getMinutes(); //获取当前分钟
+      var seconds = myDate.getSeconds() < 10 ? "0" + myDate.getSeconds() : myDate.getSeconds(); //获取当前秒var now = year + "_" + mon + "_" + date + " "+ hours + ":" + minutes + ":" + seconds;
+      var now = year + "-" + mon + "-" + date + " " + hours + ":" + minutes + ":" + seconds;
       return now;
     },
     // 下一步
@@ -504,7 +519,7 @@ export default {
           this.$message.error("请至少选择一家企业");
           return;
         }
-        if (this.dept.deptName == "乡镇") {
+        if (this.dept.parentId == 101) {
           if (this.count == this.unselected + keyCount) {
             this.nextStep = true;
             this.nextText = "发布计划";
@@ -533,7 +548,6 @@ export default {
           district,
           enterpriseId,
           createTime,
-          keyCount,
           planNumb,
         };
         let data;
@@ -566,7 +580,7 @@ export default {
             this.form2.planName != "" &&
             this.form2.planContent != ""
           ) {
-            data = await this.$api.yingji.bPlanManage("post", obj);
+            data = await this.$api.yingji.bPlanEnterprise("post", obj);
             if (data.code == 200) {
               downloadLoadingInstance.close();
               this.$message({
@@ -587,7 +601,11 @@ export default {
     },
     // 区划级联选择器选择触发
     handleChange(value) {
-      console.log(value);
+      if(value.length == 2) {
+        this.form.subdistrict = value[1]
+      } else {
+        this.form.subdistrict = value[0]
+      }
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
@@ -595,23 +613,42 @@ export default {
       }
       return "";
     },
-    commentData(item) {
-      if (item instanceof Array) {
-        item.map((item) => {
-          if (item.children instanceof Array && item.children.length == 0) {
-            delete item.children;
-          } else {
-            this.props.value = "subdistrict";
-            this.commentData(item.children);
+    commentData(item,dept) {
+      item.map((item)=>{
+        if(item.children instanceof Array && item.children.length == 0){
+          item.county = item.subdistrict
+          delete item.children;
+        } else {
+          // this.props.value = 'subdistrict'
+          this.commentData(item.children,dept)
+        }
+      })
+      this.listOne = item
+      if(dept.parentId == 100) {
+        this.listOne = this.listOne.filter((item)=>{
+          return item.institutionName == dept.deptName
+        })
+        this.listOne.map((item)=>{
+          if(item.institutionName == dept.deptName) {
+            this.form.subdistrict = item.county
+            this.workingArea = item.county
+            delete item.children
           }
-        });
+        })
+        this.disabled = true;
+      } else if(dept.parentId == 101) {
+        this.listOne.map((item)=>{
+          if(item.institutionName == dept.deptName) {
+            this.form.subdistrict = item.subdistrict
+            this.workingArea = item.county
+          }
+        })
+        this.disabled = true;
       }
       this.listOne = item;
     },
   },
   async mounted() {
-    let data = await this.$api.yingji.tree(); // 行政区划
-    this.commentData(data.data);
     let listTwo = await this.$api.yingji.dictdata({
       list: "economic_categories",
     }); // 经济类型大类
diff --git a/src/views/components/dialogTwo/index.vue b/src/views/components/dialogTwo/index.vue
index eeb0536..f60a41a 100644
--- a/src/views/components/dialogTwo/index.vue
+++ b/src/views/components/dialogTwo/index.vue
@@ -32,13 +32,14 @@
             <div>计划内容：</div>
             <div class="content">{{ content }}</div>
           </div>
-        </div>
-        <div class="plan-content">
           <div class="item-two">
             <div>备注：</div>
             <div class="content">{{ remark ?remark:'暂无备注'}}</div>
           </div>
         </div>
+        <!-- <div class="plan-content">
+          
+        </div> -->
       </div>
       <div class="tables" v-loading="loading">
         <el-table
@@ -93,6 +94,24 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column label="操作" align="center" 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">
@@ -150,6 +169,10 @@ export default {
     pagesChange(pages) {
       this.getList(pages);
       this.pages = pages;
+    },
+    // 查看
+    look(row){
+
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
@@ -289,6 +312,33 @@ export default {
         height: 448px !important;
         overflow-y: auto;
       }
+      .tabs-btns {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .look,.change,.delete {
+          display: flex;
+          align-items: center;
+          // margin-right: 30px;
+          cursor: pointer;
+          img {
+            width: 20px;
+            margin-right: 5px;
+          }
+          span {
+            font-size: 15px;
+            font-family: Alibaba PuHuiTi;
+            font-weight: 400;
+            color: #045FFD;
+          }
+        }
+        .delete {
+          margin-right: 0;
+          span {
+            color: #F71052;
+          }
+        }
+      }
     }
     ::v-deep .el-table::before {
       height: 0;
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 4896f27..8693275 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-20 11:25:04
+ * @LastEditTime: 2023-09-25 15:19:55
 -->
 <template>
     <div class="plan-management">
@@ -43,6 +43,7 @@
             <span class="demonstration">默认 click 触发子菜单</span> -->
             <el-cascader
               v-model="form.district"
+              :disabled="disabled"
               placeholder="请选择"
               :options="options"
               :props="props"
@@ -64,7 +65,7 @@
       </div>
       <div class="plan-bottomBox">
         <div class="tables">
-          <el-table
+          <!-- <el-table
             :data="tableData"
             :border="false"
             :height="484"
@@ -139,6 +140,46 @@
                 </div>
               </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="plannedYear" label="计划年份" width="200" header-align="center"></el-table-column>
+            <el-table-column prop="district" label="行政区划" width="250" header-align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="planNumb" label="计划企业数量" width="150" header-align="center"></el-table-column>
+            <el-table-column prop="keyCount" label="省重点数" width="100" header-align="center"></el-table-column>
+            <el-table-column prop="keyCount" label="剩余重点数" width="100" header-align="center"></el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="250" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" 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">
@@ -154,43 +195,83 @@
   import myDialog from "@/views/components/dialog/index.vue"
   import myDialogtwo from "@/views/components/dialogTwo/index.vue"
   import { Loading } from "element-ui";
+  import { mapState } from "vuex";
   export default {
     components:{myPagination,myDialog,myDialogtwo},
     data() {
       return {
         optionsyear:[],
-        options:[
-
-        ],
+        options:[],
         form:{
           district:[],
           plannedYear:''
         },
         props:{
           value:'county',
-          label:'institutionName'
+          label:'institutionName',
+          checkStrictly: true
         },
-        value:'2022',
-        value2:'苏州',
-        tableData: [],
-        multipleSelection: [],
+        tableData: [{
+          id: 1,
+          plannedYear: '2016-05-02',
+          district: '王小虎',
+          planNumb: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          id: 2,
+          plannedYear: '2016-05-04',
+          district: '王小虎',
+          planNumb: '上海市普陀区金沙江路 1517 弄'
+        }, {
+          id: 3,
+          plannedYear: '2016-05-01',
+          district: '王小虎',
+          planNumb: '上海市普陀区金沙江路 1519 弄',
+          children: [{
+              id: 31,
+              plannedYear: '2016-05-01',
+              district: '王小虎',
+              planNumb: '上海市普陀区金沙江路 1519 弄'
+            }, {
+              id: 32,
+              plannedYear: '2016-05-01',
+              district: '王小虎',
+              planNumb: '上海市普陀区金沙江路 1519 弄'
+          }]
+        }, {
+          id: 4,
+          plannedYear: '2016-05-03',
+          district: '王小虎',
+          planNumb: '上海市普陀区金沙江路 1516 弄'
+        }],
+        // multipleSelection: [],
         pages:{
           pageSize:10,
           pageNum:1
         },
         total:0,
-        loading:true,
+        loading:false,
+        disabled:false,
+        // 是否展开，默认全部展开
+        isExpandAll: true,
+        // 重新渲染表格状态
+        refreshTable: true,
       }
     },
+    computed: {
+      ...mapState({
+        dept: (state) => state.user.dept,
+      }),
+    },
     watch:{
       form:{
         handler(newForm) {
           let { district, plannedYear} = newForm
-          district = district[1]
+          // console.log(newForm)
+          // district = district[1]
           let obj = {...this.pages,district,plannedYear}
-          this.getList(obj)
+          // this.getList(obj)
         },
-        deep:true
+        deep:true,
       }
     },
     methods:{
@@ -224,23 +305,38 @@
       },
       // 新增计划
       newProject(){
-        this.$refs.myDialog.open('newlyIncreased')
+        this.$refs.myDialog.open('newlyIncreased',this.dept)
       },
       // 重置筛选
       reset(){
-        this.form={
-          district:[],
-          plannedYear:''
-        },
-        this.getList(this.pages)
+        let obj
+        if(this.dept.parentId !== 0) {
+          let { district} = this.form;
+          this.form.plannedYear='';
+          obj = {...this.pages,district}
+        } else {
+          this.form = {
+            plannedYear:'',
+            district:''
+          }
+          obj = this.pages
+        }
+        this.getList(obj)
       },
       // 新增成功后关闭dialog事件触发
       padlock(){
-        this.getList(this.pages);
+        let { district} = this.form;
+        let obj = {...this.pages,district}
+        this.getList(obj);
       },
       // 区划级联选择器选择触发
       handleChange(value){
         console.log(value)
+        if(value.length == 2) {
+          this.form.district = value[1]
+        } else {
+          this.form.district = value[0]
+        }
       },
       // 查看
       look(row){
@@ -248,7 +344,7 @@
       },
       // 修改
       change(row){
-        this.$refs.myDialog.open(row)
+        this.$refs.myDialog.open(row,this.dept)
       },
       // 删除
       deleteItem(row){
@@ -275,7 +371,9 @@
                 message: '删除成功',
                 type: 'success'
               });
-              this.getList();
+              let { district} = this.form;
+              let obj = {...this.pages,district}
+              this.getList(obj);
             }
           } catch (error) {
             downloadLoadingInstance.close();
@@ -303,21 +401,41 @@
         this.tableData = res.data.list;
         this.total = res.data.total
       },
-      commentData(item){
-        if(item instanceof Array) {
-          item.map((item)=>{
-            if(item.children instanceof Array && item.children.length == 0){
-              delete item.children;
-            } else {
-              this.props.value = 'subdistrict'
-              this.commentData(item.children)
+      commentData(item,dept){
+        item.map((item)=>{
+          if(item.children instanceof Array && item.children.length == 0){
+            item.county = item.subdistrict
+            delete item.children;
+          } else {
+            // this.props.value = 'subdistrict'
+            this.commentData(item.children,this.dept)
+          }
+        })
+        this.options = item
+        if(dept.parentId == 100) {
+          this.options = this.options.filter((item)=>{
+            return item.institutionName == dept.deptName
+          })
+          this.options.map((item)=>{
+            if(item.institutionName == dept.deptName) {
+              this.form.district = item.county
+              delete item.children
             }
           })
+          this.disabled = true;
+        } else if(dept.parentId == 101) {
+          this.options.map((item)=>{
+            if(item.institutionName == dept.deptName) {
+              this.form.district = item.subdistrict
+            }
+          })
+          this.disabled = true;
         }
-        this.options = item
+        // console.log(this.options)
       }
     },
     async created() {
+      console.log(this.dept)
       this.checkListTwo = this.checkList;
       // this.$nextTick(()=>{
         // let dom = document.getElementsByClassName('tables');
@@ -328,8 +446,8 @@
         // console.log(this.main.height)
       // })
       let data = await this.$api.yingji.tree();
-      this.commentData(data.data)
-      this.getList(this.pages);
+      this.commentData(data.data,this.dept)
+      // this.getList(this.pages);
     },
   }
   </script>
@@ -497,7 +615,7 @@
           .look,.change,.delete {
             display: flex;
             align-items: center;
-            margin-right: 30px;
+            // margin-right: 30px;
             cursor: pointer;
             img {
               width: 20px;
diff --git a/vue.config.js b/vue.config.js
index 47be370..27ef35c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -49,8 +49,8 @@ module.exports = {
       //   },
       // },
       '/api': {
-        // target: `http://39.101.188.84:9033`,
-        target: `http://192.168.0.119:9033`,
+        target: `http://39.101.188.84:9033`,
+        // target: `http://192.168.0.119:9033`,
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''

From aa9cad8d1796fdb705d6135dbd869532dbfb73a6 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 26 Sep 2023 13:44:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/dialog/index.vue    |  59 +++--
 src/views/components/dialogTwo/index.vue | 293 ++++++++++++++++++-----
 src/views/yingji/planManage.vue          |  53 ++--
 3 files changed, 299 insertions(+), 106 deletions(-)

diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index ffba86e..36b593e 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -155,13 +155,13 @@
                 header-align="center"
               >
               </el-table-column>
-              <el-table-column
+              <!-- <el-table-column
                 prop="ecoTypeLarge"
                 label="经济类型"
                 show-overflow-tooltip
                 header-align="center"
               >
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column
                 prop="indusTypeClass"
                 label="行业类型"
@@ -169,7 +169,7 @@
                 header-align="center"
               >
               </el-table-column>
-              <el-table-column
+              <!-- <el-table-column
                 prop="majorHazardLevel"
                 label="重大危险源等级"
                 show-overflow-tooltip
@@ -182,7 +182,7 @@
                 show-overflow-tooltip
                 header-align="center"
               >
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column
                 prop="uscCode"
                 label="统一社会信用代码"
@@ -219,14 +219,14 @@
         </div>
         <div v-else class="release-planning">
           <div class="inputs centered">
-            <div class="inputs-span">计划年份:</div>
+            <div class="inputs-span">计划年月:</div>
             <el-date-picker
               v-model="form2.plannedYear"
               type="month"
               format="yyyy-MM"
               :clearable="false"
               value-format="yyyy-MM"
-              placeholder="请选择年份"
+              placeholder="请选择年月"
             >
             </el-date-picker>
           </div>
@@ -299,6 +299,7 @@ export default {
       props: {
         value: "county",
         label: "institutionName",
+        checkStrictly: true
       },
       multipleSelection: [],
       selected: 0,
@@ -344,12 +345,38 @@ export default {
   methods: {
     // 搜索
     filtrate() {
-      if (this.form.subdistrict) {
-        this.subdistrict = this.trimTrailingZeros(this.form.subdistrict);
+      // if (this.form.subdistrict) {
+      //   this.subdistrict = this.trimTrailingZeros(this.form.subdistrict);
+      // }
+      let obj
+      // console.log(this.form.subdistrict)
+      // 如果是苏州市
+      if(!this.disabled) {
+        if(this.form.subdistrict.length > 0){
+          if(this.form.subdistrict.length == 2) {
+            this.form.subdistrict = this.form.subdistrict[1]
+            this.subdistrict = this.form.subdistrict.slice(0, 10);
+            obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
+          } else if(this.form.subdistrict.length == 1) {
+            this.form.subdistrict = this.form.subdistrict[0]
+            this.subdistrict = this.form.subdistrict.slice(0, 7);
+            obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
+          }
+        } else {
+          obj = this.pages
+        }
+      } else {
+        // 不是苏州市是区县
+        if(this.dept.parentId == 100) {
+          this.subdistrict = this.form.subdistrict.slice(0, 7);
+          obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
+        } else if(this.dept.parentId == 101){
+          this.subdistrict = this.form.subdistrict.slice(0, 10);
+          obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
+        }
       }
-      // let obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
-      let obj = { ...this.pages, ...this.form };
-      this.getTable(this.pages);
+      // obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
+      this.getTable(obj);
     },
     // 处理搜索行政区划
     trimTrailingZeros(str) {
@@ -466,7 +493,7 @@ export default {
       this.loading = true;
       let data = await this.$api.yingji.basicList(pages);
       // console.log(data.data.count, '重点企业总数');
-      console.log(this.unCount,'this.unCount')
+      // console.log(this.unCount,'this.unCount')
       this.count = data.data.count;
       data.data.count == this.unselected
         ? (this.unCount = data.data.count)
@@ -474,7 +501,7 @@ export default {
         ? (this.unCount = 0)
         : (this.unCount = data.data.count - this.unselected);
       this.total = data.data.total;
-      console.log(this.unselected,'this.unselected')
+      // console.log(this.unselected,'this.unselected')
       if (data.code == 200) {
         this.loading = false;
       }
@@ -601,11 +628,7 @@ export default {
     },
     // 区划级联选择器选择触发
     handleChange(value) {
-      if(value.length == 2) {
-        this.form.subdistrict = value[1]
-      } else {
-        this.form.subdistrict = value[0]
-      }
+      
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
diff --git a/src/views/components/dialogTwo/index.vue b/src/views/components/dialogTwo/index.vue
index f60a41a..94c2655 100644
--- a/src/views/components/dialogTwo/index.vue
+++ b/src/views/components/dialogTwo/index.vue
@@ -19,15 +19,36 @@
       <div class="planInfo">
         <div class="plan-title">
           <div class="item">
-            <div>计划标题：</div>
-            <div class="content">{{ title }}</div>
+            <div class="year">
+              <div class="year-span">年份:</div>
+              <el-date-picker
+                v-model="form.plannedYear"
+                type="month"
+                format="yyyy-MM"
+                :clearable="false"
+                value-format="yyyy-MM"
+                placeholder="请选择年份">
+              </el-date-picker>
+            </div>
+            <div class="area">
+              <div class="area-span">区划:</div>
+              <el-cascader
+                v-model="form.district"
+                :disabled="disabled"
+                placeholder="请选择"
+                :options="options"
+                :props="props"
+                @change="handleChange"></el-cascader>
+            </div>
           </div>
           <div class="item">
-            <div>计划月份：</div>
-            <div class="content">{{ year }}</div>
+            <div class="export" @click="exportFile">
+              <img src="@/assets/images/export.png" alt="">
+              <span>导出excel</span>
+            </div>
           </div>
         </div>
-        <div class="plan-content">
+        <!-- <div class="plan-content">
           <div class="item-two">
             <div>计划内容：</div>
             <div class="content">{{ content }}</div>
@@ -36,9 +57,6 @@
             <div>备注：</div>
             <div class="content">{{ remark ?remark:'暂无备注'}}</div>
           </div>
-        </div>
-        <!-- <div class="plan-content">
-          
         </div> -->
       </div>
       <div class="tables" v-loading="loading">
@@ -52,19 +70,25 @@
         >
           <el-table-column
             prop="entprName"
-            label="企业名称"
+            label="计划年月"
             show-overflow-tooltip
             header-align="center"
           >
           </el-table-column>
-          <!-- <el-table-column
+          <el-table-column
             prop="subdistrict"
             label="行政区划"
             show-overflow-tooltip
-            width="180"
             header-align="center"
           >
-          </el-table-column> -->
+          </el-table-column>
+          <el-table-column
+            prop="entprName"
+            label="企业名称"
+            show-overflow-tooltip
+            header-align="center"
+          >
+          </el-table-column>
           <!-- <el-table-column
             prop="address"
             label="企业类型"
@@ -74,41 +98,26 @@
           </el-table-column> -->
           <el-table-column
             prop="uscCode"
-            label="统一社会信用代码"
+            label="创建时间"
             show-overflow-tooltip
             header-align="center"
           >
           </el-table-column>
-          <el-table-column
-            prop="isPoint"
-            label="是否重点"
-            header-align="center"
-          >
-            <template slot-scope="scope">
-              <div
-                style="font-family: 'Alibaba PuHuiTi'"
-                :class="scope.row.isPoint == '1' ? 'isStyle' : ''"
-              >
-                <span v-if="scope.row.isPoint == '1'">是</span>
-                <span v-if="scope.row.isPoint == '0'">否</span>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" width="300" 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)">
+                <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>
               </div>
             </template>
           </el-table-column>
@@ -130,6 +139,13 @@ export default {
   data() {
     return {
       dialogVisible: false,
+      options:[],
+      props:{
+        value:'county',
+        label:'institutionName',
+        checkStrictly: true
+      },
+      disabled:false,
       tableData: [],
       total: 0,
       pages: {
@@ -137,32 +153,61 @@ export default {
         pageSize: 10,
       },
       loading: false,
-      year: "",
-      title: "",
-      content: "",
-      remark: "",
+      form:{
+        district:[],
+        plannedYear:''
+      },
+      dept:null,
     };
   },
   methods: {
-    async open(item) {
+    async open(item,dept) {
+      console.log(dept)
+      this.dept = dept
       this.dialogVisible = true;
-      this.getList(item);
+      let data = await this.$api.yingji.tree();
+      this.commentData(data.data,dept)
+      // this.getList(item);
     },
     Close() {
       this.dialogVisible = false;
       this.pages.pageNum = 1;
       this.pages.pageSize = 10;
     },
+    // 导出
+    exportFile(){
+      this.$confirm(`确认根据您的搜索条件导出搜索之后的数据吗?`, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(() => {
+        this.download(
+          "/pharmaceuticals/bPlanManage/export",
+          {
+            ...this.form,
+          },
+          `计划管理.xlsx`
+        );
+      })
+      .catch(() => {});
+    },
+    // 区划级联选择器选择触发
+    handleChange(value){
+      console.log(value)
+      if(value.length == 2) {
+        this.form.district = value[1]
+      } else {
+        this.form.district = value[0]
+      }
+    },
+    // 获取列表
     async getList(item) {
       this.loading = true;
       let data = await this.$api.yingji.bPlanManageTwo(item.id);
       if (data.code == 200) {
         this.loading = false;
       }
-      this.year = data.data.plannedYear;
-      this.title = data.data.planName;
-      this.content = data.data.planContent;
-      this.remark = data.data.remark;
       this.tableData = data.data.list;
     },
     // 页码，当前页切换事件
@@ -173,6 +218,81 @@ export default {
     // 查看
     look(row){
 
+    },
+    // 修改
+    change(row){
+      // this.$refs.myDialog.open(row,this.dept)
+    },
+    // 删除
+    deleteItem(row){
+      let	idList = [];
+      idList.push(row.id)
+      this.$modal.confirm("你确认要删除该条数据吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(async() => {
+        this.loading = true;
+        try {
+          let downloadLoadingInstance = Loading.service({
+            text: "正在删除计划，请稍候",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+          });
+          // let data = await this.$api.yingji.bPlanManage('delete',_,{idList:idList.join(',')})
+          // if(data.code == 200) {
+          //   this.loading = false;
+          //   downloadLoadingInstance.close();
+          //   this.$message({
+          //     message: '删除成功',
+          //     type: 'success'
+          //   });
+          //   let { district} = this.form;
+          //   let obj = {...this.pages,district}
+          //   this.getList(obj);
+          // }
+        } catch (error) {
+          downloadLoadingInstance.close();
+          console.log(error)
+        }
+      })
+      .catch(() => {
+        console.log('取消删除')
+      });
+    },
+    // 行政区划获取
+    commentData(item,dept){
+      item.map((item)=>{
+        if(item.children instanceof Array && item.children.length == 0){
+          item.county = item.subdistrict
+          delete item.children;
+        } else {
+          // this.props.value = 'subdistrict'
+          this.commentData(item.children,this.dept)
+        }
+      })
+      this.options = item
+      if(dept.parentId == 100) {
+        this.options = this.options.filter((item)=>{
+          return item.institutionName == dept.deptName
+        })
+        this.options.map((item)=>{
+          if(item.institutionName == dept.deptName) {
+            this.form.district = item.county
+            delete item.children
+          }
+        })
+        this.disabled = true;
+      } else if(dept.parentId == 101) {
+        this.options.map((item)=>{
+          if(item.institutionName == dept.deptName) {
+            this.form.district = item.subdistrict
+          }
+        })
+        this.disabled = true;
+      }
+      // console.log(this.options)
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
@@ -232,25 +352,88 @@ export default {
       justify-content: space-between;
       .item {
         display: flex;
-        flex: 1;
         align-items: center;
-        div {
-          font-size: 15px;
-          font-family: "Alibaba PuHuiTi";
-          font-weight: 400;
-          color: #525966;
-
-          &:nth-child(1) {
-            width: 80px;
-            text-align: right;
-            font-size: 16px;
-            font-family: "Alibaba PuHuiTi";
+        .year {
+          display: flex;
+          align-items: center;
+          margin-right: 81px;
+          .year-span {
+            font-size: 14px;
+            font-family: 'Alibaba PuHuiTi';
             font-weight: 400;
             color: #525966;
+            line-height: 40px;
+            margin-right: 10px;
           }
         }
-        .content {
-          flex: 1;
+        .area {
+          display: flex;
+          align-items: center;
+          .area-span {
+            font-size: 14px;
+            font-family: 'Alibaba PuHuiTi';
+            font-weight: 400;
+            color: #525966;
+            line-height: 40px;
+            margin-right: 10px;
+          }
+          ::v-deep .el-cascader {
+            background-color: transparent;
+            width: 276px;
+            .el-input__inner {
+              height: 33px;
+            }
+            .el-input .el-input__suffix .el-input__suffix-inner .el-icon-arrow-down::before {
+              content: "";
+              background: url(../../../assets/images/down2.png) center center no-repeat;
+              background-size: cover;
+              position: absolute;
+              width: 10px;
+              height: 7px;
+              top: 50%;
+              left: 50%;
+              transform: translate(-50%, -50%);
+            }
+          }
+        }
+        ::v-deep .el-select {
+          background-color: transparent;
+          width: 276px;
+          .el-input__inner {
+            height: 33px;
+          }
+          .el-input .el-input__suffix .el-input__suffix-inner .el-icon-arrow-up {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
+          .el-input .el-input__suffix .el-input__suffix-inner .el-icon-arrow-up::before {
+            content: "";
+            background: url(../../../assets/images/down2.png) center center no-repeat;
+            background-size: cover;
+            position: absolute;
+            width: 10px;
+            height: 7px;
+            transform: rotate(180deg);
+          }
+        }
+      }
+      .export {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #2378EC;
+        padding: 6px 19px;
+        cursor: pointer;
+        img {
+          width: 22px;
+          margin-right: 10px;
+        }
+        span {
+          color: #ffffff;
+          font-size: 14px;
+          font-family: 'Alibaba PuHuiTi';
+          font-weight: 400;
         }
       }
     }
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 8693275..dcbc02d 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-25 15:19:55
+ * @LastEditTime: 2023-09-26 13:14:38
 -->
 <template>
     <div class="plan-management">
@@ -30,25 +30,14 @@
             </el-date-picker>
           </div>
           <div class="area">
-            <div class="area-span">区划:</div>
-            <!-- <el-select v-model="value2" placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select> -->
-            <!-- <div class="block">
-            <span class="demonstration">默认 click 触发子菜单</span> -->
-            <el-cascader
+            <div class="area-span">执法计划情况统计表</div>
+            <!-- <el-cascader
               v-model="form.district"
               :disabled="disabled"
               placeholder="请选择"
               :options="options"
               :props="props"
-              @change="handleChange"></el-cascader>
-          <!-- </div> -->
+              @change="handleChange"></el-cascader> -->
           </div>
         </div>
         <div class="btns">
@@ -152,17 +141,12 @@
             :default-expand-all="isExpandAll"
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
           >
-            <el-table-column prop="plannedYear" label="计划年份" width="200" header-align="center"></el-table-column>
-            <el-table-column prop="district" label="行政区划" width="250" header-align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="planNumb" label="计划企业数量" width="150" header-align="center"></el-table-column>
-            <el-table-column prop="keyCount" label="省重点数" width="100" header-align="center"></el-table-column>
-            <el-table-column prop="keyCount" label="剩余重点数" width="100" header-align="center"></el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" width="250" header-align="center">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column prop="district" label="行政区划" header-align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="plannedYear" 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)">
@@ -340,7 +324,7 @@
       },
       // 查看
       look(row){
-        this.$refs.myDialogTwo.open(row);
+        this.$refs.myDialogTwo.open(row,this.dept);
       },
       // 修改
       change(row){
@@ -445,8 +429,8 @@
         // this.main.height = relativeHeight - 80
         // console.log(this.main.height)
       // })
-      let data = await this.$api.yingji.tree();
-      this.commentData(data.data,this.dept)
+      // let data = await this.$api.yingji.tree();
+      // this.commentData(data.data,this.dept)
       // this.getList(this.pages);
     },
   }
@@ -464,10 +448,11 @@
       .drup-downs {
         display: flex;
         align-items: center;
+        flex: 1;
         .year {
           display: flex;
           align-items: center;
-          margin-right: 81px;
+          // margin-right: 200px;
           .year-span {
             font-size: 14px;
             font-family: 'Alibaba PuHuiTi';
@@ -480,13 +465,15 @@
         .area {
           display: flex;
           align-items: center;
+          justify-content: center;
+          flex: 1;
           .area-span {
-            font-size: 14px;
+            font-size: 20px;
             font-family: 'Alibaba PuHuiTi';
-            font-weight: 400;
+            font-weight: bold;
             color: #525966;
             line-height: 40px;
-            margin-right: 10px;
+            // margin-right: 10px;
           }
           ::v-deep .el-cascader {
             background-color: transparent;