Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-01-19 a737e7b8175baf9e40544dc98dcd8b0f7b03c476

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/views/article/discussionManage.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
@@ -24,13 +23,11 @@
                    参与用户
                </el-button>

                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
                    撤销
                </el-button>

                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
@@ -137,8 +134,7 @@
                selection: true,
                excelBtn: true,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        overHidden: true,
                        label: "议事标题",
                        prop: "title",
@@ -158,7 +154,7 @@
                        span: 24,
                        minRows: 2,
                        tags: true,
                        type: "tree",
              type: "cascader",
                        multiple: true,
                        dicData: [],
                        rules: [{

 src/views/authority/role.vue

@@ -145,7 +145,7 @@
                        type: "tree",
                        dicData: [],
                        addDisabled: false,
                        // hide: true,
                        hide: true,
                        span: 24,
                        props: {
                            label: "title",

 src/views/property/components/propertyEdit.vue

@@ -7,6 +7,7 @@
      <el-tab-pane label="经营信息" name="info2"></el-tab-pane>
      <el-tab-pane label="纳税信息" name="info3"></el-tab-pane>
      <el-tab-pane label="党建信息" name="info4"></el-tab-pane>
      <el-tab-pane label="街道社区" name="info8"></el-tab-pane>
      <el-tab-pane label="企业良好行为" name="info5"></el-tab-pane>
      <el-tab-pane label="项目良好行为" name="info6"></el-tab-pane>
      <el-tab-pane label="违法违规行为惩戒" name="info7"></el-tab-pane>
@@ -30,15 +31,16 @@

        <div v-if="item.choicesType == 0">
          <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
            <el-radio v-model="item1.ids" :label="item1.id">{{item1.optionName}}-----------{{item1.score}}</el-radio>
            <el-radio v-model="item1.ids" :label="item1.id">{{item1.optionName}}</el-radio>
          </div>
        </div>

        <!-- </el-radio-group> -->

        <div v-if="item.choicesType == 3">
          <!-- <div>{{item1.optionName}}</div> -->
          <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">

          <div v-for="(item1, index1) in item.subjectOptionList" :key="index1" style="display: flex;">
            <div>{{item1.optionName}}:</div>
            <el-input-number v-model="item1.numbers" @change="handleChange" :min="0" :max="25"
              :label="item1.optionName"></el-input-number>
          </div>

 src/views/property/propertyCapitalApply.vue

@@ -2,10 +2,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">

            <template slot-scope="{ row, size, index }" slot="menu">
                <el-button :size="size" type="text" v-if="row.applyStatus === 4" @click="handleWork(row)">调整申请
@@ -158,7 +157,7 @@
                    label: "项目分摊方式",
                    prop: "allocationWay",
                    value: '按建筑面积分摊',
                    span: 14,
              span: 12,
                    row: true,
                },
                {

 src/views/property/propertyCompany.vue

@@ -18,7 +18,8 @@
          @click="openPayConfig(row)">商户配置
        </el-button>

        <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty(row)">物业评定
        <el-button :size="size" v-if="permission.property_evaluation" icon="el-icon-circle-plus-outline" type="text"
          @click="addProperty(row)">物业评定
        </el-button>
      </template>
    </avue-crud>

 src/views/work/process/maintenanceFundApply/detail.vue

@@ -176,7 +176,7 @@
              prop: "allocationWay",
              labelWidth: 140,
              value: '按建筑面积分摊',
              span: 14,
              span: 12,
              row: true,
              disabled: true
            },

 src/views/work/process/maintenanceFundApply/edit.vue

@@ -182,7 +182,7 @@
              prop: "allocationWay",
              labelWidth: 140,
              value: '按建筑面积分摊',
              span: 14,
              span: 12,
              row: true,
            },
            {

 src/views/work/process/maintenanceFundApply/form.vue

@@ -104,7 +104,7 @@
              prop: "allocationWay",
              labelWidth: 140,
              value: '按建筑面积分摊',
              span: 14,
              span: 12,
              row: true,
            },
            {

 src/views/work/process/maintenanceFundApply/handle.vue

@@ -20,8 +20,7 @@
                </div>
                <el-row type="flex" class="row-bg">
                    <el-timeline>
                        <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList"
                            placement="top">
            <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
                            <el-card shadow="hover">
                                <p>{{ flow.assigneeName }} 在 [{{ flow.createTime }}] 开始处理 [{{ flow.historyActivityName }}]
                                    环节</p>
@@ -185,7 +184,7 @@
                    prop: "allocationWay",
                    labelWidth: 140,
                    value: '按建筑面积分摊',
                    span: 14,
              span: 12,
                    row: true,
                    disabled: true
                },