From 53e79f91d0500a9e4328c17f6e99e19e7dc79aa2 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 9 May 2023 17:33:55 +0800
Subject: [PATCH] bug#304/bug#303/#bug233/bug#297

---
 .../communityParty/regionalParty/units.vue    |   8 +-
 .../regionalParty/unitsForm.vue               |   7 +-
 .../communityService/commonDemand/index.vue   |   2 +-
 .../communityService/labelConfig/addForm.vue  |  13 +-
 .../communityService/labelConfig/index.vue    | 419 +++++++++---------
 .../communityService/measure/index.vue        |   2 +-
 6 files changed, 229 insertions(+), 222 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 80c389de4..0e3edbad0 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -236,7 +236,7 @@
               type="text"
               size="small"
               @click="handleEdit(scope.row)"
-              >修改</el-button
+              >编辑</el-button
             >
 
             <el-popover
@@ -319,7 +319,7 @@
       </div>
     </div>
 
-    <!-- 修改弹出框 -->
+    <!-- 编辑弹出框 -->
     <el-dialog
       :visible.sync="formShow"
       :close-on-click-modal="false"
@@ -573,7 +573,7 @@ export default {
     },
 
     handleEdit(row) {
-      this.formTitle = "修改";
+      this.formTitle = "编辑";
       this.formShow = true;
       this.$nextTick(() => {
         this.$refs.ref_form.initForm("edit", row.id);
@@ -725,7 +725,7 @@ export default {
       };
       this.pageSize = 10;
       this.pageNo = 0;
-      // this.loadTable()
+      this.loadTable()
     },
 
     //导出表格
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index a2c2e09fb..be5071364 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -168,6 +168,7 @@
         size="small"
         v-if="formType != 'detail'"
         type="primary"
+        style="margin-right: 16px;"
         :disabled="btnDisable"
         @click="handleComfirm"
         >确 定</el-button
@@ -318,7 +319,6 @@ export default {
       // if (this.formType === 'edit') {
       //  this.formData.id = this.unitId
       // }
-
       const { data, code, msg } = await requestPost(url, this.formData);
 
       if (code === 0) {
@@ -501,6 +501,11 @@ export default {
   top: 5px;
   left: 5px;
 }
+.div_btn{
+    display: flex;
+    width: 100%;
+    justify-content: right;
+}
 </style>
 
 <style lang="scss" scoped >
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index e6509fadd..17171b3e1 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -270,7 +270,7 @@
                  :close-on-press-escape="false"
                  :title="addDiaTitle"
                  :modal-append-to-body="false"
-                 width="850px"
+                 width="720px"
                  top="5vh"
                  class="dialog-h"
                  @closed="showAdd = false">
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index 03263f97b..24d4694a3 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="my_form">
     <el-form
       ref="label_form"
       :inline="true"
@@ -220,12 +220,12 @@
           <el-button
             type="danger"
             @click="handleClickDelete(scope.$index)"
-            v-if="scope.$index != tableData.length - 1"
+            v-if="scope.$index != tableData.length - 1||(tableData.length - 1>=1&&scope.$index !='0' )"
             size="small"
             :disabled="infoType"
             icon="el-icon-minus"
             circle
-          ></el-button>
+          > </el-button>
           <!-- <img
             src="@/assets/img/icon-add.png"
             @click="handleClickAddRow"
@@ -316,6 +316,7 @@ export default {
         await this.getFormEdit(row.tagId);
       }else if(type == 'edit'){
         await this.getFormEdit(row.tagId);
+        this.formData.tagName = row.tagName;
       }
       this.tagId = row.tagId;
       this.tagObj = row
@@ -326,7 +327,7 @@ export default {
           this.handleChangeFieldsName(this.tableData[i], [i], type);
         }, 300);
       }
-      this.formData.tagName = row.tagName;
+      
     },
     querySearchAsync(val, cb) {
       console.log(this.searchList);
@@ -712,7 +713,9 @@ export default {
 .div_btn {
   display: flex;
   justify-content: right;
-  margin-right: 16px;
   margin-top: 10px;
 }
+.my_form{
+  padding: 10px 50px 0;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/labelConfig/index.vue b/src/views/modules/communityService/labelConfig/index.vue
index 3ee86c8ac..9d3098635 100644
--- a/src/views/modules/communityService/labelConfig/index.vue
+++ b/src/views/modules/communityService/labelConfig/index.vue
@@ -1,235 +1,234 @@
 <template>
-    <div class="g-main">
-        <div class="m-search">
-            <el-form :inline="true"
-               :model="formData"
-               ref="ref_searchform"
-               :label-width="'120px'">
-        <el-form-item label="标签名称"
-                      prop="tagName">
-          <el-input v-model="formData.tagName"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable
-                    placeholder="请输入">
+  <div class="g-main">
+    <div class="m-search">
+      <el-form
+        :inline="true"
+        :model="formData"
+        ref="ref_searchform"
+        :label-width="'120px'"
+      >
+        <el-form-item label="标签名称" prop="tagName">
+          <el-input
+            v-model="formData.tagName"
+            size="small"
+            class="u-item-width-normal"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
-
         </el-form-item>
-          <el-row type="flex" >
-            <el-col :span="24" align="right">
-                <el-button style="margin-left:30px"
-                   size="small"
-                   type="primary "
-                   @click="handleSearchFrom">查询</el-button>
-            </el-col>
-          </el-row>
-        
-
+        <el-row type="flex">
+          <el-col :span="24" align="right">
+            <el-button
+              style="margin-left: 30px"
+              size="small"
+              type="primary "
+              @click="handleSearchFrom"
+              >查询</el-button
+            >
+          </el-col>
+        </el-row>
       </el-form>
-        </div>
-        <div class="m-table">
-            <div class="div_btn">
-                <el-button
-                    style="height:32px;"
-                    size="small"
-                    @click="handleAdd({},'add')"
-                    type="primary"
-                    icon="el-icon-plus"
-                >
-                    新增</el-button
+    </div>
+    <div class="m-table">
+      <div class="div_btn">
+        <el-button
+          style="height: 32px"
+          size="small"
+          @click="handleAdd({}, 'add')"
+          type="primary"
+          icon="el-icon-plus"
+        >
+          新增</el-button
+        >
+      </div>
+      <el-table
+        ref="config_table"
+        border
+        :data="tableData"
+        v-loading="tableLoading"
+        style="width: 100%"
+        :height="tableHeight"
+      >
+        <el-table-column
+          label="标签名称"
+          prop="tagName"
+          fixed="left"
+          align="center"
+          key="tagName"
+        />
+        <el-table-column fixed="right" label="操作" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button
+              style="margin-right: 10px"
+              @click="handleAdd(scope.row, 'edit')"
+              size="small"
+              type="text"
+              >修改</el-button
+            >
+            <!--   按钮权限-->
+            <template>
+              <el-popconfirm
+                title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDel(scope.row)"
+              >
+                <el-button size="small" type="text" slot="reference"
+                  >删除</el-button
                 >
-             </div> 
-             <el-table
-             ref="config_table"
-             border
-            :data="tableData"
-             v-loading="tableLoading"
-             style="width: 100%"
-             :height="tableHeight"
-             >  
-                 <el-table-column
-                    label="标签名称"
-                    prop="tagName"
-                    fixed="left"
-                    align="center"
-                    key="tagName"
-                />
-                <el-table-column fixed="right" label="操作" align="center" width="200">
-                    <template slot-scope="scope">
-                        <el-button
-                            style="margin-right: 10px"
-                            @click="handleAdd(scope.row,'edit')"
-                            size="small"
-                            type="text"
-                            >修改</el-button
-                        >
-                        <!--   按钮权限-->
-                        <template >
-                       
-                        <el-popconfirm
-                            title="删除之后无法回复，确认删除？"
-                            @onConfirm="handleDel(scope.row)"
-                        >
-                            <el-button
-                            size="small"
-                            type="text"
-                            slot="reference"
-                            >删除</el-button
-                            >
-                        </el-popconfirm>
-                        </template>
-                    </template>
-                 </el-table-column>
+              </el-popconfirm>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
 
-             </el-table> 
-
-             <div class="div-flex">
-                <div class="m-page">
-                    <el-pagination
-                        @size-change="handleSizeChange"
-                        @current-change="handleCurrentChange"
-                        :current-page.sync="pageNo"
-                        :page-sizes="[20, 50, 100, 200]"
-                        :page-size="pageSize"
-                        layout="sizes, prev, pager, next, total"
-                        :total="total"
-                    >
-                    </el-pagination>
-                 </div>
-             </div>
+      <div class="div-flex">
+        <div class="m-page">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="pageSize"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
+          </el-pagination>
         </div>
-        <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               destroy-on-close
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose"
-               
-               >
-             <add-form 
-                        v-if="formShow"
-                        ref="Config_form"
-                       :row-obj="rowObj"
-                      @dialogCancle="addFormCancle"
-                      @dialogOk="addFormOk"></add-form>
-    </el-dialog>
+      </div>
     </div>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      destroy-on-close
+      width="950px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <add-form
+        v-if="formShow"
+        ref="Config_form"
+        :row-obj="rowObj"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      ></add-form>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from "vuex";
-import addForm from "./addForm.vue"
+import addForm from "./addForm.vue";
 export default {
-    name:"labelConfig",
-    data(){
-        return{
-            formData:{
-                tagName:""
-            },
-            tableData:[],
-            pageNo:1,
-            pageSize:20,
-            tableLoading:true,
-            total:0,
-            searchH:115,
-            formShow:false,
-            formTitle:"",
-            rowObj:{}
-        }
-
+  name: "labelConfig",
+  data() {
+    return {
+      formData: {
+        tagName: "",
+      },
+      tableData: [],
+      pageNo: 1,
+      pageSize: 20,
+      tableLoading: true,
+      total: 0,
+      searchH: 115,
+      formShow: false,
+      formTitle: "",
+      rowObj: {},
+    };
+  },
+  created() {},
+  components: { addForm },
+  methods: {
+    async getlabelConfigList() {
+      const url = "/governance/resiSearchTag/listResiSearchTags";
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        tagName: this.formData.tagName,
+      };
+      let { data, msg, code } = await requestPost(url, params);
+      this.tableLoading = false;
+      if (code == 0) {
+        this.tableData = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
     },
-    created(){
+    addFormCancle() {
+      this.formShow = false;
     },
-    components:{addForm},
-    methods:{
-      async getlabelConfigList(){
-          const url = "/governance/resiSearchTag/listResiSearchTags"   
-          let params = {
-            pageNo:this.pageNo,
-            pageSize:this.pageSize,
-            tagName:this.formData.tagName
-          } 
-          let {data,msg,code} = await requestPost(url,params)
-          this.tableLoading = false
-          if(code == 0 ){
-            this.tableData = data.list
-            this.total = data.total
-          }else{
-            this.$message.error(msg)
-          }
-        },
-        addFormCancle () {
-            this.formShow = false
-        },
-        addFormOk () {
-            this.formShow = false
-            this.getlabelConfigList()
-        },
-        handleAdd (row,type) {
-            if(type=="add"){
-            this.formTitle = '新增标签'
-            this.formShow = true
-            this.$nextTick(() => {
-            this.$refs.Config_form.initForm(type, row)
-            })
-            }else {
-            this.formTitle = '修改标签'
-            this.formShow = true
-            console.log(row);
-            this.rowObj = row
-            this.$nextTick(() => {
-            this.$refs.Config_form.initForm(type, row)
-            })
-            }
-      },
-        handleSizeChange(val) {
-            console.log(`每页 ${val} 条`);
-            this.pageSize = val;
-            this.getlabelConfigList()
-        },
-        async handleDel(row){
-            const url = `/governance/resiSearchTag/deleteResiSearchTag/${row.tagId}`
-            let {code,msg} = await requestPost(url)
-            if(code == 0 ){
-                this.$message.success('删除成功')
-            }else {
-                this.$message.error(msg)
-                
-            }
-            this.getlabelConfigList()
-        },
-        handleSearchFrom(){
-            this.getlabelConfigList()
-        },
-        handleCurrentChange(val) {
-            this.pageNo = val;
-            this.getlabelConfigList();
-        },
-        diaClose () {
-            this.formShow = false
-        },  
+    addFormOk() {
+      this.formShow = false;
+      this.getlabelConfigList();
+    },
+    handleAdd(row, type) {
+      if (type == "add") {
+        this.formTitle = "新增标签";
+        this.formShow = true;
+        this.$nextTick(() => {
+          this.$refs.Config_form.initForm(type, row);
+        });
+      } else {
+        this.formTitle = "修改标签";
+        this.formShow = true;
+        console.log(row);
+        this.rowObj = row;
+        this.$nextTick(() => {
+          this.$refs.Config_form.initForm(type, row);
+        });
+      }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getlabelConfigList();
+    },
+    async handleDel(row) {
+      const url = `/governance/resiSearchTag/deleteResiSearchTag/${row.tagId}`;
+      let { code, msg } = await requestPost(url);
+      if (code == 0) {
+        this.$message.success("删除成功");
+      } else {
+        this.$message.error(msg);
+      }
+      this.getlabelConfigList();
     },
-    async mounted(){
-          this.getlabelConfigList()
+    handleSearchFrom() {
+      this.getlabelConfigList();
     },
-    computed:{
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.getlabelConfigList();
+    },
+    diaClose() {
+      this.formShow = false;
+    },
+  },
+  async mounted() {
+    this.getlabelConfigList();
+  },
+  computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
-        tableHeight() {
-            const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
-            const _h = this.clientHeight - 275 - this.searchH;
-            return this.$store.state.inIframe ? h : _h;
-        },
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+      const _h = this.clientHeight - 275 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
     },
-    watch:{}
-}
+  },
+  watch: {},
+};
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
-.div_btn{
-    margin-bottom: 12px;
+.div_btn {
+  margin-bottom: 12px;
+}
+.dialog-h{
+    padding: 0 50px;
 }
 </style>
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 38ed6a844..8a10518f6 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -283,7 +283,7 @@
                :close-on-press-escape="false"
                :title="addDiaTitle"
                :modal-append-to-body="false"
-               width="850px"
+               width="720px"
                top="5vh"
                class="dialog-h"
                @closed="showAdd = false">