huifudaima

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesTemplateController.java

@@ -108,11 +108,8 @@ public class ActSuppliesTemplateController extends BaseController {
     @PreAuthorize("@ss.hasPermi('SuppliesTemplate:SuppliesTemplate:listId')")
     @GetMapping("/listId/{id}")
     public TableDataInfo listId(@PathVariable("id") Long id) {
-
         List<ActSuppliesTemplate> sysSupplies = actSuppliesTemplateService.saveTemplate(id);
-
         return getDataTable(sysSupplies);
-
     }
 
     /**
@@ -169,9 +166,7 @@ public class ActSuppliesTemplateController extends BaseController {
         if (list.size()>0){
             return AjaxResult.success("312",list.toArray());
         }
-
         return toAjax(1);
-
     }
 
     /**
@@ -186,7 +181,6 @@ public class ActSuppliesTemplateController extends BaseController {
         if (find.contains(name)){
             return AjaxResult.success("上传文件名重复，请修改后上传！","存在重复");
         }
-
         return AjaxResult.success("验证通过","验证通过");
     }
 
@@ -197,7 +191,6 @@ public class ActSuppliesTemplateController extends BaseController {
     @GetMapping("/enable/{id}")
     public AjaxResult setEnable(@PathVariable("id") Long id)
     {
-
         actSuppliesTemplateService.setEnable(id);
         return AjaxResult.success();
     }
@@ -212,9 +205,7 @@ public class ActSuppliesTemplateController extends BaseController {
 //        if(actSuppliesTemplateService.find(id).size()>0){
 //            return AjaxResult.success("该物料下存在关联物料，请先删除关联物料！！！","操作失败");
 //        }
-
         actSuppliesTemplateService.setDisable(id);
         return AjaxResult.success();
-
     }
 }
\ No newline at end of file

ruoyi-ui/src/views/system/supplies/index.vue

@@ -51,7 +51,7 @@
         <!-- luckysheet容器 -->
         <div
             id="luckysheet"
-            style="margin: 0px; padding: 0px; position: absolute; width: 100%; height:78vh; z-index: 0"
+            style="margin: 0px; padding: 0px; position: absolute; width: 100%; height:80vh; z-index: 0"
         >
         </div>
         <div v-if="showMask" class="mask">

ruoyi-ui/src/views/system/supplies/index_template.vue

@@ -388,9 +388,7 @@ export default {
 
     },
     mounted() {
-
         window.handleReturnButtonClick = this.handleReturnButtonClick;
-
     },
 
     methods: {

ruoyi-ui/src/views/system/suppliesrole/index.vue.bak1

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="模板ID" prop="tempId">
+        <el-input
+          v-model="queryParams.tempId"
+          placeholder="请输入模板ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规则名称" prop="roleName">
+        <el-input
+          v-model="queryParams.roleName"
+          placeholder="请输入规则名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </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="['system:suppliesrole: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="['system:suppliesrole: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="['system:suppliesrole: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="['system:suppliesrole:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="suppliesroleList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="模板ID" align="center" prop="tempId" />
+      <el-table-column label="规则名称" align="center" prop="roleName" />
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+      <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="['system:suppliesrole:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:suppliesrole: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="模板ID" prop="tempId">
+          <el-select v-model="form.tempId" filterable placeholder="请选择关联项" >
+            <el-option
+              v-for="option in options"
+              :key="option.templateName"
+              :label="option.templateName"
+              :value="option.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="规则名称" prop="roleName">
+          <el-input v-model="form.roleName" placeholder="请输入规则名称" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="parseInt(dict.dictValue)"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </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 { listSuppliesrole, getSuppliesrole, delSuppliesrole, addSuppliesrole, updateSuppliesrole, exportSuppliesrole,saveSid } from "@/api/system/suppliesrole";
+
+export default {
+  name: "Suppliesrole",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 导入规则表格数据
+      suppliesroleList: [],
+
+      options:[],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 状态数据字典
+      statusOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tempId: null,
+        roleName: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        tempId: [
+          { required: true, message: "关联id不能为空", trigger: "change" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getnameid();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询上级id*/
+    getnameid(){
+      saveSid().then(response =>{
+        this.options = response.rows;
+      })
+    },
+
+    /** 查询导入规则列表 */
+    getList() {
+      this.loading = true;
+      listSuppliesrole(this.queryParams).then(response => {
+        this.suppliesroleList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 岗位状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.status);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        tempId: null,
+        roleName: null,
+        status: 0,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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
+      getSuppliesrole(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) {
+            updateSuppliesrole(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSuppliesrole(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除导入规则编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delSuppliesrole(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有导入规则数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportSuppliesrole(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>