Merge branch 'master' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into master

src/api/garden/GARDENDATA.js

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

src/views/GARDENDATA/index.vue

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

src/views/GATHER/index.vue

@@ -124,17 +124,23 @@
             @click="handleDownload(scope.row)"
             >下载导入模板</el-button
           > -->
-          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 0" size="mini" type="text" @click="handleUpdate(scope.row)">录入</el-button>
+          <template v-if="scope.row.collStatus == 0">
+            <el-button style="margin: 0 2px" size="mini" type="text" v-has-permi="['gather:GATHER:add']"  @click="handleUpdate(scope.row)">录入</el-button>
+          </template>
           <template v-if="scope.row.reportStatus == 0 && scope.row.collStatus == 1">
             <el-popconfirm title="确定上报吗？" @confirm="handleReport(scope.row)">
               <el-button style="margin: 0 2px" size="mini" slot="reference" type="text"  v-hasPermi="['gather:GATHER:report']">上报</el-button>
             </el-popconfirm>
           </template>
-          <el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
-            <el-button style="margin: 0 2px" v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1" size="mini" v-hasPermi="['gather:GATHER:approve']" type="text" slot="reference">审核</el-button>
-          </el-popconfirm>
-          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text" @click="handleDetail(scope.row, 0)">查看</el-button>
+<!--          todo不加 template 会造成浏览器渲染问题 导致无法弹出 el-popconfirm 组件-->
+          <template v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1">
+            <el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
+              <el-button style="margin: 0 2px"  size="mini" v-hasPermi="['gather:GATHER:approve']" type="text" slot="reference">审核</el-button>
+            </el-popconfirm>
+          </template>
+
 
+          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text" @click="handleDetail(scope.row, 0)">查看</el-button>
           <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1 && scope.row.reportStatus == 0 && scope.row.approveStatus == 0" size="mini" type="text" @click="handleDetail(scope.row, 1)">修改</el-button>
         </template>
       </el-table-column>
@@ -403,7 +409,7 @@ export default {
           ]
         };
       }
-      
+
       // if (name == '期末单位面积企业从业人员' || name == '活跃企业数' || name == '期末企业从业人员') {
       //   return {
       //     collCalue: [
@@ -430,7 +436,7 @@ export default {
           ]
         };
           break;
-      
+
         default:
         return {
           collCalue: [
@@ -492,7 +498,7 @@ export default {
           this.openUpload = false;
         });
       }
-      
+
     },
     //下载模板
     handleDownload() {

src/views/RANK/index.vue

@@ -131,6 +131,7 @@
             </el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item prop="ranking" label-width="100px" label="排名">
           <el-input  v-model="form.ranking" placeholder="请输入排名" ></el-input>
         </el-form-item>

src/views/TOTEXP/index.vue

@@ -348,11 +348,12 @@ export default {
         callback(new Error('请输入数字和正确格式的数字'));
       } else if (value.split('.').length > 2) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
-        callback(new Error('最多只能输入两位小数')); //小数点后两位
-      } else {
+      }  else {
         callback();
       }
+    // else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
+    //     callback(new Error('最多只能输入两位小数')); //小数点后两位
+    //   }
     },
   }
 };

src/views/norm/quotaBonded.vue

@@ -86,7 +86,13 @@
 
         <el-form-item label-width="100px" label="保税区" prop="bondedName">
           <el-select v-model="form.bondedName" placeholder="请选择保税区" clearable filterable @change="selectBondedChange" style="width:100%">
-            <el-option v-for="dict in BONDEDList" :key="dict.id" :label="dict.bondedName" :value="dict" />
+<!--            <el-option v-for="dict in BONDEDList" :key="dict.id" :label="dict.bondedName" :value="dict" />-->
+            <el-option
+              v-for="item in deptList"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptName">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label-width="100px" label="辅助指标" prop="quotaName">
@@ -138,6 +144,7 @@ import { listQUOTABONDED, getQUOTABONDED, delQUOTABONDED, addQUOTABONDED, update
 import { listQUOTAFEE } from "@/api/norm/QUOTAFEE";
 import { listBONDED } from "@/api/portal/BONDED/BONDED.js";
 import { uploadFile } from '@/api/common';
+import { listDept } from '@/api/system/dept'
 
 export default {
   name: "QUOTABONDED",
@@ -166,6 +173,8 @@ export default {
       QUOTAFEEList: [],
       BONDEDList: [],
       fileList: [],
+      // 保税区列表
+      deptList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -213,11 +222,25 @@ export default {
       this.BONDEDList = response.rows;
     });
     this.getList();
+    this.getDeptList()
   },
   methods: {
+
+    // 获取保税区列表
+    getDeptList() {
+      this.loading = true;
+      listDept({parentId: '100'}).then(response => {
+        this.deptList = response.data
+        this.loading = false;
+      });
+    },
     selectBondedChange(val) {
-      this.form.bondedId = val.id;
-      this.form.bondedName = val.bondedName;
+      const selectedDept = this.deptList.find(item => item.deptName === this.form.bondedName);
+      if (selectedDept) {
+        this.form.bondedId = selectedDept.deptId;
+      }
+      // this.form.bondedId = val.id;
+      // this.form.bondedName = val.bondedName;
     },
     selectQuotaChange(val) {
       this.form.quotaId = val.id;
@@ -288,6 +311,11 @@ export default {
       const id = row.id || this.ids
       getQUOTABONDED(id).then(response => {
         this.form = response.data;
+        this.form.linkUrls = this.baseURL + response.data.linkUrls;
+        this.fileList.push({
+          name: response.data.fileNames,
+          url: response.data.linkUrls,
+        });
         this.open = true;
         this.title = "辅助指标录入修改";
       });
@@ -353,7 +381,6 @@ export default {
       let formData = new FormData()
       formData.append('file',file.file)
       uploadFile(formData).then(res=>{
-        console.log("11111111",res)
         if(res.code == 200){
           if(this.form.linkUrls == null) {
             this.form.linkUrls = res.fileName + ",";