Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

wangzhe 7 mesi fa
parent
commit
40dda283f5

+ 2 - 1
package.json

@@ -35,8 +35,8 @@
     "url": "https://gitee.com/dromara/贞达工程管理.git"
   },
   "dependencies": {
-    "@smallwei/avue": "2.11.2",
     "@riophae/vue-treeselect": "0.4.0",
+    "@smallwei/avue": "2.11.2",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
@@ -48,6 +48,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "jszip": "^3.10.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

+ 0 - 723
src/views/zdsz_p1/area/index.vue

@@ -1,723 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="小区名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入小区名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="行政区" prop="district">
-        <el-select v-model="queryParams.district" placeholder="请选择行政区" clearable style="width: 100%">
-          <el-option
-            v-for="dict in dict.type.district"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="核算行政区" prop="calculateDistrictId" label-width="100px">
-        <el-select v-model="queryParams.calculateDistrictId" placeholder="请选择核算行政区" clearable style="width: 100%">
-          <el-option
-            v-for="dict in dict.type.district"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:area:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:area:remove']"
-        >删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['gas:area:export']"
-        >导出
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExports"
-        >所属包导出
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['system:user:import']"
-        >导入
-        </el-button>
-      </el-col>
-      <!--<el-col :span="1.5">-->
-      <!--<el-button-->
-      <!--type="info"-->
-      <!--plain-->
-      <!--icon="el-icon-upload2"-->
-      <!--size="mini"-->
-      <!--@click="examinehandleImport"-->
-      <!--v-hasPermi="['system:user:import']"-->
-      <!--&gt;批量合格-->
-      <!--</el-button>-->
-      <!--</el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleUpload"
-          v-hasPermi="['system:user:import']"
-        >下载
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="小区名" align="center" prop="name"/>
-      <el-table-column label="完成率" align="center" prop="rate"/>
-      <el-table-column label="释放状态" align="center" prop="releaseIs">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.release_status" :value="scope.row.releaseIs"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="行政区" align="center" prop="calculateDistrictName">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.district" :value="scope.row.district"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="核算行政区" align="center" prop="calculateDistrictName">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.district" :value="scope.row.calculateDistrictId"/>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="小区规模" align="center" prop="areaSize"/>
-
-      <el-table-column label="所属包" align="center" prop="affiliatedPackage">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.affiliated_package" :value="scope.row.affiliatedPackage"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-download"
-            @click="handleExportHouse(scope.row)"
-            v-hasPermi="['gas:area:edit']"
-          >导出完工详情
-          </el-button>
-          <el-button v-if="scope.row.releaseIs ==='001'"
-                     size="mini"
-                     type="text"
-                     icon="el-icon-edit"
-                     @click="handleRelease(scope.row)"
-                     v-hasPermi="['gas:area:edit']"
-          >释放
-          </el-button>
-          <el-button v-if="scope.row.releaseIs ==='001'"
-                     type="text"
-                     plain
-                     icon="el-icon-download"
-                     size="mini"
-                     @click="handleUpload(scope.row)"
-                     v-hasPermi="['gas:area:edit']"
-          >下载
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['gas:area:edit']"
-          >编辑
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:area:remove']"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改小区对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="行政区" prop="district" >
-          <el-select v-model="form.district" placeholder="请选择行政区">
-            <el-option
-              v-for="dict in dict.type.district"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="小区名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入小区名" :disabled="disabled"/>
-        </el-form-item>
-        <el-form-item label="负责工长" prop="userId">
-          <el-select v-model="form.userId" filterable placeholder="请选择负责工长" style="width: 100%">
-            <el-option v-for="item in foremanList" :key="item.id" :value="item.id" :label="item.name">{{
-                item.name
-              }}
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="核算行政区" prop="calculateDistrictId">
-          <el-select v-model="form.calculateDistrictId" placeholder="请选择核算行政区" clearable style="width: 100%">
-            <el-option
-              v-for="dict in dict.type.district"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="小区规模" prop="areaSize">
-          <el-input-number v-model="form.areaSize" style="width: 100%"></el-input-number>
-        </el-form-item>
-        <el-form-item label="所属包" prop="affiliatedPackage">
-          <el-select v-model="form.affiliatedPackage" placeholder="请选择所属包" clearable style="width: 100%">
-            <el-option
-              v-for="dict in dict.type.affiliated_package"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <!--<div class="el-upload__tip" slot="tip">-->
-          <!--<el-checkbox v-model="upload.updateSupport"/>-->
-          <!--是否更新已经存在的用户数据-->
-          <!--</div>-->
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
-                   @click="importTemplate"
-          >下载模板
-          </el-link>
-        </div>
-      </el-upload>
-      <div style="padding-top: 15px;line-height: 25px;font-size: 14px;">
-        完成度:{{ bfb }}%
-        <progress max="100" :value="bfb" style="width: 200px;height: 18px;"></progress>
-        <br>
-        导入结果:{{ jdtMsg }}
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false;bfb='0';jdtMsg=''">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--<el-dialog :title="examineupload.examinetitle" :visible.sync="examineupload.examineopen" width="400px" append-to-body>-->
-    <!--<el-upload-->
-    <!--ref="examineupload"-->
-    <!--:limit="1"-->
-    <!--accept=".xlsx, .xls"-->
-    <!--:headers="examineupload.examineheaders"-->
-    <!--:action="examineupload.examineurl + '?updateSupport=' + examineupload.examineupdateSupport"-->
-    <!--:disabled="examineupload.examineisUploading"-->
-    <!--:on-progress="examineishandleFileUploadProgress"-->
-    <!--:on-success="examineishandleFileSuccess"-->
-    <!--:auto-upload="false"-->
-    <!--drag-->
-    <!--&gt;-->
-    <!--<i class="el-icon-upload"></i>-->
-    <!--<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>-->
-    <!--<div class="el-upload__tip text-center" slot="tip">-->
-    <!--<div class="el-upload__tip" slot="tip">-->
-    <!--<el-checkbox v-model="examineupload.examineupdateSupport"/>-->
-    <!--是否更新已经存在的用户数据-->
-    <!--</div>-->
-    <!--<span>仅允许导入xls、xlsx格式文件。</span>-->
-    <!--<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"-->
-    <!--@click="importTemplate">下载模板-->
-    <!--</el-link>-->
-    <!--</div>-->
-    <!--</el-upload>-->
-    <!--<div slot="footer" class="dialog-footer">-->
-    <!--<el-button type="primary" @click="examinesubmitFileForm">确 定</el-button>-->
-    <!--<el-button @click="examineupload.examineopen = false">取 消</el-button>-->
-    <!--</div>-->
-    <!--</el-dialog>-->
-
-
-    <!-- 导出对话框 -->
-    <el-dialog title="所属包导出" :visible.sync="opens" width="500px" append-to-body>
-      <el-form ref="form" :model="forms" :rules="ruless" label-width="100px">
-        <el-form-item label="核算行政区" prop="calculateDistrictId">
-          <el-select v-model="forms.calculateDistrictId" placeholder="请选择核算行政区" clearable style="width: 100%">
-            <el-option
-              v-for="dict in dict.type.district"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属包" prop="affiliatedPackage">
-          <el-select v-model="forms.affiliatedPackage" placeholder="请选择所属包" clearable style="width: 100%">
-            <el-option
-              v-for="dict in dict.type.affiliated_package"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="dowExports">确 定</el-button>
-        <el-button @click="cancels">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  listArea,
-  releaseIs,
-  getArea,
-  delArea,
-  addArea,
-  updateArea,
-  areaUpload,
-  flushProgress,
-  clearFlushProgress,
-  getAreaList
-} from '@/api/gas/area'
-import { getToken } from '@/utils/auth'
-import { getForName } from '../../../api/gas/area'
-
-export default {
-  name: 'Area',
-  dicts: ['release_status', 'affiliated_package', 'district'],
-  data() {
-    // 工号唯一性验证
-    let validateAnother = (rule, value, callback) => {
-      if (value) {
-        getForName(value, this.form.id).then(res => {
-          if (res.data === false) {
-            callback('该小区已存在')
-          } else {
-            callback()
-          }
-        }).catch(err => {
-          callback(new Error(err.data.msg))
-        })
-      } else {
-        callback()
-      }
-    }
-    return {
-      //进度条
-      timeInterval: null,
-      bfb: '0',
-      jdtMsg: '',
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      disabled: false,
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 小区表格数据
-      areaList: [],
-      areaLists: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      opens: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: undefined,
-        district: undefined,
-        calculateDistrictId: undefined,
-        userId: undefined
-      },
-      foremanList: [],
-      // 表单参数
-      form: {},
-      forms: {
-        pageNum: 1,
-        pageSize: 10
-      },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层(用户导入)
-        open: false,
-        // 弹出层标题(用户导入)
-        title: '',
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: 'Bearer ' + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + '/gas/area/importData'
-      },
-      // examineupload: {
-      //   // 是否显示弹出层(用户导入)
-      //   examineopen: false,
-      //   // 弹出层标题(用户导入)
-      //   examinetitle: "",
-      //   // 是否禁用上传
-      //   examineisUploading: false,
-      //   // 是否更新已经存在的用户数据
-      //   examineupdateSupport: 0,
-      //   // 设置上传的请求头部
-      //   examineheaders: {Authorization: "Bearer " + getToken()},
-      //   // 上传的地址
-      //   examineurl: process.env.VUE_APP_BASE_API + "/gas/area/importApprovalExcel"
-      // },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: '小区名不能为空', trigger: 'blur' },
-          { required: true, trigger: 'blur', validator: validateAnother }
-        ],
-        calculateDistrictId: [{ required: true, message: '请选择核算行政区', trigger: 'change' }],
-        areaSize: [{ required: true, message: '请输入小区规模', trigger: 'blur' }],
-        affiliatedPackage: [{ required: true, message: '请选择所属包', trigger: 'change' }]
-      },
-      // 表单校验
-      ruless: {
-        calculateDistrictId: [{ required: true, message: '请选择核算行政区', trigger: 'change' }],
-        affiliatedPackage: [{ required: true, message: '请选择所属包', trigger: 'change' }]
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.getAreaList()
-  },
-  methods: {
-    setCalculateDistrictName(data) {
-      this.form.calculateDistrictName = this.areaLists.filter(item => item.id == data)[0].name
-      console.log(this.form.calculateDistrictName)
-    },
-    /**小区下拉框*/
-    getAreaList() {
-      getAreaList().then(response => {
-        this.areaLists = response.data
-      })
-    },
-    /** 查询小区列表 */
-    getList() {
-      this.loading = true
-      listArea(this.queryParams).then(response => {
-        this.areaList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 取消按钮
-    cancels() {
-      this.opens = false
-      this.forms = {}
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        userId: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        createTime: undefined,
-        updateBy: undefined,
-        updateTime: undefined,
-        district:undefined,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加小区'
-      this.disabled = false
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true
-      this.reset()
-      this.disabled = true
-      const id = row.id || this.ids
-      getArea(id).then(response => {
-        this.loading = false
-        this.form = response.data
-        this.open = true
-        this.title = '修改小区'
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true
-          if (this.form.id != null) {
-            updateArea(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            }).finally(() => {
-              this.buttonLoading = false
-            })
-          } else {
-            addArea(this.form).then(response => {
-              if (response.data) {
-                this.$modal.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.$modal.msgError('小区名称不允许重复,请重新填写!')
-              }
-            }).finally(() => {
-              this.buttonLoading = false
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除小区编号为"' + ids + '"的数据项?').then(() => {
-        this.loading = true
-        return delArea(ids)
-      }).then(() => {
-        this.loading = false
-        this.getList()
-        this.$modal.msgSuccess('删除成功')
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    //释放
-    handleRelease(row) {
-      this.$modal.confirm('请确认照片是否下载!释放过程不可逆!是否释放?').then(() => {
-        this.loading = true
-        return releaseIs(row.id)
-      }).then(() => {
-        this.loading = false
-        this.getList()
-        this.getArea()
-        this.$modal.msgSuccess('释放成功')
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.$download.excel('/gas/area/export', this.queryParams)
-    },
-    /** 导出按钮操作 */
-    handleExports() {
-      this.opens = true
-      this.forms = {}
-    },
-    dowExports() {
-      this.$download.excel('/gas/area/exports', this.forms)
-      this.opens = false
-    },
-    /** 导出完工率按钮操作 */
-    handleExportHouse(row) {
-      this.$download.excel('/gas/area/getExportHouse?areaId=' + row.id)
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = '用户导入'
-      this.upload.open = true
-    },
-    handleUpload(row) {
-      window.location.href = 'https://cczdsz.com/prod-api/gas/area/upload?id=' + row.id
-      // window.open("http://sz.cxcloudsci.com/prod-api/gas/area/upload?id=" + row.id, '_blank')
-      // window.open("http://localhost:8080/gas/area/upload?id=" + row.id, '_blank')
-      // window.location.href="http://localhost:8080/gas/area/upload?id=" + row.id;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.$download.excel('/gas/area/importTemplate')
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      // this.upload.open = false;
-      this.upload.isUploading = false
-      this.$refs.upload.clearFiles()
-      // this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
-      // this.jdtMsg=response.msg;
-      this.getList()
-    },
-    // 提交上传文件
-    submitFileForm() {
-      const ther = this
-      this.timeInterval = setInterval(function() {
-        ther.flushProgress()
-      }, 1500)
-      this.$refs.upload.submit()
-    },
-    // 提交上传文件
-    flushProgress() {
-      flushProgress().then(response => {
-        this.bfb = parseInt(response.data.bfb) >= 100 ? 100 : response.data.bfb
-        this.jdtMsg = response.data.message
-        if (response.data.message != null && response.data.message != '') {
-          clearFlushProgress().then(response => {
-          })
-          clearInterval(this.timeInterval)
-        }
-      })
-    }
-
-    // examinehandleImport() {
-    //   this.examineupload.examinetitle = "用户导入";
-    //   this.examineupload.examineopen = true;
-    // },
-    // // 文件上传中处理
-    // examineishandleFileUploadProgress(event, file, fileList) {
-    //   this.examineupload.examineisUploading = true;
-    // },
-    // // 文件上传成功处理
-    // examineishandleFileSuccess(response, file, fileList) {
-    //   this.examineupload.examineopen = false;
-    //   this.examineupload.examineisUploading = false;
-    //   this.$refs.examineupload.clearFiles();
-    //   this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
-    //   this.getList();
-    // },
-    // // 提交上传文件
-    // examinesubmitFileForm() {
-    //   this.$refs.examineupload.submit();
-    // }
-  }
-}
-</script>

+ 0 - 290
src/views/zdsz_p1/building/index.vue

@@ -1,290 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="楼宇名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入楼宇名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item  label="所属小区" prop="areaId">
-        <el-select v-model="queryParams.areaId" filterable placeholder="请选择所属小区">
-          <el-option v-for="item in areaList" :key="item.id" :value="item.id" :label="item.name">{{ item.name }}</el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:building:add']"
-        >新增</el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:building:remove']"
-        >删除</el-button>
-      </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :loading="exportLoading"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['gas:building:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="buildingList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="所属小区" align="center" prop="areaName" />
-      <el-table-column label="楼宇名" align="center" prop="name" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['gas:building:edit']"-->
-<!--          >修改</el-button>-->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:building:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改楼宇对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="楼宇名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入楼宇名" />
-        </el-form-item>
-        <el-form-item  label="所属小区" prop="areaId">
-          <el-select v-model="form.areaId" filterable placeholder="请选择所属小区">
-            <el-option v-for="item in areaList" :key="item.id" :value="item.id" :label="item.name">{{ item.name }}</el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBuilding, getBuilding, getArea,delBuilding, addBuilding, updateBuilding } from "@/api/gas/building";
-
-export default {
-  name: "Building",
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 楼宇表格数据
-      buildingList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: undefined,
-        areaId: undefined,
-      },
-      areaList:[],
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "楼宇名不能为空", trigger: "blur" }
-        ],
-        areaId: [
-          { required: true, message: "小区id不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-    this.getArea();
-  },
-  methods: {
-    /** 查询楼宇列表 */
-    getList() {
-      this.loading = true;
-      listBuilding(this.queryParams).then(response => {
-        this.buildingList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /**小区下拉框*/
-    getArea() {
-      this.loading = true;
-      getArea().then(response => {
-        this.areaList = response.data;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        areaId: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        createTime: undefined,
-        updateBy: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-      this.getArea();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加楼宇";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getBuilding(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改楼宇";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateBuilding(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              this.getArea();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addBuilding(this.form).then(response => {
-              if(response.data){
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-                this.getArea();
-              }else{
-                this.$modal.msgError("同一小区下楼宇名称不允许重复,请重新填写!");
-              }
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除楼宇编号为"' + ids + '"的数据项?').then(() => {
-        this.loading = true;
-        return delBuilding(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.getArea();
-        this.$modal.msgSuccess("删除成功");
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-        this.$download.excel('/gas/building/export', this.queryParams);
-    }
-  }
-};
-</script>

+ 0 - 347
src/views/zdsz_p1/house/index.vue

@@ -1,347 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="房屋名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入房屋名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item  label="所属小区" prop="areaId">
-        <el-select  v-model="queryParams.areaId" filterable placeholder="请选择小区" @change="getBuilding(queryParams.areaId) ,resetqueryform()">
-          <el-option v-for="item in areaList" :key="item.id" :value="item.id" :label="item.name" >{{ item.name }}</el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item  label="所属楼宇" prop="buildingId">
-        <el-select v-model="queryParams.buildingId" filterable placeholder="请选择楼宇" @change="getUnit(queryParams.buildingId),resetqueryunitform()">
-          <el-option v-for="item in buildingList" :key="item.id" :value="item.id" :label="item.name">{{ item.name }}</el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item  label="所属单元" prop="unitId">
-        <el-select v-model="queryParams.unitId" filterable placeholder="请选择楼宇">
-          <el-option v-for="item in unitList" :key="item.id" :value="item.id" :label="item.name">{{ item.name }}</el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:house:add']"
-        >新增</el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:house:remove']"
-        >删除</el-button>
-      </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :loading="exportLoading"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['gas:house:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="houseList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="所属小区" align="center" prop="areaName" />
-      <el-table-column label="所属楼宇" align="center" prop="buildingName" />
-      <el-table-column label="所属单元" align="center" prop="unitName" />
-      <el-table-column label="房屋名" align="center" prop="name" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['gas:house:edit']"-->
-<!--          >修改</el-button>-->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:house:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改房屋对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="房屋名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入房屋名" />
-        </el-form-item>
-        <el-form-item  label="所属小区" prop="areaId">
-          <el-select v-model="form.areaId" filterable placeholder="请选择小区" @change="getBuilding(form.areaId),resetform()">
-            <el-option v-for="item in areaList" :key="item.id" :value="item.id" :label="item.name" >{{ item.name }}</el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item  label="所属楼宇" prop="buildingId">
-          <el-select v-model="form.buildingId" filterable placeholder="请选择楼宇" @change="getUnit(form.buildingId),resetunitform()">
-            <el-option v-for="item in buildingList" :key="item.id" :value="item.id" :label="item.name">{{ item.name }}</el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item  label="所属单元" prop="unitId">
-          <el-select v-model="form.unitId" filterable placeholder="请选择单元">
-            <el-option v-for="item in unitList" :key="item.id" :value="item.id" :label="item.name">{{ item.name }}</el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listHouse, getHouse,getUnit,getArea,getBuilding, delHouse, addHouse, updateHouse } from "@/api/gas/house";
-
-export default {
-  name: "House",
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 房屋表格数据
-      houseList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: undefined,
-        unitId: undefined,
-        buildingId: undefined,
-        areaId: undefined,
-      },
-      areaList:[],
-      buildingList:[],
-      unitList:[],
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "房屋名不能为空", trigger: "blur" }
-        ],
-        unitId: [
-          { required: true, message: "单元id不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-    this.getArea();
-  },
-  methods: {
-    /** 查询房屋列表 */
-    getList() {
-      this.loading = true;
-      listHouse(this.queryParams).then(response => {
-        this.houseList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /**小区下拉框*/
-    getArea() {
-      this.loading = true;
-      getArea().then(response => {
-        this.areaList = response.data;
-      });
-    },
-    /**楼宇下拉框*/
-    getBuilding(areaId) {
-      getBuilding(areaId).then(response => {
-        this.buildingList = response.data;
-      });
-    },
-    getUnit(buildingId) {
-      getUnit(buildingId).then(response => {
-        this.unitList = response.data;
-      });
-    },
-    resetqueryform(){
-      this.queryParams.buildingId = undefined;
-      this.queryParams.unitId = undefined;
-    },
-    resetqueryunitform(){
-      this.queryParams.unitId = undefined;
-    },
-    resetform(){
-      this.form.buildingId = undefined;
-      this.form.unitId = undefined;
-    },
-    resetunitform(){
-      this.form.unitId = undefined;
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        unitId: undefined,
-        buildingId: undefined,
-        areaId: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        createTime: undefined,
-        updateBy: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.buildingList = [];
-      this.unitList = [];
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加房屋";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getHouse(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改房屋";
-        this.getBuilding(this.form.areaId);
-        this.getUnit(this.form.buildingId);
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateHouse(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              this.getArea();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addHouse(this.form).then(response => {
-              if(response.data){
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-                this.getArea();
-              }else{
-                this.$modal.msgError("同一小区、同一楼宇、同一单元下房屋名称不允许重复,请重新填写!");
-              }
-
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除房屋编号为"' + ids + '"的数据项?').then(() => {
-        this.loading = true;
-        return delHouse(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.getArea();
-        this.$modal.msgSuccess("删除成功");
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-        this.$download.excel('/gas/house/export', this.queryParams);
-    }
-  }
-};
-</script>

+ 73 - 86
src/views/zdsz_p1/order/index.vue

@@ -122,30 +122,30 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:order:add']"
-        >新增
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['gas:order:add']"-->
+<!--        >新增-->
+<!--        </el-button>-->
+<!--      </el-col>-->
 
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:order:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['gas:order:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -185,16 +185,16 @@
       <el-table-column label="管子长度" align="center" prop="pipeLength"/>
       <el-table-column label="自闭阀类型" align="center" prop="valveType"/>
       <el-table-column label="订单时间" align="center" prop="time"/>
-      <el-table-column label="订单状态" align="center" prop="orderStatus">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="examineStatus">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.examine_status" :value="scope.row.examineStatus"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="订单状态" align="center" prop="orderStatus">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="审核状态" align="center" prop="examineStatus">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.examine_status" :value="scope.row.examineStatus"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="照片" align="center" prop="photoList">
         <template slot-scope="scope">
           <el-image
@@ -212,26 +212,26 @@
           <el-button v-show="scope.row.orderStatus ==='001'"
                      size="mini"
                      type="text"
-                     icon="el-icon-edit"
+                     icon="el-icon-view"
                      @click="handleUpdate(scope.row)"
                      v-hasPermi="['gas:order:edit']"
-          >修改
-          </el-button>
-          <el-button v-show="scope.row.orderStatus ==='002'"
-                     size="mini"
-                     type="text"
-                     icon="el-icon-edit"
-                     @click="handleUpdate1(scope.row)"
-                     v-hasPermi="['gas:order:edit']"
-          >复审
-          </el-button>
-          <el-button v-show="scope.row.anjianId != null && scope.row.anjianId != ''"
-                     size="mini"
-                     type="text"
-                     icon="el-icon-edit"
-                     @click="viewAnJian(scope.row)"
-          >安检开栓
+          >查看详情
           </el-button>
+<!--          <el-button v-show="scope.row.orderStatus ==='002'"-->
+<!--                     size="mini"-->
+<!--                     type="text"-->
+<!--                     icon="el-icon-edit"-->
+<!--                     @click="handleUpdate1(scope.row)"-->
+<!--                     v-hasPermi="['gas:order:edit']"-->
+<!--          >复审-->
+<!--          </el-button>-->
+<!--          <el-button v-show="scope.row.anjianId != null && scope.row.anjianId != ''"-->
+<!--                     size="mini"-->
+<!--                     type="text"-->
+<!--                     icon="el-icon-edit"-->
+<!--                     @click="viewAnJian(scope.row)"-->
+<!--          >安检开栓-->
+<!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -247,7 +247,7 @@
     <!-- 添加或修改工程管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-row :gutter="15">
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px" disabled>
           <el-col :span="22">
             <el-form-item label="服务类别" prop="serviceType">
               <el-select v-model="form.serviceType" placeholder="请选择服务类别" clearable :style="{width: '100%'}">
@@ -262,7 +262,15 @@
           </el-col>
           <el-col :span="23">
             <el-form-item label="照片" prop="photoList">
-              <imageUpload v-model="form.photoList"/>
+<!--              {{form.photoList}}-->
+<!--              <imageUpload v-model="form.photoList"/>-->
+              <el-image
+                v-for="photo in form.photoList"
+                style="width: 100px; height: 100px;margin-right: 10px"
+                :src="photo"
+                :preview-src-list="[photo]"
+              >
+              </el-image>
             </el-form-item>
           </el-col>
           <el-col :span="11">
@@ -321,38 +329,17 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="管子类型" prop="pipeType">
-              <el-radio-group v-model="form.pipeType">
-                <el-radio
-                  v-for="item in pipeTypeList"
-                  :key="item.pipeType"
-                  :label="item.pipeType"
-                >{{ item.pipeType }}
-                </el-radio>
-              </el-radio-group>
+              <el-input v-model="form.pipeType"/>
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="管子长度" prop="pipeLength" >
-              <el-radio-group v-model="form.pipeLength">
-                <el-radio
-                  v-for="item in pipeLengthList"
-                  :key="item.pipeLength"
-                  :label="item.pipeLength"
-                >{{ item.pipeLength }}
-                </el-radio>
-              </el-radio-group>
+              <el-input v-model="form.pipeLength"/>
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="自闭阀类型" prop="valveType">
-              <el-radio-group v-model="form.valveType">
-                <el-radio
-                  v-for="item in valveTypeList"
-                  :key="item.valveType"
-                  :label="item.valveType"
-                >{{ item.valveType }}
-                </el-radio>
-              </el-radio-group>
+              <el-input v-model="form.valveType"/>
             </el-form-item>
           </el-col>
           <el-col :span="22">
@@ -617,9 +604,9 @@ export default {
     this.getList()
     this.getWorker()
     this.getArea()
-    this.getPipeLength()
-    this.getPipeType()
-    this.getValveType()
+    // this.getPipeLength()
+    // this.getPipeType()
+    // this.getValveType()
   },
   methods: {
     backup() {
@@ -771,25 +758,25 @@ export default {
       this.open = true
       this.title = '添加工程管理'
       this.getWorker()
-      this.getPipeLength()
-      this.getPipeType()
-      this.getValveType()
+      // this.getPipeLength()
+      // this.getPipeType()
+      // this.getValveType()
       this.getArea()
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
       this.getWorker()
-      this.getPipeLength()
-      this.getPipeType()
-      this.getValveType()
+      // this.getPipeLength()
+      // this.getPipeType()
+      // this.getValveType()
       this.getArea()
       const id = row.id || this.ids
       getOrder(id).then(response => {
         this.loading = false
         this.form = response.data
         this.open = true
-        this.title = '修改工程管理'
+        this.title = '查看工程管理'
         this.getBuilding(this.form.areaId)
       })
     },

+ 0 - 319
src/views/zdsz_p1/unit/index.vue

@@ -1,319 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="单元名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入单元名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item  label="所属小区" prop="areaId">
-      <el-select  v-model="queryParams.areaId" filterable placeholder="请选择小区" @change="getBuilding(queryParams.areaId) ,resetqueryform()">
-        <el-option v-for="item in areaList" :key="item.id" :value="item.id" :label="item.name" >{{ item.name }}</el-option>
-      </el-select>
-      </el-form-item>
-      <el-form-item  label="所属楼宇" prop="buildingId">
-        <el-select v-model="queryParams.buildingId" filterable placeholder="请选择楼宇">
-          <el-option v-for="item in buildingList" :key="item.id" :value="item.id" :label="item.name">{{ item.name }}</el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:unit:add']"
-        >新增</el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:unit:remove']"
-        >删除</el-button>
-      </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :loading="exportLoading"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['gas:unit:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="unitList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="所属小区" align="center" prop="areaName" />
-      <el-table-column label="所属楼宇" align="center" prop="buildingName" />
-      <el-table-column label="单元名" align="center" prop="name" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['gas:unit:edit']"-->
-<!--          >修改</el-button>-->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:unit:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改单元对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单元名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入单元名" />
-        </el-form-item>
-        <el-form-item  label="所属小区" prop="areaId">
-        <el-select v-model="form.areaId" filterable placeholder="请选择小区" @change="getBuilding(form.areaId),resetform()">
-          <el-option v-for="item in areaList" :key="item.id" :value="item.id" :label="item.name" >{{ item.name }}</el-option>
-        </el-select>
-        </el-form-item>
-        <el-form-item  label="所属楼宇" prop="buildingId">
-          <el-select v-model="form.buildingId" filterable placeholder="请选择楼宇">
-            <el-option v-for="item in buildingList" :key="item.id" :value="item.id" :label="item.name">{{ item.name }}</el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listUnit, getUnit,getArea,getBuilding, delUnit, addUnit, updateUnit } from "@/api/gas/unit";
-
-export default {
-  name: "Unit",
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 单元表格数据
-      unitList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: undefined,
-        buildingId: undefined,
-        areaId: undefined,
-      },
-      areaList:[],
-      buildingList:[],
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "单元名不能为空", trigger: "blur" }
-        ],
-        buildingId: [
-          { required: true, message: "楼宇id不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-    this.getArea();
-  },
-  methods: {
-    /** 查询单元列表 */
-    getList() {
-      this.loading = true;
-      listUnit(this.queryParams).then(response => {
-        this.unitList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /**小区下拉框*/
-    getArea() {
-      this.loading = true;
-      getArea().then(response => {
-        this.areaList = response.data;
-      });
-    },
-    /**楼宇下拉框*/
-    getBuilding(areaId) {
-      getBuilding(areaId).then(response => {
-        this.buildingList = response.data;
-      });
-    },
-    resetqueryform(){
-      this.queryParams.buildingId = undefined;
-    },
-    resetform(){
-      this.form.buildingId = undefined;
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        buildingId: undefined,
-        areaId: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        createTime: undefined,
-        updateBy: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.buildingList = [];
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加单元";
-      this.buildingList = [];
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getUnit(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改单元";
-        this.getBuilding(this.form.areaId);
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateUnit(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              this.getArea();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addUnit(this.form).then(response => {
-              if(response.data){
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-                this.getArea();
-              }else{
-                this.$modal.msgError("同一小区、同一楼宇下房屋名称不允许重复,请重新填写!");
-              }
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除单元编号为"' + ids + '"的数据项?').then(() => {
-        this.loading = true;
-        return delUnit(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.getArea();
-        this.$modal.msgSuccess("删除成功");
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-        this.$download.excel('/gas/unit/export', this.queryParams);
-    }
-  }
-};
-</script>

+ 0 - 398
src/views/zdsz_p1/user/index.vue

@@ -1,398 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="姓名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工号" prop="jobNum">
-        <el-input
-          v-model="queryParams.jobNum"
-          placeholder="请输入工号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:user:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['gas:user:remove']"
-        >删除</el-button>
-      </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :loading="exportLoading"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['gas:user:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="工号" align="center" prop="jobNum" />
-      <el-table-column label="手机号" align="center" prop="phone" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['gas:user:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['gas:user:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改用户对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="工号" prop="jobNum">
-          <el-input v-model="form.jobNum" placeholder="请输入工号" />
-        </el-form-item>
-        <el-form-item label="手机号" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入手机号" />
-        </el-form-item>
-        <el-form-item label="密码" prop="password">
-          <el-input type="password" v-model="form.password" placeholder="请输入密码" />
-        </el-form-item>
-
-
-        <el-form-item label="工程权限" prop="power">
-          <el-select
-            v-model="form.power"
-            placeholder="工程权限"
-            clearable
-            multiple
-            size="small"
-            style="width:100%"
-            @change="powerChange"
-          >
-            <el-option
-              v-for="dict in dict.type.engine_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="民用内部权限" prop="civilPower" v-if="isCivilPower" v-show="isCivilPower">
-          <el-select
-            v-model="form.civilPower"
-            placeholder="民用内部权限"
-            clearable
-            multiple
-            size="small"
-            style="width:100%"
-          >
-            <el-option
-              v-for="dict in dict.type.civil_power_user"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listUser, getForPhone,getForJobnum,getUser, delUser, addUser,updateUser } from "@/api/gas/user";
-
-export default {
-  name: "User",
-  dicts: ['user_type','engine_type','civil_power_user'],
-  data() {
-    // 手机号唯一性验证
-    let validateAnotherPhone = (rule, value, callback) => {
-      console.log(value)
-      console.log(rule)
-      console.log(this.form)
-      let PHONE_REG = /^((0\d{2,3}-{0,1}\d{7,8})|(1[3-9]\d{9}))$/;
-      if (value) {
-        if (!PHONE_REG.test(value)) {
-          callback(new Error('请输入有效的手机号'));
-          return;
-        }
-        getForPhone(value,this.form.id).then(res => {
-              if (res.data===false) {
-                callback('该手机号已存在');
-              } else {
-                callback();
-              }
-            }).catch(err => {
-              callback(new Error(err.data.msg));
-            });
-      } else {
-        callback();
-      }
-    };
-    // 工号唯一性验证
-    let validateAnother = (rule, value, callback) => {
-      if (value) {
-        getForJobnum(value,this.form.id).then(res => {
-              if (res.data===false) {
-                callback('该工号已存在');
-              } else {
-                callback();
-              }
-            }).catch(err => {
-              callback(new Error(err.data.msg));
-            });
-      } else {
-        callback();
-      }
-    };
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: undefined,
-        jobNum: undefined,
-      },
-      // 工程权限集合
-      isCivilPower:false,
-
-      foremanList:[],
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "姓名不能为空", trigger: "blur" }
-        ],
-        jobNum: [
-          { required: true, message: "工号不能为空", trigger: "blur" },
-          { required: true, trigger: 'blur', validator: validateAnother }
-        ],
-
-      }
-    };
-  },
-  created() {
-    this.getList();
-
-  },
-  methods: {
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true;
-      listUser(this.queryParams).then(response => {
-        this.userList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    foreman(role){
-      if (role === "002"){
-        this.foremanForm=true;
-      }else {
-        this.foremanForm=false;
-        this.form.parentId = undefined;
-      }
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        name: undefined,
-        jobNum: undefined,
-        phone: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        createTime: undefined,
-        updateBy: undefined,
-        updateTime: undefined,
-        power: undefined,
-        civilPower: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加用户";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getUser(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改用户";
-        this.form.power = response.data.power.split(",");
-        if(response.data.power.indexOf('001')!=-1){
-          this.isCivilPower=true;
-        }
-        this.form.civilPower = response.data.civilPower.split(",");
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if(!this.isCivilPower){
-            this.form.civilPower=null;
-          }else {
-            this.form.civilPower = this.form.civilPower.toString();
-          }
-          this.form.power = this.form.power.toString();
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(() => {
-        this.loading = true;
-        return delUser(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-        this.$download.excel('/gas/user/export', this.queryParams);
-    },
-    powerChange(val){
-      if(val.indexOf("001") > -1){
-        this.isCivilPower=true;
-      }else{
-        this.isCivilPower=false;
-      }
-    }
-  }
-};
-</script>