gks 1 год назад
Родитель
Сommit
3ff51bf450

+ 77 - 0
src/api/portal/RightDistribution/RightDistribution.js

@@ -0,0 +1,77 @@
+import request from '@/utils/request'
+
+// 查询指标采集权限配置列表
+export function listNORMROLE(query) {
+  return request({
+    url: '/norm/NORMROLE/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询指标采集权限配置所有列表
+export function listAllNORMROLE(query) {
+  return request({
+    url: '/norm/NORMROLE/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询指标采集权限配置详细
+export function getNORMROLE(id) {
+  return request({
+    url: '/norm/NORMROLE/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增指标采集权限配置
+export function addNORMROLE(data) {
+  return request({
+    url: '/norm/NORMROLE/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改指标采集权限配置
+export function updateNORMROLE(data) {
+  return request({
+    url: '/norm/NORMROLE/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除指标采集权限配置
+export function delNORMROLE(id) {
+  return request({
+    url: '/norm/NORMROLE/remove/' + id,
+    method: 'get'
+  })
+}
+
+// 停用服务配置
+export function setNORMROLEStop(id) {
+  return request({
+    url: '/norm/NORMROLE/stop/' + id,
+    method: 'post'
+  })
+}
+
+// 启用服务配置
+export function setNORMROLEStart(id) {
+  return request({
+    url: '/norm/NORMROLE/strta/' + id,
+    method: 'post'
+  })
+}
+
+// 查询指标权重明细所有列表
+export function getNORMROLEAllList(id) {
+  return request({
+    url: '/normFee/listAll',
+    method: 'get'
+  })
+}

+ 99 - 79
src/views/BONDEDUPPLY/index.vue

@@ -136,84 +136,93 @@
     />
 
     <!-- 添加或修改保税区供应链数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" 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>
-        </el-form-item>
-        <el-form-item label="进出口标志" prop="jckbz">
-          <el-input v-model="form.jckbz"></el-input>
-        </el-form-item>
-        <el-form-item label="进出口日期" prop="jckrq">
-          <!-- <el-input v-model="form.jckrq"></el-input> -->
-          <el-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>
-        </el-form-item>
-        <el-form-item label="净值" prop="jingzhi">
-          <el-input v-model="form.jingzhi"></el-input>
-        </el-form-item>
-        <el-form-item label="件数" prop="js">
-          <el-input v-model="form.js"></el-input>
-        </el-form-item>
-        <el-form-item label="境内收发货人标号" prop="jnsfhrbh">
-          <el-input v-model="form.jnsfhrbh"></el-input>
-        </el-form-item>
-        <el-form-item label="境内收发货人名称 " prop="jnsfhrmc">
-          <el-input v-model="form.jnsfhrmc"></el-input>
-        </el-form-item>
-        <el-form-item label="境外发货人代码 " prop="jwfhrdm">
-          <el-input v-model="form.jwfhrdm"></el-input>
-        </el-form-item>
-        <el-form-item label="境外收发货人名称   " prop="jwsfhrmc">
-          <el-input v-model="form.jwsfhrmc"></el-input>
-        </el-form-item>
-        <el-form-item label="境外收发货人地址   " prop="jwsfhrdz">
-          <el-input v-model="form.jwsfhrdz"></el-input>
-        </el-form-item>
-        <el-form-item label="启运日期  " prop="qyrq">
-          <!-- <el-input v-model="form.qyrq"></el-input> -->
-          <el-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>
-        </el-form-item>
-        <el-form-item label="保税区主键  " prop="deptId">
-          <el-input v-model="form.deptId"></el-input>
-        </el-form-item> -->
-        <el-form-item label="报关单币种统计   " prop="bgdbztj">
-          <el-input v-model="form.bgdbztj"></el-input>
-        </el-form-item>
-        <el-form-item label="申报单位名称   " prop="sbdwmc">
-          <el-input v-model="form.sbdwmc"></el-input>
-        </el-form-item>
-        <el-form-item label="录单单位编码名称   " prop="lddwbmmc">
-          <el-input v-model="form.lddwbmmc"></el-input>
-        </el-form-item>
-      </el-form>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="35%"
+      append-to-body
+    >
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="基本信息" name="first">
+          <el-form ref="forms" :model="form" :rules="rules" label-width="140px">
+            <el-form-item label="录单单位名称" prop="lddwmc">
+              <el-input v-model="form.lddwmc"></el-input>
+            </el-form-item>
+            <el-form-item label="进出口标志" prop="jckbz">
+              <el-input v-model="form.jckbz"></el-input>
+            </el-form-item>
+            <el-form-item label="进出口日期" prop="jckrq">
+              <el-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>
+            </el-form-item>
+            <el-form-item label="净值" prop="jingzhi">
+              <el-input v-model="form.jingzhi"></el-input>
+            </el-form-item>
+            <el-form-item label="件数" prop="js">
+              <el-input v-model="form.js"></el-input>
+            </el-form-item>
+
+            <el-form-item label="启运日期  " prop="qyrq">
+              <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="bgdbztj">
+              <el-input v-model="form.bgdbztj"></el-input>
+            </el-form-item>
+            <el-form-item label="申报单位名称   " prop="sbdwmc">
+              <el-input v-model="form.sbdwmc"></el-input>
+            </el-form-item>
+            <el-form-item label="录单单位编码名称   " prop="lddwbmmc">
+              <el-input v-model="form.lddwbmmc"></el-input>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="境内外信息" name="second">
+          <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+            <el-form-item label="境内收发货人标号" prop="jnsfhrbh">
+              <el-input v-model="form.jnsfhrbh"></el-input>
+            </el-form-item>
+            <el-form-item label="境内收发货人名称 " prop="jnsfhrmc">
+              <el-input v-model="form.jnsfhrmc"></el-input>
+            </el-form-item>
+            <el-form-item label="境外发货人代码 " prop="jwfhrdm">
+              <el-input v-model="form.jwfhrdm"></el-input>
+            </el-form-item>
+            <el-form-item label="境外收发货人名称   " prop="jwsfhrmc">
+              <el-input v-model="form.jwsfhrmc"></el-input>
+            </el-form-item>
+            <el-form-item label="境外收发货人地址   " prop="jwsfhrdz">
+              <el-input v-model="form.jwsfhrdz"></el-input>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -235,6 +244,7 @@ export default {
   name: "BONDEDUPPLY",
   data() {
     return {
+      activeName: "first",
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -443,7 +453,15 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form, "------------------------------");
+      let is;
+      this.$refs["forms"].validate((valid) => {
+        if (!valid) {
+          this.$message.error("请补全基本信息");
+          is = true;
+          return;
+        }
+      });
+      if (is) return;
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id == null) {
@@ -461,6 +479,8 @@ export default {
               this.reset();
             });
           }
+        }else{
+          this.$message.error("请补全境内外信息");
         }
       });
     },

+ 168 - 127
src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -65,8 +65,8 @@
       @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="id">
+      </el-table-column> -->
       <!-- <el-table-column label="部门id" align="center" prop="deptId">
       </el-table-column> -->
       <el-table-column label="部门名称" align="center" prop="deptName">
@@ -157,130 +157,156 @@
     />
 
     <!-- 添加或修改企业贸易绩效数据(每个月填报)对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" 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>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="40%"
+      append-to-body
+    >
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="基本信息" name="first">
+          <el-form ref="forms" :model="form" :rules="rules" label-width="180px">
+            <el-form-item label="部门" prop="deptName">
+              <el-select
+                v-model="form.deptName"
+                @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="gdzctz">
+              <el-input
+                v-model="form.gdzctz"
+                placeholder="请输入固定资产投资"
+              ></el-input>
+            </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="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>
+        </el-tab-pane>
+        <el-tab-pane label="进出口信息" name="second">
+          <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="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="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>
+        </el-tab-pane>
+      </el-tabs>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -305,7 +331,6 @@ export default {
     return {
       // 部门列表
       deptList: [],
-      deptValue: null,
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -326,6 +351,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      activeName: "first",
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -377,6 +403,9 @@ export default {
             trigger: "blur",
           },
         ],
+        deptName: [
+          { required: true, message: "部门信息不能为空", trigger: "blur" },
+        ],
         gdzctz: [
           { required: true, message: "固定资产投资不能为空", trigger: "blur" },
         ],
@@ -557,6 +586,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      let is;
+      this.$refs["forms"].validate((valid) => {
+        if (!valid) {
+          this.$message.error("请补全基本信息");
+          is = true;
+          return;
+        }
+      });
+      if (is) return;
+      
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -572,6 +611,8 @@ export default {
               this.getList();
             });
           }
+        }else{
+          this.$message.error("请补全进出口信息");
         }
       });
     },

+ 25 - 21
src/views/GARDENBASEDATA/index.vue

@@ -8,17 +8,17 @@
       v-show="showSearch"
       label-width="88px"
     >
-    <el-form-item label="部门名称" prop="deptId">
-      <el-select v-model="queryParams.deptId" placeholder="请选择">
-        <el-option
-          v-for="item in detpList"
-          :key="item.value"
-          :label="item.deptName"
-          :value="item.deptId"
-        >
-        </el-option>
-      </el-select>
-    </el-form-item>
+      <el-form-item label="部门名称" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择">
+          <el-option
+            v-for="item in detpList"
+            :key="item.value"
+            :label="item.deptName"
+            :value="item.deptId"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="法定代表人" prop="fddbr">
         <el-input v-model="queryParams.fddbr" placeholder="请输入"></el-input>
       </el-form-item>
@@ -202,8 +202,14 @@
     />
 
     <!-- 添加或修改园区内企业基础数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="35%" append-to-body>
-      <el-tabs v-model="tabMsg"  type="border-card">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="35%"
+      append-to-body
+    >
+      <el-tabs v-model="tabMsg" type="border-card">
         <el-tab-pane name="basicMsg" label="企业基本信息">
           <el-form ref="forms" :model="form" :rules="rules" label-width="180px">
             <el-form-item label="法定代表人" prop="fddbr">
@@ -431,7 +437,7 @@ export default {
   data() {
     return {
       // 新增标签索引
-      tabMsg:"basicMsg",
+      tabMsg: "basicMsg",
       // 部门列表
       detpList: [],
 
@@ -709,16 +715,14 @@ export default {
     /** 提交按钮 */
     submitForm() {
       let is;
-      this.$refs["forms"].validate((valid)=>{
-        if (valid) {
-        
-        }else{
-          this.$message.error("请补齐企业基本信息")
+      this.$refs["forms"].validate((valid) => {
+        if (!valid) {
+          this.$message.error("请补齐企业基本信息");
           is = true;
           return;
         }
       });
-      
+
       if (is) return;
 
       this.$refs["form"].validate((valid) => {
@@ -736,7 +740,7 @@ export default {
               this.getList();
             });
           }
-        }else{
+        } else {
           this.$message.error("请补齐额外信息");
           return;
         }

+ 429 - 0
src/views/RightDistribution/index.vue

@@ -0,0 +1,429 @@
+<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="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in statusOpt"
+            :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:NORMROLE: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:NORMROLE: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:NORMROLE: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:NORMROLE:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table :data="NORMROLEList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+
+      <el-table-column label="指标分类名称" align="center" prop="fname">
+      </el-table-column>
+      <el-table-column label="指标分类编号" align="center" prop="feeId">
+      </el-table-column>
+      <el-table-column label="排序" align="center" prop="senId">
+      </el-table-column>
+      <el-table-column label="是否启用" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            @change="statusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark">
+      </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:NORMROLE:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:NORMROLE: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="80px">
+        <el-form-item label="选择角色" prop="senId">
+          <el-select filterable v-model="form.senId" placeholder="请选择">
+            <el-option
+              v-for="item in roleList"
+              :key="item.value"
+              :label="item.roleName"
+              :value="item.roleId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择指标" prop="feeId">
+          <el-select filterable v-model="form.feeId" placeholder="请选择">
+            <el-option
+              v-for="item in indList"
+              :key="item.value"
+              :label="item.fname"
+              :value="item.id"
+            >
+            </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 {
+  listNORMROLE,
+  getNORMROLE,
+  delNORMROLE,
+  addNORMROLE,
+  updateNORMROLE,
+  setNORMROLEStop,
+  setNORMROLEStart,
+  listAllNORMROLE,
+  getNORMROLEAllList,
+} from "@/api/portal/RightDistribution/RightDistribution";
+
+import { listRole } from "@/api/system/role";
+
+export default {
+  name: "NORMROLE",
+  data() {
+    return {
+      roleValue: "",
+      indValue: "",
+
+      statusOpt: [
+        {
+          label: "未启用",
+          value: 0,
+        },
+        {
+          label: "启用",
+          value: 1,
+        },
+      ],
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 指标采集权限配置表格数据
+      NORMROLEList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        deptId: null,
+        feeId: null,
+        senId: null,
+        status: null,
+        startTime: null,
+        stopTime: null,
+        remark: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        roleId: [{ required: true, message: "角色不能为空", trigger: "blur" }],
+        ind: [{ required: true, message: "指标不能为空", trigger: "blur" }],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" },
+        ],
+        feeId: [{ required: true, message: "指标不能为空", trigger: "blur" }],
+        senId: [{ required: true, message: "角色不能为空", trigger: "blur" }],
+        status: [
+          {
+            required: true,
+            message: "是否启用(1=启用,0不启用)不能为空",
+            trigger: "blur",
+          },
+        ],
+        startTime: [
+          { required: true, message: "启用时间不能为空", trigger: "blur" },
+        ],
+        stopTime: [
+          { required: true, message: "停用时间不能为空", trigger: "blur" },
+        ],
+        remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+      },
+      indList: [],
+      roleList: [],
+    };
+  },
+  created() {
+    setNORMROLEStart;
+    this.getList();
+    this.getNormroleallList();
+    this.getRoleList();
+  },
+  methods: {
+    statusChange(val) {
+      // if (val.status == 0) {
+        setNORMROLEStart(val.id).then((res) => {
+          if (res.code == 200) {
+            this.$message.success("修改成功");
+          }
+        });
+      // } else {
+      //   setNORMROLEStop(val.id).then((res) => {
+      //     if (res.code == 200) {
+      //       this.$message.success("修改成功");
+      //     }
+      //   });
+      // }
+      this.getList();
+    },
+
+    // 查询指标采集权限配置所有列表
+    getNormroleallList() {
+      getNORMROLEAllList().then((res) => {
+        this.indList = res.data;
+      });
+    },
+
+    // 查询角色列表
+    getRoleList() {
+      listRole().then((res) => {
+        this.roleList = res.rows;
+      });
+    },
+    /** 查询指标采集权限配置列表 */
+    getList() {
+      this.loading = true;
+      listNORMROLE(this.queryParams).then((response) => {
+        response.rows.forEach((item, index) => {
+          response.rows[index].status = item.status == 0 ? false : true;
+        });
+        this.NORMROLEList = response.rows;
+        console.log(this.NORMROLEList);
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        deptId: null,
+        feeId: null,
+        senId: null,
+        status: null,
+        startTime: null,
+        stopTime: null,
+        remark: 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;
+      getNORMROLE(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) {
+            updateNORMROLE(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.status = 1;
+            addNORMROLE(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 delNORMROLE(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/NORMROLE/export",
+        {
+          ...this.queryParams,
+        },
+        `NORMROLE_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

+ 1 - 1
src/views/norm/quotaBonded.vue

@@ -104,7 +104,7 @@
           <el-link style="text-decoration: underline;color: #36aafd" @click="download(scope.row.fileNames)">{{scope.row.fileNames}}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="350">
+      <el-table-column label="操作" align="center" fixed="right" width="180">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == null"