Merge branch 'master' into hezhihong_bug修复

src/api/common.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 通用上传
+// 通用上传(单文件)
 export function uploadFile(data) {
   return request({
     url: '/common/upload',
@@ -9,3 +9,22 @@ export function uploadFile(data) {
     timeout: 2000000
   })
 }
+
+// 通用上传(多文件)
+export function uploadFiles(data) {
+  return request({
+    url: '/common/uploads',
+    method: 'post',
+    data: data,
+    timeout: 2000000
+  })
+}
+
+// 下载
+export function downloadFiles(resource) {
+  return request({
+    url: '/common/download/resource?resource=' + encodeURI(resource),
+    method: 'get',
+    timeout: 2000000
+  })
+}

src/api/portal/BONDEDUPPLY/BONDEDUPPLY.js

@@ -46,7 +46,6 @@ export function updateBONDEDUPPLY(data) {
 
 // 删除保税区供应链数据
 export function delBONDEDUPPLY(lddwmc) {
-  console.log(lddwmc);
   return request({
     url: '/BONDEDUPPLY/remove/' + lddwmc,
     method: 'get'

src/api/portal/ENTERPRISESCREENDATA/ENTERPRISESCREENDATA.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询企业大屏所需供应商数据列表
+export function listENTERPRISESCREENDATA(query) {
+  return request({
+    url: '/business/ENTERPRISESCREENDATA/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业大屏所需供应商数据所有列表
+export function listAllENTERPRISESCREENDATA(query) {
+  return request({
+    url: '/business/ENTERPRISESCREENDATA/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业大屏所需供应商数据详细
+export function getENTERPRISESCREENDATA(id) {
+  return request({
+    url: '/business/ENTERPRISESCREENDATA/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增企业大屏所需供应商数据
+export function addENTERPRISESCREENDATA(data) {
+  return request({
+    url: '/business/ENTERPRISESCREENDATA/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改企业大屏所需供应商数据
+export function updateENTERPRISESCREENDATA(data) {
+  return request({
+    url: '/business/ENTERPRISESCREENDATA/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除企业大屏所需供应商数据
+export function delENTERPRISESCREENDATA(id) {
+  return request({
+    url: '/business/ENTERPRISESCREENDATA/remove/' + id,
+    method: 'get'
+  })
+}

src/api/portal/ENTERPRISETRADEPERFORMANCE/ENTERPRISETRADEPERFORMANCE.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询企业贸易绩效数据（每个月填报）列表
+export function listENTERPRISETRADEPERFORMANCE(query) {
+  return request({
+    url: '/ENTERPRISETRADEPERFORMANCE/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业贸易绩效数据（每个月填报）所有列表
+export function listAllENTERPRISETRADEPERFORMANCE(query) {
+  return request({
+    url: '/ENTERPRISETRADEPERFORMANCE/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询企业贸易绩效数据（每个月填报）详细
+export function getENTERPRISETRADEPERFORMANCE(id) {
+  return request({
+    url: '/ENTERPRISETRADEPERFORMANCE/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增企业贸易绩效数据（每个月填报）
+export function addENTERPRISETRADEPERFORMANCE(data) {
+  return request({
+    url: '/ENTERPRISETRADEPERFORMANCE/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改企业贸易绩效数据（每个月填报）
+export function updateENTERPRISETRADEPERFORMANCE(data) {
+  return request({
+    url: '/ENTERPRISETRADEPERFORMANCE/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取部门列表
+export function getDeptList(data) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+  })
+}
+
+// 删除企业贸易绩效数据（每个月填报）
+export function delENTERPRISETRADEPERFORMANCE(id) {
+  return request({
+    url: '/ENTERPRISETRADEPERFORMANCE/remove/' + id,
+    method: 'get'
+  })
+}

src/api/portal/GARDENBASEDATA/GARDENBASEDATA.js

@@ -0,0 +1,61 @@
+import request from "@/utils/request";
+
+// 查询园区内企业基础数据列表
+export function listGARDENBASEDATA(query) {
+  return request({
+    url: "/GARDENBASEDATA/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询园区内企业基础数据所有列表
+export function listAllGARDENBASEDATA(query) {
+  return request({
+    url: "/GARDENBASEDATA/listAll",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询园区内企业基础数据详细
+export function getGARDENBASEDATA(id) {
+  return request({
+    url: "/GARDENBASEDATA/getInfo/" + id,
+    method: "get",
+  });
+}
+
+// 新增园区内企业基础数据
+export function addGARDENBASEDATA(data) {
+  return request({
+    url: "/GARDENBASEDATA/add",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改园区内企业基础数据
+export function updateGARDENBASEDATA(data) {
+  return request({
+    url: "/GARDENBASEDATA/edit",
+    method: "post",
+    data: data,
+  });
+}
+
+// 删除园区内企业基础数据
+export function delGARDENBASEDATA(id) {
+  return request({
+    url: "/GARDENBASEDATA/remove/" + id,
+    method: "get",
+  });
+}
+
+// 企业名录列表
+export function getEnterprise(id) {
+  return request({
+    url: "/system/dept/list",
+    method: "get",
+  });
+}

src/api/portal/GATHER/GATHER.js

@@ -72,13 +72,23 @@ export function report(data) {
   })
 }
 
+// 录入员审核
+export function setAudit(data) {
+  return request({
+    url: '/gather/audit',
+    method: 'post',
+    params: data,
+    
+  })
+}
+
 
 // 提交审核
 export function approve(data) {
   return request({
     url: '/gather/approve',
     method: 'post',
-    data: data
+    params: data
   })
 }
 

src/api/portal/IMPORTANTPROJECT/IMPORTANTPROJECT.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询重点项目数据							 列表
+export function listIMPORTANTPROJECT(query) {
+  return request({
+    url: '/business/IMPORTANTPROJECT/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询重点项目数据							 所有列表
+export function listAllIMPORTANTPROJECT(query) {
+  return request({
+    url: '/business/IMPORTANTPROJECT/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询重点项目数据							 详细
+export function getIMPORTANTPROJECT(id) {
+  return request({
+    url: '/business/IMPORTANTPROJECT/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增重点项目数据							 
+export function addIMPORTANTPROJECT(data) {
+  return request({
+    url: '/business/IMPORTANTPROJECT/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改重点项目数据							 
+export function updateIMPORTANTPROJECT(data) {
+  return request({
+    url: '/business/IMPORTANTPROJECT/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除重点项目数据							 
+export function delIMPORTANTPROJECT(id) {
+  return request({
+    url: '/business/IMPORTANTPROJECT/remove/' + id,
+    method: 'get'
+  })
+}

src/views/ARTICLE/edit.vue

@@ -12,13 +12,14 @@
         <el-select
           v-model="form.scale"
           placeholder="请选择建设规模"
+          @change="typeSelect"
           style="width: 50%"
         >
           <el-option
             v-for="item in scaleList"
             :key="item.value + 'typeList'"
             :label="item.label"
-            :value="item.value"
+            :value="item.label"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -126,6 +127,10 @@ export default {
     }
   },
   methods: {
+
+    typeSelect(val){
+      this.form.scale = val;
+    },
     /** 提交按钮 */
     submitForm(type) {
       this.$refs["form"].validate((valid) => {

src/views/ARTICLE/index.vue

@@ -21,7 +21,7 @@
             v-for="item in scaleList"
             :key="item.value + 'typeList'"
             :label="item.label"
-            :value="item.value"
+            :value="item.label"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -98,11 +98,11 @@
         </template>
       </el-table-column>
       <el-table-column label="建设规模" align="center" prop="scale">
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <el-tag v-if="scope.row.scale == 1" type="success">小型</el-tag>
           <el-tag v-else-if="scope.row.scale == 2" type="success">中型</el-tag>
           <el-tag v-else-if="scope.row.scale == 3" type="success">大型</el-tag>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column label="年度投资计划(万)" align="center" prop="plan">
         <template slot-scope="scope">

src/views/AttendMeeting/index.vue

@@ -138,7 +138,7 @@
           <el-button
             size="mini"
             type="text"
-            @click="handleUnit(scope.row)"
+            @click="handleReply(scope.row)"
             v-hasPermi="['business:JOINTCONFERENCE:query']"
             >会议回复</el-button
           >

src/views/BONDEDUPPLY/index.vue

@@ -101,7 +101,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime">
       </el-table-column>
       <el-table-column
-      fixed="right"
+        fixed="right"
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -136,7 +136,7 @@
     />
 
     <!-- 添加或修改保税区供应链数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="35%" 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>
@@ -145,7 +145,14 @@
           <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-input v-model="form.jckrq"></el-input> -->
+          <el-date-picker
+            v-model="form.jckrq"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="净重" prop="jz">
           <el-input v-model="form.jz"></el-input>
@@ -172,10 +179,24 @@
           <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-input v-model="form.qyrq"></el-input> -->
+          <el-date-picker
+            v-model="form.qyrq"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="卸毕日期   " prop="xbrq">
           <el-input v-model="form.xbrq"></el-input>
+          <!-- <el-date-picker
+            v-model="form.xbrq"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          >
+          </el-date-picker> -->
         </el-form-item>
         <!-- <el-form-item label="供应链主键  " prop="id">
           <el-input v-model="form.id"></el-input>

src/views/ENTERPRISESCREENDATA/index.vue

@@ -0,0 +1,307 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <!-- <el-form-item label="供应商类型(三种) " prop="providerType">
+        <el-select v-model="queryParams.providerType" placeholder="请选择供应商类型(三种) " clearable filterable>
+          <el-option
+            v-for="dict in dict.type.${dictType}"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:ENTERPRISESCREENDATA: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:ENTERPRISESCREENDATA: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:ENTERPRISESCREENDATA: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:ENTERPRISESCREENDATA:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ENTERPRISESCREENDATAList" @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="enterpriseName">
+        
+      </el-table-column>
+      <el-table-column label="供应商名称 " align="center" prop="providerName">
+       
+      </el-table-column>
+      <el-table-column label="供应商类型(三种) " align="center" prop="providerType">
+    
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+      
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy">
+        
+      </el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updateTime">
+        
+      </el-table-column>
+      <el-table-column label="修改人" align="center" prop="updateBy">
+     
+      </el-table-column>
+      <el-table-column label="部门主键" align="center" prop="deeptId">
+       
+      </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="['business:ENTERPRISESCREENDATA:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:ENTERPRISESCREENDATA: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="providerType">
+          <!-- <el-select v-model="form.providerType" placeholder="请选择供应商类型(三种) " filterable>
+            <el-option
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+:value="dict.value"
+            ></el-option>
+          </el-select> -->
+        </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 { listENTERPRISESCREENDATA, getENTERPRISESCREENDATA, delENTERPRISESCREENDATA, addENTERPRISESCREENDATA, updateENTERPRISESCREENDATA } from "@/api/portal/ENTERPRISESCREENDATA/ENTERPRISESCREENDATA";
+
+export default {
+  name: "ENTERPRISESCREENDATA",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 企业大屏所需供应商数据表格数据
+      ENTERPRISESCREENDATAList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        enterpriseName: null,
+        providerName: null,
+        providerType: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        deeptId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "企业大屏所需数据主键不能为空", trigger: "blur" }
+        ],
+        enterpriseName: [
+          { required: true, message: "企业名称不能为空", trigger: "blur" }
+        ],
+        providerName: [
+          { required: true, message: "供应商名称 不能为空", trigger: "blur" }
+        ],
+        providerType: [
+          { required: true, message: "供应商类型(三种) 不能为空", trigger: "change" }
+        ],
+        deeptId: [
+          { required: true, message: "部门主键不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询企业大屏所需供应商数据列表 */
+    getList() {
+      this.loading = true;
+      listENTERPRISESCREENDATA(this.queryParams).then(response => {
+        this.ENTERPRISESCREENDATAList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        enterpriseName: null,
+        providerName: null,
+        providerType: null,
+        deeptId: 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
+      getENTERPRISESCREENDATA(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) {
+            updateENTERPRISESCREENDATA(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addENTERPRISESCREENDATA(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 delENTERPRISESCREENDATA(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/ENTERPRISESCREENDATA/export', {
+        ...this.queryParams
+      }, `ENTERPRISESCREENDATA_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -0,0 +1,608 @@
+<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:ENTERPRISETRADEPERFORMANCE: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:ENTERPRISETRADEPERFORMANCE: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:ENTERPRISETRADEPERFORMANCE: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:ENTERPRISETRADEPERFORMANCE:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="ENTERPRISETRADEPERFORMANCEList"
+      @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="部门id" align="center" prop="deptId">
+      </el-table-column>
+      <el-table-column label="部门名称" align="center" prop="deptName">
+      </el-table-column>
+      <el-table-column label="规模以上工业产值" align="center" prop="gmysgycz">
+      </el-table-column>
+      <el-table-column label="固定资产投资" align="center" prop="gdzctz">
+      </el-table-column>
+      <el-table-column label="资产分类 " align="center" prop="zcfl">
+      </el-table-column>
+      <el-table-column label="主要贸易国家 " align="center" prop="zymygj">
+      </el-table-column>
+      <el-table-column label="电子账册分类 " align="center" prop="dzzcfl">
+      </el-table-column>
+      <el-table-column label="进、出口总值" align="center" prop="jckzz">
+      </el-table-column>
+      <el-table-column label="进口总值" align="center" prop="jkzz">
+      </el-table-column>
+      <el-table-column label="出口总值" align="center" prop="ckzz">
+      </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="hgss">
+      </el-table-column>
+      <el-table-column label="税务部门税收" align="center" prop="swbmss">
+      </el-table-column>
+      <el-table-column label="期末企业从业人员" align="center" prop="qmqycyry">
+      </el-table-column>
+      <el-table-column label="实际使用外资金额" align="center" prop="sjsywzje">
+      </el-table-column>
+      <el-table-column label="维修业务进出口值 " align="center" prop="wxyejckz">
+      </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="createTime">
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy">
+      </el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updateTime">
+      </el-table-column>
+      <el-table-column label="更信任" align="center" prop="updateBy">
+      </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:ENTERPRISETRADEPERFORMANCE:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:ENTERPRISETRADEPERFORMANCE: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="40%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+        <el-form-item label="规模以上工业产值" prop="gmysgycz">
+          <el-input
+            v-model="form.gmysgycz"
+            placeholder="请输入规模以上工业产值"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="固定资产投资" prop="gdzctz">
+          <el-input
+            v-model="form.gdzctz"
+            placeholder="请输入固定资产投资"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="部门" prop="gdzctz">
+          <!-- <el-input v-model="form.gdzctz" placeholder="请选择部门"></el-input> -->
+          <el-select
+            v-model="deptValue"
+            @change="deptSelect"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="(item, index) in deptList"
+              :key="index"
+              :label="item.deptName"
+              :value="index"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="资产分类 " prop="zcfl">
+          <el-input
+            v-model="form.zcfl"
+            placeholder="请输入资产分类 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="主要贸易国家 " prop="zymygj">
+          <el-input
+            v-model="form.zymygj"
+            placeholder="请输入主要贸易国家 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="电子账册分类 " prop="dzzcfl">
+          <el-input
+            v-model="form.dzzcfl"
+            placeholder="请输入电子账册分类 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="进出口总值" prop="jckzz">
+          <el-input
+            v-model="form.jckzz"
+            placeholder="请输入进出口总值"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="进口总值" prop="jkzz">
+          <el-input v-model="form.jkzz" placeholder="请输入进口总值"></el-input>
+        </el-form-item>
+        <el-form-item label="出口总值" prop="ckzz">
+          <el-input v-model="form.ckzz" placeholder="请输入出口总值"></el-input>
+        </el-form-item>
+        <el-form-item label="加工贸易进出口值 " prop="jgmyjckz">
+          <el-input
+            v-model="form.jgmyjckz"
+            placeholder="请输入加工贸易进出口值 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="物流货物进出口值 " prop="wlhwjckz">
+          <el-input
+            v-model="form.wlhwjckz"
+            placeholder="请输入物流货物进出口值 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="一般贸易进出口值 " prop="ybmyjckz">
+          <el-input
+            v-model="form.ybmyjckz"
+            placeholder="请输入一般贸易进出口值 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="海关税收" prop="hgss">
+          <el-input v-model="form.hgss" placeholder="请输入海关税收"></el-input>
+        </el-form-item>
+        <el-form-item label="税务部门税收" prop="swbmss">
+          <el-input
+            v-model="form.swbmss"
+            placeholder="请输入税务部门税收"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="期末企业从业人员" prop="qmqycyry">
+          <el-input
+            v-model="form.qmqycyry"
+            placeholder="请输入期末企业从业人员"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="实际使用外资金额" prop="sjsywzje">
+          <el-input
+            v-model="form.sjsywzje"
+            placeholder="请输入期末企业从业人员"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="维修业务进出口值 " prop="wxyejckz">
+          <el-input
+            v-model="form.wxyejckz"
+            placeholder="请输入维修业务进出口值 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="研发业务进出口值 " prop="yfywjckz">
+          <el-input
+            v-model="form.yfywjckz"
+            placeholder="请输入研发业务进出口值 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="租赁贸易进出口值 " prop="zlmyjckz">
+          <el-input
+            v-model="form.zlmyjckz"
+            placeholder="请输入租赁贸易进出口值 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="跨境电商业务进出口值 " prop="kjdsywjckz">
+          <el-input
+            v-model="form.kjdsywjckz"
+            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 {
+  listENTERPRISETRADEPERFORMANCE,
+  getDeptList,
+  getENTERPRISETRADEPERFORMANCE,
+  delENTERPRISETRADEPERFORMANCE,
+  addENTERPRISETRADEPERFORMANCE,
+  updateENTERPRISETRADEPERFORMANCE,
+} from "@/api/portal/ENTERPRISETRADEPERFORMANCE/ENTERPRISETRADEPERFORMANCE";
+
+export default {
+  name: "ENTERPRISETRADEPERFORMANCE",
+  data() {
+    return {
+      // 部门列表
+      deptList: [],
+      deptValue: null,
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 企业贸易绩效数据（每个月填报）表格数据
+      ENTERPRISETRADEPERFORMANCEList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        deptId: null,
+        gmysgycz: null,
+        gdzctz: null,
+        zcfl: null,
+        zymygj: null,
+        dzzcfl: null,
+        jckzz: null,
+        jkzz: null,
+        ckzz: null,
+        jgmyjckz: null,
+        wlhwjckz: null,
+        ybmyjckz: null,
+        hgss: null,
+        swbmss: null,
+        qmqycyry: null,
+        sjsywzje: null,
+        wxyejckz: null,
+        yfywjckz: null,
+        zlmyjckz: null,
+        kjdsywjckz: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          {
+            required: true,
+            message: "企业贸易绩效数据不能为空",
+            trigger: "blur",
+          },
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" },
+        ],
+        gmysgycz: [
+          {
+            required: true,
+            message: "规模以上工业产值不能为空",
+            trigger: "blur",
+          },
+        ],
+        gdzctz: [
+          { required: true, message: "固定资产投资不能为空", trigger: "blur" },
+        ],
+        zcfl: [
+          { required: true, message: "资产分类 不能为空", trigger: "blur" },
+        ],
+        zymygj: [
+          { required: true, message: "主要贸易国家 不能为空", trigger: "blur" },
+        ],
+        dzzcfl: [
+          { required: true, message: "电子账册分类 不能为空", trigger: "blur" },
+        ],
+        jckzz: [
+          { required: true, message: "进、出口总值不能为空", trigger: "blur" },
+        ],
+        jkzz: [
+          { required: true, message: "进口总值不能为空", trigger: "blur" },
+        ],
+        ckzz: [
+          { required: true, message: "出口总值不能为空", trigger: "blur" },
+        ],
+        jgmyjckz: [
+          {
+            required: true,
+            message: "加工贸易进出口值 不能为空",
+            trigger: "blur",
+          },
+        ],
+        wlhwjckz: [
+          {
+            required: true,
+            message: "物流货物进出口值 不能为空",
+            trigger: "blur",
+          },
+        ],
+        ybmyjckz: [
+          {
+            required: true,
+            message: "一般贸易进出口值 不能为空",
+            trigger: "blur",
+          },
+        ],
+        hgss: [
+          { required: true, message: "海关税收不能为空", trigger: "blur" },
+        ],
+        swbmss: [
+          { required: true, message: "税务部门税收不能为空", trigger: "blur" },
+        ],
+        qmqycyry: [
+          {
+            required: true,
+            message: "期末企业从业人员不能为空",
+            trigger: "blur",
+          },
+        ],
+        sjsywzje: [
+          {
+            required: true,
+            message: "实际使用外资金额不能为空",
+            trigger: "blur",
+          },
+        ],
+        wxyejckz: [
+          {
+            required: true,
+            message: "维修业务进出口值 不能为空",
+            trigger: "blur",
+          },
+        ],
+        yfywjckz: [
+          {
+            required: true,
+            message: "研发业务进出口值 不能为空",
+            trigger: "blur",
+          },
+        ],
+        zlmyjckz: [
+          {
+            required: true,
+            message: "租赁贸易进出口值 不能为空",
+            trigger: "blur",
+          },
+        ],
+        kjdsywjckz: [
+          {
+            required: true,
+            message: "跨境电商业务进出口值 不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    getDeptList().then((res) => {
+      this.deptList = res.data;
+    });
+  },
+  methods: {
+    /** 查询企业贸易绩效数据（每个月填报）列表 */
+    getList() {
+      this.loading = true;
+      listENTERPRISETRADEPERFORMANCE(this.queryParams).then((response) => {
+        this.ENTERPRISETRADEPERFORMANCEList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deptId: null,
+        gmysgycz: null,
+        gdzctz: null,
+        zcfl: null,
+        zymygj: null,
+        dzzcfl: null,
+        jckzz: null,
+        jkzz: null,
+        ckzz: null,
+        jgmyjckz: null,
+        wlhwjckz: null,
+        ybmyjckz: null,
+        hgss: null,
+        swbmss: null,
+        qmqycyry: null,
+        sjsywzje: null,
+        wxyejckz: null,
+        yfywjckz: null,
+        zlmyjckz: null,
+        kjdsywjckz: 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;
+      getENTERPRISETRADEPERFORMANCE(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改企业贸易绩效数据（每个月填报）";
+      });
+    },
+
+    deptSelect(index) {
+      this.form.deptId = this.deptList[index].deptId;
+      this.form.deptName = this.deptList[index].deptName;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateENTERPRISETRADEPERFORMANCE(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addENTERPRISETRADEPERFORMANCE(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 delENTERPRISETRADEPERFORMANCE(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/ENTERPRISETRADEPERFORMANCE/export",
+        {
+          ...this.queryParams,
+        },
+        `ENTERPRISETRADEPERFORMANCE_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/GARDENBASEDATA/index.vue

@@ -0,0 +1,701 @@
+<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:GARDENBASEDATA: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:GARDENBASEDATA: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:GARDENBASEDATA: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:GARDENBASEDATA:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="GARDENBASEDATAList"
+      @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="deptId">
+      </el-table-column>
+      <el-table-column label="部门名称" align="center" prop="deptName">
+      </el-table-column>
+      <el-table-column label="法定代表人 " align="center" prop="fddbr">
+      </el-table-column>
+      <el-table-column label="企业代表联系方式 " align="center" prop="qydblxfs">
+      </el-table-column>
+      <el-table-column label="控股企业 " align="center" prop="kgqy">
+      </el-table-column>
+      <el-table-column label="注册资金" align="center" prop="zczj">
+      </el-table-column>
+      <el-table-column label="行业大类 " align="center" prop="hydl">
+      </el-table-column>
+      <el-table-column label="行业小类 " align="center" prop="hyxl">
+      </el-table-column>
+      <el-table-column label="企业类型 " align="center" prop="qylx">
+      </el-table-column>
+      <el-table-column label="是否外资企业 " align="center" prop="sfwzqy">
+      </el-table-column>
+      <el-table-column label="经营状态 " align="center" prop="jyzt">
+      </el-table-column>
+      <el-table-column label="统一社会信用代码 " align="center" prop="shtyxydm">
+      </el-table-column>
+      <el-table-column label="企业海关编码 " align="center" prop="qyhgbm">
+      </el-table-column>
+      <el-table-column label="人员规模" align="center" prop="rygm">
+      </el-table-column>
+      <el-table-column label="成立日期 " align="center" prop="clrq">
+      </el-table-column>
+      <el-table-column label="投产时间 " align="center" prop="tcsj">
+      </el-table-column>
+      <el-table-column label="经营期限自 " align="center" prop="jyqxz">
+      </el-table-column>
+      <el-table-column label="经营期限至 " align="center" prop="jyqxz1">
+      </el-table-column>
+      <el-table-column label="注册地址 " align="center" prop="zcdz">
+      </el-table-column>
+      <el-table-column label="主营业务 " align="center" prop="zyyw">
+      </el-table-column>
+      <el-table-column label="经营范围 " align="center" prop="jyfw">
+      </el-table-column>
+      <el-table-column label="企业资质 " align="center" prop="qyzz">
+      </el-table-column>
+      <el-table-column label="主要市场 " align="center" prop="zysc">
+      </el-table-column>
+      <el-table-column label="一般纳税人情况 " align="center" prop="ybnsrqk">
+      </el-table-column>
+      <el-table-column
+        label="国家级奖项、发明专利 "
+        align="center"
+        prop="gjjjxfmzl"
+      >
+      </el-table-column>
+      <el-table-column label="AEO情况 " align="center" prop="aeoqk">
+      </el-table-column>
+      <el-table-column
+        label="检测、服务外包、文化服务创新 "
+        align="center"
+        prop="jcfwwbwhfwcx"
+      >
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy">
+      </el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updateTime">
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy">
+      </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:GARDENBASEDATA:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:GARDENBASEDATA: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="35%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+        <el-form-item label="法定代表人" prop="fddbr">
+          <el-input
+            v-model="form.fddbr"
+            placeholder="请输入法定代表人"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="部门" prop="fddbr">
+          <el-select v-model="detpValue" @change="deptSelect" placeholder="请选择部门">
+            <el-option
+              v-for="(item,index) in detpList"
+              :key="index"
+              :label="item.deptName"
+              :value="index"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="企业代表联系方式 " prop="qydblxfs">
+          <el-input
+            v-model="form.qydblxfs"
+            placeholder="请输入企业代表联系方式 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="控股企业 " prop="kgqy">
+          <el-input
+            v-model="form.kgqy"
+            placeholder="请输入控股企业 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="注册资金" prop="zczj">
+          <el-input v-model="form.zczj" placeholder="请输入注册资金"></el-input>
+        </el-form-item>
+        <el-form-item label="行业大类 " prop="hydl">
+          <el-input
+            v-model="form.hydl"
+            placeholder="请输入行业大类 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="行业小类 " prop="hyxl">
+          <el-input
+            v-model="form.hyxl"
+            placeholder="请输入行业小类 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企业类型 " prop="qylx">
+          <el-input
+            v-model="form.qylx"
+            placeholder="请输入企业类型 "
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="是否外资企业 " prop="sfwzqy">
+          <el-input
+            v-model="form.sfwzqy"
+            placeholder="请输入是否外资企业 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="经营状态 " prop="jyzt">
+          <el-input
+            v-model="form.jyzt"
+            placeholder="请输入经营状态 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="统一社会信用代码 " prop="shtyxydm">
+          <el-input
+            v-model="form.shtyxydm"
+            placeholder="请输入统一社会信用代码 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企业海关编码 " prop="qyhgbm">
+          <el-input
+            v-model="form.qyhgbm"
+            placeholder="请输入企业海关编码 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="人员规模" prop="rygm">
+          <el-input v-model="form.rygm" placeholder="请输入人员规模"></el-input>
+        </el-form-item>
+        <el-form-item label="成立日期 " prop="clrq">
+          <!-- <el-input  v-model="form.clrq" placeholder="请输入成立日期 "></el-input> -->
+          <el-date-picker
+            value-format="yyyy-MM-dd"
+            @change="setUpTimeSelect"
+            v-model="form.clrq"
+            type="date"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="投产时间 " prop="tcsj">
+          <!-- <el-input  v-model="form.tcsj" placeholder="请输入投产时间 "></el-input> -->
+          <el-date-picker
+            value-format="yyyy-MM-dd"
+            @change="putTimeSelect"
+            v-model="form.tcsj"
+            type="date"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="经营期限自 " prop="jyqxz">
+          <el-input
+            v-model="form.jyqxz"
+            placeholder="请输入经营期限自 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="经营期限至 " prop="jyqxz1">
+          <el-input
+            v-model="form.jyqxz1"
+            placeholder="请输入经营期限至 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="注册地址 " prop="zcdz">
+          <el-input
+            v-model="form.zcdz"
+            placeholder="请输入注册地址 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="主营业务 " prop="zyyw">
+          <el-input
+            v-model="form.zyyw"
+            placeholder="请输入主营业务 "
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="经营范围  " prop="jyfw">
+          <el-input
+            v-model="form.jyfw"
+            placeholder="请输入经营范围  "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企业资质  " prop="qyzz">
+          <el-input
+            v-model="form.qyzz"
+            placeholder="请输入企业资质  "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="主要市场  " prop="zysc">
+          <el-input
+            v-model="form.zysc"
+            placeholder="请输入主要市场  "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="一般纳税人情况  " prop="ybnsrqk">
+          <el-input
+            v-model="form.ybnsrqk"
+            placeholder="请输入一般纳税人情况  "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="国家级奖项、发明专利   " prop="gjjjxfmzl">
+          <el-input
+            v-model="form.gjjjxfmzl"
+            placeholder="请输入国家级奖项、发明专利   "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="AEO情况   " prop="aeoqk">
+          <el-input
+            v-model="form.aeoqk"
+            placeholder="请输入AEO情况   "
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="检测、服务外包、文化服务创新   "
+          prop="jcfwwbwhfwcx"
+        >
+          <el-input
+            v-model="form.jcfwwbwhfwcx"
+            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 {
+  listGARDENBASEDATA,
+  getGARDENBASEDATA,
+  delGARDENBASEDATA,
+  addGARDENBASEDATA,
+  updateGARDENBASEDATA,
+  getEnterprise,
+} from "@/api/portal/GARDENBASEDATA/GARDENBASEDATA";
+
+export default {
+  name: "GARDENBASEDATA",
+  data() {
+    return {
+      // 部门列表
+      detpList: [],
+      detpValue:null,
+
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 园区内企业基础数据表格数据
+      GARDENBASEDATAList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        deptId: null,
+        fddbr: null,
+        qydblxfs: null,
+        kgqy: null,
+        zczj: null,
+        hydl: null,
+        hyxl: null,
+        qylx: null,
+        sfwzqy: null,
+        jyzt: null,
+        shtyxydm: null,
+        qyhgbm: null,
+        rygm: null,
+        clrq: null,
+        tcsj: null,
+        jyqxz: null,
+        jyqxz1: null,
+        zcdz: null,
+        zyyw: null,
+        jyfw: null,
+        qyzz: null,
+        zysc: null,
+        ybnsrqk: null,
+        gjjjxfmzl: null,
+        aeoqk: null,
+        jcfwwbwhfwcx: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          {
+            required: true,
+            message: "园区内企业基础数据主键不能为空",
+            trigger: "blur",
+          },
+        ],
+        deptId: [
+          { required: true, message: "部门主键不能为空", trigger: "blur" },
+        ],
+        fddbr: [
+          { required: true, message: "法定代表人 不能为空", trigger: "blur" },
+        ],
+        qydblxfs: [
+          {
+            required: true,
+            message: "企业代表联系方式 不能为空",
+            trigger: "blur",
+          },
+        ],
+        kgqy: [
+          { required: true, message: "控股企业 不能为空", trigger: "blur" },
+        ],
+        zczj: [
+          { required: true, message: "注册资金不能为空", trigger: "blur" },
+        ],
+        hydl: [
+          { required: true, message: "行业大类 不能为空", trigger: "blur" },
+        ],
+        hyxl: [
+          { required: true, message: "行业小类 不能为空", trigger: "blur" },
+        ],
+        qylx: [
+          { required: true, message: "企业类型 不能为空", trigger: "blur" },
+        ],
+        sfwzqy: [
+          { required: true, message: "是否外资企业 不能为空", trigger: "blur" },
+        ],
+        jyzt: [
+          { required: true, message: "经营状态 不能为空", trigger: "blur" },
+        ],
+        shtyxydm: [
+          {
+            required: true,
+            message: "统一社会信用代码 不能为空",
+            trigger: "blur",
+          },
+        ],
+        qyhgbm: [
+          { required: true, message: "企业海关编码 不能为空", trigger: "blur" },
+        ],
+        rygm: [
+          { required: true, message: "人员规模不能为空", trigger: "blur" },
+        ],
+        clrq: [
+          { required: true, message: "成立日期 不能为空", trigger: "change" },
+        ],
+        tcsj: [
+          { required: true, message: "投产时间 不能为空", trigger: "change" },
+        ],
+        jyqxz: [
+          { required: true, message: "经营期限自 不能为空", trigger: "blur" },
+        ],
+        jyqxz1: [
+          { required: true, message: "经营期限至 不能为空", trigger: "blur" },
+        ],
+        zcdz: [
+          { required: true, message: "注册地址 不能为空", trigger: "blur" },
+        ],
+        zyyw: [
+          { required: true, message: "主营业务 不能为空", trigger: "blur" },
+        ],
+        jyfw: [
+          { required: true, message: "经营范围 不能为空", trigger: "blur" },
+        ],
+        qyzz: [
+          { required: true, message: "企业资质 不能为空", trigger: "blur" },
+        ],
+        zysc: [
+          { required: true, message: "主要市场 不能为空", trigger: "blur" },
+        ],
+        ybnsrqk: [
+          {
+            required: true,
+            message: "一般纳税人情况 不能为空",
+            trigger: "blur",
+          },
+        ],
+        gjjjxfmzl: [
+          {
+            required: true,
+            message: "国家级奖项、发明专利 不能为空",
+            trigger: "blur",
+          },
+        ],
+        aeoqk: [
+          { required: true, message: "AEO情况 不能为空", trigger: "blur" },
+        ],
+        jcfwwbwhfwcx: [
+          {
+            required: true,
+            message: "检测、服务外包、文化服务创新 不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    getEnterprise().then((res) => {
+      this.detpList = res.data;
+    });
+  },
+  methods: {
+    deptSelect(val){
+      this.form.deptId = this.detpList[val].deptId;
+      this.form.deptName = this.detpList[val].deptName;
+    },
+    setUpTimeSelect(val) {
+      this.form.clrq = val;
+    },
+    putTimeSelect(val) {
+      this.form.tcsj = val;
+    },
+    /** 查询园区内企业基础数据列表 */
+    getList() {
+      this.loading = true;
+      listGARDENBASEDATA(this.queryParams).then((response) => {
+        this.GARDENBASEDATAList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deptId: null,
+        fddbr: null,
+        qydblxfs: null,
+        kgqy: null,
+        zczj: null,
+        hydl: null,
+        hyxl: null,
+        qylx: null,
+        sfwzqy: null,
+        jyzt: null,
+        shtyxydm: null,
+        qyhgbm: null,
+        rygm: null,
+        clrq: null,
+        tcsj: null,
+        jyqxz: null,
+        jyqxz1: null,
+        zcdz: null,
+        zyyw: null,
+        jyfw: null,
+        qyzz: null,
+        zysc: null,
+        ybnsrqk: null,
+        gjjjxfmzl: null,
+        aeoqk: null,
+        jcfwwbwhfwcx: 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;
+      getGARDENBASEDATA(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) {
+            updateGARDENBASEDATA(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGARDENBASEDATA(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 delGARDENBASEDATA(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/GARDENBASEDATA/export",
+        {
+          ...this.queryParams,
+        },
+        `GARDENBASEDATA_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/GARDENTRADEDATA/edit.vue

@@ -3,6 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="200px">
       <el-form-item label="企业出口退税额" prop="companyDrawback">
         <el-input
+          type="number"
           v-model="form.companyDrawback"
           placeholder="请输入企业出口退税额"
         ></el-input>
@@ -10,6 +11,7 @@
 
       <el-form-item label="园区出口退税总额" prop="gardenDrawback">
         <el-input
+          type="number"
           v-model="form.gardenDrawback"
           placeholder="请输入园区出口退税总额"
         ></el-input>
@@ -17,6 +19,7 @@
 
       <el-form-item label="园区运营单位缴税总额" prop="gardenTax">
         <el-input
+          type="number"
           v-model="form.gardenTax"
           placeholder="请输入园区运营单位缴税总额"
         ></el-input>
@@ -24,6 +27,7 @@
 
       <el-form-item label="企业承接单量" prop="companyLists">
         <el-input
+          type="number"
           v-model="form.companyLists"
           placeholder="请输入企业承接单量"
         ></el-input>
@@ -31,6 +35,7 @@
 
       <el-form-item label="园区承接单总量" prop="gardenLits">
         <el-input
+          type="number"
           v-model="form.gardenLits"
           placeholder="请输入园区承接单总量"
         ></el-input>
@@ -38,6 +43,7 @@
 
       <el-form-item label="企业创新获奖量" prop="companyInnovative">
         <el-input
+          type="number"
           v-model="form.companyInnovative"
           placeholder="请输入企业创新获奖量"
         ></el-input>
@@ -45,6 +51,7 @@
 
       <el-form-item label="园区内创新获奖总量" prop="gardenInnovative">
         <el-input
+          type="number"
           v-model="form.gardenInnovative"
           placeholder="请输入园区内创新获奖总量"
         ></el-input>
@@ -52,6 +59,7 @@
 
       <el-form-item label="企业工业用水、用电量" prop="companyWaterElectric">
         <el-input
+          type="number"
           v-model="form.companyWaterElectric"
           placeholder="请输入企业工业用水、用电量"
         ></el-input>
@@ -59,6 +67,7 @@
 
       <el-form-item label="园区工业用水、用电总量" prop="gardenWaterElectric">
         <el-input
+          type="number"
           v-model="form.gardenWaterElectric"
           placeholder="请输入园区工业用水、用电总量"
         ></el-input>
@@ -94,72 +103,40 @@ export default {
           { required: true, message: "保税区ID不能为空", trigger: "blur" },
         ],
         companyDrawback: [
-          {
-            required: true,
-            message: "企业出口退税额 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "企业出口退税额年龄必须为数字值" },
+          { required: true, message: "企业出口退税额 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "企业出口退税额年龄必须为整数值" },
         ],
         gardenDrawback: [
-          {
-            required: true,
-            message: "园区出口退税总额 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "园区出口退税总额必须为数字值" },
+          { required: true, message: "园区出口退税总额 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "园区出口退税总额必须为整数值" },
         ],
         gardenTax: [
-          {
-            required: true,
-            message: "园区运营单位缴税总额 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "园区运营单位缴税总额必须为数字值" },
+          { required: true, message: "园区运营单位缴税总额 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "园区运营单位缴税总额必须为整数值" },
         ],
         companyLists: [
           { required: true, message: "企业承接单量 不能为空", trigger: "blur" },
-          { type: "number", message: "企业承接单量必须为数字值" },
+          { pattern: /^[1-9]\d*$/, message: "企业承接单量必须为整数值" },
         ],
         gardenLits: [
-          {
-            required: true,
-            message: "园区承接单总量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "园区承接单总量年龄必须为数字值" },
+          { required: true, message: "园区承接单总量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "园区承接单总量年龄必须为整数值" },
         ],
         companyInnovative: [
-          {
-            required: true,
-            message: "企业创新获奖量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "企业创新获奖量必须为数字值" },
+          { required: true, message: "企业创新获奖量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "企业创新获奖量必须为整数值" },
         ],
         gardenInnovative: [
-          {
-            required: true,
-            message: "园区内创新获奖总量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "园区内创新获奖总量必须为数字值" },
+          { required: true, message: "园区内创新获奖总量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "园区内创新获奖总量必须为整数值" },
         ],
         companyWaterElectric: [
-          {
-            required: true,
-            message: "企业工业用水、用电量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "必须为数字值" },
+          { required: true, message: "企业工业用水、用电量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "必须为整数值" },
         ],
         gardenWaterElectric: [
-          {
-            required: true,
-            message: "园区工业用水、用电总量 不能为空",
-            trigger: "blur",
-          },
-          { type: "number", message: "必须为数字值" },
+          { required: true, message: "园区工业用水、用电总量 不能为空", trigger: "blur", },
+          { pattern: /^[1-9]\d*$/, message: "必须为整数值" },
         ],
       },
     };

src/views/GATHER/importFile.vue

@@ -1,13 +1,14 @@
 <template>
+  <div>
+    <template>
+      <div class="tips-text">
+        <span class="tit">提示</span>
+        <p>1.请检查保税区名称是否一致或者统一！</p>
+        <p>2.上传前，请先检查excel文件内容的严谨性！</p>
+      </div>
+    </template>
     <div class="cmain" style="display: flex;justify-content: center;align-items: center;">
-      <el-upload
-        class="upload-demo"
-        drag
-        action="#"
-        :http-request="AvatarUpload"
-        multiple
-        :auto-upload="true"
-      >
+      <el-upload class="upload-demo" drag action="#" :http-request="AvatarUpload" multiple :auto-upload="true">
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       </el-upload>
@@ -15,43 +16,43 @@
         <el-button @click="$layer.close(layerid)">取 消</el-button>
       </div>
     </div>
-  </template>
+  </div>
+</template>
   
-  <script>
-  import { importUpload } from "@/api/portal/GARDENTRADEDATA/GARDENTRADEDATA.js";
-  export default {
-    data() {
-      return {};
+<script>
+import { importUpload } from "@/api/portal/GARDENTRADEDATA/GARDENTRADEDATA.js";
+export default {
+  data() {
+    return {};
+  },
+  props: {
+    layerid: {
+      type: String
     },
-    props:{
-      layerid: {
-        type: String
-      },
-      param: {
+    param: {
       type: Object,
       default: () => {
         return {};
       },
     },
+  },
+  methods: {
+    AvatarUpload(file) {
+      let formData = new FormData()
+      formData.append('file', file.file)
+      Object.keys(this.param).forEach(item => {
+        formData.append(item, this.param[item])
+      });
+      importUpload(formData).then(res => {
+        if (res.code == 200) {
+          this.$modal.msgSuccess(res.msg);
+          this.$parent.getList();
+          this.$layer.close(this.layerid);
+        }
+      })
     },
-    methods: {
-      AvatarUpload(file) {
-          let formData = new FormData()
-          formData.append('file',file.file)
-          Object.keys(this.param).forEach(item => {
-            formData.append(item, this.param[item])
-          });
-          importUpload(formData).then(res=>{
-              if(res.code == 200){
-                this.$modal.msgSuccess(res.msg);
-                this.$parent.getList();
-                this.$layer.close(this.layerid);
-              }
-          })
-      },
-    },
-  };
-  </script>
+  },
+};
+</script>
   
-  <style>
-  </style>
+<style></style>

src/views/IMPORTANTPROJECT/index.vue

@@ -0,0 +1,523 @@
+<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:IMPORTANTPROJECT: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:IMPORTANTPROJECT: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:IMPORTANTPROJECT: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:IMPORTANTPROJECT:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="IMPORTANTPROJECTList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="重点项目数据	主键" align="center" prop="id">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.id"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="项目名称 " align="center" prop="xmmc">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.xmmc"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="建设单位 " align="center" prop="jsdw">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.jsdw"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="承建单位 " align="center" prop="cjdw">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.cjdw"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="建设规模 " align="center" prop="jsgm">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.jsgm"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="建设内容 " align="center" prop="jsnr">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.jsnr"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="年度投资计划 " align="center" prop="ndtzjh">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.ndtzjh"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="实际完成投资额 " align="center" prop="sjwctze">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sjwctze"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column
+        label="年度投资完成百分比 "
+        align="center"
+        prop="ndtzwcbfb"
+      >
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.ndtzwcbfb"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createTime"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createBy"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="修改时间" align="center" prop="updateTime">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateTime"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="修改人" align="center" prop="updateBy">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateBy"/>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="部门主键" align="center" prop="deptId">
+        <!-- <template slot-scope="scope">
+          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.deptId"/>
+        </template> -->
+      </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:IMPORTANTPROJECT:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:IMPORTANTPROJECT: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="35%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"></el-input>
+        </el-form-item>
+
+        <el-form-item label="建设单位" prop="jsdw">
+          <el-select
+            v-model="buildValue"
+            @change="selectBuild"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="(item, index) in deptList"
+              :key="index"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="承设单位" prop="cjdw">
+          <!-- {{ buildValue  }} -->
+          <el-select
+            v-model="deptValue"
+            @change="selectDept"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="(item, index) in deptList"
+              :key="index"
+              :label="item.deptName"
+              :value="item.deptId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="建设规模 " prop="jsgm">
+          <el-input
+            v-model="form.jsgm"
+            placeholder="请输入建设规模 "
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="建设内容 " prop="jsnr">
+          <el-input
+            v-model="form.jsnr"
+            placeholder="请输入建设内容 "
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="年度投资计划 " prop="ndtzjh">
+          <el-input
+            v-model="form.ndtzjh"
+            placeholder="请输入年度投资计划 "
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="实际完成投资额 " prop="sjwctze">
+          <el-input
+            v-model="form.sjwctze"
+            placeholder="请输入实际完成投资额 "
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="年度投资完成百分比 " prop="ndtzwcbfb">
+          <el-input
+            v-model="form.ndtzwcbfb"
+            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 { listDept } from "@/api/system/dept";
+
+import {
+  listIMPORTANTPROJECT,
+  getIMPORTANTPROJECT,
+  delIMPORTANTPROJECT,
+  addIMPORTANTPROJECT,
+  updateIMPORTANTPROJECT,
+} from "@/api/portal/IMPORTANTPROJECT/IMPORTANTPROJECT";
+
+export default {
+  name: "IMPORTANTPROJECT",
+  data() {
+    return {
+      // 单位列表
+      deptList: [],
+      deptValue: null,
+      buildValue: null,
+
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 重点项目数据							 表格数据
+      IMPORTANTPROJECTList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        xmmc: null,
+        jsdw: null,
+        cjdw: null,
+        jsgm: null,
+        jsnr: null,
+        ndtzjh: null,
+        sjwctze: null,
+        ndtzwcbfb: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          {
+            required: true,
+            message: "重点项目数据	主键不能为空",
+            trigger: "blur",
+          },
+        ],
+        xmmc: [
+          { required: true, message: "项目名称 不能为空", trigger: "blur" },
+        ],
+        jsdw: [
+          { required: true, message: "建设单位 不能为空", trigger: "blur" },
+        ],
+        cjdw: [
+          { required: true, message: "承建单位 不能为空", trigger: "blur" },
+        ],
+        jsgm: [
+          { required: true, message: "建设规模 不能为空", trigger: "blur" },
+        ],
+        jsnr: [
+          { required: true, message: "建设内容 不能为空", trigger: "blur" },
+        ],
+        ndtzjh: [
+          { required: true, message: "年度投资计划 不能为空", trigger: "blur" },
+        ],
+        sjwctze: [
+          {
+            required: true,
+            message: "实际完成投资额 不能为空",
+            trigger: "blur",
+          },
+        ],
+        ndtzwcbfb: [
+          {
+            required: true,
+            message: "年度投资完成百分比 不能为空",
+            trigger: "blur",
+          },
+        ],
+        deptId: [
+          {
+            required: true,
+            message: "部门主键,根据[建设单位 ]获得不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    listDept().then((res) => {
+      res.data.forEach((item) => {
+        if (item.type == 3) {
+          this.deptList.push(item);
+        }
+      });
+      console.log(this.deptList);
+    });
+  },
+  methods: {
+    /** 查询重点项目数据							 列表 */
+    getList() {
+      this.loading = true;
+      listIMPORTANTPROJECT(this.queryParams).then((response) => {
+        this.IMPORTANTPROJECTList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    selectDept(val) {
+      this.form.cjdw = val;
+    },
+    selectBuild(val) {
+      this.form.jsdw = val;
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        xmmc: null,
+        jsdw: null,
+        cjdw: null,
+        jsgm: null,
+        jsnr: null,
+        ndtzjh: null,
+        sjwctze: null,
+        ndtzwcbfb: null,
+        deptId: null,
+      };
+      this.deptValue = null;
+      this.buildValue = 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;
+      getIMPORTANTPROJECT(id).then((response) => {
+        this.deptList.forEach((item) => {
+          if (item.deptId == response.data.jsdw) {
+            this.deptValue = item.deptName;
+          } else if (item.deptId == response.data.cjdw) {
+            this.buildValue = item.deptName;
+          }
+        });
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改重点项目数据							 ";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateIMPORTANTPROJECT(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            // this.form.deptId = this.$store.state.user.
+            addIMPORTANTPROJECT(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 delIMPORTANTPROJECT(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/IMPORTANTPROJECT/export",
+        {
+          ...this.queryParams,
+        },
+        `IMPORTANTPROJECT_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/JOINTCONFERENCE/add.vue

@@ -18,7 +18,7 @@
       </el-form-item>
 
       <el-form-item label="协作单位" prop="dept">
-        <!-- <el-select 
+        <!-- <el-select
           v-model="deptId"
           multiple
           placeholder="请选择协作单位"
@@ -213,7 +213,8 @@ export default {
             //   }
             // }
             //俊豪像甲方一样，老是让我改传参
-            this.form.cooperativeUnitId = this.deptId;
+            //↑好家伙你还改错了，是seleValue不是deptId
+            this.form.cooperativeUnitId = this.seleValue;
             this.form.deptNum = this.form.cooperativeUnitId.length;
             addJOINTCONFERENCE(this.form).then((response) => {
               this.$modal.msgSuccess("发布成功");

src/views/JOINTCONFERENCE/callback.vue

@@ -186,4 +186,8 @@ export default {
 .cmain .detail_item p {
   margin: 0;
 }
+
+textarea:focus{
+   outline: none;
+ }
 </style>

src/views/JOINTCONFERENCE/detail.vue

@@ -14,8 +14,8 @@
       <p>{{ item.reply }}</p>
     </div>
 
-    <div class="detail_item">
-      <div class="title">附件：</div>
+    <div class="detail_item wire">
+      <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
@@ -111,7 +111,10 @@ export default {
 .cmain .detail_item {
   display: flex;
   align-items: flex-start;
-  margin-bottom: 20px;
+  margin-bottom: 50px;
+}
+.wire{
+
 }
 .detail_item .title {
   width: 100px;
@@ -127,9 +130,7 @@ export default {
   margin-right: 10px;
 }
 
-.detail_item .item {
- 
-}
+
 .item_file{
   cursor: pointer;
   display: flex;
@@ -138,9 +139,7 @@ export default {
 }
 
 .img_text {
-  // width: 80px;
-  // overflow: hidden;
-  // text-overflow: ellipsis;
+  width: 240px;
 }
 
 .dept_list {
@@ -148,7 +147,7 @@ export default {
   align-items: flex-start;
   margin-bottom: 35px;
   .title {
-    width: 120px;
+    width: 240px;
   }
   p {
     flex: 1;

src/views/TOTEXP/index.vue

@@ -1,19 +1,56 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item>
         <el-form-item label="保税区名称" prop="type" label-width="110">
-          <el-select v-model="queryParams.deptId" placeholder="请选择保税区" clearable filterable class="se">
-            <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId" />
+          <el-select
+            v-model="queryParams.deptId"
+            placeholder="请选择保税区"
+            clearable
+            filterable
+            class="se"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.deptName"
+              :value="item.deptId"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="年份" prop="type" label-width="110">
-          <el-select v-model="queryParams.year" placeholder="请选择年份" clearable filterable class="se">
-            <el-option v-for="item in nearYearList" :key="item" :label="item" :value="item" />
+          <el-select
+            v-model="queryParams.year"
+            placeholder="请选择年份"
+            clearable
+            filterable
+            class="se"
+          >
+            <el-option
+              v-for="item in nearYearList"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
           </el-select>
         </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-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>
 
@@ -26,7 +63,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['totexp:TOTEXP:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -37,7 +75,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['totexp:TOTEXP:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -48,7 +87,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['totexp:TOTEXP:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -58,26 +98,35 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['totexp:TOTEXP:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <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">-->
-<!--          {{scope.row.id}}-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="主键" align="center" prop="id">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          {{scope.row.id}}-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column label="保税区" align="center" prop="deptName">
         <template slot-scope="scope">
-          {{scope.row.deptName}}
+          {{ scope.row.deptName }}
         </template>
       </el-table-column>
       <el-table-column label="进出口值" align="center" prop="imExport">
         <template slot-scope="scope">
-          {{scope.row.imExport}}
+          {{ scope.row.imExport }}
+        </template>
+      </el-table-column>
+      <el-table-column label="市进出口值" align="center" prop="cityTotal">
+        <template slot-scope="scope">
+          {{scope.row.cityTotal}}
         </template>
       </el-table-column>
 <!--      <el-table-column label="创建时间" align="center" prop="createTime">-->
@@ -92,10 +141,14 @@
 <!--      </el-table-column>-->
       <el-table-column label="年份" align="center" prop="year">
         <template slot-scope="scope">
-          {{scope.row.year}}
+          {{ scope.row.year }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -103,20 +156,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['totexp:TOTEXP:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['totexp:TOTEXP:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -124,15 +179,22 @@
     />
 
     <!-- 添加或修改保税区进出口总值数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
       <el-form :ref="'form'" :model="form" :rules="rules" label-width="80px">
-        <el-form-item prop="deptId"  label-width="100px" label="保税区名称">
-          <el-select v-model="form.deptId" filterable default-first-option clearable placeholder="请选择保税区">
+        <el-form-item prop="deptId" label-width="120px" label="保税区名称">
+          <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">
+              :value="item.deptId"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -142,14 +204,37 @@
               v-for="(item,index) in nearYearList"
               :key="index"
               :label="item"
+              type="month"
               :value="item">
             </el-option>
           </el-select>
+<!--          我只要年份，请不要打开这个代码谢谢 -->
+<!--          <el-date-picker-->
+<!--            v-model="form.year"-->
+<!--            type="month"-->
+<!--            placeholder="请选择年月"-->
+<!--          >-->
+<!--          </el-date-picker>-->
+        </el-form-item>
+        <!-- <el-form-item label="分类" prop="typeName" label-width="110">
+          <el-cascader
+            clearable
+            v-model="seleValue"
+            :options="deptListSele"
+            :props="propOpt"
+            @change="handleChange"
+          >
+          </el-cascader>
+        </el-form-item> -->
+        <el-form-item prop="ratio" label-width="100px" label="同比">
+          <el-input v-model="form.ratio" placeholder="请输入同比"></el-input>
         </el-form-item>
         <el-form-item prop="imExport" label-width="100px" label="进出口总值">
-          <el-input  v-model="form.imExport" placeholder="请输入进出口总值" ></el-input>
+          <el-input
+            v-model="form.imExport"
+            placeholder="请输入进出口总值"
+          ></el-input>
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -160,8 +245,14 @@
 </template>
 
 <script>
-import { listTOTEXP, getTOTEXP, delTOTEXP, addTOTEXP, updateTOTEXP } from "@/api/totexp/TOTEXP";
-import { listDept } from '@/api/system/dept'
+import {
+  listTOTEXP,
+  getTOTEXP,
+  delTOTEXP,
+  addTOTEXP,
+  updateTOTEXP,
+} from "@/api/totexp/TOTEXP";
+import { listDept } from "@/api/system/dept";
 
 export default {
   name: "TOTEXP",
@@ -200,23 +291,21 @@ export default {
         imExport: null,
         createTime: null,
         createBy: null,
-        year: null
+        year: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         deptId: [
-          { required: true, message: "保税区不能为空", trigger: "blur" }
+          { required: true, message: "保税区不能为空", trigger: "blur" },
         ],
         imExport: [
           { required: true, message: "进出口值不能为空", trigger: "blur" },
-          { trigger: 'blur', validator: this.validatorFloatNum }
+          { trigger: "blur", validator: this.validatorFloatNum },
         ],
-        year: [
-          { required: true, message: "年份不能为空", trigger: "blur" }
-        ]
-      }
+        year: [{ required: true, message: "年份不能为空", trigger: "blur" }],
+      },
     };
   },
   created() {
@@ -227,18 +316,18 @@ export default {
     /** 查询保税区进出口总值数据列表 */
     getList() {
       this.loading = true;
-      listTOTEXP(this.queryParams).then(response => {
+      listTOTEXP(this.queryParams).then((response) => {
         this.TOTEXPList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
-      this.getDeptList()
+      this.getDeptList();
     },
     // 获取保税区列表
     getDeptList() {
       this.loading = true;
-      listDept({parentId: '100'}).then(response => {
-        this.deptList = response.data
+      listDept({ parentId: "100" }).then((response) => {
+        this.deptList = response.data;
         this.loading = false;
       });
     },
@@ -249,12 +338,12 @@ export default {
 
       // 获取近三年
       let nearYearArr = [];
-      nearYearArr.push(curYear)
+      nearYearArr.push(curYear);
       for (let i = 1; i <= 4; i++) {
-        nearYearArr.push(curYear - i + '');
+        nearYearArr.push(curYear - i + "");
       }
 
-      this.nearYearList = nearYearArr
+      this.nearYearList = nearYearArr;
     },
     // 取消按钮
     cancel() {
@@ -267,7 +356,7 @@ export default {
         id: null,
         deptId: null,
         imExport: null,
-        year: null
+        year: null,
       };
       this.resetForm("form");
     },
@@ -283,9 +372,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -296,27 +385,27 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getTOTEXP(id).then(response => {
+      const id = row.id || this.ids;
+      getTOTEXP(id).then((response) => {
         this.form = response.data;
-        this.form.deptId = Number(this.form.deptId)
+        this.form.deptId = Number(this.form.deptId);
         this.open = true;
         this.title = "修改保税区进出口总值数据";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
-        console.log(valid)
+      this.$refs["form"].validate((valid) => {
+        console.log(valid);
         if (valid) {
           if (this.form.id != null) {
-            updateTOTEXP(this.form).then(response => {
+            updateTOTEXP(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addTOTEXP(this.form).then(response => {
+            addTOTEXP(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -328,33 +417,43 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除保税区进出口总值数据编号为"' + ids + '"的数据项？').then(function() {
-        return delTOTEXP(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm(
+          '是否确认删除保税区进出口总值数据编号为"' + ids + '"的数据项？'
+        )
+        .then(function () {
+          return delTOTEXP(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('totexp/TOTEXP/export', {
-        ...this.queryParams
-      }, `TOTEXP_${new Date().getTime()}.xlsx`)
+      this.download(
+        "totexp/TOTEXP/export",
+        {
+          ...this.queryParams,
+        },
+        `TOTEXP_${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 {
+        callback(new Error("请输入数字和正确格式的数字"));
+      } else if (value.split(".").length > 2) {
+        callback(new Error("请输入正确格式的数字")); //防止输入多个小数点
+      } else {
         callback();
       }
-    // else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
-    //     callback(new Error('最多只能输入两位小数')); //小数点后两位
-    //   }
+      // else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
+      //     callback(new Error('最多只能输入两位小数')); //小数点后两位
+      //   }
     },
-  }
+  },
 };
 </script>

src/views/norm/quotaBonded.vue

@@ -51,7 +51,11 @@
       <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" prop="fileNames" width="280">
+        <template slot-scope="scope">
+          <el-link @click="download(scope.row.fileNames)">{{scope.row.fileNames}}</el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="150">
         <template slot-scope="scope">
           <el-button
@@ -113,9 +117,11 @@
             class="upload-demo"
             ref="upload"
             action="#"
-            :http-request="httprequest"
             :file-list="fileList"
-            :auto-upload="true"
+            :auto-upload="false"
+            :on-remove="handleRemove"
+            :on-change="handleChange"
+            :multiple="true"
           >
             <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
           </el-upload>
@@ -143,7 +149,7 @@
 import { listQUOTABONDED, getQUOTABONDED, delQUOTABONDED, addQUOTABONDED, updateQUOTABONDED } from "@/api/norm/QUOTABONDED";
 import { listQUOTAFEE } from "@/api/norm/QUOTAFEE";
 import { listBONDED } from "@/api/portal/BONDED/BONDED.js";
-import { uploadFile } from '@/api/common';
+import { uploadFiles,downloadFiles } from '@/api/common';
 import { listDept } from '@/api/system/dept'
 
 export default {
@@ -312,6 +318,7 @@ export default {
       getQUOTABONDED(id).then(response => {
         this.form = response.data;
         this.form.linkUrls = this.baseURL + response.data.linkUrls;
+        this.fileList = [];
         this.fileList.push({
           name: response.data.fileNames,
           url: response.data.linkUrls,
@@ -321,7 +328,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm() {
+    async submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (!(parseInt(this.form.score) == this.form.score)) {
@@ -345,11 +352,26 @@ export default {
             return;
           }
           if (this.form.id != null) {
-            updateQUOTABONDED(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
+            let formData = new FormData()
+            if (this.fileList.length < 1) {
+              this.$message.error("请选择文件传输！");
+              return;
+            }
+            this.fileList.forEach((item) => {
+              formData.append("file", item.raw);
             });
+            uploadFiles(formData).then(res=>{
+              if(res.code == 200){
+                this.form.linkUrls = res.fileNames;
+                this.form.fileNames = res.newFileNames;
+
+                updateQUOTABONDED(this.form).then(response => {
+                  this.$modal.msgSuccess("修改成功");
+                  this.open = false;
+                  this.getList();
+                });
+              }
+            })
           } else {
             addQUOTABONDED(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
@@ -377,24 +399,21 @@ export default {
       }, `QUOTABONDED_${new Date().getTime()}.xlsx`)
     },
 
-    httprequest(file) {
-      let formData = new FormData()
-      formData.append('file',file.file)
-      uploadFile(formData).then(res=>{
-        if(res.code == 200){
-          if(this.form.linkUrls == null) {
-            this.form.linkUrls = res.fileName + ",";
-            this.form.fileNames = res.newFileName + ",";
-          } else {
-            this.form.linkUrls += res.fileName + ",";
-            this.form.fileNames += res.newFileName + ",";
-          }
-          this.form.linkUrls = this.form.linkUrls.slice(0,this.form.linkUrls.length-1)
-          this.form.fileNames = this.form.fileNames.slice(0,this.form.fileNames.length-1)
-        }
+    handleChange(file, fileList) {
+      this.fileList = fileList;
+    },
+    handleRemove(file, fileList) {
+      this.fileList = fileList;
+    },
+    download(resource) {
+      console.log("resource",resource)
+      downloadFiles(resource).then(res=>{
+        if(res.code == 200) {
 
+
+        }
       })
-    },
+    }
   }
 };
 </script>