Jelajahi Sumber

删除判断

wangzhuo 1 tahun lalu
induk
melakukan
e1f6f779a6

+ 8 - 2
src/views/iosBasicData/baccelements/index.vue

@@ -29,8 +29,7 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
-        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.baccelements_delete"
-          @click="handleDelete">删 除
+        <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
         </el-button>
         <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
         </el-button>
@@ -404,6 +403,13 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
+        }
+      }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 20 - 13
src/views/iosBasicData/bcorps/index.vue

@@ -1106,7 +1106,7 @@ export default {
       // // console.log(data, 904)
       // reqiestData.corpType = data.id
       // if (this.search.corpType == null) {
-        this.search.corpType = data.id
+      this.search.corpType = data.id
       // } else {
       //   this.search.corpType = null
       // }
@@ -1153,21 +1153,28 @@ export default {
       });
     },
     rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return removeBcorps(row.id);
+      if (row.status === 1) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
+          .then(() => {
+            return removeBcorps(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
           });
+      } else {
+        this.$message({
+          message: '非禁用状态无法删除',
+          type: 'warning'
         });
+      }
     },
     handleDelete() {
       if (this.selectionList.length === 0) {

+ 7 - 0
src/views/iosBasicData/bcountrys/index.vue

@@ -388,6 +388,13 @@ export default {
                 this.$message.warning("请选择至少一条数据");
                 return;
             }
+
+            for (const selection of this.selectionList) {
+                if (selection.status == 0) {
+                    this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+                    return;
+                }
+            }
             this.$confirm("确定将选择数据删除?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",

+ 8 - 2
src/views/iosBasicData/blocations/index.vue

@@ -29,8 +29,7 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
-        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.blocations_delete"
-          @click="handleDelete">删 除
+        <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
         </el-button>
         <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
         </el-button>
@@ -425,6 +424,13 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
+        }
+      }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 7 - 0
src/views/iosBasicData/bpackages/index.vue

@@ -528,6 +528,13 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+
+        for (const selection of this.selectionList) {
+          if (selection.status == 0) {
+            this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+            return;
+          }
+        }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 7 - 0
src/views/iosBasicData/bports/index.vue

@@ -501,6 +501,13 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
+        }
+      }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 8 - 2
src/views/iosBasicData/bserviceterms/index.vue

@@ -40,8 +40,7 @@
       <template slot="menuLeft">
         <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新建服务条款
         </el-button>
-        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.bserviceterms_delete"
-          @click="handleDelete">删 除
+        <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
         </el-button>
         <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
         </el-button>
@@ -544,6 +543,13 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
+        }
+      }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 8 - 2
src/views/iosBasicData/btrademodes/index.vue

@@ -31,8 +31,7 @@
       <template slot="menuLeft">
         <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新建贸易条款
         </el-button>
-        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.btrademodes_delete"
-          @click="handleDelete">删 除
+        <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
         </el-button>
         <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
         </el-button>
@@ -435,6 +434,13 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
+        }
+      }
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 481 - 495
src/views/iosBasicData/bunits/index.vue

@@ -1,29 +1,13 @@
 <!-- 计量单位 -->
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               id="out-table"
-               :header-cell-class-name="headerClassName"
-               :before-open="beforeOpen"
-               :search.sync="search"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 296)"
-               @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 296)"
-               @on-load="onLoad">
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
+      id="out-table" :header-cell-class-name="headerClassName" :before-open="beforeOpen" :search.sync="search"
+      v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+      @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 296)"
+      @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 296)" @on-load="onLoad">
       <template slot="code" slot-scope="scope">
         <avue-text-ellipsis :text="scope.row.code" :height="30" use-tooltip placement="top">
           <small slot="more">...</small>
@@ -45,417 +29,385 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.bunits_delete"
-                   @click="handleDelete">删 除
+        <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
         </el-button>
