Merge branch 'master' into hezhihong_bug修复

.env.development

@@ -5,9 +5,10 @@ VUE_APP_TITLE = 综合保税区管理系统
 ENV = 'development'
 
 # 综合保税区管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.111:9527/zhbsq-service'
+# 本地
+VUE_APP_BASE_IP = 'http://localhost:9527'
 
-# VUE_APP_BASE_API = 'http://106.55.241.82:9527/zhbsq-service'
+# VUE_APP_BASE_IP = 'http://106.55.241.82:9528'
 
 VUE_APP_BASE_API = '/dev-api'
 

src/api/garden/GARDENDATA.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询企业园区大屏数据列表
+export function listGARDENDATA(query) {
+  return request({
+    url: '/analysis/GARDENDATA/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业园区大屏数据所有列表
+export function listAllGARDENDATA(query) {
+  return request({
+    url: '/analysis/GARDENDATA/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业园区大屏数据详细
+export function getGARDENDATA(id) {
+  return request({
+    url: '/analysis/GARDENDATA/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增企业园区大屏数据
+export function addGARDENDATA(data) {
+  return request({
+    url: '/analysis/GARDENDATA/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改企业园区大屏数据
+export function updateGARDENDATA(data) {
+  return request({
+    url: '/analysis/GARDENDATA/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除企业园区大屏数据
+export function delGARDENDATA(id) {
+  return request({
+    url: '/analysis/GARDENDATA/remove/' + id,
+    method: 'get'
+  })
+}

src/api/portal/BONDEDUPPLY/BONDEDUPPLY.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询保税区供应链数据列表
+export function listBONDEDUPPLY(query) {
+  return request({
+    url: '/BONDEDUPPLY/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询保税区供应链数据所有列表
+export function listAllBONDEDUPPLY(query) {
+  return request({
+    url: '/BONDEDUPPLY/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询保税区供应链数据详细
+export function getBONDEDUPPLY(lddwmc) {
+  return request({
+    url: '/BONDEDUPPLY/getInfo/' + lddwmc,
+    method: 'get'
+  })
+}
+
+// 新增保税区供应链数据
+export function addBONDEDUPPLY(data) {
+  return request({
+    url: '/BONDEDUPPLY/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改保税区供应链数据
+export function updateBONDEDUPPLY(data) {
+  return request({
+    url: '/BONDEDUPPLY/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除保税区供应链数据
+export function delBONDEDUPPLY(lddwmc) {
+  console.log(lddwmc);
+  return request({
+    url: '/BONDEDUPPLY/remove/' + lddwmc,
+    method: 'get'
+  })
+}

src/api/portal/ECONOMICSINDEX/ECONOMICSINDEX.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询综合保税区经济运行主要指标列表
+export function listECONOMICSINDEX(query) {
+  return request({
+    url: '/ECONOMICSINDEX/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询综合保税区经济运行主要指标所有列表
+export function listAllECONOMICSINDEX(query) {
+  return request({
+    url: '/ECONOMICSINDEX/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询综合保税区经济运行主要指标详细
+export function getECONOMICSINDEX(id) {
+  return request({
+    url: '/ECONOMICSINDEX/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增综合保税区经济运行主要指标
+export function addECONOMICSINDEX(data) {
+  return request({
+    url: '/ECONOMICSINDEX/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改综合保税区经济运行主要指标
+export function updateECONOMICSINDEX(data) {
+  return request({
+    url: '/ECONOMICSINDEX/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除综合保税区经济运行主要指标
+export function delECONOMICSINDEX(id) {
+  return request({
+    url: '/ECONOMICSINDEX/remove/' + id,
+    method: 'get'
+  })
+}

src/api/portal/JOINTCONFERENCE/JOINTCONFERENCE.js

@@ -26,7 +26,7 @@ export function getJOINTCONFERENCE(id) {
   })
 }
 
-// 查询联席会议详细
+// 查询联席会议详细信息
 export function getAttendMeetingDetail(id) {
   return request({
     url: '/JOINTCONFERENCE/getreplyInfo/' + id,
@@ -34,6 +34,26 @@ export function getAttendMeetingDetail(id) {
   })
 }
 
+// 联席会议详回复
+export function setMeetingReply(data) {
+  return request({
+    url: '/CONFERENCEREPLY/add',
+    method: 'post',
+    data
+  })
+}
+
+// 联席会议详回复
+export function fileDownloadFun(data) {
+  return request({
+    url: '/common/download',
+    method: 'get',
+    params: data,
+    responseType: "blob"
+
+  })
+}
+
 
 // 新增联席会议
 export function addJOINTCONFERENCE(data) {

src/views/AttendMeeting/index.vue

@@ -51,7 +51,7 @@
           >发起会议</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -62,7 +62,7 @@
           v-hasPermi="['business:JOINTCONFERENCE:edit']"
           >修改</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -166,6 +166,7 @@ import {
 } from "@/api/portal/JOINTCONFERENCE/JOINTCONFERENCE.js";
 import add from "@/views/JOINTCONFERENCE/add.vue";
 import detail from "@/views/JOINTCONFERENCE/detail.vue";
+import callback from "@/views/JOINTCONFERENCE/callback.vue";
 
 import { getInfo } from "@/api/login";
 
@@ -203,7 +204,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        deptIds:null,
+        deptIds: null,
         id: null,
         createTime: null,
         createBy: null,
@@ -281,10 +282,19 @@ export default {
         height: "60%",
       });
     },
+    handleReply(row) {
+      this.iframe({
+        obj: callback,
+        param: { id: row.id },
+        title: "回复会议",
+        width: "750px",
+        height: "60%",
+      });
+    },
     /** 查询联席会议列表 */
     getList() {
       this.loading = true;
-      
+
       listJOINTCONFERENCE(this.queryParams).then((response) => {
         this.JOINTCONFERENCEList = response.rows;
         this.total = response.total;

src/views/BONDEDUPPLY/index.vue

@@ -0,0 +1,475 @@
+<template>
+  <div class="app-container">
+    <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <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="['business:BONDEDUPPLY:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:BONDEDUPPLY:edit']"
+          >修改</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="['business:BONDEDUPPLY:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:BONDEDUPPLY:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table :data="BONDEDUPPLYList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="录单单位名称 " align="center" prop="lddwmc">
+      </el-table-column>
+      <el-table-column label="进出口标志 " align="center" prop="jckbz">
+      </el-table-column>
+      <el-table-column label="进出口日期 " align="center" prop="jckrq">
+      </el-table-column>
+      <el-table-column label="净重 " align="center" prop="jz">
+      </el-table-column>
+      <el-table-column label="净值 " align="center" prop="jingzhi">
+      </el-table-column>
+      <el-table-column label="件数 " align="center" prop="js">
+      </el-table-column>
+      <el-table-column label="境内收发货人编号 " align="center" prop="jnsfhrbh">
+      </el-table-column>
+      <el-table-column label="境内收发货人名称 " align="center" prop="jnsfhrmc">
+      </el-table-column>
+      <el-table-column label="境外发货人代码 " align="center" prop="jwfhrdm">
+      </el-table-column>
+      <el-table-column label="境外收发货人名称 " align="center" prop="jwsfhrmc">
+      </el-table-column>
+      <el-table-column label="境外收发货人地址 " align="center" prop="jwsfhrdz">
+      </el-table-column>
+      <el-table-column label="启运日期 " align="center" prop="qyrq">
+      </el-table-column>
+      <el-table-column label="卸毕日期 " align="center" prop="xbrq">
+      </el-table-column>
+      <el-table-column label="供应链主键" align="center" prop="id">
+      </el-table-column>
+      <el-table-column label="保税区主键" align="center" prop="deptId">
+      </el-table-column>
+      <el-table-column label="报关单币种统计 " align="center" prop="bgdbztj">
+      </el-table-column>
+      <el-table-column label="申报单位名称 " align="center" prop="sbdwmc">
+      </el-table-column>
+      <el-table-column label="录单单位编码名称 " align="center" prop="lddwbmmc">
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+      </el-table-column>
+      <el-table-column
+      fixed="right"
+        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="['business:BONDEDUPPLY:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:BONDEDUPPLY: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="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="录单单位名称" prop="lddwmc">
+          <el-input v-model="form.lddwmc"></el-input>
+        </el-form-item>
+        <el-form-item label="进出口标志" prop="jckbz">
+          <el-input v-model="form.jckbz"></el-input>
+        </el-form-item>
+        <el-form-item label="进出口日期" prop="jckrq">
+          <el-input v-model="form.jckrq"></el-input>
+        </el-form-item>
+        <el-form-item label="净重" prop="jz">
+          <el-input v-model="form.jz"></el-input>
+        </el-form-item>
+        <el-form-item label="净值" prop="jingzhi">
+          <el-input v-model="form.jingzhi"></el-input>
+        </el-form-item>
+        <el-form-item label="件数" prop="js">
+          <el-input v-model="form.js"></el-input>
+        </el-form-item>
+        <el-form-item label="境内收发货人标号" prop="jnsfhrbh">
+          <el-input v-model="form.jnsfhrbh"></el-input>
+        </el-form-item>
+        <el-form-item label="境内收发货人名称 " prop="jnsfhrmc">
+          <el-input v-model="form.jnsfhrmc"></el-input>
+        </el-form-item>
+        <el-form-item label="境外发货人代码 " prop="jwfhrdm">
+          <el-input v-model="form.jwfhrdm"></el-input>
+        </el-form-item>
+        <el-form-item label="境外收发货人名称   " prop="jwsfhrmc">
+          <el-input v-model="form.jwsfhrmc"></el-input>
+        </el-form-item>
+        <el-form-item label="境外收发货人地址   " prop="jwsfhrdz">
+          <el-input v-model="form.jwsfhrdz"></el-input>
+        </el-form-item>
+        <el-form-item label="启运日期  " prop="qyrq">
+          <el-input v-model="form.qyrq"></el-input>
+        </el-form-item>
+        <el-form-item label="卸毕日期   " prop="xbrq">
+          <el-input v-model="form.xbrq"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="供应链主键  " prop="id">
+          <el-input v-model="form.id"></el-input>
+        </el-form-item>
+        <el-form-item label="保税区主键  " prop="deptId">
+          <el-input v-model="form.deptId"></el-input>
+        </el-form-item> -->
+        <el-form-item label="报关单币种统计   " prop="bgdbztj">
+          <el-input v-model="form.bgdbztj"></el-input>
+        </el-form-item>
+        <el-form-item label="申报单位名称   " prop="sbdwmc">
+          <el-input v-model="form.sbdwmc"></el-input>
+        </el-form-item>
+        <el-form-item label="录单单位编码名称   " prop="lddwbmmc">
+          <el-input v-model="form.lddwbmmc"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBONDEDUPPLY,
+  getBONDEDUPPLY,
+  delBONDEDUPPLY,
+  addBONDEDUPPLY,
+  updateBONDEDUPPLY,
+} from "@/api/portal/BONDEDUPPLY/BONDEDUPPLY";
+
+export default {
+  name: "BONDEDUPPLY",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 保税区供应链数据表格数据
+      BONDEDUPPLYList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        lddwmc: null,
+        jckbz: null,
+        jckrq: null,
+        jz: null,
+        jingzhi: null,
+        js: null,
+        jnsfhrbh: null,
+        jnsfhrmc: null,
+        jwfhrdm: null,
+        jwsfhrmc: null,
+        jwsfhrdz: null,
+        qyrq: null,
+        xbrq: null,
+        id: null,
+        deptId: null,
+        bgdbztj: null,
+        sbdwmc: null,
+        lddwbmmc: null,
+        createTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        lddwmc: [
+          { required: true, message: "录单单位名称 不能为空", trigger: "blur" },
+        ],
+        jckbz: [
+          { required: true, message: "进出口标志 不能为空", trigger: "blur" },
+        ],
+        jckrq: [
+          { required: true, message: "进出口日期 不能为空", trigger: "blur" },
+        ],
+        jz: [{ required: true, message: "净重 不能为空", trigger: "blur" }],
+        jingzhi: [
+          { required: true, message: "净值 不能为空", trigger: "blur" },
+        ],
+        js: [{ required: true, message: "件数 不能为空", trigger: "blur" }],
+        jnsfhrbh: [
+          {
+            required: true,
+            message: "境内收发货人编号 不能为空",
+            trigger: "blur",
+          },
+        ],
+        jnsfhrmc: [
+          {
+            required: true,
+            message: "境内收发货人名称 不能为空",
+            trigger: "blur",
+          },
+        ],
+        jwfhrdm: [
+          {
+            required: true,
+            message: "境外发货人代码 不能为空",
+            trigger: "blur",
+          },
+        ],
+        jwsfhrmc: [
+          {
+            required: true,
+            message: "境外收发货人名称 不能为空",
+            trigger: "blur",
+          },
+        ],
+        jwsfhrdz: [
+          {
+            required: true,
+            message: "境外收发货人地址 不能为空",
+            trigger: "blur",
+          },
+        ],
+        qyrq: [
+          { required: true, message: "启运日期 不能为空", trigger: "blur" },
+        ],
+        xbrq: [
+          { required: true, message: "卸毕日期 不能为空", trigger: "blur" },
+        ],
+        id: [
+          { required: true, message: "供应链主键不能为空", trigger: "blur" },
+        ],
+        deptId: [
+          { required: true, message: "保税区主键不能为空", trigger: "blur" },
+        ],
+        bgdbztj: [
+          {
+            required: true,
+            message: "报关单币种统计 不能为空",
+            trigger: "blur",
+          },
+        ],
+        sbdwmc: [
+          { required: true, message: "申报单位名称 不能为空", trigger: "blur" },
+        ],
+        lddwbmmc: [
+          {
+            required: true,
+            message: "录单单位编码名称 不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询保税区供应链数据列表 */
+    getList() {
+      this.loading = true;
+      listBONDEDUPPLY(this.queryParams).then((response) => {
+        this.BONDEDUPPLYList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        lddwmc: null,
+        jckbz: null,
+        jckrq: null,
+        jz: null,
+        jingzhi: null,
+        js: null,
+        jnsfhrbh: null,
+        jnsfhrmc: null,
+        jwfhrdm: null,
+        jwsfhrmc: null,
+        jwsfhrdz: null,
+        qyrq: null,
+        xbrq: null,
+        id: null,
+        deptId: null,
+        bgdbztj: null,
+        sbdwmc: null,
+        lddwbmmc: null,
+      };
+      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);
+      console.log(this.ids);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加保税区供应链数据";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      console.log(row.lddwmc);
+      this.reset();
+      let lddwmc = row.id || this.ids;
+      getBONDEDUPPLY(lddwmc).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改保税区供应链数据";
+        console.log(this.form, "form");
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.form, "------------------------------");
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id == null) {
+            addBONDEDUPPLY(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.reset();
+            });
+          } else {
+            updateBONDEDUPPLY(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.reset();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const lddwmcs = row.id || this.ids;
+      console.log(lddwmcs);
+      this.$modal
+        .confirm(
+          '是否确认删除保税区供应链数据编号为"' + lddwmcs + '"的数据项？'
+        )
+        .then(function () {
+          return delBONDEDUPPLY(lddwmcs);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/BONDEDUPPLY/export",
+        {
+          ...this.queryParams,
+        },
+        `BONDEDUPPLY_new Date().getTme()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/ECONOMICSINDEX/index.vue

@@ -0,0 +1,906 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <!-- <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="['business:ECONOMICSINDEX:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:ECONOMICSINDEX:edit']"
+          >修改</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="['business:ECONOMICSINDEX:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:ECONOMICSINDEX:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="ECONOMICSINDEXList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column
+        label="综合保税区经济运行主要指标表主键"
+        align="center"
+        prop="id"
+      >
+      </el-table-column> -->
+      <el-table-column label="进出口总值 " align="center" prop="jckzz">
+      </el-table-column>
+      <el-table-column label="加工贸易进出口值 " align="center" prop="jgmyjckz">
+      </el-table-column>
+      <el-table-column label="物流货物进出口值 " align="center" prop="wlhwjckz">
+      </el-table-column>
+      <el-table-column label="一般贸易进出口值 " align="center" prop="ybmyjckz">
+      </el-table-column>
+      <el-table-column label="经营总收入 " align="center" prop="jyzsr">
+      </el-table-column>
+      <el-table-column label="海关税收 " align="center" prop="hgss">
+      </el-table-column>
+      <el-table-column label="税务部门税收 " align="center" prop="swbmss">
+      </el-table-column>
+      <el-table-column
+        label="货物贸易涉外收支总额 "
+        align="center"
+        prop="hwmyswszze"
+      >
+      </el-table-column>
+      <el-table-column label="期末企业从业人员 " align="center" prop="qmqycyry">
+      </el-table-column>
+      <el-table-column label="活跃企业数 " align="center" prop="hyqys">
+      </el-table-column>
+      <el-table-column label="单位面积进出口值 " align="center" prop="dwmjjckz">
+      </el-table-column>
+      <el-table-column
+        label="单位面积经营总收入 "
+        align="center"
+        prop="dwmjjyzsr"
+      >
+      </el-table-column>
+      <el-table-column label="单位面积海关税收 " align="center" prop="dwmjhgss">
+      </el-table-column>
+      <el-table-column
+        label="单位面积税务部门税收 "
+        align="center"
+        prop="dwmjswbmss"
+      >
+      </el-table-column>
+      <el-table-column
+        label="单位面积货物贸易涉外收支额 "
+        align="center"
+        prop="dwmjhwmyswsze"
+      >
+      </el-table-column>
+      <el-table-column
+        label="期末单位面积企业从业人员 "
+        align="center"
+        prop="qmdwmjqycyry"
+      >
+      </el-table-column>
+      <el-table-column label="进出口总值增幅 " align="center" prop="jckzzzf">
+      </el-table-column>
+      <el-table-column
+        label="同期活跃企业数增幅 "
+        align="center"
+        prop="tqhyqyszf"
+      >
+      </el-table-column>
+      <el-table-column
+        label="期末批准规划面积验收率 "
+        align="center"
+        prop="qmpzghmjysl"
+      >
+      </el-table-column>
+      <el-table-column
+        label="期末封闭围网面积开发率 "
+        align="center"
+        prop="qmfbwwmjkfl"
+      >
+      </el-table-column>
+      <el-table-column label="实际使用外资金额 " align="center" prop="sjsywzje">
+      </el-table-column>
+      <el-table-column label="进出区货物总值" align="center" prop="jcqhwzz">
+      </el-table-column>
+      <el-table-column
+        label="进出口总值占其所在省"
+        align="center"
+        prop="jckzzzqszstqjckbz"
+      >
+      </el-table-column>
+      <el-table-column label="维修业务进出口值 " align="center" prop="wxywjckz">
+      </el-table-column>
+      <el-table-column label="研发业务进出口值 " align="center" prop="yfywjckz">
+      </el-table-column>
+      <el-table-column label="租赁贸易进出口值 " align="center" prop="zlmyjckz">
+      </el-table-column>
+      <el-table-column
+        label="跨境电商业务进出口值 "
+        align="center"
+        prop="kjdsywjckz"
+      >
+      </el-table-column>
+      <el-table-column label="规模以上工业产值 " align="center" prop="gmysgycz">
+      </el-table-column>
+      <el-table-column label="固定资产投资 " align="center" prop="gdtzcz">
+      </el-table-column>
+      <el-table-column
+        label="占同期所在市进出口值比重 "
+        align="center"
+        prop="ztqszsjckzbz"
+      >
+      </el-table-column>
+      <el-table-column label="时间" align="center" prop="createTime">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        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="['business:ECONOMICSINDEX:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:ECONOMICSINDEX: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="65%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="220px">
+        <el-form-item label="进出口总值" prop="jckzz">
+          <el-input v-model="form.jckzz"></el-input>
+        </el-form-item>
+        <el-form-item label="加工贸易进出口值" prop="jgmyjckz">
+          <el-input v-model="form.jgmyjckz"></el-input>
+        </el-form-item>
+        <el-form-item label="物流货物进出口值" prop="wlhwjckz">
+          <el-input v-model="form.wlhwjckz"></el-input>
+        </el-form-item>
+        <el-form-item label="一般贸易进出口值" prop="ybmyjckz">
+          <el-input v-model="form.ybmyjckz"></el-input>
+        </el-form-item>
+        <el-form-item label="经营总收入 " prop="jyzsr">
+          <el-input v-model="form.jyzsr"></el-input>
+        </el-form-item>
+        <el-form-item label="海关税收 " prop="hgss">
+          <el-input v-model="form.hgss"></el-input>
+        </el-form-item>
+        <el-form-item label="税务部门税收 " prop="swbmss">
+          <el-input v-model="form.swbmss"></el-input>
+        </el-form-item>
+        <el-form-item label="货物贸易涉外收支总额 " prop="hwmyswszze">
+          <el-input v-model="form.hwmyswszze"></el-input>
+        </el-form-item>
+        <el-form-item label="期末企业从业人员 " prop="qmqycyry">
+          <el-input v-model="form.qmqycyry"></el-input>
+        </el-form-item>
+        <el-form-item label="活跃企业数 " prop="hyqys">
+          <el-input v-model="form.hyqys"></el-input>
+        </el-form-item>
+        <el-form-item label="单位面积进出口值 " prop="dwmjjckz">
+          <el-input v-model="form.dwmjjckz"></el-input>
+        </el-form-item>
+        <el-form-item label="单位面积经营总收入 " prop="dwmjjyzsr">
+          <el-input v-model="form.dwmjjyzsr"></el-input>
+        </el-form-item>
+        <el-form-item label="单位面积海关税收 " prop="dwmjhgss">
+          <el-input v-model="form.dwmjhgss"></el-input>
+        </el-form-item>
+        <el-form-item label="单位面积税务部门税收 " prop="dwmjswbmss">
+          <el-input v-model="form.dwmjswbmss"></el-input>
+        </el-form-item>
+        <el-form-item label="单位面积货物贸易涉外收支额 " prop="dwmjhwmyswsze">
+          <el-input v-model="form.dwmjhwmyswsze"></el-input>
+        </el-form-item>
+        <el-form-item label="期末单位面积企业从业人员 " prop="qmdwmjqycyry">
+          <el-input v-model="form.qmdwmjqycyry"></el-input>
+        </el-form-item>
+        <el-form-item label="进出口总值增幅 " prop="jckzzzf">
+          <el-input v-model="form.jckzzzf"></el-input>
+        </el-form-item>
+        <el-form-item label="同期活跃企业数增幅 " prop="tqhyqyszf">
+          <el-input v-model="form.tqhyqyszf"></el-input>
+        </el-form-item>
+
+        <el-form-item label="期末批准规划面积验收率  " prop="qmpzghmjysl">
+          <el-input v-model="form.qmpzghmjysl"></el-input>
+        </el-form-item>
+        <el-form-item label="期末封闭围网面积开发率  " prop="qmfbwwmjkfl">
+          <el-input v-model="form.qmfbwwmjkfl"></el-input>
+        </el-form-item>
+        <el-form-item label="实际使用外资金额  " prop="sjsywzje">
+          <el-input v-model="form.sjsywzje"></el-input>
+        </el-form-item>
+        <el-form-item label="进出区货物总值 " prop="jcqhwzz">
+          <el-input v-model="form.jcqhwzz"></el-input>
+        </el-form-item>
+        <el-form-item label="进出口总值占其所在省 " prop="jckzzzqszstqjckbz">
+          <el-input v-model="form.jckzzzqszstqjckbz"></el-input>
+        </el-form-item>
+        <el-form-item label="维修业务进出口值  " prop="wxywjckz">
+          <el-input v-model="form.wxywjckz"></el-input>
+        </el-form-item>
+        <el-form-item label="研发业务进出口值  " prop="yfywjckz">
+          <el-input v-model="form.yfywjckz"></el-input>
+        </el-form-item>
+        <el-form-item label="租赁贸易进出口值  " prop="zlmyjckz">
+          <el-input v-model="form.zlmyjckz"></el-input>
+        </el-form-item>
+        <el-form-item label="跨境电商业务进出口值  " prop="kjdsywjckz">
+          <el-input v-model="form.kjdsywjckz"></el-input>
+        </el-form-item>
+        <el-form-item label="规模以上工业产值  " prop="gmysgycz">
+          <el-input v-model="form.gmysgycz"></el-input>
+        </el-form-item>
+        <el-form-item label="固定资产投资  " prop="gdtzcz">
+          <el-input v-model="form.gdtzcz"></el-input>
+        </el-form-item>
+        <el-form-item label="占同期所在市进出口值比重  " prop="ztqszsjckzbz">
+          <el-input v-model="form.ztqszsjckzbz"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listECONOMICSINDEX,
+  getECONOMICSINDEX,
+  delECONOMICSINDEX,
+  addECONOMICSINDEX,
+  updateECONOMICSINDEX,
+} from "@/api/portal/ECONOMICSINDEX/ECONOMICSINDEX";
+
+export default {
+  name: "ECONOMICSINDEX",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 综合保税区经济运行主要指标表格数据
+      ECONOMICSINDEXList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        jckzz: null,
+        jgmyjckz: null,
+        wlhwjckz: null,
+        ybmyjckz: null,
+        jyzsr: null,
+        hgss: null,
+        swbmss: null,
+        hwmyswszze: null,
+        qmqycyry: null,
+        hyqys: null,
+        dwmjjckz: null,
+        dwmjjyzsr: null,
+        dwmjhgss: null,
+        dwmjswbmss: null,
+        dwmjhwmyswsze: null,
+        qmdwmjqycyry: null,
+        jckzzzf: null,
+        tqhyqyszf: null,
+        qmpzghmjysl: null,
+        qmfbwwmjkfl: null,
+        sjsywzje: null,
+        jcqhwzz: null,
+        jckzzzqszstqjckbz: null,
+        wxywjckz: null,
+        yfywjckz: null,
+        zlmyjckz: null,
+        kjdsywjckz: null,
+        gmysgycz: null,
+        gdtzcz: null,
+        ztqszsjckzbz: null,
+        createTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        names: [
+          {
+            required: true,
+            message: "综合保税区经济运行主要指标表主键不能为空",
+            trigger: "blur",
+          },
+
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        id: [
+          {
+            required: true,
+            message: "综合保税区经济运行主要指标表主键不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        jckzz: [
+          { required: true, message: "进出口总值 不能为空", trigger: "blur" },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        jgmyjckz: [
+          {
+            required: true,
+            message: "加工贸易进出口值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        wlhwjckz: [
+          {
+            required: true,
+            message: "物流货物进出口值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        ybmyjckz: [
+          {
+            required: true,
+            message: "一般贸易进出口值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        jyzsr: [
+          { required: true, message: "经营总收入 不能为空", trigger: "blur" },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        hgss: [
+          { required: true, message: "海关税收 不能为空", trigger: "blur" },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        swbmss: [
+          { required: true, message: "税务部门税收 不能为空", trigger: "blur" },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        hwmyswszze: [
+          {
+            required: true,
+            message: "货物贸易涉外收支总额 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        qmqycyry: [
+          {
+            required: true,
+            message: "期末企业从业人员 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        hyqys: [
+          { required: true, message: "活跃企业数 不能为空", trigger: "blur" },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        dwmjjckz: [
+          {
+            required: true,
+            message: "单位面积进出口值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        dwmjjyzsr: [
+          {
+            required: true,
+            message: "单位面积经营总收入 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        dwmjhgss: [
+          {
+            required: true,
+            message: "单位面积海关税收 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        dwmjswbmss: [
+          {
+            required: true,
+            message: "单位面积税务部门税收 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        dwmjhwmyswsze: [
+          {
+            required: true,
+            message: "单位面积货物贸易涉外收支额 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        qmdwmjqycyry: [
+          {
+            required: true,
+            message: "期末单位面积企业从业人员 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        jckzzzf: [
+          {
+            required: true,
+            message: "进出口总值增幅 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        tqhyqyszf: [
+          {
+            required: true,
+            message: "同期活跃企业数增幅 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        qmpzghmjysl: [
+          {
+            required: true,
+            message: "期末批准规划面积验收率 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        qmfbwwmjkfl: [
+          {
+            required: true,
+            message: "期末封闭围网面积开发率 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        sjsywzje: [
+          {
+            required: true,
+            message: "实际使用外资金额 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        jcqhwzz: [
+          {
+            required: true,
+            message: "进出区货物总值不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        jckzzzqszstqjckbz: [
+          {
+            required: true,
+            message: "进出口总值占其所在省不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        wxywjckz: [
+          {
+            required: true,
+            message: "维修业务进出口值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        yfywjckz: [
+          {
+            required: true,
+            message: "研发业务进出口值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        zlmyjckz: [
+          {
+            required: true,
+            message: "租赁贸易进出口值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        kjdsywjckz: [
+          {
+            required: true,
+            message: "跨境电商业务进出口值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        gmysgycz: [
+          {
+            required: true,
+            message: "规模以上工业产值 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        gdtzcz: [
+          { required: true, message: "固定资产投资 不能为空", trigger: "blur" },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+        ztqszsjckzbz: [
+          {
+            required: true,
+            message: "占同期所在市进出口值比重 不能为空",
+            trigger: "blur",
+          },
+          {
+            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            message: "值需为数字或小数",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询综合保税区经济运行主要指标列表 */
+    getList() {
+      this.loading = true;
+      listECONOMICSINDEX(this.queryParams).then((response) => {
+        this.ECONOMICSINDEXList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        jckzz: null,
+        jgmyjckz: null,
+        wlhwjckz: null,
+        ybmyjckz: null,
+        jyzsr: null,
+        hgss: null,
+        swbmss: null,
+        hwmyswszze: null,
+        qmqycyry: null,
+        hyqys: null,
+        dwmjjckz: null,
+        dwmjjyzsr: null,
+        dwmjhgss: null,
+        dwmjswbmss: null,
+        dwmjhwmyswsze: null,
+        qmdwmjqycyry: null,
+        jckzzzf: null,
+        tqhyqyszf: null,
+        qmpzghmjysl: null,
+        qmfbwwmjkfl: null,
+        sjsywzje: null,
+        jcqhwzz: null,
+        jckzzzqszstqjckbz: null,
+        wxywjckz: null,
+        yfywjckz: null,
+        zlmyjckz: null,
+        kjdsywjckz: null,
+        gmysgycz: null,
+        gdtzcz: null,
+        ztqszsjckzbz: null,
+      };
+      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.reset();
+      const id = row.id || this.ids;
+      getECONOMICSINDEX(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改综合保税区经济运行主要指标";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateECONOMICSINDEX(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addECONOMICSINDEX(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm(
+          '是否确认删除综合保税区经济运行主要指标编号为"' + ids + '"的数据项？'
+        )
+        .then(function () {
+          return delECONOMICSINDEX(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/ECONOMICSINDEX/export",
+        {
+          ...this.queryParams,
+        },
+        `ECONOMICSINDEX_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/GARDENDATA/index.vue

@@ -0,0 +1,340 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+      <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="['analysis:GARDENDATA:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['analysis:GARDENDATA:edit']"
+        >修改</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="['analysis:GARDENDATA:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['analysis:GARDENDATA:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table :data="GARDENDATAList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="部门名称" align="center" prop="deptName">
+        <template slot-scope="scope">
+          {{ scope.row.deptName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="数值类型" align="center" prop="type">
+        <template slot-scope="scope">
+          {{ scope.row.type }}
+        </template>
+      </el-table-column>
+      <el-table-column label="年份" align="center" prop="year">
+        <template slot-scope="scope">
+          {{ scope.row.year }}
+        </template>
+      </el-table-column>
+      <el-table-column label="数值" align="center" prop="value">
+        <template slot-scope="scope">
+          {{ scope.row.value }}
+        </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-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['analysis:GARDENDATA:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['analysis:GARDENDATA: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="deptId">
+         <el-select v-model="form.deptId" filterable default-first-option clearable placeholder="请选择保税区">
+           <el-option
+             v-for="item in deptList"
+             :key="item.deptId"
+             :label="item.deptName"
+             :value="item.deptId">
+           </el-option>
+         </el-select>
+       </el-form-item>
+
+        <el-form-item label="数值类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择数值类型" filterable>
+            <el-option
+              v-for="item in typeList"
+              :label="item"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="value" label="数值">
+          <el-input  v-model="form.value" placeholder="请输入数值" ></el-input>
+        </el-form-item>
+        <el-form-item prop="year"label="年份">
+          <el-input  v-model="form.year" placeholder="请输入年份" ></el-input>
+        </el-form-item>
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+
+import { addGARDENDATA, getGARDENDATA, listGARDENDATA, updateGARDENDATA } from '@/api/garden/GARDENDATA'
+import { listDept } from '@/api/system/dept'
+
+export default {
+  name: "GARDENDATA",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 企业园区大屏数据表格数据
+      GARDENDATAList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        deptId: null,
+        type: null,
+        year: null,
+        value: null
+      },
+      // 部门列表
+      deptList: [],
+      // TODO 数值类型
+      typeList: ['进出口总值', '经营收入'],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "主键不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "部门(企业)不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "数值类型不能为空", trigger: "change" }
+        ],
+        year: [
+          { required: true, message: "年份不能为空", trigger: "blur" }
+        ],
+        value: [
+          { required: true, message: "数值不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询企业园区大屏数据列表 */
+    getList() {
+      this.loading = true;
+      listGARDENDATA(this.queryParams).then(response => {
+        this.GARDENDATAList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      this.getDeptList()
+    },
+    // 获取保税区列表
+    getDeptList() {
+      this.loading = true;
+      listDept().then(response => {
+        let data = response.data
+        // let deptList = data.filler()
+        this.deptList = data.filter(item => {
+          return item.type === 2 || item.type === 3;
+        })
+        console.log(this.deptList)
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deptId: null,
+        type: null,
+        year: null,
+        value: null
+      };
+      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.reset();
+      const id = row.id || this.ids
+      getGARDENDATA(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改企业园区大屏数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateGARDENDATA(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGARDENDATA(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除企业园区大屏数据编号为"' + ids + '"的数据项？').then(function() {
+        return delGARDENDATA(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('analysis/GARDENDATA/export', {
+        ...this.queryParams
+      }, `GARDENDATA_${new Date().getTime()}.xlsx`)
+    },
+    // 校验参数
+    validatorFloatNum(rule, value, callback) {
+      let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
+      if (!reg.test(value)) {
+        callback(new Error('请输入数字和正确格式的数字'));
+      } else if (value.split('.').length > 2) {
+        callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
+      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
+        callback(new Error('最多只能输入两位小数')); //小数点后两位
+      } else {
+        callback();
+      }
+    },
+  }
+};
+</script>

src/views/GARDENTRADEDATA/edit.vue

@@ -99,6 +99,7 @@ export default {
             message: "企业出口退税额 不能为空",
             trigger: "blur",
           },
+          { type: "number", message: "企业出口退税额年龄必须为数字值" },
         ],
         gardenDrawback: [
           {
@@ -106,6 +107,7 @@ export default {
             message: "园区出口退税总额 不能为空",
             trigger: "blur",
           },
+          { type: "number", message: "园区出口退税总额必须为数字值" },
         ],
         gardenTax: [
           {
@@ -113,9 +115,11 @@ export default {
             message: "园区运营单位缴税总额 不能为空",
             trigger: "blur",
           },
+          { type: "number", message: "园区运营单位缴税总额必须为数字值" },
         ],
         companyLists: [
           { required: true, message: "企业承接单量 不能为空", trigger: "blur" },
+          { type: "number", message: "企业承接单量必须为数字值" },
         ],
         gardenLits: [
           {
@@ -123,6 +127,7 @@ export default {
             message: "园区承接单总量 不能为空",
             trigger: "blur",
           },
+          { type: "number", message: "园区承接单总量年龄必须为数字值" },
         ],
         companyInnovative: [
           {
@@ -130,6 +135,7 @@ export default {
             message: "企业创新获奖量 不能为空",
             trigger: "blur",
           },
+          { type: "number", message: "企业创新获奖量必须为数字值" },
         ],
         gardenInnovative: [
           {
@@ -137,6 +143,7 @@ export default {
             message: "园区内创新获奖总量 不能为空",
             trigger: "blur",
           },
+          { type: "number", message: "园区内创新获奖总量必须为数字值" },
         ],
         companyWaterElectric: [
           {
@@ -144,6 +151,7 @@ export default {
             message: "企业工业用水、用电量 不能为空",
             trigger: "blur",
           },
+          { type: "number", message: "必须为数字值" },
         ],
         gardenWaterElectric: [
           {
@@ -151,6 +159,7 @@ export default {
             message: "园区工业用水、用电总量 不能为空",
             trigger: "blur",
           },
+          { type: "number", message: "必须为数字值" },
         ],
       },
     };
@@ -172,7 +181,7 @@ export default {
         this.form = response.data;
       });
     } else {
-        //如果没传ID过来那就是新增，需要获取当前用户deptId
+      //如果没传ID过来那就是新增，需要获取当前用户deptId
       getUser().then((res) => {
         this.deptId = res.user.deptId;
       });
@@ -203,5 +212,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/views/GARDENTRADEDATA/index.vue

@@ -43,7 +43,7 @@
           v-hasPermi="['business:GARDENTRADEDATA:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -51,7 +51,7 @@
           @click="importFile"
           v-hasPermi="['business:GARDENTRADEDATA:add']"
         >导入</el-button>
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button
           type="warning"
@@ -117,7 +117,7 @@
           {{scope.row.gardenWaterElectric}}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/GATHER/index.vue

@@ -49,7 +49,7 @@
           plain
           @click="importFile({type: '0', mark: '1'})"
           v-hasPermi="['gather:GATHER:upload']"
-        >海关一般数据导入</el-button>
+        >海关部分贸易导入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -57,7 +57,7 @@
           plain
           @click="importFile({type: '0', mark: '2'})"
           v-hasPermi="['gather:GATHER:upload']"
-        >海关特殊数据导入</el-button>
+        >海关进出口总值导入</el-button>
       </el-col>
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -98,6 +98,13 @@
           <span v-if="scope.row.collStatus == 1">已采集</span>
         </template>
       </el-table-column>
+      <el-table-column label="采集人" align="center" prop="collName" width="110">
+        <template slot-scope="scope">
+          <span>{{ scope.row.collName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="采集时间" align="center" prop="collTime" width="100">
+      </el-table-column>
       <el-table-column label="上报状态" align="center" prop="reportStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.reportStatus == 0">未上报</span>
@@ -105,8 +112,9 @@
         </template>
       </el-table-column>
       <el-table-column label="上报人" align="center" prop="reportName" width="110" />
-      <el-table-column label="上报时间" align="center" prop="createTime" width="100" />
-
+      <el-table-column label="上报时间" align="center" prop="reportTime" width="100" />
+      <el-table-column label="审核人" align="center" prop="approveName" width="110"/>
+      <el-table-column label="审核时间" align="center" prop="approveTime" width="100"/>
       <el-table-column label="审核状态" align="center" prop="approveStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.approveStatus == 0">未提交审核</span>
@@ -115,7 +123,7 @@
           <span v-if="scope.row.approveStatus == 3">审核拒绝</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- <el-button
             style="margin: 0 2px"
@@ -124,18 +132,24 @@
             @click="handleDownload(scope.row)"
             >下载导入模板</el-button
           > -->
-          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 0" size="mini" type="text" @click="handleUpdate(scope.row)">录入</el-button>
-          <template v-if="scope.row.reportStatus == 0 && scope.row.collStatus == 1">
+
+          <template v-if="scope.row.collStatus == 0 && checkPermi(['gather:GATHER:add'])">
+            <el-button style="margin: 0 2px" size="mini" type="text" @click="handleUpdate(scope.row)">录入</el-button>
+          </template>
+          <template v-if="scope.row.reportStatus == 0 && scope.row.collStatus == 1 && checkPermi(['gather:GATHER:report'])">
             <el-popconfirm title="确定上报吗？" @confirm="handleReport(scope.row)">
               <el-button style="margin: 0 2px" size="mini" slot="reference" type="text">上报</el-button>
             </el-popconfirm>
           </template>
-          <el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
-            <el-button style="margin: 0 2px" v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1" size="mini" type="text" slot="reference">提交审核</el-button>
-          </el-popconfirm>
-          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text" @click="handleDetail(scope.row, 0)">查看</el-button>
+<!--          todo不加 template 会造成浏览器渲染问题 导致无法弹出 el-popconfirm 组件-->
+          <template v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1 && checkPermi(['gather:GATHER:approve'])">
+            <el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
+              <el-button style="margin: 0 2px"  size="mini" type="text" slot="reference">审核</el-button>
+            </el-popconfirm>
+          </template>
 
-          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 0" size="mini" type="text" @click="handleDetail(scope.row, 1)">修改</el-button>
+          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text" @click="handleDetail(scope.row, 0)">查看</el-button>
+          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 0 && checkPermi(['gather:GATHER:edit'])" size="mini" type="text" @click="handleDetail(scope.row, 1)">修改</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -173,7 +187,7 @@
         <el-tab-pane v-for="(item, index) in tabList" :key="index + 'tabs'" :label="item.normName" :name="item.normName">
           <el-form v-for="(listItem, listIndex) in form.feeLists" :key="index + listIndex + listItem.normId" :rules="validatorList(listItem.normfeeName)" :model="listItem" :ref="'form' + listIndex">
             <!-- :rules="rules" ref="form" -->
-            <el-form-item :key="listItem.normfeeId" :label="listItem.normfeeName" v-if="listItem.normId == item.normId" prop="collCalue">
+            <el-form-item :key="listItem.normfeeId" :label="listItem.normfeeName + '（'+ listItem.funit_dictText +'）'" v-if="listItem.normId == item.normId" prop="collCalue">
               <!-- 这里科研失败！想动态绑定校验规则的 -->
               <!-- :prop="listItem.normfeeId" -->
               <!-- :rules="rules.listItem.normfeeId" -->
@@ -199,7 +213,7 @@
       <template v-else-if="this.form.type == 1">
         <el-form v-for="(listItem, listIndex) in form.feeLists" :model="listItem" :ref="'form' + listIndex" :rules="rules">
           <!-- :rules="rules" ref="form" -->
-          <el-form-item :key="listItem.normfeeId" :label="listItem.normfeeName" prop="collCalue">
+          <el-form-item :key="listItem.normfeeId" :label="listItem.normfeeName + '（'+ listItem.funit_dictText +'）'" prop="collCalue">
             <!-- 这里科研失败！想动态绑定校验规则的 -->
             <!-- :prop="listItem.normfeeId" -->
             <!-- :rules="rules.listItem.normfeeId" -->
@@ -220,7 +234,7 @@
         <el-tab-pane v-for="(item, index) in tabList" :key="index + 'tabs'" :label="item.normName" :name="item.normName">
           <el-form v-for="(listItem, listIndex) in form.feeLists" :model="listItem" :ref="'form' + listIndex" :rules="rules">
             <!-- :rules="rules" ref="form" -->
-            <el-form-item prop="collCalue" :key="listItem.normfeeId" :label="listItem.normfeeName" v-if="listItem.normId == item.normId">
+            <el-form-item prop="collCalue" :key="listItem.normfeeId" :label="listItem.normfeeName + '（'+ listItem.funit_dictText +'）'" v-if="listItem.normId == item.normId">
               <!-- 这里科研失败！想动态绑定校验规则的 -->
               <!-- :prop="listItem.normfeeId" -->
               <!-- :rules="rules.listItem.normfeeId" -->
@@ -246,7 +260,7 @@
 
       <el-form :model="form" v-else-if="this.form.type == 1">
         <!-- :rules="rules" ref="form" -->
-        <el-form-item v-for="(listItem, listIndex) in form.feeLists" :key="listItem.normfeeId" :label="listItem.normfeeName">
+        <el-form-item v-for="(listItem, listIndex) in form.feeLists" :key="listItem.normfeeId" :label="listItem.normfeeName + '（'+ listItem.funit_dictText +'）'">
           <!-- 这里科研失败！想动态绑定校验规则的 -->
           <!-- :prop="listItem.normfeeId" -->
           <!-- :rules="rules.listItem.normfeeId" -->
@@ -267,6 +281,7 @@ import importFile from "./importFile.vue";
 import { saveAs } from 'file-saver';
 import { getToken } from '@/utils/auth';
 import axios from 'axios';
+import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 
 export default {
   name: 'GATHER',
@@ -363,6 +378,8 @@ export default {
     this.getList();
   },
   methods: {
+    checkPermi,
+    checkRole,
     validatorNum(rule, value, callback) {},
     validatorFloatNum(rule, value, callback) {
       let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
@@ -403,7 +420,7 @@ export default {
           ]
         };
       }
-      
+
       // if (name == '期末单位面积企业从业人员' || name == '活跃企业数' || name == '期末企业从业人员') {
       //   return {
       //     collCalue: [
@@ -430,7 +447,7 @@ export default {
           ]
         };
           break;
-      
+
         default:
         return {
           collCalue: [
@@ -492,7 +509,7 @@ export default {
           this.openUpload = false;
         });
       }
-      
+
     },
     //下载模板
     handleDownload() {

src/views/JOINTCONFERENCE/callback.vue

@@ -0,0 +1,189 @@
+<template>
+  <div class="cmain">
+    <div class="detail_item">
+      <div class="title">会议标题：</div>
+      <p>{{ form.conference.conferenceTitle }}</p>
+    </div>
+    <div class="detail_item">
+      <div class="title">会议内容：</div>
+      <p>{{ form.conference.conferenceContent }}</p>
+    </div>
+
+    <div class="detail_item">
+      <div class="title">回 复：</div>
+      <textarea
+        v-model="queryData.reply"
+        style="width: 60%; height: 200px"
+      ></textarea>
+    </div>
+
+    <div class="detail_item">
+      <div class="title">附 件：</div>
+      <el-upload
+        class="upload-demo"
+        ref="upload"
+        :headers="{
+          Authorization: 'Bearer ' + token,
+        }"
+        accept=".doc,.docx,.xls,.xlsx"
+        name="file"
+        list-type="doc/docx/xls/xlsx"
+        :action="ip + '/common/upload'"
+        :on-change="handleSelect"
+        :on-remove="handleRemove"
+        :on-success="handleSuccess"
+        :before-upload="beforeFileUpload"
+        :file-list="fileList"
+        :auto-upload="false"
+      >
+        <el-button slot="trigger" size="small" type="primary"
+          >选取文件</el-button
+        >
+        <!-- <el-button
+          style="margin-left: 10px"
+          size="small"
+          type="success"
+          @click="submitUpload"
+          >上传到服务器</el-button
+        > -->
+        <div slot="tip" class="el-upload__tip">
+          只能上传 doc/docx/xls/xlsx 文件
+        </div>
+      </el-upload>
+    </div>
+
+    <div class="mfooter">
+      <el-button type="primary" @click="submitUpload">回 复</el-button>
+      <el-button @click="$layer.close(layerid)">返 回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  getAttendMeetingDetail,
+  setMeetingReply,
+} from "@/api/portal/JOINTCONFERENCE/JOINTCONFERENCE";
+export default {
+  data() {
+    return {
+      form: {
+        conference: {},
+        reply: [],
+      },
+      fileList: [],
+
+      fileUplodList: [],
+
+      queryData: {
+        conferenceId: "",
+        reply: "",
+        attachment: "",
+      },
+      imgList: [],
+
+      ip: null,
+      token: null,
+    };
+  },
+  props: {
+    param: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    layerid: {
+      type: String,
+    },
+  },
+  created() {
+    this.token = this.$store.state.user.token;
+    this.ip = process.env.VUE_APP_BASE_IP;
+    if (this.param.id) {
+      getAttendMeetingDetail(this.param.id).then((response) => {
+        this.form = response.data;
+        console.log(this.form);
+      });
+    }
+  },
+  methods: {
+    handleSelect(file, list) {
+      this.fileList = list;
+    },
+    handleRemove(file, list) {},
+    handleSuccess(response, file, fileList) {
+      this.imgList = [];
+      fileList.forEach((i) => {
+        if (i.response.fileName) {
+          this.imgList.push(i.response.fileName + "");
+        }
+      });
+
+      this.queryData.conferenceId = this.form.conference.id;
+      this.queryData.attachment = this.imgList.toString();
+
+      setMeetingReply(this.queryData).then((res) => {
+        if (res.code == 200) {
+          if (res.msg == "该会议已回复") {
+            this.$message.error(res.msg);
+            this.$layer.close(this.layerid);
+            return;
+          }
+          this.$parent.getList();
+          this.$modal.msgSuccess(res.msg);
+          this.$layer.close(this.layerid);
+        }
+      });
+    },
+    submitUpload() {
+      if (this.fileList.length == 0) {
+        this.queryData.conferenceId = this.form.conference.id;
+        // this.queryData.attachment = this.imgList.toString();
+
+        setMeetingReply(this.queryData).then((res) => {
+          if (res.code == 200) {
+            if (res.msg == "该会议已回复") {
+              this.$message.error(res.msg);
+              this.$layer.close(this.layerid);
+              return;
+            }
+            this.$parent.getList();
+            this.$modal.msgSuccess(res.msg);
+            this.$layer.close(this.layerid);
+          }
+        });
+        return;
+      }
+      this.$refs.upload.submit();
+    },
+
+    beforeFileUpload(file) {
+      let type = file.name.substring(file.name.lastIndexOf(".") + 1);
+
+      let is =
+        type == "doc" || type == "docx" || type == "xls" || type == "xlsx";
+      if (!is) {
+        this.$message.warning("文件只支持doc/ docx/ xls/ xlsx");
+      }
+      return is;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.cmain .detail_item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 20px;
+  color: #333333;
+  font-size: 16px;
+}
+.detail_item .title {
+  width: 100px;
+}
+.cmain .detail_item p {
+  margin: 0;
+}
+</style>

src/views/JOINTCONFERENCE/detail.vue

@@ -1,17 +1,42 @@
 <template>
   <div class="cmain">
     <div class="detail_item">
-      <div class="title">会议标题： </div>
-      <p>{{form.conference.conferenceTitle}}</p>
+      <div class="title">会议标题：</div>
+      <p>{{ form.conference.conferenceTitle }}</p>
     </div>
     <div class="detail_item">
-      <div class="title">会议内容： </div>
-      <p>{{form.conference.conferenceContent}}</p>
+      <div class="title">会议内容：</div>
+      <p>{{ form.conference.conferenceContent }}</p>
     </div>
 
-    <div class="dept_list" v-for="(item,index) in form.reply" :key="index">
-      <div>{{item.dept}}</div>
-      <p>{{item.content}}</p>
+    <div class="dept_list" v-for="(item, index) in form.reply" :key="index">
+      <div class="title">{{ item.deptName }}：</div>
+      <p>{{ item.reply }}</p>
+    </div>
+
+    <div class="detail_item">
+      <div class="title">附件：</div>
+      <div class="item">
+        <div class="item_file" @click="downloadFile(fileList[index], index)" v-for="(item, index) in imgList" :key="index">
+          <img
+            class="file"
+            :src="
+              item.substring(item.lastIndexOf('.') + 1) == 'doc' ||
+              item.substring(item.lastIndexOf('.') + 1) == 'docx'
+                ? word
+                : excel
+            "
+            alt=""
+            
+          />
+          <p
+            class="img_text"
+            :title="imgList[index].replace('/profile/upload/', '')"
+          >
+            {{ imgList[index].replace("/profile/upload/", "") }}
+          </p>
+        </div>
+      </div>
     </div>
     <div class="mfooter">
       <el-button @click="$layer.close(layerid)">返 回</el-button>
@@ -20,14 +45,24 @@
 </template>
 
 <script>
-import { getAttendMeetingDetail } from "@/api/portal/JOINTCONFERENCE/JOINTCONFERENCE";
+import { saveAs } from "file-saver";
+import {
+  getAttendMeetingDetail,
+  fileDownloadFun,
+} from "@/api/portal/JOINTCONFERENCE/JOINTCONFERENCE";
 export default {
   data() {
     return {
       form: {
-        conference:{},
-        reply:[]
+        conference: {},
+        reply: [],
       },
+
+      word: require("@/assets/images/file-word.png"),
+      excel: require("@/assets/images/file-excel.png"),
+
+      fileList: [],
+      imgList: [],
     };
   },
   props: {
@@ -45,24 +80,80 @@ export default {
     if (this.param.id) {
       getAttendMeetingDetail(this.param.id).then((response) => {
         this.form = response.data;
+        response.data.reply.forEach((item) => {
+          if (item.attachment) {
+            this.fileList.push(item);
+            this.imgList.push(...item.attachment.split(","));
+          }
+        });
       });
     }
   },
+  methods: {
+    downloadFile(item, index) {
+      console.log(item);
+      let path = this.imgList[index].replace("/profile", "");
+      let name = this.imgList[index].replace("/profile/upload/", "");
+      fileDownloadFun({ fileName: path, delete: false }).then((res) => {
+        let bolb = new Blob([res]);
+        saveAs(bolb, name);
+      });
+    },
+  },
 };
 </script>
 
 <style scoped lang="scss">
-.cmain .detail_item{
-  display: flex;
-  align-items:flex-start;
-  margin-bottom: 20px;
+.cmain {
   color: #333333;
   font-size: 16px;
 }
-.detail_item .title{
+.cmain .detail_item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 20px;
+}
+.detail_item .title {
   width: 100px;
+  margin: 0;
+}
+.cmain .detail_item p {
+  margin: 0;
+}
+
+.detail_item .file {
+  height: 50px;
+  width: 40px;
+  margin-right: 10px;
+}
+
+.detail_item .item {
+ 
 }
-.cmain .detail_item p{
-  margin:0;
+.item_file{
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  margin-bottom: 30px;
+}
+
+.img_text {
+  // width: 80px;
+  // overflow: hidden;
+  // text-overflow: ellipsis;
+}
+
+.dept_list {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 35px;
+  .title {
+    width: 120px;
+  }
+  p {
+    flex: 1;
+    margin: 0;
+    margin-left: 20px;
+  }
 }
 </style>

src/views/JOINTCONFERENCE/index.vue

@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="会议日期" prop="status"></el-form-item> -->
+      <!-- <el-form-item label="会议日期" prop="status"> </el-form-item> -->
 
       <el-form-item label="会议状态" prop="status">
         <el-select
@@ -51,7 +51,7 @@
           >发起会议</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -62,7 +62,7 @@
           v-hasPermi="['business:JOINTCONFERENCE:edit']"
           >修改</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"

src/views/RANK/index.vue

@@ -63,7 +63,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="RANKList" @selection-change="handleSelectionChange">
+    <el-table  :data="RANKList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="保税区" align="center" prop="deptName">
         <template slot-scope="scope">
@@ -124,14 +124,16 @@
         <el-form-item prop="year" label-width="100px" label="年份">
           <el-select v-model="form.year" filterable default-first-option clearable placeholder="请选择年份">
             <el-option
-              v-for="item in nearYearList"
+              v-for="(item,i) in nearYearList"
+              :key="i"
               :label="item"
               :value="item">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="ranking" label-width="100px" label="出入口总值">
-          <el-input  v-model="form.ranking" placeholder="请输入出入口总值" ></el-input>
+
+        <el-form-item prop="ranking" label-width="100px" label="排名">
+          <el-input  v-model="form.ranking" placeholder="请输入排名" ></el-input>
         </el-form-item>
 
       </el-form>
@@ -194,11 +196,11 @@ export default {
           { required: true, message: "保税区ID不能为空", trigger: "blur" }
         ],
         year: [
-          { required: true, message: "年份不能为空", trigger: "blur" },
-          { trigger: 'blur', validator: this.validatorFloatNum }
+          { required: true, message: "年份不能为空", trigger: "blur" }
         ],
         ranking: [
-          { required: true, message: "排名不能为空", trigger: "blur" }
+          { required: true, message: "排名不能为空", trigger: "blur" },
+          { trigger: 'blur', validator: this.validatorFloatNum }
         ],
       }
     };
@@ -234,6 +236,7 @@ export default {
 
       // 获取近三年
       let nearYearArr = [];
+      nearYearArr.push(curYear)
       for (let i = 1; i <= 4; i++) {
         nearYearArr.push(curYear - i + '');
       }
@@ -284,6 +287,7 @@ export default {
       const id = row.id || this.ids
       getRANK(id).then(response => {
         this.form = response.data;
+        this.form.deptId = Number(this.form.deptId)
         this.open = true;
         this.title = "修改广西保税区排名";
       });
@@ -291,6 +295,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        debugger
         if (valid) {
           if (this.form.id != null) {
             updateRANK(this.form).then(response => {
@@ -329,14 +334,14 @@ export default {
       let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
       if (!reg.test(value)) {
         callback(new Error('请输入数字和正确格式的数字'));
-      } else if (value.split('.').length > 2) {
+      } else if (value.split('.').length >= 1) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
+      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
         callback(new Error('最多只能输入两位小数')); //小数点后两位
       } else {
         callback();
       }
-    },
+    }
   }
 };
 </script>

src/views/TOTEXP/index.vue

@@ -63,7 +63,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="TOTEXPList" @selection-change="handleSelectionChange">
+    <el-table :data="TOTEXPList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="主键" align="center" prop="id">-->
 <!--        <template slot-scope="scope">-->
@@ -139,14 +139,15 @@
         <el-form-item prop="year" label-width="100px" label="年份">
           <el-select v-model="form.year" filterable default-first-option clearable placeholder="请选择年份">
             <el-option
-              v-for="item in nearYearList"
+              v-for="(item,index) in nearYearList"
+              :key="index"
               :label="item"
               :value="item">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="imExport" label-width="100px" label="出入口总值">
-          <el-input  v-model="form.imExport" placeholder="请输入出入口总值" ></el-input>
+        <el-form-item prop="imExport" label-width="100px" label="进出口总值">
+          <el-input  v-model="form.imExport" placeholder="请输入进出口总值" ></el-input>
         </el-form-item>
 
       </el-form>
@@ -248,6 +249,7 @@ export default {
 
       // 获取近三年
       let nearYearArr = [];
+      nearYearArr.push(curYear)
       for (let i = 1; i <= 4; i++) {
         nearYearArr.push(curYear - i + '');
       }
@@ -297,6 +299,7 @@ export default {
       const id = row.id || this.ids
       getTOTEXP(id).then(response => {
         this.form = response.data;
+        this.form.deptId = Number(this.form.deptId)
         this.open = true;
         this.title = "修改保税区进出口总值数据";
       });
@@ -345,11 +348,12 @@ export default {
         callback(new Error('请输入数字和正确格式的数字'));
       } else if (value.split('.').length > 2) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
-        callback(new Error('最多只能输入两位小数')); //小数点后两位
-      } else {
+      }  else {
         callback();
       }
+    // else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
+    //     callback(new Error('最多只能输入两位小数')); //小数点后两位
+    //   }
     },
   }
 };

src/views/norm/quotaBonded.vue

@@ -45,11 +45,13 @@
 
     <el-table :data="QUOTABONDEDList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="保税区名称" align="center" prop="bondedName"></el-table-column>
-      <el-table-column label="指标名称" align="center" prop="quotaName"></el-table-column>
-      <el-table-column label="得分" align="center" prop="score" width="120"></el-table-column>
-      <el-table-column label="说明" align="center" prop="remark" width="300"></el-table-column>
-      <el-table-column label="附件" align="center" prop="fileNames" width="300"></el-table-column>
+      <el-table-column label="保税区名称" align="center" prop="bondedName" width="140"></el-table-column>
+      <el-table-column label="指标名称" align="center" prop="quotaName" width="180"></el-table-column>
+      <el-table-column label="得分" align="center" prop="score"></el-table-column>
+      <el-table-column label="录入方式" align="center" prop="enterType"></el-table-column>
+      <el-table-column label="数值" align="center" prop="numValue"></el-table-column>
+      <el-table-column label="文字说明" align="center" prop="remark" width="280"></el-table-column>
+      <el-table-column label="附件" align="center" prop="fileNames" width="280"></el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="150">
         <template slot-scope="scope">
           <el-button
@@ -84,7 +86,13 @@
 
         <el-form-item label-width="100px" label="保税区" prop="bondedName">
           <el-select v-model="form.bondedName" placeholder="请选择保税区" clearable filterable @change="selectBondedChange" style="width:100%">
-            <el-option v-for="dict in BONDEDList" :key="dict.id" :label="dict.bondedName" :value="dict" />
+<!--            <el-option v-for="dict in BONDEDList" :key="dict.id" :label="dict.bondedName" :value="dict" />-->
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptName">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label-width="100px" label="辅助指标" prop="quotaName">
@@ -92,7 +100,15 @@
             <el-option v-for="dict in QUOTAFEEList" :key="dict.id" :label="dict.quotaName" :value="dict" />
           </el-select>
         </el-form-item>
-        <el-form-item label-width="100px" label="上传附件" prop="linkUrls">
+
+        <el-form-item label-width="100px" label="录入方式" prop="enterType">
+          <el-select v-model="form.enterType" placeholder="请选择录入方式" clearable filterable style="width:100%">
+            <el-option value="附件">附件</el-option>
+            <el-option value="文字说明">文字说明</el-option>
+            <el-option value="数值">数值</el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.enterType == '附件'" label-width="100px" prop="linkUrls" label="上传附件">
           <el-upload
             class="upload-demo"
             ref="upload"
@@ -104,9 +120,13 @@
             <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
           </el-upload>
         </el-form-item>
-        <el-form-item label-width="100px" prop="remark" label="说明">
+        <el-form-item v-if="form.enterType == '文字说明'" label-width="100px" prop="remark" label="说明">
           <el-input type="textarea" v-model="form.remark" rows="5"></el-input>
         </el-form-item>
+        <el-form-item v-if="form.enterType == '数值'" label-width="100px" prop="numValue" label="数值">
+          <el-input v-model="form.numValue"></el-input>
+        </el-form-item>
+
         <el-form-item label-width="100px" prop="score" label="分值">
           <el-input v-model="form.score"></el-input>
         </el-form-item>
@@ -124,6 +144,7 @@ import { listQUOTABONDED, getQUOTABONDED, delQUOTABONDED, addQUOTABONDED, update
 import { listQUOTAFEE } from "@/api/norm/QUOTAFEE";
 import { listBONDED } from "@/api/portal/BONDED/BONDED.js";
 import { uploadFile } from '@/api/common';
+import { listDept } from '@/api/system/dept'
 
 export default {
   name: "QUOTABONDED",
@@ -152,6 +173,8 @@ export default {
       QUOTAFEEList: [],
       BONDEDList: [],
       fileList: [],
+      // 保税区列表
+      deptList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -185,9 +208,6 @@ export default {
         quotaName: [
           { required: true, message: "指标名称不能为空", trigger: "blur" }
         ],
-        score: [
-          { required: true, message: "得分不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -202,11 +222,25 @@ export default {
       this.BONDEDList = response.rows;
     });
     this.getList();
+    this.getDeptList()
   },
   methods: {
+
+    // 获取保税区列表
+    getDeptList() {
+      this.loading = true;
+      listDept({parentId: '100'}).then(response => {
+        this.deptList = response.data
+        this.loading = false;
+      });
+    },
     selectBondedChange(val) {
-      this.form.bondedId = val.id;
-      this.form.bondedName = val.bondedName;
+      const selectedDept = this.deptList.find(item => item.deptName === this.form.bondedName);
+      if (selectedDept) {
+        this.form.bondedId = selectedDept.deptId;
+      }
+      // this.form.bondedId = val.id;
+      // this.form.bondedName = val.bondedName;
     },
     selectQuotaChange(val) {
       this.form.quotaId = val.id;
@@ -242,7 +276,9 @@ export default {
         stopTime: null,
         linkUrls: null,
         remark: null,
-        fileNames: null
+        fileNames: null,
+        enterType: null,
+        numValue: null
       };
       this.fileList = [];
       this.resetForm("form");
@@ -267,7 +303,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加辅助指标-综保区";
+      this.title = "辅助指标录入新增";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -275,8 +311,13 @@ export default {
       const id = row.id || this.ids
       getQUOTABONDED(id).then(response => {
         this.form = response.data;
+        this.form.linkUrls = this.baseURL + response.data.linkUrls;
+        this.fileList.push({
+          name: response.data.fileNames,
+          url: response.data.linkUrls,
+        });
         this.open = true;
-        this.title = "修改辅助指标-综保区";
+        this.title = "辅助指标录入修改";
       });
     },
     /** 提交按钮 */
@@ -287,7 +328,22 @@ export default {
             this.$message.error("得分必须为整数");
             return;
           }
-
+          if (this.form.enterType == '附件' && this.form.linkUrls == null) {
+            this.$message.error("请上传附件");
+            return;
+          }
+          if (this.form.enterType == '文字说明' && this.form.remark == null) {
+            this.$message.error("请录入文字说明");
+            return;
+          }
+          if (this.form.enterType == '数值' && this.form.numValue == null) {
+            this.$message.error("请录入数值");
+            return;
+          }
+          if (this.form.numValue != null && !(parseInt(this.form.numValue) == this.form.numValue || parseFloat(this.form.numValue) == this.form.numValue)) {
+            this.$message.error("数值必须为整数或小数");
+            return;
+          }
           if (this.form.id != null) {
             updateQUOTABONDED(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -325,7 +381,6 @@ export default {
       let formData = new FormData()
       formData.append('file',file.file)
       uploadFile(formData).then(res=>{
-        console.log("11111111",res)
         if(res.code == 200){
           if(this.form.linkUrls == null) {
             this.form.linkUrls = res.fileName + ",";

src/views/norm/quotafee.vue

@@ -1,16 +1,15 @@
 <template>
-  <el-dialog
-    title="辅助指标明细"
-    :visible.sync="isShowQuotaDialog"
-    :width="'80%'"
-    :close-on-click-modal="false"
-    :before-close="closeHandler"
-  >
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
         <el-form-item label="指标名称" prop="quotaName">
           <el-input v-model="queryParams.quotaName"></el-input>
         </el-form-item>
+        <el-form-item label="指标分类" prop="normName">
+          <el-select v-model="queryParams.normName" clearable filterable>
+            <el-option value="加分项">加分项</el-option>
+            <el-option value="减分项">减分项</el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -47,7 +46,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
-      <el-table :data="quotaData" @selection-change="handleSelectionChange">
+      <el-table :data="QUOTAFEEList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
 
         <el-table-column label="指标分类" width="85" align="center" prop="normName">
@@ -125,7 +124,6 @@
         </div>
       </el-dialog>
     </div>
-  </el-dialog>
 </template>
 
 <script>
@@ -133,30 +131,6 @@ import { listQUOTAFEE, getQUOTAFEE, delQUOTAFEE, addQUOTAFEE, updateQUOTAFEE } f
 
 export default {
   name: "QUOTAFEE",
-  props: {
-    isShowQuotaDialog: {
-      type: Boolean,
-      default: () => {
-        return false;
-      },
-    },
-    normId: {
-      type: String,
-      default: () => {
-        return null;
-      },
-    },
-    quotaData: {
-      type: Array,
-      defaultL: () => {
-        return [];
-      },
-    },
-    totalNum:{
-      type:Number,
-      default:0
-    }
-  },
   data() {
     return {
       // 根路径
@@ -173,6 +147,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      // 辅助指标表格数据
+      QUOTAFEEList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -181,7 +157,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        quotaName: null
+        quotaName: null,
+        normName: null
       },
       // 表单参数
       form: {},
@@ -219,14 +196,13 @@ export default {
     /** 查询辅助指标明细列表 */
     getList() {
       this.loading = true;
-      this.queryParams.normId = this.normId;
       listQUOTAFEE(this.queryParams).then(response => {
         response.rows.forEach((item, index) => {
           response.rows[index].status = item.status == 0 ? false : true;
         });
+        this.QUOTAFEEList = response.rows;
         this.total = response.total;
         this.loading = false;
-        this.$emit("dataHandler", response.rows);
       });
     },
     // 取消按钮
@@ -298,7 +274,6 @@ export default {
             return;
           }
 
-          this.form.normId = this.normId;
           this.form.status = 1;
           if (this.form.id != null) {
             updateQUOTAFEE(this.form).then(response => {