更新

Lou

2024-02-23 daea06fe6b912c640c87e9a40dc8ead31b87ac3c

更新

 src/views/article/components/deitDiscussion.vue

@@ -221,6 +221,7 @@
          delBtn: false,
          excelBtn: true,
          dialogClickModal: false,
          header:false,
          column: [{
            label: '姓名',
            prop: 'name',

 src/views/article/components/discussionManageChild.vue

@@ -263,6 +263,7 @@
      handleSubmit(row, done) {
        row.articleId = this.articleId
        row.eventType = 1
        row.userIds = JSON.stringify(row.userIds)
        addPd(row).then(
          () => {
            this.onLoad(this.discussion)
@@ -283,6 +284,7 @@
        this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
        this.dialogVisibles = true
        this.disCussFrom = {}
        // this.disCussFrom = data;
        this.discussion = data
        this.articleId = data.id
        this.onLoad(data)
@@ -308,20 +310,20 @@



        // getListPd(1, 10, Object.assign(params, this.query)).then(res => {
        //   const data = res.data.data
        //   this.page.total = data.total
        //   this.disCussFrom = data.records[0]
        //   if (this.disCussFrom.userIds) {
        //     getPersonPublicSelect({
        //       id: this.disCussFrom.userIds
        //     }).then(res => {
        //       const column = this.findObject(this.option.column, "userIds")
        //       column.dicData = res.data.data
        //       this.loading = false
        //     })
        //   }
        // })
        getListPd(1, 10, Object.assign(params, this.query)).then(res => {
          const data = res.data.data
          this.page.total = data.total
          this.disCussFrom = data.records[0]
          if (this.disCussFrom.userIds) {
            getPersonPublicSelect({
              id: this.disCussFrom.userIds
            }).then(res => {
              const column = this.findObject(this.option.column, "userIds")
              column.dicData = res.data.data
              this.loading = false
            })
          }
        })
      }
    }
  }

 src/views/article/components/publicSignUpChild.vue

@@ -133,6 +133,7 @@
                delBtn: false,
                excelBtn: true,
                dialogClickModal: false,
                header:false,
                column: [{
                    label: '姓名',
                    prop: 'name',

 src/views/article/rotation.vue

@@ -129,6 +129,7 @@
                    },
                    {
                        width: 144,
                        labelWidth:100,
                        label: "时间",
                        prop: "createTime",
                        addDisplay: false,

 src/views/authority/apiscope.vue

@@ -91,6 +91,7 @@
                delBtn: false,
                menuWidth: 150,
                dialogClickModal: false,
                header:false,
                column: [
                    {
                        label: "菜单名称",

 src/views/authority/datascope.vue

@@ -94,6 +94,7 @@
                delBtn: false,
                menuWidth: 150,
                dialogClickModal: false,
                header:false,
                column: [
                    {
                        label: "菜单名称",

 src/views/cGovernance/punchCard.vue

@@ -47,6 +47,7 @@
                viewBtn: true,
                excelBtn: true,
                dialogClickModal: false,
                header:false,
                column: [
                    {
                        width: 110,

 src/views/flow/follow.vue

@@ -65,6 +65,7 @@
                viewBtn: false,
                dialogWidth: 900,
                dialogClickModal: false,
                header:false,
                column: [
                    {
                        label: "执行id",

 src/views/patrolList/patrolRecord.vue

@@ -137,6 +137,7 @@
                // selection: true,
                excelBtn: true,
                dialogClickModal: false,
                header:false,
                column: [{
                    label: "所属街道",
                    prop: "streetName",

 src/views/property/propertyCapitalApply.vue

@@ -9,8 +9,8 @@
      <template slot-scope="{ row, size, index }" slot="menu">
        <el-button :size="size" type="text" v-if="row.applyStatus === 4" @click="handleWork(row)">调整申请
        </el-button>
        <el-button :size="size" type="text" @click="goDetail(row)">查看申请
        </el-button>
        <!-- <el-button :size="size" type="text" @click="goDetail(row)">查看申请
        </el-button> -->
        <!-- <el-button :size="size" type="text" @click="goDetail(row)">删 除
        </el-button> -->
      </template>
@@ -31,31 +31,19 @@
    </avue-crud>


    <el-dialog  title="详情" append-to-body :visible.sync="showDialog" width="80%">
      <avue-crud :option="optionList"   ref="crud2"  :data="optionData"   :span-method="spanMethod">
        </avue-crud>
        </el-dialog>

    <!-- <el-dialog   title="详情" :visible.sync="showDialog" width="80%"  z-index="55555"  :before-close="showDialog = false">
      <span>
        1111
      </span>
      <avue-crud :option="optionList"   ref="crud2">
          <template slot="menuLeft" v-if="!editFlag">
            <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
            </el-button>
          </template>
    <el-dialog   title="详情"  append-to-body  :visible.sync="showDialog" width="80%"  >
      <avue-crud :option="optionList"    :data="topictData"  ref="crud2">
          <template #icon="scope">
            <i :class="scope.row.icon" style="font-size:14px"></i>
          </template>
           <template #menu="{ row, size }">
           <!-- <template #menu="{ row, size }">
            <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
            <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
            <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
              选择此项人数：{{ row.number }} 详情</el-button>
          </template>
          </template> -->
        </avue-crud>
    </el-dialog>     -->
    </el-dialog>    


  </basic-container>
@@ -74,6 +62,9 @@
  } from "vuex"
  import website from '@/config/website'
  import func from "@/util/func"
  import {
    getLists,
  } from "@/api/discuss/topics"
  export default {
    data() {
      return {
@@ -105,10 +96,11 @@
          //stripe:true,
          index: true,
          editBtn: false,
          viewBtn: false,
          viewBtn: true,
          delBtn: false,
          selection: true,
          dialogClickModal: false,
          viewBtnText:"查看申请",
          column: [{
              width: 220,
              overHidden: true,
@@ -135,6 +127,7 @@
              search: false,
              type: 'tree',
              dicUrl: `/api/blade-district/district/getDistrictTree?filterFlag=1`,
              cascader: ['articleId'],
              props: {
                label: "name",
                value: "id"
@@ -314,15 +307,16 @@
              value: '0.00'
            },
            {
              display:false,
              hide: true,
              parent: false,
              label: "议事标题",
              prop: "",
              prop: "articleId",
              search: false,
              type: 'select',
              dicUrl: "",
              dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtIdList={{districtId}}`,
              props: {
                label: "name",
                label: "title",
                value: "id"
              },
              defaultExpandedKeys: ["361102003"],
@@ -337,6 +331,7 @@
                console.log ("val===>",  val)
                if(val.value){
                  this.showDialog = true;
                  this.getDetail( val.value,val.articleRange)
                }

              }
@@ -382,7 +377,7 @@
        data: [],
     
        optionList: {
          hander:false,
          header:false,
          menu: false,
          headerAlign: 'center',
          align: 'center',
@@ -395,15 +390,15 @@
          rowParentKey: 'parentId',
          column: [{
              label: '标题',
              prop: 'title',
              prop: 'discussContent',
            },
            {
              label: '选项内容',
              prop: 'content',
              prop: 'optionContent',
            },
            {
              label: '人数',
              prop: 'count',
              prop: 'number',
            }
          ]
        },
@@ -423,8 +418,8 @@
               content:"选项",
               count:2
           },

       ]
       ],
       topictData:[]
      }
    },
    watch: {
@@ -439,6 +434,17 @@
            //     immediate: true
           
      // }

      'form.districtId': {
        handler(newData) {
          const column = this.findObject(this.option.column, "articleId")
          if (newData) {
            column.display = true;
          } else {
            column.display = false
          }
        },
      },
    },
    computed: {
      ...mapGetters(["permission", "userInfo"]),
@@ -473,6 +479,12 @@
      }
    },
    methods: {

      rowView(){
          this.showDialog = false;
      },


      showStringDispose(row, type) {
        row[type] = !row[type]
      },
@@ -673,6 +685,17 @@
            }
          }
        }
      },
      getDetail(articleId,districtId){
        let params = {
          level:1,
          articleId:articleId,
          districtId:districtId
        }
        getLists(1,10,params).then(res => {
              const data = res.data.data
              this.topictData = data
            })
      }
    }
    

 src/views/property/propertyChargeRecord.vue

@@ -52,6 +52,7 @@
                dialogClickModal: false,
                addBtn: false,
                editBtn: false,
                header:false,
                column: [
                    {
                        label: "物业公司",

 src/views/propertySupervision/houseHoldSupervision.vue

@@ -224,7 +224,7 @@
                viewBtn: true,
                dialogType: 'drawer',
                dialogClickModal: false,

                header:false,
                column: [{
                    label: "房屋编号",
                    prop: "houseCode",

 src/views/propertySupervision/residentSupervision.vue

@@ -216,7 +216,7 @@
                editBtn: false,
                dialogType: 'drawer',
                dialogClickModal: false,

                header:false,
                column: [
                    {
                        width: 110,

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -416,7 +416,7 @@
                } else if (data == 4) {
                    tags = {
                        type: 'warning',
                        text: '待接收'
                        text: '待完成'
                    }
                }


 src/views/publicSecurity/positionManage/TransactRegist.vue

@@ -327,7 +327,7 @@
                            label: '未通过',
                            value: 3
                        }, {
                            label: '待接收',
                            label: '待完成',
                            value: 4
                        }],
                        align: 'center',
@@ -413,7 +413,7 @@
                } else if (data == 4) {
                    tags = {
                        type: 'warning',
                        text: '待接收'
                        text: '待完成'
                    }
                }


 src/views/work/claim.vue

@@ -63,6 +63,7 @@
                delBtn: false,
                dialogWidth: 900,
                dialogClickModal: false,
                header:false,
                column: [
                    {
                        label: "流程分类",

 src/views/work/done.vue

@@ -71,6 +71,7 @@
                delBtn: false,
                dialogWidth: 900,
                dialogClickModal: false,
                header:false,
                column: [
                    {
                        label: "流程分类",

 src/views/work/send.vue

@@ -64,6 +64,7 @@
                delBtn: false,
                dialogWidth: 900,
                dialogClickModal: false,
                header:false,
                column: [
                    {
                        label: "流程分类",

 src/views/work/todo.vue

@@ -75,6 +75,7 @@
                delBtn: false,
                dialogWidth: 900,
                dialogClickModal: false,
                header:false,
                column: [
                    {
                        label: "流程分类",