From c79a020be41892e60021c2a750ea2976dd20f2f3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 05 十一月 2024 11:19:20 +0800
Subject: [PATCH] 工单审核对话框bug
---
src/views/system/point/index.vue | 190 +++++++++++++++++++++++++++--------------------
1 files changed, 108 insertions(+), 82 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 8554d51..fe4a301 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -29,7 +29,7 @@
v-hasPermi="['point:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-bottom" v-loading="download" size="mini" @click="handleExport"
+ <el-button type="primary" plain icon="el-icon-top" v-loading="download" size="mini" @click="handleExport"
v-hasPermi="['point:export']">瀵煎嚭鐐逛綅</el-button>
</el-col>
<el-col :span="1.5">
@@ -84,17 +84,17 @@
<el-button class="bottom_" type="primary" size="small" v-loading="upload" @click="handleImport"
v-hasPermi="['point:import']">瀵煎叆</el-button>
</div>
- <el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference">瀵煎叆鐐逛綅</el-button>
+ <el-button type="primary" size="mini" plain icon="el-icon-bottom" slot="reference" v-hasPermi="['point:import']">瀵煎叆鐐逛綅</el-button>
</el-popover>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="danger" plain icon="el-icon-receiving" size="mini" @click="handleEditBatch"-->
<!-- v-hasPermi="['point:edit']">鎵归噺淇敼</el-button>-->
<!-- </el-col>-->
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar @refreshHeader= "getDyColumn" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
+ <el-table :key = "refreshkey" v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200" show-overflow-tooltip/>
<el-table-column label="鏍囩" align="center" width="200" show-overflow-tooltip>
@@ -110,6 +110,11 @@
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
+ <el-table-column v-for="(column, index) in dynamicColumnList" :key="index" :label="column.labelValue" :prop="column.propName" align="center">
+ <template slot-scope="scope">
+ {{ getDynamicValue(scope.row, column.propName) }}
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -124,81 +129,82 @@
@pagination="getList" />
<!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="130px">
- <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
- <el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
- </el-form-item>
- <el-form-item label="閲嶇偣鏍囩" prop="importantTag">
- <el-switch
- style="display: block"
- v-model="form.importantTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="閲嶇偣鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable>
- <el-option label="閲嶇偣鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <el-form-item label="鐪佸巺鏍囩" prop="provinceTag">
- <el-switch
- style="display: block"
- v-model="form.provinceTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="鐪佸巺鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
- <el-option label="鐪佸巺鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <el-form-item label="閲嶇偣鎸囨尌鍥惧儚鏍囩" prop="importantCommandImageTag">
- <el-switch
- style="display: block"
- v-model="form.importantCommandImageTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable>
- <el-option label="閲嶇偣鎸囨尌鍥惧儚鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <!-- <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">-->
- <!-- <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>-->
- <!-- </el-form-item>-->
- <el-form-item label="鐩戠閮ㄩ棬" prop="deptId">
- <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
- :props="{ checkStrictly: true }">
- </el-cascader>
- </el-form-item>
- <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
- <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
- <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="杩愮淮鏃堕棿" prop="timezone">
- <el-date-picker
- size="small"
- v-model="timezone"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="杩愮淮寮�濮嬫椂闂�"
- end-placeholder="杩愮淮缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鐐逛綅澶囨敞" prop="remark">
- <el-input type="textarea" v-model="form.remark"/>
- </el-form-item>
- </el-form>
+ <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+ <div style="display: flex;flex-direction: row">
+ <div style="flex: 5; border-right: 1px solid #d3d3d3; padding-right: 10px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+ <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
+ <el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
+ </el-form-item>
+ <el-form-item label="鐩戠閮ㄩ棬" prop="deptId">
+ <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
+ :props="{ checkStrictly: true }">
+ </el-cascader>
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
+ <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩愮淮鏃堕棿" prop="timezone">
+ <el-date-picker
+ size="small"
+ v-model="timezone"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="杩愮淮寮�濮嬫椂闂�"
+ end-placeholder="杩愮淮缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鐐逛綅澶囨敞" prop="remark">
+ <el-input type="textarea" v-model="form.remark"/>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div style="flex: 5">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+ <el-form-item label="閲嶇偣:" prop="importantTag">
+ <el-switch
+ v-model="form.importantTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閲嶇偣鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="鐪佸巺:" prop="provinceTag">
+ <el-switch
+ v-model="form.provinceTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="閮ㄧ骇:" prop="deptTag">
+ <el-switch
+ v-model="form.deptTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閮ㄧ骇鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="閲嶇偣鎸囨尌鍥惧儚:" prop="importantCommandImageTag">
+ <el-switch
+ v-model="form.importantCommandImageTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ </el-form>
+
+ </div>
+ </div>
+
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -234,6 +240,7 @@
</template>
<script>
+import { addDynamicColumn, deleteDynamicColumnById, editDynamicColumn, getDynamicColumnList } from '@/api/platform/dynamicColumn'
import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint, exportData, importData, timeRange } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
import { getCascader } from '@/api/platform/region'
@@ -241,9 +248,11 @@
export default {
name: "Point",
- dicts: ['point_tag'],
+ dicts: ['point_tag', 'area_code'],
data() {
return {
+ refreshkey : 0,
+ dynamicColumnList: [],
needUpdateUnit: false,
importantTag: false,
provinceTag: false,
@@ -327,8 +336,24 @@
this.getUnitSelect();
// this.getCascader();
this.getDeptCascader();
+ this.getDyColumn();
},
methods: {
+ getDyColumn() {
+ // 鏌ヨ鍔ㄦ�佸垪
+ let params = {
+ tableName: 't_yw_point'
+ }
+ getDynamicColumnList(params).then(res => {
+ this.dynamicColumnList = res.data
+ this.refreshkey+=1
+ console.log("鍔犺浇鍔ㄦ�佸垪"+this.refreshkey)
+ })
+ },
+ getDynamicValue(row, propName) {
+ let target = row.dynamicColumnList.filter(item => item.propName === propName)
+ return target && target.length > 0 ? target[0].columnValue : ''
+ },
getTagText(row) {
let text = '';
@@ -460,8 +485,9 @@
createTime: null,
updateTime: null,
deleted: null,
- importantTag: null,
- provinceTag: null
+ importantTag: false,
+ provinceTag: false,
+ deptTag: false,
};
this.resetForm("form");
},
--
Gitblit v1.8.0