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

shuishen

2024-04-18 4522ab3fe8bd45ee753ef187448c1e884bbc601f

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

@@ -10,7 +10,25 @@
        <div slot="header">
          <span>审批信息</span>
        </div>
        <avue-form :option="option" :value="form"></avue-form>
        <avue-form :option="option" :value="form">

          <template slot-scope="{ row, size, index }" slot="vote">
            <div>{{ topicTitle }}</div>
            <el-table :data="topictData" v-if="topictData.length">
              <el-table-column width="300" property="optionContent" label="选项"
                label-class-name="workOrderStyle"></el-table-column>
              <el-table-column width="300" property="number" label="人数" label-class-name="workOrderStyle">
              </el-table-column>
              <el-table-column width="300">
                <template slot-scope="scope">
                  <el-button slot="reference" type="primary" size="mini"
                    @click="openUserPopup(scope.row, 1)">详情</el-button>
                </template>
              </el-table-column>
            </el-table>
          </template>

        </avue-form>
        <!-- <el-form-item label="申请人">
          <el-input :disabled="true" v-model="form.flow.assigneeName" />
        </el-form-item>
@@ -38,10 +56,10 @@
          <el-timeline>
            <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>
                <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
                <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
                <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
                <p>{{ flow.assigneeName }} 在 [{{ flow.createTime }}] 开始处理 [{{ flow.historyActivityName }}] 环节</p>
                <p v-if="flow.historyActivityDurationTime !== ''">任务历时 [{{ flow.historyActivityDurationTime }}]</p>
                <p v-if="flow.comment !== ''">批复意见: [{{ flow.comment }}]</p>
                <p v-if="flow.endTime !== ''">结束时间: [{{ flow.endTime }}]</p>
              </el-card>
            </el-timeline-item>
          </el-timeline>
@@ -56,7 +74,10 @@
        </el-row>
      </el-card>
    </el-form>
    <deitDiscussion ref="DeitDiscussion">
    </deitDiscussion>
  </basic-container>

</template>

<script>
@@ -72,7 +93,14 @@
    getPropertyCapitalApply
  } from "@/api/property/propertyCapitalApply";

  import {
    getLists
  } from "@/api/discuss/topics"
  import deitDiscussion from "../../components/deitDiscussion.vue"
  export default {
    components: {
      deitDiscussion
    },
    data() {
      return {
        businessId: '',
@@ -110,6 +138,7 @@
              search: true,
              type: 'tree',
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              cascader: ['articleId'],
              props: {
                label: "name",
                value: "id"
@@ -172,10 +201,10 @@
              disabled: true
            },
            {
              label: "项目分摊方式",
              prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
              labelWidth: 140,
              value: '按建筑面积分摊',
              value: '',
              span: 12,
              row: true,
              disabled: true
@@ -251,6 +280,54 @@
              disabled: true
            },
            {
              disabled: true,
              display: false,
              hide: true,
              parent: false,
              label: "投票结果",
              prop: "articleId",
              search: false,
              viewDisabled: false,
              type: 'select',
              dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtId={{districtId}}`,
              cascader: ['vote'],
              props: {
                label: "title",
                value: "id"
              },
              defaultExpandedKeys: ["361102003"],
              span: 12,
              labelWidth: 140,
              rules: [{
                required: true,
                message: "请选择投票结果",
                trigger: "blur",
              }, ],
              change: (val) => {
                console.log("val===>", val)
                // console.log("form===>",this.form)
                if (val.value && !this.form.id) {
                  this.articleRange = val.articleRange;
                  // this.showDialog = true;
                  // this.getDetail(val.value, val.articleRange)
                }

              }
            },

            {
              disabled: true,
              display: false,
              span: 24,
              hide: true,
              prop: "vote",
              slot: true,
              label: "投票详情",
              labelWidth: 140,

            },

            {
              label: "项目摘要",
              span: 24,
              hide: true,
@@ -291,9 +368,42 @@
              }, ],
            }
          ],
        }
        },
        topictData: [],
        topicTitle: "",
        articleRange: ""
      }
    },

    watch: {
      'form.districtId': {
        handler(newData) {
          const column = this.findObject(this.option.column, "articleId")
          if (newData && this.form.articleId) {
            column.display = true;
          } else {
            column.display = false
          }
        }
      },


      'form.articleId': {
        handler(newData) {
          this.getVoteDetail(this.form.articleId, this.articleRange)
          const column = this.findObject(this.option.column, "vote")
          if (newData) {
            column.display = true;
          } else {
            column.display = false
          }
        }
      },

    },



    created() {
      this.init();
    },
@@ -319,7 +429,33 @@
        this.$router.push({
          path: `/work/start`
        });
      }
      },

      getVoteDetail(articleId, districtId) {
        let params = {
          level: 1,
          articleId: articleId,
          districtId: districtId
        }
        getLists(1, 10, params).then(res => {
          const data = res.data.data
          if (data.length) {
            this.topictData = data[0].children;
            this.topicTitle = data[0].discussContent;
          }
        })
      },

      openUserPopup(row) {
        this.$refs.DeitDiscussion.openUser(row, 1, [this.form.districtId])
      },
    }
  }
</script>
</script>


<style>
  .workOrderStyle {
    font-weight: normal;
  }
</style>