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

src/views/components/dialog/index.vue

@@ -421,6 +421,7 @@ export default {
     selectFirm(){
       if(this.$refs.next.innerText == "发布计划"){
         this.nextStep = false;
+        this.filtrate();
         this.nextText = "下一步";
         this.multipleSelection.map((item)=>{
           this.$nextTick(() => {
@@ -591,6 +592,9 @@ export default {
     },
     // 关闭
     Close(item) {
+      this.pages.pageNum = 1;
+      this.pages.pageSize = 10;
+      this.$refs.mypagination.defaultPages();
       this.dialogVisible = false;
       this.tableData = [];
       this.multipleSelection = [];
@@ -600,9 +604,6 @@ export default {
       Object.keys(this.form).forEach((key) => (this.form[key] = ""));
       Object.keys(this.form2).forEach((key) => (this.form2[key] = ""));
       // this.unCount = 0;
-      this.pages.pageNum = 1;
-      this.pages.pageSize = 10;
-      this.$refs.mypagination.defaultPages();
       this.selected = 0;
       // this.unselected = 0;
       // this.count = 0;

src/views/components/firmDialog/index.vue

@@ -450,7 +450,7 @@ export default {
       for (let key in this.details) {
         this.listDes.forEach((value1, index1) => {
           if (key == value1.eng) {
-            this.listDes[index1].value = this.details[key] == '无' ? '/' : this.details[key];
+            this.listDes[index1].value = this.details[key] == '无' ? '/' : this.details[key] == 'true' ? '是' : this.details[key];
             return;
           }
         });

src/views/components/tempDialog/index.vue

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-28 11:25:48
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-30 01:07:17
+ * @LastEditTime: 2023-09-30 14:01:06
 -->
 <template>
   <el-dialog
@@ -20,7 +20,7 @@
       <div class="closeClick">
         <div class="newplan">
           <div class="line"></div>
-          <div class="span">详情</div>
+          <div class="span">{{ title }}</div>
         </div>
         <img src="@/assets/images/close.png" alt="" @click="Close" />
       </div>
@@ -34,8 +34,17 @@
         <el-form-item label="发布时间:" class="form-input">
           <el-input v-model="form.createTime" :readonly="true"></el-input>
         </el-form-item>
-        <el-form-item label="年月:" class="form-input">
-          <el-input v-model="form.plannedYear" :readonly="true"></el-input>
+        <el-form-item label="计划年月:" class="form-input">
+          <!-- <el-input v-model="form.plannedYear" :readonly="true"></el-input> -->
+          <el-date-picker
+            v-model="form.plannedYear"
+            type="month"
+            format="yyyy-MM"
+            :clearable="false"
+            :disabled="readonly"
+            value-format="yyyy-MM"
+            placeholder="请选择年月">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="计划标题:">
           <el-input v-model="form.planName" :readonly="readonly"></el-input>
@@ -86,6 +95,7 @@ export default {
       id:'',
       readonly:false,
       loading:true,
+      title:'查看详情'
     }
   },
   computed: {
@@ -100,8 +110,10 @@ export default {
       this.getMyData(item.id)
       if(id == 0) {
         this.readonly = true;
+        this.title = '查看详情'
       } else {
         this.readonly = false;
+        this.title = '修改详情'
       }
       this.dialogVisible = true;
     },
@@ -148,7 +160,7 @@ export default {
         .then(async() => {
           try {
             let downloadLoadingInstance = Loading.service({
-              text: "正在删除计划，请稍候",
+              text: "正在修改计划，请稍候",
               spinner: "el-icon-loading",
               background: "rgba(0, 0, 0, 0.7)",
             });
@@ -160,6 +172,11 @@ export default {
             console.log(data)
             if(data.code == 200){
               downloadLoadingInstance.close();
+              this.$message({
+                showClose: true,
+                message: '修改成功',
+                type: 'success'
+              });
               this.Close("newsuccess")
             }
           } catch (error) {

src/views/yingji/planManage.vue

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-30 01:03:48
+ * @LastEditTime: 2023-09-30 13:57:47
 -->
 <template>
     <div class="plan-management">
@@ -32,6 +32,7 @@
               :props="props"
               @change="handleChange"></el-cascader>
           </div>
+          <div class="select-btn reset" @click="reset">重置</div>
         </div>
         <div class="btns">
           <div class="export" @click="exportFile">
@@ -42,7 +43,6 @@
             <img src="@/assets/images/newProject.png" alt="">
             <span>新增计划</span>
           </div>
-          <div class="select-btn reset" @click="reset">重置</div>
         </div>
       </div>
       <div class="plan-bottomBox">
@@ -262,7 +262,7 @@
           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)){
@@ -272,6 +272,8 @@
               } else if(newForm.district.length == 1) {
                 let district = this.form.district[0].slice(1, 8);
                 obj = { ...this.pages, ...this.form,district };
+              } else {
+                obj = { ...this.pages, ...this.form};
               }
               // 不是数组
             } else {
@@ -386,12 +388,39 @@
       },
       // 新增成功后关闭dialog事件触发
       padlock(){
-        let { district} = this.form;
+        // let { district} = this.form;
         this.pages.pageNum = 1;
         this.pages.pageSize = 10;
         this.$refs.mypagination.defaultPages();
-        let obj = {...this.pages,district}
-        console.log('123')
+        let obj
+        if(!this.disabled) {
+          if(Array.isArray(this.form.district)){
+            if(this.form.district.length == 2) {
+              let district = this.form.district[1].slice(1, 11);
+              obj = { ...this.pages, ...this.form,district };
+            } else if(this.form.district.length == 1) {
+              let district = this.form.district[0].slice(1, 8);
+              obj = { ...this.pages, ...this.form,district };
+            } else {
+              obj = { ...this.pages, ...this.form};
+            }
+            // 不是数组
+          } else {
+            // 判断是区县
+            if(this.county){
+              let district = this.form.district.slice(1, 8);
+              obj = { ...this.pages, ...this.form,district };
+            } else {
+              let district = this.form.district.slice(1, 11);
+              obj = { ...this.pages, ...this.form,district };
+            }
+          }
+        } else {
+          // 不是苏州市是乡镇
+          let district = this.form.district;
+          obj = { ...this.pages, ...this.form,district };
+        }
+        // console.log('obj',obj)
         this.getList(obj);
       },
       // 区划级联选择器选择触发
@@ -475,6 +504,9 @@
             //   this.commentData(item.children,this.dept)
             // }
             item.children.map((itemTwo)=>{
+              if(itemTwo.children.length == 0){
+                delete itemTwo.children;
+              }
               itemTwo.county = itemTwo.subdistrict
             })
           })
@@ -564,15 +596,15 @@
         .area {
           display: flex;
           align-items: center;
-          justify-content: center;
-          flex: 1;
+          // justify-content: center;
+          // flex: 1;
           .area-span {
             // font-size: 20px;
             // font-family: 'Alibaba PuHuiTi';
             // font-weight: bold;
             // color: #525966;
             // line-height: 40px;
-            // margin-right: 100px;
+            margin-left: 40px;
             font-size: 14px;
             font-family: 'Alibaba PuHuiTi';
             font-weight: 400;
@@ -624,6 +656,21 @@
             transform: rotate(180deg);
           }
         }
+        .select-btn {
+          width: 120px;
+          height: 34px;
+          border-radius: 2px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 15px;
+          font-family: 'Alibaba PuHuiTi';
+          font-weight: 500;
+          color: #ffffff;
+          cursor: pointer;
+          background: #FDAB5B;
+          margin-left: 20px;
+        }
       }
       .btns {
         display: flex;
@@ -645,21 +692,6 @@
             font-weight: 400;
           }
         }
-        .select-btn {
-          width: 120px;
-          height: 34px;
-          border-radius: 2px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          font-size: 15px;
-          font-family: 'Alibaba PuHuiTi';
-          font-weight: 500;
-          color: #ffffff;
-          cursor: pointer;
-          background: #FDAB5B;
-          margin-left: 20px;
-        }
         .export {
           background-color: #2378EC;
           margin-right: 30px;