-                <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
-                </el-button>
-                <el-button type="success" size="small" @click="handleExport" icon="el-icon-printer">导出</el-button>
+        <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
+        </el-button>
+        <el-button type="success" size="small" @click="handleExport" icon="el-icon-printer">导出</el-button>
       </template>
     </avue-crud>
 
     <el-dialog title="导入往来单位" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
-            v-dialog-drag>
-            <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore"
-                :upload-after="onSuccess">
-                <template slot="excelTemplate">
-                    <el-button type="primary" @click="handleGet">
-                        点击下载<i class="el-icon-download el-icon--right"></i>
-                    </el-button>
-                </template>
-            </avue-form>
-            <p style="text-align: center;color: #DC0505">
-                温馨提示 第一次导入时请先下载模板
-            </p>
-        </el-dialog>
+      v-dialog-drag>
+      <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore"
+        :upload-after="onSuccess">
+        <template slot="excelTemplate">
+          <el-button type="primary" @click="handleGet">
+            点击下载<i class="el-icon-download el-icon--right"></i>
+          </el-button>
+        </template>
+      </avue-form>
+      <p style="text-align: center;color: #DC0505">
+        温馨提示 第一次导入时请先下载模板
+      </p>
+    </el-dialog>
 
   </basic-container>
 </template>
 
 <script>
-  import {getBunitsList, getBunitsDetail, addBunits, updateBunits, removeBunits} from "@/api/iosBasicData/bunits";
-  import {mapGetters} from "vuex";
+import { getBunitsList, getBunitsDetail, addBunits, updateBunits, removeBunits } from "@/api/iosBasicData/bunits";
+import { mapGetters } from "vuex";
 
