linwei
2024-01-18 cec7af18fc04916f5b94b69e913d4cad9a14cb57
bug 修复
4 files modified
143 ■■■■ changed files
src/views/article/components/deitDiscussion.vue 7 ●●●● patch | view | raw | blame | history
src/views/article/components/publicSignUpChild.vue 43 ●●●● patch | view | raw | blame | history
src/views/property/components/propertyEdit.vue 91 ●●●● patch | view | raw | blame | history
src/views/property/propertyCompany.vue 2 ●●● patch | view | raw | blame | history
src/views/article/components/deitDiscussion.vue
@@ -41,7 +41,8 @@
    </el-dialog>
    <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
      <avue-crud :data="userData" :page="userPage" :option="userOption"></avue-crud>
      <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
        @search-reset="searchReset"></avue-crud>
    </el-dialog>
  </div>
</template>
@@ -193,6 +194,7 @@
          searchShow: true,
          searchMenuSpan: 3,
          // menuWidth: 500,
          menu: false,
          height: "auto",
          calcHeight: 54,
@@ -205,6 +207,7 @@
          addBtn: false,
          viewBtn: false,
          selection: true,
          delBtn: false,
          excelBtn: true,
          dialogClickModal: false,
          column: [{
@@ -214,6 +217,8 @@
            search: true,
          }, {
            label: '头像',
            type: 'upload',
            listType: "picture-img",
            prop: 'avatar'
          }, {
            label: '手机',
src/views/article/components/publicSignUpChild.vue
@@ -1,8 +1,9 @@
<template>
  <div>
    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
      <avue-crud ref="DataUser" :option="userOption" :data="dataUser" v-model="dataUser" :page="pageUser"></avue-crud>
    <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="80%" :before-close="userHandleClose">
      <avue-crud ref="DataUser" :option="userOption" :data="dataUser" v-model="dataUser" :page="pageUser"
        @search-change="searchChange" @search-reset="searchReset"></avue-crud>
    </el-dialog>
  </div>
@@ -112,11 +113,31 @@
        // 选择行
        selectionList: [],
        userOption: {
          addBtn: false,
          labelWidth: 96,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          // menuWidth: 500,
          menu: false,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          border: false,
          //stripe:true,
          index: true,
          editBtn: false,
          addBtn: false,
          viewBtn: false,
          selection: true,
          delBtn: false,
          excelBtn: true,
          dialogClickModal: false,
          column: [{
              label: '姓名',
              prop: 'name'
              prop: 'name',
              search: true,
            }, {
              label: '头像',
              type: 'upload',
@@ -131,7 +152,8 @@
            },
            {
              label: '手机',
              prop: 'phone'
              prop: 'phone',
              search: true,
            }, {
              label: '小区',
              prop: 'aoiName'
@@ -164,6 +186,17 @@
      }
    },
    methods: {
      searchReset() {
        this.query = {}
        this.getUser(this.userPage)
      },
      searchChange(params, done) {
        this.query = params
        this.userPage.currentPage = 1
        this.getUser(this.userPage, params)
        done()
      },
      init(data) {
        this.houseCode = data.houseCode
        this.onLoad(this.page)
src/views/property/components/propertyEdit.vue
@@ -2,33 +2,49 @@
  <el-dialog title="" append-to-body :visible.sync="infoVisible" top="10vh" width="70%">
    <el-tabs v-model="activeName" @tab-click="handleClick">
      <el-tab-pane label="基础信息" name="first"></el-tab-pane>
      <el-tab-pane label="基础信息" name="second"></el-tab-pane>
      <el-tab-pane label="良好行为信息" name="third"></el-tab-pane>
      <el-tab-pane label="不良行为信息" name="fourth"></el-tab-pane>
      <!-- <el-tab-pane label="物业信息" name="first"></el-tab-pane> -->
      <el-tab-pane label="基础信息" name="info1"></el-tab-pane>
      <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="info5"></el-tab-pane>
      <el-tab-pane label="项目良好行为" name="info6"></el-tab-pane>
      <el-tab-pane label="违法违规行为惩戒" name="info7"></el-tab-pane>
    </el-tabs>
    <avue-form :option="option" v-model="first" v-if="activeName == 'first'"></avue-form>
    <!-- <avue-form :option="option" v-model="first" v-if="activeName == 'first'" @submit="rowSave"></avue-form> -->
    <!-- <avue-form :option="option" v-model="second" v-if="activeName == 'second'"></avue-form> -->
    <div>
    <div v-if="activeName != 'first'">
      <div v-for="(item, index) in questionBankData" :key="index">
        <div>
          {{ item.subjectName }}
          {{index+1}} .{{ item.subjectName }}
        </div>
        <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
          <!-- <div>
            {{ item1.optionName }}
          </div> -->
          <el-radio-group>
          <el-radio-group v-model="item1.ids" v-if="item.choicesType == 0">
            <el-radio :label="item1.id">{{item1.optionName}}</el-radio>
          </el-radio-group>
          <div v-if="item.choicesType == 3">
            <div>{{item1.optionName}}</div>
            <el-input-number v-model="item1.numbers" @change="handleChange" :min="0" :max="25"
              :label="item1.optionName"></el-input-number>
            <!-- <el-input v-model="item1.numbers" type="number" :placeholder="item1.optionName"></el-input> -->
          </div>
        </div>
      </div>
    </div>
    <div slot="footer" class="dialog-footer">
      <el-button @click="payInfoVisible = false">取 消</el-button>
      <el-button type="primary" @click="submit">提 交</el-button>
    </div>
@@ -40,10 +56,16 @@
    getList,
    remove
  } from "@/api/subjectChoices/subjectChoices";
  import {
    add
  } from "@/api/property/propertyCompany"
  import {
    mapGetters
  } from "vuex"
  export default {
    data() {
      return {
        activeName: 'first',
        activeName: 'info1',
        infoVisible: false,
        page: {
          pageSize: 20,
@@ -170,7 +192,32 @@
        },
      };
    },
    computed: {
      ...mapGetters(["permission", "userInfo"]),
    },
    methods: {
      handleChange(value) {
        console.log(value);
      },
      rowSave(form, done) {
        console.log('==========>', JSON.stringify(form))
        form.userid = this.userInfo.user_id
        add(form).then(
          () => {
            // this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },
      questionBankOnLoad(page, params = {}) {
        // params = {}
@@ -189,12 +236,32 @@
      init(row) {
        this.infoVisible = true
        let param = {
          subclassName: '基础信息'
        }
        this.questionBankOnLoad(this.page, param)
      },
      handleClick(tab, event) {
        console.log(tab, event);
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          })
          .then(() => {
            return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
          })
        // console.log(tab, event);
        console.log('============>', JSON.stringify(this.questionBankData))
        let param = {
          categoryName: tab.label
          subclassName: tab.label
        }
        this.questionBankOnLoad(this.page, param)
      }
src/views/property/propertyCompany.vue
@@ -18,7 +18,7 @@
          @click="openPayConfig(row)">商户配置
        </el-button>
        <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty()">新 增
        <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty()">物业评定
        </el-button>
      </template>
    </avue-crud>