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

shuishen

2024-04-18 4522ab3fe8bd45ee753ef187448c1e884bbc601f

 src/views/place/residencePermitApply.vue

@@ -23,19 +23,15 @@
        </el-tag>
      </template>

      <!--   <template slot="menuLeft">
        <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
        </el-button>
      </template> -->

      <template slot-scope="{row, size}" slot="phoneNumber">
        <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')"
          v-text="textDispose(row, 'phoneNumberflag', 'phoneNumber')">
        </el-button>
      <template slot-scope="{row, size}" slot="minors">
        <el-tag :size="size">{{
      row.minors == 2?'是':'否'
    }}</el-tag>
      </template>
      <template slot-scope="{row, size}" slot="transactionObjectTel">
        <el-button :size="size" type="text" @click="showStringDispose(row, 'transactionObjectTelflag')"
          v-text="textDispose(row, 'transactionObjectTelflag', 'transactionObjectTel')">

      <template slot-scope="{row, size}" slot="phone">
        <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
          v-text="textDispose(row, 'phoneflag', 'phone')">
        </el-button>
      </template>
      <template slot-scope="{row, size}" slot="idCard">
@@ -62,9 +58,9 @@
<script>
  import {
    getList,
    remove,
    updateAuditing
  } from "@/api/task/residencePermitApply"
  import NProgress from 'nprogress'
  import 'nprogress/nprogress.css'
  import Qs from "qs"
  import {
@@ -138,45 +134,34 @@
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 190,
          selection: true,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          // menu: false,
          border: true,
          //stripe:true,
          stripe: true,
          index: true,
          viewBtn: true,
          addBtn: false,
          editBtn: false,
          delBtn: false,
          refreshBtn: false,
          menuFixed: 'right',
          searchShowBtn: false,
          columnBtn: false,
          selection: true,
          dialogClickModal: false,
          column: [{
              width: 110,
              span: 12,
              label: "名称",
              label: "姓名",
              prop: "name",
              searchSpan: 4,
              searchLabelWidth: 100,
              searchLabelWidth: 60,
              search: true,
              align: 'center',
              labelWidth: 110,
            },
            {
              width: 110,
              span: 12,
              label: "地址",
              prop: "address",
              searchSpan: 4,
              searchLabelWidth: 110,
              search: true,
              align: 'center',
              labelWidth: 110,
            }, {
              width: 120,
              span: 12,
              label: "联系电话",
@@ -192,26 +177,7 @@
              slot: true,
              labelWidth: 110,
            },
            {
              width: 60,
              searchSpan: 4,
              searchLabelWidth: 60,
              label: "未成年",
              hide: true,
              viewDisplay: false,
              search: true,
              prop: "minors",
              type: "select",
              dicData: [{
                  label: "未成年人员",
                  value: 2
                },
                {
                  label: "全部人员",
                  value: 1
                }
              ],
            },

            {
              width: 160,
              span: 12,
@@ -224,6 +190,15 @@
              labelWidth: 110,
            },
            {
              minWidth: 150,
              span: 12,
              label: "地址",
              prop: "address",
              align: 'center',
              labelWidth: 110,
              overHidden: true,
            },
            {
              width: 110,
              span: 12,
              label: "申请事由",
@@ -234,7 +209,7 @@
            {
              width: 140,
              span: 12,
              label: "创建时间",
              label: "申请时间",
              prop: "createTime",
              align: 'center',
              labelWidth: 110,
@@ -242,8 +217,6 @@
            {
              width: 110,
              label: "所属街道",
              // hide: true,
              // search: true,
              parent: false,
              searchSpan: 4,
              prop: "streetName",
@@ -259,22 +232,45 @@
              labelWidth: 110,
            },
            {
              width: 80,
              labelWidth: 110,
              searchSpan: 3,
              searchLabelWidth: 70,
              label: "未成年",
              search: true,
              prop: "minors",
              type: "select",
              align: "center",
              dicData: [{
                  label: "全部",
                  value: ""
                }, {
                  label: "是",
                  value: 2
                },
                {
                  label: "否",
                  value: 1
                },
              ],
            },
            {
              width: 100,
              addDisplay: false,
              editDisplay: false,
              label: '审核状态',
              prop: 'confirmFlag',
              type: 'radio',
              type: 'select',
              slot: true,
              dicData: [{
                label: '待审核',
                value: 1
              }, {
                label: '通过',
                value: 3
                value: 2
              }, {
                label: '驳回',
                value: 4
                value: 3
              }],
              align: 'center',
              labelWidth: 110,
@@ -327,18 +323,13 @@
            }
          } else if (data == 2) {
            tags = {
              type: 'success',
              text: '已审核'
              type: 'danger',
              text: '通过'
            }
          } else if (data == 3) {
            tags = {
              type: 'danger',
              text: '未通过'
            }
          } else if (data == 4) {
            tags = {
              type: 'warning',
              text: '待完成'
              text: '驳回'
            }
          }

@@ -544,12 +535,10 @@
            type: "warning",
          })
          .then(() => {
            row.isDeleted = 1
            return removeTask(row)
            return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page)

            this.$message({
              type: "success",
              message: "操作成功!",
@@ -629,15 +618,6 @@
        let values = {
          ...params,
        }
        // if (dateTime) {
        //   values = {
        //     ...params,
        //     startTime: dateTime[0],
        //     endTime: dateTime[1],
        //     ...this.query,
        //   }
        //   values.dateTime = null
        // }
        values.reportType = 2
        this.loading = true
        getList(page.currentPage, page.pageSize, values).then((res) => {