-  import { getToken } from "@/util/auth";
+import { getToken } from "@/util/auth";
 
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        excelBox: false,
-            search: {},
-        excelForm: {},
-            excelLoading: false,
-        excelOption: {
-                submitBtn: false,
-                emptyBtn: false,
-                column: [
-                    {
-                        label: "模板下载",
-                        prop: "excelTemplate",
-                        formslot: true,
-                        span: 24
-                    },
-                    {
-                        label: "模板上传",
-                        prop: "excelFile",
-                        type: "upload",
-                        drag: true,
-                        loadText: "模板上传中,请稍等",
-                        span: 24,
-                        propsHttp: {
-                            res: "data"
-                        },
-                        tip: "请上传 .xls,.xlsx 标准格式文件",
-                        action: "/api/blade-los/bunits/importBUnits"
-                    }
-                ]
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      excelBox: false,
+      search: {},
+      excelForm: {},
+      excelLoading: false,
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24
+          },
+          {
+            label: "模板上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "模板上传中,请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data"
             },
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {},
-        optionBack: {
-            addBtnText:'新建计量单位',
-            addTitle:'新建计量单位',
-            editBtnText:'编辑',
-            editTitle:'编辑计量单位',
-            viewBtnText:'查看',
-            viewTitle:'查看计量单位',
-          height:'auto',
-          stripe: true,
-          searchIcon: true,
-          searchIndex: 3,
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            // {
-            //   label: "主键",
-            //   prop: "id",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入主键",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "创建人 Id",
-            //   prop: "createUser",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入创建人 Id",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "创建人",
-            //   prop: "createUserName",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入创建人",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "创建部门 Id",
-            //   prop: "createDept",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入创建部门 Id",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "创建部门",
-            //   prop: "createDeptName",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入创建部门",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "创建时间",
-            //   prop: "createTime",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入创建时间",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "修改人 Id",
-            //   prop: "updateUser",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入修改人 Id",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "修改人",
-            //   prop: "updateUserName",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入修改人",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "修改时间",
-            //   prop: "updateTime",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入修改时间",
-            //     trigger: "blur"
-            //   }]
-            // },
-            {
-              label: "编码",
-              prop: "code",
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/blade-los/bunits/importBUnits"
+          }
+        ]
+      },
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      option: {},
+      optionBack: {
+        addBtnText: '新建计量单位',
+        addTitle: '新建计量单位',
+        editBtnText: '编辑',
+        editTitle: '编辑计量单位',
+        viewBtnText: '查看',
+        viewTitle: '查看计量单位',
+        height: 'auto',
+        stripe: true,
+        searchIcon: true,
+        searchIndex: 3,
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: true,
+        selection: true,
+        dialogClickModal: false,
+        column: [
+          // {
+          //   label: "主键",
+          //   prop: "id",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入主键",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "创建人 Id",
+          //   prop: "createUser",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入创建人 Id",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "创建人",
+          //   prop: "createUserName",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入创建人",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "创建部门 Id",
+          //   prop: "createDept",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入创建部门 Id",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "创建部门",
+          //   prop: "createDeptName",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入创建部门",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "创建时间",
+          //   prop: "createTime",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入创建时间",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "修改人 Id",
+          //   prop: "updateUser",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入修改人 Id",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "修改人",
+          //   prop: "updateUserName",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入修改人",
+          //     trigger: "blur"
+          //   }]
+          // },
+          // {
+          //   label: "修改时间",
+          //   prop: "updateTime",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入修改时间",
+          //     trigger: "blur"
+          //   }]
+          // },
+          {
+            label: "编码",
+            prop: "code",
             width: "180",
-              search: true,
-              slot: true,
-              rules: [{
-                required: true,
-                message: "请输入编码",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "中文名称",
-              prop: "cnName",
+            search: true,
+            slot: true,
+            rules: [{
+              required: true,
+              message: "请输入编码",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "中文名称",
+            prop: "cnName",
             width: "180",
-              search: true,
-              slot: true,
-              rules: [{
-                required: true,
-                message: "请输入中文名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "英文名称",
-              prop: "enName",
+            search: true,
+            slot: true,
+            rules: [{
+              required: true,
+              message: "请输入中文名称",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "英文名称",
+            prop: "enName",
             width: "180",
-              search: true,
-              slot: true,
-              rules: [{
-                required: true,
-                message: "请输入英文名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "单一窗口编码",
-              prop: "codeSw",
-                width:160,
-              search: true,
-            },
-            {
-              label: "数量规则",
-              prop: "quantityRule",
-              // rules: [{
-              //   required: true,
-              //   message: "请输入数量规则,用于根据单位自动计算数量",
-              //   trigger: "blur"
-              // }]
-            },
-            // {
-            //   label: "quantity_rule=FIXED 时,默认的数量",
-            //   prop: "quantity",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入quantity_rule=FIXED 时,默认的数量",
-            //     trigger: "blur"
-            //   }]
-            // },
-            {
-              label: "版本",
-              prop: "version",
-              display:false,
-            },
-            {
-              label: "状态",
-              prop: "status",
-              type: "select",
-              dicData:[{
-                label:'启用',
-                value:0
-              },{
-                label:'停用',
-                value:1
-              }],
+            search: true,
+            slot: true,
+            rules: [{
+              required: true,
+              message: "请输入英文名称",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "单一窗口编码",
+            prop: "codeSw",
+            width: 160,
+            search: true,
+          },
+          {
+            label: "数量规则",
+            prop: "quantityRule",
+            // rules: [{
+            //   required: true,
+            //   message: "请输入数量规则,用于根据单位自动计算数量",
+            //   trigger: "blur"
+            // }]
+          },
+          // {
+          //   label: "quantity_rule=FIXED 时,默认的数量",
+          //   prop: "quantity",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入quantity_rule=FIXED 时,默认的数量",
+          //     trigger: "blur"
+          //   }]
+          // },
+          {
+            label: "版本",
+            prop: "version",
+            display: false,
+          },
+          {
+            label: "状态",
+            prop: "status",
+            type: "select",
+            dicData: [{
+              label: '启用',
               value: 0
-            },
-            // {
-            //   label: "是否已删除(0 否 1是)",
-            //   prop: "isDeleted",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入是否已删除(0 否 1是)",
-            //     trigger: "blur"
-            //   }]
-            // },
-            {
-              label: "备注",
-              prop: "remarks",
-              type: 'textarea',
-              width: "180",
-              span: 24,
-              minRows: 3,
-              slot: true
-            },
-          ]
-        },
-        data: []
+            }, {
+              label: '停用',
+              value: 1
+            }],
+            value: 0
+          },
+          // {
+          //   label: "是否已删除(0 否 1是)",
+          //   prop: "isDeleted",
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入是否已删除(0 否 1是)",
+          //     trigger: "blur"
+          //   }]
+          // },
+          {
+            label: "备注",
+            prop: "remarks",
+            type: 'textarea',
+            width: "180",
+            span: 24,
+            minRows: 3,
+            slot: true
+          },
+        ]
+      },
+      data: []
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        // addBtn: this.vaildData(this.permission.bunits_add, false),
+        // viewBtn: this.vaildData(this.permission.bunits_view, false),
+        // delBtn: this.vaildData(this.permission.bunits_delete, false),
+        // editBtn: this.vaildData(this.permission.bunits_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          // addBtn: this.vaildData(this.permission.bunits_add, false),
-          // viewBtn: this.vaildData(this.permission.bunits_view, false),
-          // delBtn: this.vaildData(this.permission.bunits_delete, false),
-          // editBtn: this.vaildData(this.permission.bunits_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(296), this.optionBack);
+  },
+  methods: {
+    // 导出
+    handleExport() {
+      var condition = ''
+      for (const key in this.search) {
+        var value = this.search[key]
+        if (value) {
+          condition += `&${key}=${this.search[key]}`
+        }
       }
+
+      this.$confirm('是否导出计量单位?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        window.open(
+          `/api/blade-los/bunits/exportBUnits?${this.website.tokenHeader
+          }=${getToken()}${condition}`
+        );
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消' //
+        });
+      })
     },
-    async created() {
-        this.option = await this.getColumnData(this.getColumnName(296), this.optionBack);
+    uploadBefore(file, done, loading) {
+      done();
+      loading = true;
     },
-    methods: {
-        // 导出
-        handleExport() {
-            var condition = ''
-            for (const key in this.search) {
-                var value = this.search[key]
-                if (value) {
-                    condition += `&${key}=${this.search[key]}`
-                }
-            }
-
-            this.$confirm('是否导出计量单位?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                window.open(
-                    `/api/blade-los/bunits/exportBUnits?${this.website.tokenHeader
-                    }=${getToken()}${condition}`
-                );
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消' //
-                });
-            })
-        },
-        uploadBefore(file, done, loading) {
-            done();
-            loading = true;
-        },
-        // 上传成功
-        onSuccess(res, done, loading, column) {
-            this.excelBox = false;
-            this.$message.success("导入成功!");
-            loading = false;
-            this.onLoad(this.page);
-            done();
-        },
-        // 下载模板
-        handleGet() {
-            window.open(
-                `/api/blade-los/bunits/exportBUnits/template?${this.website.tokenHeader
-                }=${getToken()}`
-            );
-        },
-      rowSave(row, done, loading) {
-        addBunits(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
+    // 上传成功
+    onSuccess(res, done, loading, column) {
+      this.excelBox = false;
+      this.$message.success("导入成功!");
+      loading = false;
+      this.onLoad(this.page);
+      done();
+    },
+    // 下载模板
+    handleGet() {
+      window.open(
+        `/api/blade-los/bunits/exportBUnits/template?${this.website.tokenHeader
+        }=${getToken()}`
+      );
+    },
+    rowSave(row, done, loading) {
+      addBunits(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        updateBunits(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+    },
+    rowUpdate(row, index, done, loading) {
+      updateBunits(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      rowDel(row) {
-        if (row.status === 1) {
-          this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-            .then(() => {
-              return removeBunits(row.id);
-            })
-            .then(() => {
-              this.onLoad(this.page);
-              this.$message({
-                type: "success",
-                message: "操作成功!"
-              });
-            });
-        } else {
-          this.$message({
-            message: '非禁用状态无法删除',
-            type: 'warning'
-          });
-        }
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      if (row.status === 1) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         })
           .then(() => {
-            return removeBunits(this.ids);
+            return removeBunits(row.id);
           })
           .then(() => {
             this.onLoad(this.page);
@@ -463,105 +415,139 @@
               type: "success",
               message: "操作成功!"
             });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getBunitsDetail(this.form.id).then(res => {
-            this.form = res.data.data;
           });
+      } else {
+        this.$message({
+          message: '非禁用状态无法删除',
+          type: 'warning'
+        });
+      }
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
         }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-        // 选择的数据抛出
-        this.$emit('selectionChange',list)
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getBunitsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return removeBunits(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
         });
-      },
-      //自定义列保存
-      async saveColumnTwo(ref, option, optionBack, code) {
-            /**
-             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
-             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
-             * 一定要执行异步操作,要等接口成功返回,才能执行下一行编码
-             */
-            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-            if (inSave) {
-                this.$message.success("保存成功");
-                //关闭窗口
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
-            }
-      },
-        //自定义列重置
-      async resetColumnTwo(ref, option, optionBack, code) {
-            this[option] = this[optionBack];
-            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-            if (inSave) {
-                this.$message.success("重置成功");
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
-            }
-      },
-        // 更改表格颜色
-        headerClassName(tab){
-            //颜色间隔
-            let back = ""
-            if (tab.columnIndex >= 0 && tab.column.level === 1) {
-                if (tab.columnIndex % 2 === 0) {
-                    back = "back-one"
-                } else if (tab.columnIndex % 2 === 1) {
-                    back = "back-two"
-                }
-            }
-            return back;
-        },
-    }
-  };
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getBunitsDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+      // 选择的数据抛出
+      this.$emit('selectionChange', list)
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getBunitsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    //自定义列保存
+    async saveColumnTwo(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+       * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作,要等接口成功返回,才能执行下一行编码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //自定义列重置
+    async resetColumnTwo(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = ""
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one"
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two"
+        }
+      }
+      return back;
+    },
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-
 ::v-deep#out-table .back-one {
-        background: #ecf5ff !important;
-    }
-    ::v-deep#out-table .back-two {
-        background: #ecf5ff !important;
-    }
+  background: #ecf5ff !important;
+}
+
+::v-deep#out-table .back-two {
+  background: #ecf5ff !important;
+}
+
 /deep/ .el-col-md-8 {
   width: 24.33333%;
 }
-
 </style>

+ 4 - 4
src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -521,8 +521,8 @@ export default {
         if (valid) {
           this.loadingBtn = true;
           if (this.form.id) {
-            delItem({ id: this.form.id }).then(res => {
-              if (res.data.code == 200) {
+            // delItem({ id: this.form.id }).then(res => {
+            //   if (res.data.code == 200) {
                 typeSave({
                   ...this.form,
                   curExrateList: this.dataList
@@ -534,8 +534,8 @@ export default {
                   .finally(() => {
                     this.loadingBtn = false;
                   });
-              }
-            });
+            //   }
+            // });
           } else {
             typeSave({
               ...this.form,

+ 33 - 0
src/views/iosBasicData/rateManagement/index.vue

@@ -26,6 +26,10 @@
         <template slot-scope="{ row }" slot="updateUser">
           <span>{{ row.updateUserName }}</span>
         </template>
+        <template slot="menuLeft">
+          <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
+          </el-button>
+        </template>
         <template slot-scope="{ row, index }" slot="menu">
           <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
             编辑
@@ -260,6 +264,35 @@ export default {
       this.onLoad(this.page, this.search);
       this.isShow = true;
     },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
+        }
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return deleteDetails(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {
       /**